Commit f926d51b11a7017dd1746607cd1f77ee7bc8bae0 | config

author	Natalie Marks <nmarks413@gmail.com> 2024-10-05 14:47:09-07:00
committer	Natalie Marks <nmarks413@gmail.com> 2024-10-05 14:47:09-07:00
log	f926d51b11a7017dd1746607cd1f77ee7bc8bae0
tree	9a362971307da7bf5dc0ceb65d7abdff6454e27e
parent	2f8594d6edaf69dccd88990f211395c76da10123

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

hosts/laptop/configuration.nix+10

...	...	@@ -40,6 +40,16 @@
40	40	zsh.enable = true; # default shell on catalina
41	41	};
42	42
	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	53	# Used for backwards compatibility, please read the changelog before changing.
44	54	# $ darwin-rebuild changelog
45	55	system.stateVersion = 4;

hosts/laptop/home.nix+2-5

...	...	@@ -32,6 +32,7 @@
32	32
33	33	home.packages = with pkgs; [
34	34	# ghostty.packages.aarch64-darwin.default
	35	wireguard-tools
35	36	pyright
36	37	ruff
37	38	python312Packages.jedi-language-server
...	...	@@ -84,6 +85,7 @@
84	85	ollama
85	86	sl
86	87	#LSP + formatters/linters
	88	texlivePackages.chktex
87	89	lua-language-server
88	90	nil
89	91	alejandra
...	...	@@ -127,12 +129,7 @@
127	129	}
128	130	];
129	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	};
137	134
138	135	programs.hyfetch = {