kdb424/nixFlake
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix: Fix previous fix

Browse source
This commit is contained in:
Kyle Brown 2024-02-27 20:12:03 -08:00
parent 23e9f1b695
commit 0203155ea7
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
flake.nix
View file

@ -134,7 +134,12 @@
darwinConfigurations = {
# M2 Mac mini
cubert = mkDarwin "aarch64-darwin" [
{home-manager.users.kdb424 = ./home-manager/machines/cubert.nix;}
{
home-manager.users.kdb424 = ./home-manager/machines/cubert.nix;
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {inherit inputs outputs;};
}
home-manager.darwinModules.home-manager
stylix.darwinModules.stylix
./hosts/cubert

6
justfile
View file

@ -15,7 +15,7 @@ trace target_host=hostname: (build target_host "--show-trace")
# Build the nix-darwin configuration and switch to it
[macos]
switch target_host=hostname: (build target_host) && hm-switch
switch target_host=hostname: (build target_host)
#!/usr/bin/env bash
set -euxo pipefail
echo "switching to new config for {{target_host}}"
@ -27,7 +27,9 @@ switch target_host=hostname: (build target_host) && hm-switch
sudo mv /etc/bashrc /etc/bashrc.before.nix
fi
# if macOS updates and overwrites /etc/shells, nix will refuse to update it
sudo mv /etc/shells /tmp/shells.bak
if test -f /etc/shells; then
sudo mv /etc/shells /tmp/shells.bak
fi
./result/sw/bin/darwin-rebuild switch --flake ".#{{target_host}}"
# Reload the skhd (hotkey daemon) service to apply new config. Workaround for config changes not being auto-detected.