From 2c2b62d14ebd6f0e32653b8a1f728199cb984e14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Sun, 7 Jan 2024 19:26:29 +0100 Subject: [PATCH] feat: improve ags --- .../hyprland/ags/js/bar/buttons/DateButton.js | 2 +- home/desktops/hyprland/ags/js/main.js | 2 ++ .../hyprland/ags/js/overview/Workspace.js | 4 +-- .../ags/js/quicksettings/QuickSettings.js | 11 ++++--- .../ags/js/quicksettings/widgets/Header.js | 4 +-- .../hyprland/ags/js/settings/setup.js | 13 ++++++++ .../hyprland/ags/js/settings/theme.js | 31 +++++++++++++------ .../hyprland/ags/js/settings/wallpaper.js | 12 ++----- home/desktops/hyprland/ags/js/themes.js | 11 ++++--- home/desktops/hyprland/darkman.nix | 2 +- home/desktops/hyprland/default.nix | 1 + hosts/MONSTER/default.nix | 2 +- 12 files changed, 60 insertions(+), 35 deletions(-) diff --git a/home/desktops/hyprland/ags/js/bar/buttons/DateButton.js b/home/desktops/hyprland/ags/js/bar/buttons/DateButton.js index 0413767..07a0835 100644 --- a/home/desktops/hyprland/ags/js/bar/buttons/DateButton.js +++ b/home/desktops/hyprland/ags/js/bar/buttons/DateButton.js @@ -2,7 +2,7 @@ import App from "resource:///com/github/Aylur/ags/app.js"; import Clock from "../../misc/Clock.js"; import PanelButton from "../PanelButton.js"; -export default ({ format = "%H:%M - %A %e." } = {}) => +export default ({ format = "%R - %x" } = {}) => PanelButton({ class_name: "dashboard panel-button", on_clicked: () => App.toggleWindow("dashboard"), diff --git a/home/desktops/hyprland/ags/js/main.js b/home/desktops/hyprland/ags/js/main.js index b6e4c98..f472849 100644 --- a/home/desktops/hyprland/ags/js/main.js +++ b/home/desktops/hyprland/ags/js/main.js @@ -15,6 +15,7 @@ import { init } from "./settings/setup.js"; import { forMonitors } from "./utils.js"; import { initWallpaper } from "./settings/wallpaper.js"; import options from "./options.js"; +import Dock from "./dock/Dock.js"; initWallpaper(); @@ -27,6 +28,7 @@ const windows = () => [ forMonitors(TopBar), Applauncher(), Dashboard(), + Dock(), Overview(), PowerMenu(), QuickSettings(), diff --git a/home/desktops/hyprland/ags/js/overview/Workspace.js b/home/desktops/hyprland/ags/js/overview/Workspace.js index 5b37f5b..3086033 100644 --- a/home/desktops/hyprland/ags/js/overview/Workspace.js +++ b/home/desktops/hyprland/ags/js/overview/Workspace.js @@ -19,8 +19,8 @@ export default (index) => { class_name: "workspace", vpack: "center", css: ` - min-width: ${1920 * SCALE}px; - min-height: ${1080 * SCALE}px; + min-width: ${3840 * SCALE}px; + min-height: ${2160 * SCALE}px; `, connections: [ [ diff --git a/home/desktops/hyprland/ags/js/quicksettings/QuickSettings.js b/home/desktops/hyprland/ags/js/quicksettings/QuickSettings.js index c39bc1f..be2bbd0 100644 --- a/home/desktops/hyprland/ags/js/quicksettings/QuickSettings.js +++ b/home/desktops/hyprland/ags/js/quicksettings/QuickSettings.js @@ -56,16 +56,17 @@ export default () => children: [ Row([Volume()], [SinkSelector(), AppMixer()]), Microhone(), - Brightness(), + /*Brightness()*/ + , ], }), Row( - [Homogeneous([NetworkToggle(), BluetoothToggle()]), DND()], - [WifiSelection(), BluetoothDevices()], + [Homogeneous([/*NetworkToggle(),*/ BluetoothToggle()]), DND()], + [/*WifiSelection()*/ BluetoothDevices()], ), Row( - [Homogeneous([ProfileToggle(), ThemeToggle()]), MicMute()], - [ProfileSelector(), ThemeSelector()], + [Homogeneous([/*ProfileToggle(),*/ ThemeToggle()]), MicMute()], + [/*ProfileSelector(),*/ ThemeSelector()], ), Media(), ], diff --git a/home/desktops/hyprland/ags/js/quicksettings/widgets/Header.js b/home/desktops/hyprland/ags/js/quicksettings/widgets/Header.js index 7395e4a..d45cc23 100644 --- a/home/desktops/hyprland/ags/js/quicksettings/widgets/Header.js +++ b/home/desktops/hyprland/ags/js/quicksettings/widgets/Header.js @@ -17,7 +17,7 @@ export default () => vpack: "center", hexpand: true, children: [ - Widget.Box({ + /*Widget.Box({ class_name: "battery horizontal", children: [ Widget.Icon({ binds: [["icon", Battery, "icon-name"]] }), @@ -29,7 +29,7 @@ export default () => Widget.Label({ class_name: "uptime", binds: [["label", uptime, "value", (v) => `up: ${v}`]], - }), + }),*/ Widget.Button({ on_clicked: openSettings, child: Widget.Icon(icons.ui.settings), diff --git a/home/desktops/hyprland/ags/js/settings/setup.js b/home/desktops/hyprland/ags/js/settings/setup.js index 083fb6c..46c4033 100644 --- a/home/desktops/hyprland/ags/js/settings/setup.js +++ b/home/desktops/hyprland/ags/js/settings/setup.js @@ -16,6 +16,7 @@ export function init() { warnOnLowBattery(); globals(); tmux(); + kitty(); gsettigsColorScheme(); gtkFontSettings(); dependandOptions(); @@ -35,6 +36,18 @@ function dependandOptions() { }); } +function kitty() { + if (!Utils.exec("which kitty")) return; + console.log("kitty"); + options.theme.scheme.connect("changed", ({ value }) => + Utils.execAsync( + `kitty +kitten themes --reload-in=all --config-file-name /home/theaninova/.config/kitty/current-colors.conf Catppuccin-${ + value === "light" ? "Latte" : "Frappe" + }`, + ), + ); +} + function tmux() { if (!Utils.exec("which tmux")) return; diff --git a/home/desktops/hyprland/ags/js/settings/theme.js b/home/desktops/hyprland/ags/js/settings/theme.js index 624432e..7b54cf4 100644 --- a/home/desktops/hyprland/ags/js/settings/theme.js +++ b/home/desktops/hyprland/ags/js/settings/theme.js @@ -21,15 +21,28 @@ export const WP = App.configDir + "/assets/"; export const lightColors = { "theme.scheme": "light", - "color.red": "#e55f86", - "color.green": "#00D787", - "color.yellow": "#EBFF71", - "color.blue": "#51a4e7", - "color.magenta": "#9077e7", - "color.teal": "#51e6e6", - "color.orange": "#E79E64", - "theme.bg": "#fffffa", - "theme.fg": "#141414", + "color.red": "#d20f39", + "color.green": "#40a02b", + "color.yellow": "#df8e1d", + "color.blue": "#1e66f5", + "color.magenta": "#8839ef", + "color.teal": "#179299", + "color.orange": "#fe640b", + "theme.bg": "transparentize(#eff1f5, 0.3)", + "theme.fg": "#4c4f69", +}; + +export const darkColors = { + "theme.scheme": "dark", + "color.red": "#e78284", + "color.green": "#a6d189", + "color.yellow": "#e5c890", + "color.blue": "#8caaee", + "color.magenta": "#ca9ee6", + "color.teal": "#81c8be", + "color.orange": "#ef9f76", + "theme.bg": "transparentize(#303446, 0.3)", + "theme.fg": "#c6d0f5", }; export const Theme = ({ name, icon = " ", ...options }) => ({ diff --git a/home/desktops/hyprland/ags/js/settings/wallpaper.js b/home/desktops/hyprland/ags/js/settings/wallpaper.js index 6fbeffb..fe9d5c2 100644 --- a/home/desktops/hyprland/ags/js/settings/wallpaper.js +++ b/home/desktops/hyprland/ags/js/settings/wallpaper.js @@ -13,13 +13,7 @@ export function initWallpaper() { export function wallpaper() { if (!dependencies(["swww"])) return; - execAsync([ - "swww", - "img", - "--transition-type", - "grow", - "--transition-pos", - exec("hyprctl cursorpos").replace(" ", ""), - options.desktop.wallpaper.img.value, - ]).catch((err) => console.error(err)); + execAsync(["swww", "img", options.desktop.wallpaper.img.value]).catch((err) => + console.error(err), + ); } diff --git a/home/desktops/hyprland/ags/js/themes.js b/home/desktops/hyprland/ags/js/themes.js index 8d434b9..9edd765 100644 --- a/home/desktops/hyprland/ags/js/themes.js +++ b/home/desktops/hyprland/ags/js/themes.js @@ -2,18 +2,19 @@ * A Theme is a set of options that will be applied * ontop of the default values. see options.js for possible options */ -import { Theme, WP, lightColors } from "./settings/theme.js"; +import { Theme, WP, lightColors, darkColors } from "./settings/theme.js"; export default [ Theme({ - name: "Kitty Dark", + name: "Latte", icon: "󰄛", "desktop.screen_corners": false, "bar.style": "floating", "desktop.wallpaper.img": WP + "Lakeside-2-1.jpg", + ...darkColors, }), Theme({ - name: "Kitty Light", + name: "Frappe", icon: "󰄛", "desktop.screen_corners": false, "bar.style": "floating", @@ -22,7 +23,7 @@ export default [ "theme.widget.bg": "$accent", "theme.widget.opacity": 64, }), - Theme({ + /*Theme({ name: "Leaves", icon: "󰌪", "desktop.wallpaper.img": WP + "leaves.jpg", @@ -66,5 +67,5 @@ export default [ "theme.bg": "transparentize(#171717, 0.3)", "theme.widget.opacity": 95, "bar.flat_buttons": false, - }), + }),*/ ]; diff --git a/home/desktops/hyprland/darkman.nix b/home/desktops/hyprland/darkman.nix index 3212d4e..097015d 100644 --- a/home/desktops/hyprland/darkman.nix +++ b/home/desktops/hyprland/darkman.nix @@ -6,7 +6,7 @@ services.darkman = let wallpaperPath = "${config.home.homeDirectory}/.local/state/wallpaper.jpg"; in { - enable = true; + enable = false; package = pkgs.buildGoModule rec { pname = "darkman"; version = "1.5.4"; diff --git a/home/desktops/hyprland/default.nix b/home/desktops/hyprland/default.nix index 872775a..06249d4 100644 --- a/home/desktops/hyprland/default.nix +++ b/home/desktops/hyprland/default.nix @@ -152,6 +152,7 @@ glib brightnessctl ydotool + kitty ]}"; }; Install = { diff --git a/hosts/MONSTER/default.nix b/hosts/MONSTER/default.nix index e8759f1..eb82d6d 100644 --- a/hosts/MONSTER/default.nix +++ b/hosts/MONSTER/default.nix @@ -148,7 +148,7 @@ programs.hyprland.enable = true; programs.fish.enable = true; security.sudo.configFile = '' - Defaults env_reset,pwfeedback,insults,passprompt="󰟵 " + Defaults env_reset,pwfeedback,passprompt="󰟵 " ''; users.defaultUserShell = pkgs.fish; users.users.${username} = {