Merge branch '2024-07-31-wsl' into wsl-2024-06-27

ADGEfficiency · Jul 31, 2024 · 850db2c · 850db2c
2 parents a197a18 + b45b0c2
commit 850db2c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -66,8 +66,10 @@ setup-nix:
 	. ./nix/load-$(OS).sh && nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable
 	. ./nix/load-$(OS).sh && nix-channel --update
 
+NIX_ARGS=--extra-experimental-features nix-command --extra-experimental-features flakes
+
 nix-pkgs: setup-nix
-	. ./nix/load-$(OS).sh && cd nix && nix flake update && nix profile install
+	. ./nix/load-$(OS).sh && cd nix && nix flake update $(NIX_ARGS) && nix profile install $(NIX_ARGS)
 
 .PHONY: setup-brew brew-pkgs
 

diff --git a/dotfiles/common/.zshrc b/dotfiles/common/.zshrc
@@ -31,6 +31,7 @@ pretzo_init() {
   export STARSHIP_CONFIG=~/dotfiles/starship/starship.toml
   source $HOME/dotfiles/zsh/.zprezto
   source $HOME/dotfiles/dotfiles/common/.zpreztorc
+  source ~/.zprezto/init.zsh
 }
 
 starship_init() {
@@ -83,5 +84,4 @@ eval "$(direnv hook zsh)"
 
 # done twice for a reason
 pretzo_init
-pretzo_init
 fzf_init