From 90a5d3bfd9f1ba451861d3a7d815ed11da9761b6 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Sun, 5 May 2024 17:22:15 -0400
Subject: [PATCH] sway/river/hypr: removed duplicated hard dependencies

---
 aly.nix                                      |  5 +++++
 dustin.nix                                   |  5 +++++
 homeManagerModules/apps/swaylock/default.nix |  2 ++
 homeManagerModules/desktop/hypr/default.nix  | 12 +-----------
 homeManagerModules/desktop/river/default.nix | 14 +-------------
 homeManagerModules/desktop/sway/default.nix  | 14 +-------------
 6 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/aly.nix b/aly.nix
index 95ee48cc..07490949 100644
--- a/aly.nix
+++ b/aly.nix
@@ -13,10 +13,14 @@
 
   home.packages = with pkgs; [
     browsh
+    celluloid
     curl
+    evince
     fractal
     gh
     git
+    gnome.eog
+    gnome.file-roller
     (google-chrome.override {
       commandLineArgs = [
         "--enable-features=UseOzonePlatform"
@@ -28,6 +32,7 @@
     ruby
     trayscale
     wget
+    xfce.xfce4-taskmanager
     zoom-us
   ];
 
diff --git a/dustin.nix b/dustin.nix
index 4a192539..735832fe 100644
--- a/dustin.nix
+++ b/dustin.nix
@@ -13,10 +13,15 @@
   programs.home-manager.enable = true;
 
   home.packages = with pkgs; [
+    celluloid
+    evince
     fractal
+    gnome.eog
+    gnome.file-roller
     libreoffice-fresh
     plexamp
     vlc
+    xfce.xfce4-taskmanager
     zoom-us
   ];
 
diff --git a/homeManagerModules/apps/swaylock/default.nix b/homeManagerModules/apps/swaylock/default.nix
index c98bef0a..dc31d89e 100644
--- a/homeManagerModules/apps/swaylock/default.nix
+++ b/homeManagerModules/apps/swaylock/default.nix
@@ -9,6 +9,8 @@
   config = lib.mkIf config.alyraffauf.apps.swaylock.enable {
     home.packages = with pkgs; [swaylock];
 
+    programs.swaylock.enable = true;
+
     xdg.configFile."swaylock/config".text = ''
       font="${config.alyraffauf.desktop.theme.terminalFont.name}-Regular"
 
diff --git a/homeManagerModules/desktop/hypr/default.nix b/homeManagerModules/desktop/hypr/default.nix
index 69362134..126f562c 100644
--- a/homeManagerModules/desktop/hypr/default.nix
+++ b/homeManagerModules/desktop/hypr/default.nix
@@ -44,17 +44,7 @@
     };
 
     services.cliphist.enable = lib.mkDefault true;
-
-    # Packages that should be installed to the user profile.
-    home.packages = with pkgs; [
-      celluloid
-      evince
-      gnome.eog
-      gnome.file-roller
-      hyprland-protocols
-      networkmanagerapplet
-      xfce.xfce4-taskmanager
-    ];
+    services.swayosd.enable = lib.mkDefault true;
 
     xdg.portal = {
       enable = true;
diff --git a/homeManagerModules/desktop/river/default.nix b/homeManagerModules/desktop/river/default.nix
index d9312f0a..0456cf22 100644
--- a/homeManagerModules/desktop/river/default.nix
+++ b/homeManagerModules/desktop/river/default.nix
@@ -39,19 +39,7 @@
     programs.swaylock.enable = lib.mkDefault true;
 
     services.cliphist.enable = lib.mkDefault true;
-
-    # Packages that should be installed to the user profile.
-    home.packages = with pkgs; [
-      celluloid
-      evince
-      gnome.eog
-      gnome.file-roller
-      networkmanagerapplet
-      playerctl
-      swayidle
-      swayosd
-      xfce.xfce4-taskmanager
-    ];
+    services.swayosd.enable = lib.mkDefault true;
 
     xdg.portal = {
       enable = true;
diff --git a/homeManagerModules/desktop/sway/default.nix b/homeManagerModules/desktop/sway/default.nix
index 573f04fe..fb9f596b 100644
--- a/homeManagerModules/desktop/sway/default.nix
+++ b/homeManagerModules/desktop/sway/default.nix
@@ -29,21 +29,9 @@
       };
       desktop.theme.enable = lib.mkDefault true;
     };
-    # Packages that should be installed to the user profile.
-    home.packages = with pkgs; [
-      celluloid
-      evince
-      gnome.eog
-      gnome.file-roller
-      networkmanagerapplet
-      playerctl
-      swayidle
-      swayosd
-      xfce.xfce4-taskmanager
-    ];
 
-    programs.swaylock.enable = lib.mkDefault true;
     services.cliphist.enable = lib.mkDefault true;
+    services.swayosd.enable = lib.mkDefault true;
 
     programs.waybar = {
       settings = {