From 9ff402fd1293dc607b7cfd14940e9f09e8d8ae78 Mon Sep 17 00:00:00 2001
From: servostar <sven.vogel123@web.de>
Date: Fri, 15 Dec 2023 23:18:26 +0100
Subject: [PATCH] moved fish to core

---
 configuration.nix | 11 -----------
 core/default.nix  |  1 +
 core/fish.nix     | 18 ++++++++++++++++++
 settings.nix      |  2 ++
 4 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 core/fish.nix

diff --git a/configuration.nix b/configuration.nix
index 5f3509e..847a511 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -56,7 +56,6 @@
   services.rpcbind.enable = true; # needed for NFS
 
   programs.partition-manager.enable = true;
-  programs.fish.enable = true;
 
   # use bash shell for other users
   environment.shells = with pkgs; [ bash ];
@@ -96,16 +95,6 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = (with pkgs; [
-
-    fishPlugins.done    # notifications for background process finished
-    fishPlugins.fzf-fish
-    fishPlugins.forgit
-    fzf
-    fishPlugins.grc
-    grc
-    fishPlugins.tide    # asynchronous prompt for fish shell
-    fishPlugins.autopair
-
     distrobox
 
     go
diff --git a/core/default.nix b/core/default.nix
index 98528bd..325af9e 100644
--- a/core/default.nix
+++ b/core/default.nix
@@ -4,6 +4,7 @@ let
 in
 {
     imports = [ ./fonts.nix ]
+        ++ lib.optionals settings.fish [ ./fish.nix ]
         ++ lib.optionals settings.printing.enable [ ./printing.nix ]
         ++ lib.optionals settings.xdg.enable [ ./xdg.nix ]
         ++ lib.optionals settings.java [ ./java.nix ]
diff --git a/core/fish.nix b/core/fish.nix
new file mode 100644
index 0000000..5ad1a2e
--- /dev/null
+++ b/core/fish.nix
@@ -0,0 +1,18 @@
+{ pkgs, lib, config, ... }:
+let
+    settings = import ./../settings.nix;
+in
+{
+    programs.fish.enable = true;
+
+    environment.systemPackages = (with pkgs; [
+        fishPlugins.done    # notifications for background process finished
+        fishPlugins.fzf-fish
+        fishPlugins.forgit
+        fzf
+        fishPlugins.grc
+        grc
+        fishPlugins.tide    # asynchronous prompt for fish shell
+        fishPlugins.autopair
+    ]);
+}
diff --git a/settings.nix b/settings.nix
index a78ad87..ed407d7 100644
--- a/settings.nix
+++ b/settings.nix
@@ -18,6 +18,8 @@ with import <nixpkgs> {}; {
         };
     };
 
+    fish = true;
+
     plasma5 = {
         enable = true;
         dconf = true;