From ecf22370992361ddb1939214d98af44a157048d0 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Tue, 2 Aug 2022 21:01:17 +0200 Subject: [PATCH] Unified system flake update --- home/programs/fish.nix | 2 +- home/programs/scripts/nix-darwin-switch | 13 ---------- home/programs/scripts/nixpkgs-switch | 34 +++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 14 deletions(-) delete mode 100755 home/programs/scripts/nix-darwin-switch create mode 100755 home/programs/scripts/nixpkgs-switch diff --git a/home/programs/fish.nix b/home/programs/fish.nix index 6bb74aa..7aa62b6 100644 --- a/home/programs/fish.nix +++ b/home/programs/fish.nix @@ -94,7 +94,7 @@ ]; shellAliases = { - drsw = "nix-darwin-switch"; + nrsw = "nixpkgs-switch"; upa = "nix flake update ~/.config/nixpkgs -v && upn"; upn = "$HOME/.config/nixpkgs/home/programs/nvim/update-plugins.sh"; ngc = "nix-collect-garbage -d && sudo nix-collect-garbage -d"; diff --git a/home/programs/scripts/nix-darwin-switch b/home/programs/scripts/nix-darwin-switch deleted file mode 100755 index 7a2c91a..0000000 --- a/home/programs/scripts/nix-darwin-switch +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env fish - -pushd ~/.config/nixpkgs -rm -rf result - -set system_old (readlink /run/current-system) -env TERM=xterm-256color darwin-rebuild switch --flake . -set system_new (readlink /run/current-system) - -nvd diff "$system_old" "$system_new" - -rm -f result -popd diff --git a/home/programs/scripts/nixpkgs-switch b/home/programs/scripts/nixpkgs-switch new file mode 100755 index 0000000..f87ba1e --- /dev/null +++ b/home/programs/scripts/nixpkgs-switch @@ -0,0 +1,34 @@ +#!/usr/bin/env fish + +set -g os (uname) + +switch $os + case Darwin + set -g config_dir "$HOME/.config/nixpkgs" + case Linux + set -g config_dir /etc/nixos + case '*' + echo "Unsupported OS" + exit 1 +end + +pushd "$config_dir" +rm -rf result + +set system_old (readlink /run/current-system) + +switch $os + case Darwin + git pull + env TERM=xterm-256color darwin-rebuild switch --flake . + case Linux + sudo git pull + sudo nixos-rebuild switch --flake . +end + +set system_new (readlink /run/current-system) + +nvd diff "$system_old" "$system_new" + +rm -f result +popd