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

included relevant work from impermanence branch

Browse Source
This commit is contained in:
pagedmov
2024-10-17 22:07:34 -04:00
parent f512c7c7bb
commit 11f97cf4f3
23 changed files with 222 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/home/scripts/nix/homep.nix
View File

@@ -18,7 +18,7 @@ pkgs.writeShellScriptBin "homep" ''
if [ -n "$selected_packages" ]; then
echo "$selected_packages" | while read -r package; do
# Append each selected package to the Nix config file
sed -i "/^\t]/i \ \t\t$package" "$HOME/sysflakes/glasshouse-desktop/home/userpkgs.nix"
sed -i "/^\t]/i \ \t\t$package" "${self}/modules/home/userpkgs.nix"
echo "Added $package to the Home Manager configuration."
done

4
modules/home/scripts/nix/homer.nix
View File

@@ -5,11 +5,11 @@
pkgs.writeShellScriptBin "homer" ''
#!/run/current-system/sw/bin/bash
selected_packages=$(sed -n '/\[/,/\]/p' "$HOME/sysflakes/glasshouse-desktop/home/userpkgs.nix" | sed '1d;$d' | fzf -m)
selected_packages=$(sed -n '/\[/,/\]/p' "${self}/modules/home/userpkgs.nix" | sed '1d;$d' | fzf -m)
if [ -n "$selected_packages" ]; then
echo "$selected_packages" | while read -r package; do
sed -i "/\b$package\b/d" "$HOME/sysflakes/glasshouse-desktop/home/userpkgs.nix"
sed -i "/\b$package\b/d" "${self}/modules/home/userpkgs.nix"
echo "Removed $package from the Home Manager configuration."
done

5
modules/home/scripts/nix/nixcommit.nix
View File

@@ -7,8 +7,7 @@ pkgs.writeShellScriptBin "nixcommit" ''
#!/run/current-system/sw/bin/bash
scheck && runbg aplay ${self}/media/sound/nixswitch-start.wav
builtin cd "$HOME/sysflakes" || exit
nix flake update
pushd "${self}" || exit
if [ -n "$2" ]; then
echo "too many arguments"
@@ -45,5 +44,5 @@ pkgs.writeShellScriptBin "nixcommit" ''
fi
scheck && runbg aplay ${self}/media/sound/gitcommit.wav
builtin cd - || exit
popd || exit
''

2
modules/home/scripts/nix/nixp.nix
View File

@@ -18,7 +18,7 @@ pkgs.writeShellScriptBin "nixp" ''
if [ -n "$selected_packages" ]; then
echo "$selected_packages" | while read -r package; do
# Append each selected package to the Nix config file
sed -i "/^\t]/i \ \t\t$package" "$HOME/sysflakes/glasshouse-desktop/sys/packages.nix"
sed -i "/^\t]/i \ \t\t$package" "${self}/modules/sys/packages.nix"
echo "Added $package to the Nix configuration."
done

2
modules/home/scripts/nix/nixpush.nix
View File

@@ -7,7 +7,7 @@ pkgs.writeShellScriptBin "nixpush" ''
scheck && runbg aplay ${self}/media/sound/nixswitch-start.wav
set -e
pushd "$HOME/sysflakes"
pushd "${self}"
commits=$(git log origin/$(git rev-parse --abbrev-ref HEAD)..HEAD --oneline)
if [ -z "$commits" ]; then

4
modules/home/scripts/nix/nixr.nix
View File

@@ -5,11 +5,11 @@
pkgs.writeShellScriptBin "nixr" ''
#!/run/current-system/sw/bin/bash
selected_packages=$(sed -n '/\[/,/\]/p' "$HOME/sysflakes/glasshouse-desktop/sys/packages.nix" | sed '1d;$d' | fzf -m)
selected_packages=$(sed -n '/\[/,/\]/p' "${self}/modules/sys/packages.nix" | sed '1d;$d' | fzf -m)
if [ -n "$selected_packages" ]; then
echo "$selected_packages" | while read -r package; do
sed -i "/\b$package\b/d" "$HOME/sysflakes/glasshouse-desktop/sys/packages.nix"
sed -i "/\b$package\b/d" "${self}/modules/sys/packages.nix"
echo "Removed $package from the Nix configuration."
done

6
modules/home/scripts/nix/rebuild.nix
View File

@@ -8,14 +8,10 @@ pkgs.writeShellScriptBin "rebuild" ''
scheck && runbg aplay ${self}/media/sound/nixswitch-start.wav
set -e
pushd "$HOME/sysflakes"
nix flake update
sudo nixos-rebuild switch --flake "$HOME/sysflakes#${host}"
sudo nixos-rebuild switch --flake "$HOME/.sysflake#${host}"
if [ $? -eq 0 ]; then
scheck && runbg aplay ${self}/media/sound/update.wav
else
scheck && runbg aplay ${self}/media/sound/error.wav
fi
popd
''