From f770342649241cc3d9ac62c8911d6bafa2ba88c0 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Mon, 7 Jul 2025 21:22:25 -0500 Subject: [PATCH] hypland theme fixes --- hosts/desktop/hyprland-settings.nix | 4 ++ hosts/nas/services.nix | 13 +++++++ .../hyprland/config/hypr/default.nix | 4 ++ .../hyprland/config/waybar/default.nix | 37 ++++++++++++++----- .../desktop-environments/hyprland/home.nix | 21 ++++++++++- .../desktop-environments/hyprland/theme.nix | 12 +++--- 6 files changed, 74 insertions(+), 17 deletions(-) diff --git a/hosts/desktop/hyprland-settings.nix b/hosts/desktop/hyprland-settings.nix index 49de2b1..92eaecb 100644 --- a/hosts/desktop/hyprland-settings.nix +++ b/hosts/desktop/hyprland-settings.nix @@ -84,6 +84,10 @@ in ${defaultOpacity} ${borderLeft} } + + #custom-lights:hover { + background: ${theme.nord.polarNight.nord3}; + } ''; }; } \ No newline at end of file diff --git a/hosts/nas/services.nix b/hosts/nas/services.nix index acbbaf7..c0932a3 100755 --- a/hosts/nas/services.nix +++ b/hosts/nas/services.nix @@ -308,6 +308,19 @@ in ''; wantedBy = [ "multi-user.target" ]; }; + + hd-idle = { + path = [ + pkgs.bash + pkgs.hd-idle + ]; + script = '' + hd-idle + ''; + serviceConfig = { + Type = "oneshot"; + }; + }; }; security.pam.services.login.enableGnomeKeyring = true; diff --git a/modules/desktop-environments/hyprland/config/hypr/default.nix b/modules/desktop-environments/hyprland/config/hypr/default.nix index 2f47098..206da7d 100755 --- a/modules/desktop-environments/hyprland/config/hypr/default.nix +++ b/modules/desktop-environments/hyprland/config/hypr/default.nix @@ -261,6 +261,10 @@ in # "move onscreen 0 0, tag:horizonrdp" # float the vmware window cause its annoying to use in fullscreen "float, class:(.*[Vv][Mm]ware-view),title:([Vv][Mm]ware [Hh]orizon [Cc]lient)" + + "tag +waydroid, class:([Ww]aydroid.*)" + "float, tag:waydroid" + "pin, tag:waydroid" ] ++ hyprlandSettings.windowRule; input = { diff --git a/modules/desktop-environments/hyprland/config/waybar/default.nix b/modules/desktop-environments/hyprland/config/waybar/default.nix index 9a0a528..981008f 100755 --- a/modules/desktop-environments/hyprland/config/waybar/default.nix +++ b/modules/desktop-environments/hyprland/config/waybar/default.nix @@ -60,8 +60,8 @@ in temperature = { hwmon-path = "/sys/class/hwmon/hwmon4/temp1_input"; - critical-threshold = 100; - format-critical = "{temperatureC}°C {icon}"; + critical-threshold = 110; + format-critical = "{temperatureC}°C "; format = "{temperatureC}°C {icon}"; format-icons = [ "" # fa-temperature-empty @@ -69,15 +69,14 @@ in "" # fa-temperature-half "" # fa-temperature-three-quarters "" # fa-temperature-full - "" # fa-temperature-high ]; tooltip-format = "CPU: {temperatureC}°C"; }; "temperature#gpu" = { hwmon-path = "/sys/class/hwmon/hwmon0/temp1_input"; - critical-threshold = 100; - format-critical = "{temperatureC}°C {icon}"; + critical-threshold = 110; + format-critical = "{temperatureC}°C "; format = "{temperatureC}°C {icon}"; format-icons = [ "" # fa-temperature-empty @@ -85,7 +84,6 @@ in "" # fa-temperature-half "" # fa-temperature-three-quarters "" # fa-temperature-full - "" # fa-temperature-high ]; on-click = "lact"; tooltip-format = "GPU: {temperatureC}°C"; @@ -93,7 +91,6 @@ in "keyboard-state#capslock" = { capslock = true; - icon-size = 20; format = "{icon}"; tooltip-format = "Caps Lock {state}"; format-icons = { @@ -104,7 +101,6 @@ in "keyboard-state#numlock" = { numlock = true; - icon-size = 60; format = "{icon}"; tooltip-format = "Num Lock {state}"; format-icons = { @@ -248,7 +244,7 @@ in ${defaultBorderRadius} ${defaultOpacity} ${defaultCenterOptions} - margin-left: 1rem; + margin-left: 0.6rem; } #workspaces button { @@ -326,6 +322,11 @@ in background-color: ${settings.theme.nord.polarNight.nord0}; ${defaultOpacity} ${borderRight} + padding-right: 1rem; + } + + #idle_inhibitor:hover { + background: ${settings.theme.nord.polarNight.nord3}; } #network { @@ -345,6 +346,10 @@ in border-radius: 0; } + #bluetooth:hover { + background: ${settings.theme.nord.polarNight.nord3}; + } + #wireplumber.source { color: ${settings.theme.nord.frost.nord8}; background-color: ${settings.theme.nord.polarNight.nord0}; @@ -353,6 +358,10 @@ in border-radius: 0; } + #wireplumber.source:hover { + background: ${settings.theme.nord.polarNight.nord3}; + } + #wireplumber.sink { color: ${settings.theme.nord.frost.nord7}; background-color: ${settings.theme.nord.polarNight.nord0}; @@ -361,6 +370,10 @@ in border-radius: 0; } + #wireplumber.sink:hover { + background: ${settings.theme.nord.polarNight.nord3}; + } + #keyboard-state.numlock { color: ${settings.theme.nord.frost.nord8}; background-color: ${settings.theme.nord.polarNight.nord0}; @@ -385,6 +398,10 @@ in border-radius: 0; } + #temperature.gpu:hover { + background: ${settings.theme.nord.polarNight.nord3}; + } + #temperature { color: ${settings.theme.nord.frost.nord9}; background-color: ${settings.theme.nord.polarNight.nord0}; @@ -400,7 +417,7 @@ in ${defaultOpacity} ${defaultCenterOptions} ${defaultBorderRadius} - margin-right: 1rem; + margin-right: 0.6rem; } /* ------------- */ diff --git a/modules/desktop-environments/hyprland/home.nix b/modules/desktop-environments/hyprland/home.nix index 53a150a..944661a 100755 --- a/modules/desktop-environments/hyprland/home.nix +++ b/modules/desktop-environments/hyprland/home.nix @@ -2,6 +2,23 @@ let settings = import ./settings.nix { inherit pkgs hyprlandSettings; }; wallpaper = "/run/wallpaper.jpg"; + jiggler = pkgs.python3.pkgs.buildPythonPackage rec { + pname = "jiggler"; + version = "0.0.3"; + format = "pyproject"; + src = pkgs.fetchPypi { + inherit pname version; + sha256 = "sha256-6M4CbwxajYaQ5s73y+arKewLgu/pjfCay2giVVGYjhM="; + }; + + # do not run tests + doCheck = false; + nativeBuildInputs = with pkgs.python3.pkgs; [ setuptools ]; + propagatedBuildInputs = with pkgs.python3.pkgs; [ + click + pynput + ]; + }; in { imports = [ @@ -216,7 +233,9 @@ in size = settings.cursorSize; }; - packages = settings.requiredPkgs; + packages = [ + jiggler + ] ++ settings.requiredPkgs; }; dconf = { diff --git a/modules/desktop-environments/hyprland/theme.nix b/modules/desktop-environments/hyprland/theme.nix index 2afe6a4..7e27336 100644 --- a/modules/desktop-environments/hyprland/theme.nix +++ b/modules/desktop-environments/hyprland/theme.nix @@ -38,15 +38,15 @@ defaultOpacity = "opacity: 0.85;"; defaultBorderRadius = "border-radius: 1rem;"; defaultCenterOptions = '' - padding-top: 0.5rem; - padding-bottom: 0.5rem; + padding-top: 0.2rem; + padding-bottom: 0.2rem; padding-left: 0.5rem; padding-right: 0.5rem; margin: 3px 0; ''; borderRight = '' - padding-top: 0.5rem; - padding-bottom: 0.5rem; + padding-top: 0.2rem; + padding-bottom: 0.2rem; padding-left: 0.5rem; padding-right: 0.5rem; margin: 3px 0; @@ -54,8 +54,8 @@ margin-right: 0.5rem; ''; borderLeft = '' - padding-top: 0.5rem; - padding-bottom: 0.5rem; + padding-top: 0.2rem; + padding-bottom: 0.2rem; padding-left: 0.5rem; padding-right: 0.5rem; margin: 3px 0;