mirror of
https://github.com/Swarsel/.dotfiles.git
synced 2025-12-06 09:07:21 +01:00
feat: add fs-diff script for impermanence check
This commit is contained in:
parent
c0a2be3791
commit
ea81fcf56e
8 changed files with 51 additions and 4 deletions
|
|
@ -4041,6 +4041,7 @@ As such, I also define three additional overlays:
|
||||||
swarselcheck = callPackage ./swarselcheck { };
|
swarselcheck = callPackage ./swarselcheck { };
|
||||||
waybarupdate = callPackage ./waybarupdate { };
|
waybarupdate = callPackage ./waybarupdate { };
|
||||||
opacitytoggle = callPackage ./opacitytoggle { };
|
opacitytoggle = callPackage ./opacitytoggle { };
|
||||||
|
fs-diff = callPackage ./fs-diff { };
|
||||||
}
|
}
|
||||||
|
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
@ -4418,6 +4419,40 @@ As such, I also define three additional overlays:
|
||||||
}
|
}
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
|
**** fs-diff
|
||||||
|
|
||||||
|
#+begin_src shell :tangle scripts/fs-diff.sh
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
OLD_TRANSID=$(sudo btrfs subvolume find-new /mnt/root-blank 9999999)
|
||||||
|
OLD_TRANSID=${OLD_TRANSID#transid marker was }
|
||||||
|
|
||||||
|
sudo btrfs subvolume find-new "/mnt/root" "$OLD_TRANSID" |
|
||||||
|
sed '$d' |
|
||||||
|
cut -f17- -d' ' |
|
||||||
|
sort |
|
||||||
|
uniq |
|
||||||
|
while read -r path; do
|
||||||
|
path="/$path"
|
||||||
|
if [ -L "$path" ]; then
|
||||||
|
: # The path is a symbolic link, so is probably handled by NixOS already
|
||||||
|
elif [ -d "$path" ]; then
|
||||||
|
: # The path is a directory, ignore
|
||||||
|
else
|
||||||
|
echo "$path"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
#+end_src
|
||||||
|
|
||||||
|
#+begin_src nix :tangle pkgs/fs-diff/default.nix
|
||||||
|
{ writeShellApplication, sway}:
|
||||||
|
|
||||||
|
writeShellApplication {
|
||||||
|
name = "fs-diff";
|
||||||
|
text = builtins.readFile ../../scripts/fs-diff.sh;
|
||||||
|
}
|
||||||
|
#+end_src
|
||||||
|
|
||||||
|
|
||||||
*** Overlays
|
*** Overlays
|
||||||
|
|
||||||
|
|
@ -6300,6 +6335,7 @@ Programming languages and default lsp's are defined here: [[#h:0e7e8bea-ec58-499
|
||||||
swarselcheck
|
swarselcheck
|
||||||
waybarupdate
|
waybarupdate
|
||||||
opacitytoggle
|
opacitytoggle
|
||||||
|
fs-diff
|
||||||
|
|
||||||
(pkgs.writeScriptBin "project" ''
|
(pkgs.writeScriptBin "project" ''
|
||||||
#! ${pkgs.bash}/bin/bash
|
#! ${pkgs.bash}/bin/bash
|
||||||
|
|
@ -6994,6 +7030,7 @@ Here we set some aliases (some of them should be shellApplications instead) as w
|
||||||
cd = "z";
|
cd = "z";
|
||||||
cdr = "cd \"$( (find /home/swarsel/Documents/GitHub -maxdepth 1 && echo /home/swarsel/.dotfiles) | fzf )\"";
|
cdr = "cd \"$( (find /home/swarsel/Documents/GitHub -maxdepth 1 && echo /home/swarsel/.dotfiles) | fzf )\"";
|
||||||
nix-ldd = "LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH ldd";
|
nix-ldd = "LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH ldd";
|
||||||
|
fs-diff = "sudo mount -o subvol=/ /dev/mapper/cryptroot /mnt ; fs-diff";
|
||||||
};
|
};
|
||||||
autosuggestion.enable = true;
|
autosuggestion.enable = true;
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
|
|
|
||||||
|
|
@ -127,7 +127,7 @@
|
||||||
# # NixOS modules that can only be used on NixOS systems
|
# # NixOS modules that can only be used on NixOS systems
|
||||||
nixModules = [
|
nixModules = [
|
||||||
inputs.stylix.nixosModules.stylix
|
inputs.stylix.nixosModules.stylix
|
||||||
# inputs.lanzaboote.nixosModules.lanzaboote
|
inputs.lanzaboote.nixosModules.lanzaboote
|
||||||
inputs.disko.nixosModules.disko
|
inputs.disko.nixosModules.disko
|
||||||
# inputs.impermanence.nixosModules.impermanence
|
# inputs.impermanence.nixosModules.impermanence
|
||||||
inputs.sops-nix.nixosModules.sops
|
inputs.sops-nix.nixosModules.sops
|
||||||
|
|
|
||||||
|
|
@ -13,4 +13,5 @@ in
|
||||||
swarselcheck = callPackage ./swarselcheck { };
|
swarselcheck = callPackage ./swarselcheck { };
|
||||||
waybarupdate = callPackage ./waybarupdate { };
|
waybarupdate = callPackage ./waybarupdate { };
|
||||||
opacitytoggle = callPackage ./opacitytoggle { };
|
opacitytoggle = callPackage ./opacitytoggle { };
|
||||||
|
fs-diff = callPackage ./fs-diff { };
|
||||||
}
|
}
|
||||||
|
|
|
||||||
6
pkgs/fs-diff/default.nix
Normal file
6
pkgs/fs-diff/default.nix
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
{ writeShellApplication, sway }:
|
||||||
|
|
||||||
|
writeShellApplication {
|
||||||
|
name = "fs-diff";
|
||||||
|
text = builtins.readFile ../../scripts/fs-diff.sh;
|
||||||
|
}
|
||||||
|
|
@ -158,6 +158,7 @@
|
||||||
swarselcheck
|
swarselcheck
|
||||||
waybarupdate
|
waybarupdate
|
||||||
opacitytoggle
|
opacitytoggle
|
||||||
|
fs-diff
|
||||||
|
|
||||||
(pkgs.writeScriptBin "project" ''
|
(pkgs.writeScriptBin "project" ''
|
||||||
#! ${pkgs.bash}/bin/bash
|
#! ${pkgs.bash}/bin/bash
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
cd = "z";
|
cd = "z";
|
||||||
cdr = "cd \"$( (find /home/swarsel/Documents/GitHub -maxdepth 1 && echo /home/swarsel/.dotfiles) | fzf )\"";
|
cdr = "cd \"$( (find /home/swarsel/Documents/GitHub -maxdepth 1 && echo /home/swarsel/.dotfiles) | fzf )\"";
|
||||||
nix-ldd = "LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH ldd";
|
nix-ldd = "LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH ldd";
|
||||||
|
fs-diff = "sudo mount -o subvol=/ /dev/mapper/cryptroot /mnt ; fs-diff";
|
||||||
};
|
};
|
||||||
autosuggestion.enable = true;
|
autosuggestion.enable = true;
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,9 @@
|
||||||
|
|
||||||
# pinentry
|
# pinentry
|
||||||
|
|
||||||
|
# secure boot
|
||||||
|
sbctl
|
||||||
|
|
||||||
nix-index
|
nix-index
|
||||||
|
|
||||||
# keyboards
|
# keyboards
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,3 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
# fs-diff.sh
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
OLD_TRANSID=$(sudo btrfs subvolume find-new /mnt/root-blank 9999999)
|
OLD_TRANSID=$(sudo btrfs subvolume find-new /mnt/root-blank 9999999)
|
||||||
|
|
@ -10,7 +8,7 @@ sed '$d' |
|
||||||
cut -f17- -d' ' |
|
cut -f17- -d' ' |
|
||||||
sort |
|
sort |
|
||||||
uniq |
|
uniq |
|
||||||
while read path; do
|
while read -r path; do
|
||||||
path="/$path"
|
path="/$path"
|
||||||
if [ -L "$path" ]; then
|
if [ -L "$path" ]; then
|
||||||
: # The path is a symbolic link, so is probably handled by NixOS already
|
: # The path is a symbolic link, so is probably handled by NixOS already
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue