From 936959b35fde602e6b9ad5fc91cf97382321a33d Mon Sep 17 00:00:00 2001
From: EinEtwas <ein@etwas.me>
Date: Wed, 16 Oct 2024 17:41:07 +0200
Subject: [PATCH] feat: move zsh config to home-manager

---
 home/default.nix          |  1 +
 home/zsh.nix              | 41 +++++++++++++++++++++++++++++++++++++++
 modules/configuration.nix |  3 ++-
 modules/default.nix       |  3 ++-
 modules/environment.nix   |  3 +++
 modules/fonts.nix         |  6 ++++++
 modules/shell.nix         | 14 -------------
 7 files changed, 55 insertions(+), 16 deletions(-)
 create mode 100644 home/zsh.nix
 create mode 100644 modules/environment.nix
 create mode 100644 modules/fonts.nix
 delete mode 100644 modules/shell.nix

diff --git a/home/default.nix b/home/default.nix
index 41afe14..42c964f 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -28,6 +28,7 @@
         ./easyeffects.nix
         ./packages.nix
         ./alacritty.nix
+        ./zsh.nix
         # inputs.catppuccin.nixosModules.catppuccin
       ];
 
diff --git a/home/zsh.nix b/home/zsh.nix
new file mode 100644
index 0000000..5baa62c
--- /dev/null
+++ b/home/zsh.nix
@@ -0,0 +1,41 @@
+{
+  programs.zsh = {
+    enable = true;
+
+    autocd = true;
+    shellAliases = {
+      os-update = "sudo nixos-rebuild switch --flake \".#$HOST\" --log-format internal-json -v |& nom --json";
+    };
+
+    autosuggestion = {
+      enable = true;
+    };
+
+    history = {
+      append = true;
+      expireDuplicatesFirst = true;
+    };
+
+    syntaxHighlighting = {
+      enable = true;
+
+      highlighters = [
+        "brackets"
+      ];
+    };
+
+    oh-my-zsh = {
+      enable = true;
+
+      plugins = [
+        "git"
+        "sudo"
+        "virtualenv"
+        "safe-paste"
+        "timer"
+      ];
+
+      theme = "agnoster";
+    };
+  };
+}
\ No newline at end of file
diff --git a/modules/configuration.nix b/modules/configuration.nix
index f6657b3..73477d6 100644
--- a/modules/configuration.nix
+++ b/modules/configuration.nix
@@ -66,10 +66,11 @@
   environment.systemPackages = with pkgs; [
   #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
   #  wget
-    google-chrome
     fprintd
   ];
 
+  programs.zsh.enable = true;
+
   environment.sessionVariables = { 
     NIXOS_OZONE_WL = "1";
   };
diff --git a/modules/default.nix b/modules/default.nix
index 009a904..08ad937 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -3,9 +3,10 @@
     ./configuration.nix
     ./hardware-configuration.nix
     ./fingerprint.nix
-    ./shell.nix
+    ./fonts.nix
     ./wayland.nix
     ./greetd.nix
     ./power-profiles.nix
+    ./environment.nix
   ];
 }
\ No newline at end of file
diff --git a/modules/environment.nix b/modules/environment.nix
new file mode 100644
index 0000000..af8c514
--- /dev/null
+++ b/modules/environment.nix
@@ -0,0 +1,3 @@
+{
+  environment.pathsToLink = [ "/share/zsh" ];
+}
\ No newline at end of file
diff --git a/modules/fonts.nix b/modules/fonts.nix
new file mode 100644
index 0000000..f3cd07f
--- /dev/null
+++ b/modules/fonts.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  fonts.packages = with pkgs; [
+    nerdfonts
+  ];
+}
diff --git a/modules/shell.nix b/modules/shell.nix
deleted file mode 100644
index 60b8b2f..0000000
--- a/modules/shell.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.zsh.enable = true;
-  programs.zsh.ohMyZsh.enable = true;
-  programs.zsh.ohMyZsh.theme = "agnoster";
-
-  environment.shellAliases = {
-    os-update = "sudo nixos-rebuild switch --flake \".#$HOST\" --log-format internal-json -v |& nom --json";
-  };
-
-  fonts.packages = with pkgs; [
-    nerdfonts
-  ];
-}