diff --git a/apply.sh b/apply.sh deleted file mode 100755 index 5811bc5..0000000 --- a/apply.sh +++ /dev/null @@ -1,7 +0,0 @@ -name=$1 - -if [ -z "$name" ]; then - sudo nixos-rebuild switch --flake . -else - sudo nixos-rebuild switch --flake ".#$name" -fi diff --git a/modules/basic/default.nix b/modules/basic/default.nix index f3ff83d..9366fda 100644 --- a/modules/basic/default.nix +++ b/modules/basic/default.nix @@ -4,6 +4,7 @@ imports = [ ./locales.nix ./nix.nix + ./network.nix ./security.nix ]; diff --git a/modules/basic/network.nix b/modules/basic/network.nix index 34b6b7c..56df0e1 100644 --- a/modules/basic/network.nix +++ b/modules/basic/network.nix @@ -2,4 +2,9 @@ { networking.networkmanager.enable = true; + # + # environment.systemPackages = with pkgs; [ nfs-utils ]; + # boot.initrd.kernelModules = [ "nfs" ]; + # boot.initrd.supportedFilesystems = [ "nfs" ]; + # services.rpcbind.enable = true; } diff --git a/os.sh b/os.sh new file mode 100755 index 0000000..b951fce --- /dev/null +++ b/os.sh @@ -0,0 +1,38 @@ + +ACTION=$1; shift +LOCATION=$PWD + +function apply() { + name=$1 + if [ -z "$name" ]; then + sudo nixos-rebuild switch --flake $LOCATION + else + sudo nixos-rebuild switch --flake "$LOCATION#$name" + fi +} + +function upgrade() { + if git -C "$LOCATION" diff-index --quiet HEAD --; then + nix flake update --commit-lock-file "$LOCATION" + else + echo "Error: git working tree is dirty" + exit 1 + fi +} + +function cleanup() { + nix-collect-garbage -d + nixos-store --optimise +} + +case $ACTION in + apply) + apply $1 + ;; + upgrade) + upgrade $1 + ;; + *) + echo "Usage: $0 {apply}" + exit 1 +esac