authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2024-10-05 14:47:09-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2024-10-05 14:47:09-07:00
logf926d51b11a7017dd1746607cd1f77ee7bc8bae0
tree9a362971307da7bf5dc0ceb65d7abdff6454e27e
parent2f8594d6edaf69dccd88990f211395c76da10123

updates

2 files changed, 12 insertions(+), 5 deletions(-)

hosts/laptop/configuration.nix+10
...@@ -40,6 +40,16 @@...@@ -40,6 +40,16 @@
40 zsh.enable = true; # default shell on catalina40 zsh.enable = true; # default shell on catalina
41 };41 };
4242
43 programs.zsh = {
44 interactiveShellInit = ''
45 if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
46 then
47 shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
48 exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
49 fi
50 '';
51 };
52
43 # Used for backwards compatibility, please read the changelog before changing.53 # Used for backwards compatibility, please read the changelog before changing.
44 # $ darwin-rebuild changelog54 # $ darwin-rebuild changelog
45 system.stateVersion = 4;55 system.stateVersion = 4;
hosts/laptop/home.nix+2-5
...@@ -32,6 +32,7 @@...@@ -32,6 +32,7 @@
3232
33 home.packages = with pkgs; [33 home.packages = with pkgs; [
34 # ghostty.packages.aarch64-darwin.default34 # ghostty.packages.aarch64-darwin.default
35 wireguard-tools
35 pyright36 pyright
36 ruff37 ruff
37 python312Packages.jedi-language-server38 python312Packages.jedi-language-server
...@@ -84,6 +85,7 @@...@@ -84,6 +85,7 @@
84 ollama85 ollama
85 sl86 sl
86 #LSP + formatters/linters87 #LSP + formatters/linters
88 texlivePackages.chktex
87 lua-language-server89 lua-language-server
88 nil90 nil
89 alejandra91 alejandra
...@@ -127,12 +129,7 @@...@@ -127,12 +129,7 @@
127 }129 }
128 ];130 ];
129 shellAliases = {131 shellAliases = {
130 hm-update = "git add home.nix ; git commit -m 'updated home-manager config'; git push origin main; home-manager switch --flake ~/.dotfiles/#nmarks";
131 sys-update = "git add configuration.nix ; git commit -m 'updated system config'; git push origin main; sudo nixos-rebuild switch --flake ~/.dotfiles/#nmarks";
132 full-update = "sys-update; hm-update";
133 reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
134 };132 };
135 shellInit = "source $HOME/.nix-profile/share/asdf-vm/asdf.fish ";
136 };133 };
137134
138 programs.hyfetch = {135 programs.hyfetch = {