home-manager.nix

@@ -19,10 +19,21 @@ in
     ];
 
     imports = [
-      ./home-manager/hyprland.nix
-      ./home-manager/fish.nix
+      ./home-hyprland.nix
     ];
 
+    programs = {
+      fish = {
+        enable = true;
+        interactiveShellInit = (builtins.readFile ./config/fish/conf.d/interactive.fish);
+        shellAliases = {
+          wget = "wget -c";
+        };
+        functions = {
+          fish_prompt = (builtins.readFile ./config/fish/functions/fish_prompt.fish);
+        };
+      };
+    };
   };
 
   # keep everything using home manager within this block
@@ -51,9 +62,21 @@ in
 
     imports = [
       ./home-manager/hyprland.nix
-      ./home-manager/fish.nix
     ];
 
+    programs = {
+      fish = {
+        enable = true;
+        interactiveShellInit = (builtins.readFile ./config/fish/conf.d/interactive.fish);
+        shellAliases = {
+          wget = "wget -c";
+        };
+        functions = {
+          fish_prompt = (builtins.readFile ./config/fish/functions/fish_prompt.fish);
+        };
+      };
+    };
+
   services.mako.enable = true;
   };
 }

home-manager/fish.nix

@@ -1,14 +0,0 @@
-{ config, ... }:
-
-{
-  programs.fish = {
-    enable = true;
-    interactiveShellInit = (builtins.readFile ./config/fish/conf.d/interactive.fish);
-    shellAliases = {
-      wget = "wget -c";
-    };
-    functions = {
-      fish_prompt = (builtins.readFile ./config/fish/functions/fish_prompt.fish);
-    };
-  };
-}

home-manager/hyprland.nix

@@ -12,6 +12,6 @@ in {
   wayland.windowManager.hyprland = {
     enable = true;
 
-    extraConfig = (builtins.readFile ./config/hypr/hyprland.conf);
+    extraConfig = (builtins.readFile ../config/hypr/hyprland.conf);
   };
 }