updates
This commit is contained in:
parent
2f8594d6ed
commit
f926d51b11
2 changed files with 12 additions and 5 deletions
|
@ -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;
|
||||
|
|
|
@ -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 = {
|
||||
|
|
Loading…
Reference in a new issue