pagedmov/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed file conflicts

Browse Source
This commit is contained in:
Kyler Clay
2024-09-25 01:37:09 -04:00
parent e0f4d10742
commit 514a944f80
4 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
glasshouse-desktop/modules/zshell.nix
View File

@@ -43,7 +43,6 @@
navhelp = "navhelp | less";
svc = "systemctl --user";
hmswitch = "home-manager switch";
nixswitch = "sudo nixos-rebuild switch --flake $HOME/sysflakes#glasshouse";
hmconf = "nvim $HOME/sysflakes/glasshouse-desktop/home.nix";
nixconf = "nvim $HOME/sysflakes/glasshouse-desktop/configuration.nix";
};
@@ -195,6 +194,19 @@ screengrab() {
fi
grimblast save area $name
}
nixswitch() {
cd $HOME/sysflakes
gen=$(readlink /nix/var/nix/profiles/system | sed 's/.*system-\([0-9]*\)-link/\1/')
gen=$((gen + 1))
git diff --cached --quiet
if [ $? = 0 ]; then
git add .
git commit -m "Commit for generation $gen"
git push
fi
sudo nixos-rebuild switch --flake $HOME/sysflakes#glasshouse
}
'';
initExtraBeforeCompInit = ''