wip

number5 · Jun 4, 2024 · 0205c5c · 0205c5c
1 parent 72804af
commit 0205c5c
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 57 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -34,8 +34,7 @@
     nix-minecraft.inputs.nixpkgs.follows = "nixpkgs";
 
     # hyprland
-
-    hyprland.url = "github:hyprwm/hyprland";
+    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
     hyprland.inputs.nixpkgs.follows = "nixpkgs";
 
     hyprpaper.url = "github:hyprwm/hyprpaper";

diff --git a/home/modules/wayland/hyprland.nix b/home/modules/wayland/hyprland.nix
@@ -125,20 +125,18 @@ in {
     };
   };
 
-  cursor = {
-    package = pkgs.catppuccin-cursors.macchiatoPink;
-    name = "Catppuccin-Macchiato-Pink-Cursors";
-    size = 24;
-  };
-
-  config = mkIf cfg.enable {
-    os = {
-      programs.hyprland = {
-        enable = true;
-        inherit (cfg) package;
-      };
-      xdg.portal.wlr.enable = lib.mkForce false;
+  config = let
+    cursor = {
+      package = pkgs.catppuccin-cursors.macchiatoPink;
+      name = "Catppuccin-Macchiato-Pink-Cursors";
+      size = 24;
+    };
+  in {
+    programs.hyprland = {
+      enable = true;
+      inherit (cfg) package;
     };
+    xdg.portal.wlr.enable = lib.mkForce false;
 
     home.packages = with pkgs;
     with inputs.hyprcontrib.packages.${pkgs.system};
@@ -187,7 +185,7 @@ in {
       };
     };
 
-    home.xdg.configFile."hypr/hyprpaper.conf".text = ''
+    xdg.configFile."hypr/hyprpaper.conf".text = ''
       preload=${cfg.monitors.main.wallpaper}
       ${
         if cfg.monitors.secondary.wallpaper != null

diff --git a/parts/home_configs.nix b/parts/home_configs.nix
@@ -100,6 +100,7 @@ in {
               {systemd.user.startServices = "legacy";}
               inputs.sops-nix.homeManagerModules.sops
               inputs.catppuccin.homeManagerModules.catppuccin
+              inputs.hyprland.homeManagerModules.default
             ]
             ++ config.modules
             ++ builtins.attrValues self.homeModules