refactor: hyprland home-manager module systemd handles environment va…

…riables now
khaneliman · Oct 7, 2023 · 5435b5f · 5435b5f
1 parent fc1dd5a
commit 5435b5f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 83 deletions.
diff --git a/modules/home/desktop/hyprland/apps.nix b/modules/home/desktop/hyprland/apps.nix
@@ -39,10 +39,6 @@ in
               # ░█▀█░█▀▀░█▀▀░░░▀▀█░░█░░█▀█░█▀▄░░█░░█░█░█▀▀
               # ░▀░▀░▀░░░▀░░░░░▀▀▀░░▀░░▀░▀░▀░▀░░▀░░▀▀▀░▀░░
 
-              # import env
-              "${getExe pkgs.khanelinix.import_env} system"
-              "${getExe pkgs.khanelinix.import_env} tmux"
-
               # Startup background apps
               "${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1 &"
               "${getExe pkgs.hyprpaper}"

diff --git a/modules/home/desktop/hyprland/default.nix b/modules/home/desktop/hyprland/default.nix
@@ -57,15 +57,6 @@ in
 
         wayland.windowManager.hyprland = {
           enable = true;
-          xwayland.enable = true;
-          systemdIntegration = true;
-          package = hyprland.packages.${system}.hyprland;
-
-          settings = {
-            exec = [
-              "notify-send --icon ~/.face -u normal \"Hello $(whoami)\""
-            ];
-          };
 
           extraConfig = ''
             source=~/.config/hypr/displays.conf
@@ -76,6 +67,20 @@ in
 
             ${cfg.extraConfig}
           '';
+
+          package = hyprland.packages.${system}.hyprland;
+
+          settings = {
+            exec = [
+              "notify-send --icon ~/.face -u normal \"Hello $(whoami)\""
+            ];
+          };
+
+          systemd = {
+            enable = true;
+          };
+
+          xwayland.enable = true;
         };
       };
 }
diff --git a/packages/import_env/default.nix b/packages/import_env/default.nix