feat: cleanup hyprland

sioodmy · Nov 8, 2022 · d51c464 · d51c464
1 parent 4d6bb33
commit d51c464
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 37 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
@@ -38,11 +38,23 @@ in {
     pngquant
   ];
 
-  # xdg.configFile."hypr/hyprland.conf".source = ./hyprland.conf;
-  # systemd.user.services.swayidle.Install.WantedBy = lib.mkForce ["hyprland-session.target"];
-
   wayland.windowManager.hyprland = {
     enable = true;
+    package = inputs.hyprland.packages.${pkgs.system}.default.override {
+      nvidiaPatches = true;
+      wlroots =
+        inputs.hyprland.packages.${pkgs.system}.wlroots-hyprland.overrideAttrs
+        (old: {
+          patches =
+            (old.patches or [])
+            ++ [
+              (pkgs.fetchpatch {
+                url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-nvidia-format-workaround.patch?h=hyprland-nvidia-screenshare-git";
+                sha256 = "A9f1p5EW++mGCaNq8w7ZJfeWmvTfUm4iO+1KDcnqYX8=";
+              })
+            ];
+        });
+    };
     systemdIntegration = true;
     extraConfig = builtins.readFile ./hyprland.conf;
   };

diff --git a/system/default.nix b/system/default.nix
@@ -108,25 +108,6 @@ in {
 
   programs = {
     ccache.enable = true;
-    hyprland = {
-      enable = true;
-      # credits to IceDBorn and fufexan for this patch <3
-      package = inputs.hyprland.packages.${pkgs.system}.default.override {
-        nvidiaPatches = true;
-        wlroots =
-          inputs.hyprland.packages.${pkgs.system}.wlroots-hyprland.overrideAttrs
-          (old: {
-            patches =
-              (old.patches or [])
-              ++ [
-                (pkgs.fetchpatch {
-                  url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-nvidia-format-workaround.patch?h=hyprland-nvidia-screenshare-git";
-                  sha256 = "A9f1p5EW++mGCaNq8w7ZJfeWmvTfUm4iO+1KDcnqYX8=";
-                })
-              ];
-          });
-      };
-    };
   };
 
   environment.etc."greetd/environments".text = ''