From eee00d113e62c4ecac2e670b1acca5a8db351b51 Mon Sep 17 00:00:00 2001
From: RealStickman <mrc@frm01.net>
Date: Mon, 1 May 2023 09:48:31 +0200
Subject: [PATCH] Use additional fish config file

---
 nixos-config/home-manager.nix      | 27 ++-------------------------
 nixos-config/home-manager/fish.nix | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 25 deletions(-)
 create mode 100644 nixos-config/home-manager/fish.nix

diff --git a/nixos-config/home-manager.nix b/nixos-config/home-manager.nix
index 3d7c9eaf..1bf27ff8 100644
--- a/nixos-config/home-manager.nix
+++ b/nixos-config/home-manager.nix
@@ -20,20 +20,9 @@ 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);
-        };
-      };
-    };
   };
 
   # keep everything using home manager within this block
@@ -62,21 +51,9 @@ 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;
   };
 }
diff --git a/nixos-config/home-manager/fish.nix b/nixos-config/home-manager/fish.nix
new file mode 100644
index 00000000..74f371d1
--- /dev/null
+++ b/nixos-config/home-manager/fish.nix
@@ -0,0 +1,14 @@
+{ 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);
+    };
+  };
+}