diff --git a/README.md b/README.md index ed400b6..e51ac9a 100755 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ each host should have these files: - multi architecture configuration ([nix-systems](https://github.com/nix-systems/nix-systems)?) - bitwarden - divide steam and gamemode? - - cursor size theme option + - laptop specific configuration (power profiles daemon, battery, etc) + - sddm cursors no work :( - sddm x11 support, too. or maybe just remove x11 - gnome keyring / gcr for saving passwords \ No newline at end of file diff --git a/config/waybar.css b/config/waybar.css index 3ee3ba2..0dd5959 100644 --- a/config/waybar.css +++ b/config/waybar.css @@ -103,10 +103,6 @@ window#waybar.floating #window { color: @sapphire; } -#backlight { - color: @yellow; -} - #pulseaudio { color: @pink; } diff --git a/hosts/goopnet-interface/default.nix b/hosts/goopnet-interface/default.nix index 72a1c87..f014afa 100755 --- a/hosts/goopnet-interface/default.nix +++ b/hosts/goopnet-interface/default.nix @@ -26,7 +26,7 @@ # none yet ]) ++ (with pkgs.gnome; [ # yay gnomeware!!!!!!!!!!!!!! yum - nautilus gnome-disk-utility ghex pkgs.gnome-text-editor pkgs.baobab file-roller gnome-system-monitor loupe + nautilus gnome-disk-utility pkgs.gnome-text-editor pkgs.baobab file-roller gnome-system-monitor loupe ]); modules = { diff --git a/modules/desktop/hypridle.nix b/modules/desktop/hypridle.nix index 1d79489..49bd7fb 100644 --- a/modules/desktop/hypridle.nix +++ b/modules/desktop/hypridle.nix @@ -14,24 +14,18 @@ in { }; config = mkIf cfg.enable { - hm.services.hypridle = let - hyprctl = "${config.modules.desktop.hyprland.package}/bin/hyprctl"; - in { + hm.services.hypridle = { enable = true; package = cfg.package; lockCmd = "${pkgs.procps}/bin/pidof hyprlock || ${lib.getExe config.modules.desktop.hyprlock.package}"; unlockCmd = "${pkgs.procps}/bin/pkill -USR1 hyprlock"; - beforeSleepCmd = "${pkgs.systemd}/bin/loginctl lock-session"; # lock the screen before sleeping - afterSleepCmd = "${hyprctl} dispatch dpms on"; # turn on the screen to avoid moving mouse/pressing key + beforeSleepCmd = "${pkgs.systemd}/bin/loginctl lock-session"; - listeners = [ - { - timeout = 60 * 1; - onTimeout = "${lib.getExe pkgs.brightnessctl} -c backlight -s set 20"; # dim screen, save brightness state - onResume = "${lib.getExe pkgs.brightnessctl} -c backlight -r"; # restore previous screen brightness state - } + listeners = let + hyprctl = "${config.modules.desktop.hyprland.package}/bin/hyprctl"; + in [ { timeout = 90; # 1.5 min onTimeout = "${hyprctl} dispatch dpms off"; # turn off screen @@ -42,7 +36,7 @@ in { onTimeout = "${pkgs.systemd}/bin/loginctl lock-session"; # lock computer } { - timeout = 60 * 15; # 15 min + timeout = 60 * 30; # 30 min onTimeout = "${pkgs.systemd}/bin/systemctl suspend"; # sleep/suspend } ]; diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index a420b4e..948d6ab 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -49,9 +49,6 @@ in { bindel = [ # "bind held & locked" ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 10%+" ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 10%-" - - ", XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s +5%" - ", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s 5%-" ]; bindl = [ # "bind locked" ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" @@ -150,11 +147,8 @@ in { "center, initialTitle:^Open Files$" "size 1100 730, initialTitle:^Open Files$" "float, initialTitle:^Save As$" - "center, initialTitle:^Save As$" + "center, initialTitle:^Save As%" "size 1100 730, initialTitle:^Save As$" - "float, initialTitle:^Select a file to open$" - "center, initialTitle:^Select a file to open$" - "size 1100 730, initialTitle:^Select a file to open$" "float, class:\.exe$" diff --git a/modules/desktop/sddm.nix b/modules/desktop/sddm.nix index 7e90a0d..69efeea 100644 --- a/modules/desktop/sddm.nix +++ b/modules/desktop/sddm.nix @@ -9,10 +9,8 @@ in { }; config = mkIf cfg.enable { - # unsure if it's correct to put this in `environment.systemPackages` environment.systemPackages = with pkgs; [ config.modules.desktop.themes.sddmTheme.package - config.modules.desktop.themes.cursorTheme.package libsForQt5.qt5.qtsvg libsForQt5.qt5.qtgraphicaleffects libsForQt5.qt5.qtquickcontrols2 diff --git a/modules/desktop/waybar.nix b/modules/desktop/waybar.nix index 0c91d10..9c4e939 100644 --- a/modules/desktop/waybar.nix +++ b/modules/desktop/waybar.nix @@ -49,7 +49,6 @@ in { orientation = "inherit"; modules = [ "pulseaudio" - "backlight" #"network" "cpu" "memory" @@ -170,11 +169,6 @@ in { on-click = "${lib.getExe pkgs.pavucontrol}"; ignored-sinks = ["Easy Effects Sink"]; }; - backlight = { - format = "{icon} {percent}%"; - format-icons = ["" ""]; - scroll-step = 1; - }; cpu = { interval = 4; format = " {usage}% {avg_frequency}GHz";