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

(desktop) Gen 446: Cleaned up broken inputs, altered 'nixswitch' to be interchangeable between hosts, added 'host' attr

Browse Source
This commit is contained in:
pagedMov
2024-10-13 02:15:56 -04:00
parent 1379e5a8ef
commit 9372e3af0d
14 changed files with 124 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
{ self, pkgs, ... }:
{ host, self, pkgs, ... }:
let
compress = (import ./commands/compress.nix { self = self; pkgs = pkgs;});
@@ -13,10 +13,8 @@ let
homep = (import ./nix/homep.nix { self = self; pkgs = pkgs;});
homer = (import ./nix/homer.nix { self = self; pkgs = pkgs;});
nsp = (import ./nix/nsp.nix { self = self; pkgs = pkgs;});
nixswitch = (import ./nix/nixswitch.nix { self = self; pkgs = pkgs;});
nixr = (import ./nix/nixr.nix { self = self; pkgs = pkgs;});
nixp = (import ./nix/nixp.nix { self = self; pkgs = pkgs;});
nixcommit = (import ./nix/nixcommit.nix { self = self; pkgs = pkgs;});
lofi = (import ./wm-controls/lofi.nix { self = self; pkgs = pkgs;});
music = (import ./wm-controls/music.nix { self = self; pkgs = pkgs;});
shutdown-script = (import ./wm-controls/shutdown-script.nix { self = self; pkgs = pkgs;});
@@ -25,6 +23,8 @@ let
toggle_float = (import ./wm-controls/toggle_float.nix { self = self; pkgs = pkgs;});
toggle_oppacity = (import ./wm-controls/toggle_oppacity.nix { self = self; pkgs = pkgs;});
toggle_waybar = (import ./wm-controls/toggle_waybar.nix { self = self; pkgs = pkgs;});
nixswitch = (import ./nix/nixswitch.nix { host = host; self = self; pkgs = pkgs;});
nixcommit = (import ./nix/nixcommit.nix { host = host; self = self; pkgs = pkgs;});
in
{
home.packages = [

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

@@ -1,4 +1,4 @@
{ self, pkgs }:
{ self, pkgs, host}:
pkgs.writeShellScriptBin "nixcommit" (''
@@ -22,7 +22,7 @@ if [ -n "$diffcheck" ]; then
exit
fi
git add .
git commit -m "Gen $gen: $1"
git commit -m "(${host}) Gen $gen: $1"
git push
scheck && runbg aplay ${self}/media/sound/gitpush.wav
builtin cd - || exit

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

@@ -1,4 +1,4 @@
{ self, pkgs }:
{ host, self, pkgs }:
pkgs.writeShellScriptBin "nixswitch" (''
@@ -8,11 +8,11 @@ scheck && runbg aplay ${self}/media/sound/nixswitch-start.wav
builtin cd "$HOME/sysflakes" || exit
nix flake update
sudo nixos-rebuild switch --flake "$HOME/sysflakes#glasshouse-desktop"
sudo nixos-rebuild switch --flake "$HOME/sysflakes#${host}"
if [ $? -eq 0 ]; then
scheck && runbg aplay ${self}/media/sound/update.wav
else
scheck && runbg aplay ${self}/media/sound/error.wav
fi
builtin cd "$OLDPWD" || exit
'')
'')