From 2194664a1eab1767f4a511a2ebad27271b0b941d Mon Sep 17 00:00:00 2001
From: Joey Hafner <joey@jafner.net>
Date: Fri, 13 Sep 2024 16:08:33 -0700
Subject: [PATCH] Update from joey@joey-laptop

---
 nix/home-manager/home.nix   | 28 ++++++++++++++++++++++++++++
 nix/nixos/configuration.nix | 13 +++----------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/nix/home-manager/home.nix b/nix/home-manager/home.nix
index f5743fc9..f291324a 100644
--- a/nix/home-manager/home.nix
+++ b/nix/home-manager/home.nix
@@ -6,6 +6,7 @@
   home.stateVersion = "24.05";
   home.packages = [
     pkgs.fastfetch
+    pkgs.tree 
   ];
   home.file = {};
   home.sessionVariables = {};
@@ -42,6 +43,33 @@
     dotDir = ".config/zsh";
     enableCompletion = true;
     autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+    shellAliases = {
+      nos = "sudo nixos-rebuild switch --flake .";
+      hms = "home-manager switch --flake .";
+    };
+    history = {
+      share = true;
+      save = 10000;
+      size = 10000;
+      expireDuplicatesFirst = false;
+      extended = false;
+      ignoreAllDups = false;
+      ignoreDups = true;
+    };
+    initExtra = ''
+      bindkey -e
+      bindkey '^[[1;5A' history-search-backward # Ctrl+Up-arrow
+      bindkey '^[[1;5B' history-search-forward # Ctrl+Down-arrow
+      bindkey '^[[1;5D' backward-word # Ctrl+Left-arrow
+      bindkey '^[[1;5C' forward-word # Ctrl+Right-arrow
+      bindkey '^[[H' beginning-of-line # Home
+      bindkey '^[[F' end-of-line # End
+      bindkey '^[w' kill-region # Delete
+      bindkey '^I^I' autosuggest-accept # Tab, Tab
+      bindkey '^[' autosuggest-clear # Esc
+    '';
+    
   };
   
   programs.home-manager = {
diff --git a/nix/nixos/configuration.nix b/nix/nixos/configuration.nix
index b9e149b1..8eb8982a 100644
--- a/nix/nixos/configuration.nix
+++ b/nix/nixos/configuration.nix
@@ -73,6 +73,9 @@
     pulse.enable = true;
   };
 
+  programs.zsh.enable = true;
+  users.users.joey.shell = pkgs.zsh;
+
   users.users.joey = {
     isNormalUser = true;
     description = "joey";
@@ -87,18 +90,8 @@
   environment.systemPackages = with pkgs; [
     vim
     git
-    fastfetch
-    waybar mako libnotify swww kitty rofi-wayland polkit-kde-agent wl-clipboard 
   ];
   
-  #programs.kitty.enable = true; # This line is present in hyprland's install docs, but seems to be invalid
-  programs.hyprland.enable = true;
-  #programs.hyprland.xwayland.enable = true;
-  #programs.hyprland.package = inputs.hyprland.packages."${pkgs.system}".hyprland;
-  xdg.portal.enable = true;
-  xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
-  xdg.portal.config.common.default = "*";
-
   system.stateVersion = "24.05"; 
 
 }