diff --git a/homeManagerModules/desktop/hyprland/settings.nix b/homeManagerModules/desktop/hyprland/settings.nix index 63cac0a5..0457d2c7 100644 --- a/homeManagerModules/desktop/hyprland/settings.nix +++ b/homeManagerModules/desktop/hyprland/settings.nix @@ -129,7 +129,6 @@ in { (lib.getExe pkgs.mako) (lib.getExe pkgs.waybar) (lib.getExe pkgs.wayland-pipewire-idle-inhibit) - (lib.getExe' pkgs.playerctl "playerctld") ] ++ lib.lists.optional (cfg.desktop.redShift) "${lib.getExe pkgs.gammastep} -l 33.74:-84.38" diff --git a/homeManagerModules/desktop/sway/settings.nix b/homeManagerModules/desktop/sway/settings.nix index 1f1e50af..7b20c661 100644 --- a/homeManagerModules/desktop/sway/settings.nix +++ b/homeManagerModules/desktop/sway/settings.nix @@ -161,7 +161,6 @@ in { {command = lib.getExe pkgs.autotiling;} {command = lib.getExe pkgs.mako;} {command = lib.getExe pkgs.wayland-pipewire-idle-inhibit;} - {command = lib.getExe' pkgs.playerctl "playerctld";} ] ++ lib.optional cfg.desktop.redShift {command = "${lib.getExe pkgs.gammastep} -l 33.74:-84.38";} diff --git a/homeManagerModules/desktop/wayland/default.nix b/homeManagerModules/desktop/wayland/default.nix index 69cf84d3..640a9d59 100644 --- a/homeManagerModules/desktop/wayland/default.nix +++ b/homeManagerModules/desktop/wayland/default.nix @@ -13,9 +13,9 @@ swaylock.enable = lib.mkDefault true; waybar.enable = lib.mkDefault true; }; + services = { swayidle.enable = lib.mkDefault true; - swayosd.enable = lib.mkDefault true; }; }; @@ -34,6 +34,11 @@ swayosd ]; + services = { + playerctld.enable = lib.mkDefault true; + swayosd.enable = lib.mkDefault true; + }; + xdg.portal = { enable = true; configPackages = diff --git a/homeManagerModules/options.nix b/homeManagerModules/options.nix index 7b0ffd84..e3f6f188 100644 --- a/homeManagerModules/options.nix +++ b/homeManagerModules/options.nix @@ -217,7 +217,6 @@ in { }; swayidle.enable = lib.mkEnableOption "Swayidle idle daemon."; - swayosd.enable = lib.mkEnableOption "On Screen Display (OSD) for volume/brightness/etc."; }; theme = { diff --git a/homeManagerModules/services/default.nix b/homeManagerModules/services/default.nix index 7fd52f95..2fd584ce 100644 --- a/homeManagerModules/services/default.nix +++ b/homeManagerModules/services/default.nix @@ -3,6 +3,5 @@ ./easyeffects ./mpd ./swayidle - ./swayosd ]; } diff --git a/homeManagerModules/services/swayidle/default.nix b/homeManagerModules/services/swayidle/default.nix index 05e0d0dc..d32535d8 100644 --- a/homeManagerModules/services/swayidle/default.nix +++ b/homeManagerModules/services/swayidle/default.nix @@ -7,9 +7,8 @@ cfg = config.ar.home; hyprctl = lib.getExe' config.wayland.windowManager.hyprland.package "hyprctl"; swaymsg = lib.getExe' config.wayland.windowManager.sway.package "swaymsg"; - in { - config = lib.mkIf cfg.apps.swayidle.enable { + config = lib.mkIf cfg.services.swayidle.enable { services.swayidle = { enable = true; diff --git a/homeManagerModules/services/swayosd/default.nix b/homeManagerModules/services/swayosd/default.nix deleted file mode 100644 index 42199d3a..00000000 --- a/homeManagerModules/services/swayosd/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - config, - lib, - ... -}: { - config = lib.mkIf config.ar.home.apps.swayosd.enable { - services.swayosd.enable = true; - }; -}