From 7d2860624825aae7a9bbae76b3eb11a2ecf7dea8 Mon Sep 17 00:00:00 2001
From: KoenDR06 <koen.de.ruiter@hotmail.com>
Date: Mon, 8 Apr 2024 11:47:49 +0200
Subject: [PATCH] Configured ZSH

---
 machines/luna/configuration.nix  |  3 +--
 machines/solis/configuration.nix |  1 +
 machines/terra/configuration.nix |  1 +
 pkgs/zsh.nix                     | 24 ++++++++++++++++++++++++
 4 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/zsh.nix

diff --git a/machines/luna/configuration.nix b/machines/luna/configuration.nix
index e5ea99b..e9b5086 100644
--- a/machines/luna/configuration.nix
+++ b/machines/luna/configuration.nix
@@ -10,6 +10,7 @@
     inputs.home-manager.nixosModules.home-manager
     ./hardware-configuration.nix
     ../../pkgs/firefox.nix
+    ../../pkgs/zsh.nix
   ];
 
   home-manager = {
@@ -54,8 +55,6 @@
   services.xserver.displayManager.gdm.enable = true;
   boot.loader.systemd-boot.enable = true;  
 
-  environment.shells = with pkgs; [ zsh ];
-
   services.tailscale.enable = true;
 
   users.users = {
diff --git a/machines/solis/configuration.nix b/machines/solis/configuration.nix
index 6767897..cc93934 100644
--- a/machines/solis/configuration.nix
+++ b/machines/solis/configuration.nix
@@ -9,6 +9,7 @@
   imports = [
     inputs.home-manager.nixosModules.home-manager
     ./hardware-configuration.nix
+    ../../pkgs/zsh.nix
   ];
 
 
diff --git a/machines/terra/configuration.nix b/machines/terra/configuration.nix
index 4c6b743..ee285e2 100644
--- a/machines/terra/configuration.nix
+++ b/machines/terra/configuration.nix
@@ -11,6 +11,7 @@
     ./hardware-configuration.nix
     ./refind.nix
     ../../pkgs/firefox.nix
+    ../../pkgs/zsh.nix
   ];
 
   # NVIDIA Drivers
diff --git a/pkgs/zsh.nix b/pkgs/zsh.nix
new file mode 100644
index 0000000..c587b24
--- /dev/null
+++ b/pkgs/zsh.nix
@@ -0,0 +1,24 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  users.defaultUserShell = pkgs.zsh;
+  environment.shells = with pkgs; [ zsh ];
+
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autosuggestions.enable = true;
+
+    shellAliases = {
+      update = "sudo nixos-rebuild switch --flake";
+    };
+
+    ohMyZsh = {
+      enable = true;
+      plugins = ["git"];
+      theme = "robbyrussell";
+    };
+  };
+}