From b204d6cadf4659cff93540256da1dbca66083aa4 Mon Sep 17 00:00:00 2001
From: Tyler Kelley <tylerzanekelley@gmail.com>
Date: Wed, 19 Feb 2025 17:13:47 -0600
Subject: [PATCH] Add zsh config and make it the default user shell. Also
 disabled kitty

---
 CHANGELOG.md              |  3 +++
 modules/core/packages.nix |  1 -
 modules/core/user.nix     |  2 +-
 modules/home/bash.nix     |  7 +------
 modules/home/default.nix  |  1 +
 modules/home/ghostty.nix  | 10 ++++++++--
 modules/home/kitty.nix    | 18 ++++++++----------
 modules/home/zsh.nix      |  7 +++++++
 8 files changed, 29 insertions(+), 20 deletions(-)
 create mode 100644 modules/home/zsh.nix

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61128ff..1edd2cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -73,3 +73,6 @@ has been improved.
 - Massive improvement to Hyprland window rules.
 - Removed broken support for Apple Silicon (this may return).
 - Install script improved.
+- Fixed `nix flake check` not working.
+- Added nvidia prime PCI ID variables to host `variables.nix`.
+- Made Ghostty the new default terminal.
diff --git a/modules/core/packages.nix b/modules/core/packages.nix
index a347da3..b78ad5c 100644
--- a/modules/core/packages.nix
+++ b/modules/core/packages.nix
@@ -59,7 +59,6 @@
     playerctl
     ripgrep
     socat
-    tree
     unrar
     unzip
     usbutils
diff --git a/modules/core/user.nix b/modules/core/user.nix
index 31b3379..89c3b56 100644
--- a/modules/core/user.nix
+++ b/modules/core/user.nix
@@ -36,7 +36,7 @@ in {
       "lp"
       "docker"
     ];
-    shell = pkgs.bash;
+    shell = pkgs.zsh;
     ignoreShellProgramCheck = true;
   };
   nix.settings.allowed-users = ["${username}"];
diff --git a/modules/home/bash.nix b/modules/home/bash.nix
index 932798b..409c17e 100644
--- a/modules/home/bash.nix
+++ b/modules/home/bash.nix
@@ -1,12 +1,7 @@
 {profile, ...}: {
   programs.bash = {
-    enable = true;
+    enable = false;
     enableCompletion = true;
-    profileExtra = ''
-      #if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
-      #  exec Hyprland
-      #fi
-    '';
     initExtra = ''
       fastfetch
       if [ -f $HOME/.bashrc-personal ]; then
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 61c36b3..3a03577 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -22,5 +22,6 @@
     ./waybar.nix
     ./wlogout
     ./xdg.nix
+    ./zsh.nix
   ];
 }
diff --git a/modules/home/ghostty.nix b/modules/home/ghostty.nix
index 455c03e..fcfbe9b 100644
--- a/modules/home/ghostty.nix
+++ b/modules/home/ghostty.nix
@@ -1,16 +1,22 @@
 {...}: {
   programs.ghostty = {
     enable = true;
-    enableBashIntegration = true;
+    enableBashIntegration = false;
+    enableZshIntegration = true;
     settings = {
-      font-thicken = true;
+      font-thicken = false;
       font-feature = ["ss04" "ss01"];
       bold-is-bright = false;
       adjust-box-thickness = 1;
       cursor-style = "bar";
       cursor-style-blink = false;
+      copy-on-select = false;
+      confirm-close-surface = false;
       adjust-cursor-thickness = 1;
       mouse-hide-while-typing = true;
+      window-padding-x = 4;
+      window-padding-y = 6;
+      window-padding-balance = true;
       title = "GhosTTY";
       gtk-single-instance = true;
     };
diff --git a/modules/home/kitty.nix b/modules/home/kitty.nix
index 3fa7a2e..3fef38a 100644
--- a/modules/home/kitty.nix
+++ b/modules/home/kitty.nix
@@ -1,16 +1,14 @@
-{ pkgs, ... }:
-
-{
+{pkgs, ...}: {
   programs.kitty = {
-    enable = true;
+    enable = false;
     package = pkgs.kitty;
     settings = {
-    wheel_scroll_min_lines = 1;
-    window_padding_width = 4;
-    confirm_os_window_close = 0;
-    scrollback_lines = 10000;
-    enable_audio_bell = false;
-    mouse_hide_wait = 60;
+      wheel_scroll_min_lines = 1;
+      window_padding_width = 4;
+      confirm_os_window_close = 0;
+      scrollback_lines = 10000;
+      enable_audio_bell = false;
+      mouse_hide_wait = 60;
     };
     extraConfig = ''
       tab_bar_style fade
diff --git a/modules/home/zsh.nix b/modules/home/zsh.nix
new file mode 100644
index 0000000..af2acd0
--- /dev/null
+++ b/modules/home/zsh.nix
@@ -0,0 +1,7 @@
+{...}: {
+  programs.zsh = {
+    enable = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+  };
+}