From f926d51b11a7017dd1746607cd1f77ee7bc8bae0 Mon Sep 17 00:00:00 2001
From: Natalie <nmarks413@gmail.com>
Date: Sat, 5 Oct 2024 14:47:09 -0700
Subject: [PATCH] updates

---
 hosts/laptop/configuration.nix | 10 ++++++++++
 hosts/laptop/home.nix          |  7 ++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index ddfbde8..9d44ebf 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -40,6 +40,16 @@
     zsh.enable = true; # default shell on catalina
   };
 
+  programs.zsh = {
+    interactiveShellInit = ''
+      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
+      then
+        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+      fi
+    '';
+  };
+
   # Used for backwards compatibility, please read the changelog before changing.
   # $ darwin-rebuild changelog
   system.stateVersion = 4;
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index e812412..2093f7c 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -32,6 +32,7 @@
 
   home.packages = with pkgs; [
     # ghostty.packages.aarch64-darwin.default
+    wireguard-tools
     pyright
     ruff
     python312Packages.jedi-language-server
@@ -84,6 +85,7 @@
     ollama
     sl
     #LSP + formatters/linters
+    texlivePackages.chktex
     lua-language-server
     nil
     alejandra
@@ -127,12 +129,7 @@
       }
     ];
     shellAliases = {
-      hm-update = "git add home.nix ; git commit -m 'updated home-manager config'; git push origin main; home-manager switch --flake ~/.dotfiles/#nmarks";
-      sys-update = "git add configuration.nix ; git commit -m 'updated system config'; git push origin main; sudo nixos-rebuild switch --flake ~/.dotfiles/#nmarks";
-      full-update = "sys-update; hm-update";
-      reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
     };
-    shellInit = "source $HOME/.nix-profile/share/asdf-vm/asdf.fish ";
   };
 
   programs.hyfetch = {