Merge remote-tracking branch 'refs/remotes/origin/nixos' into nixos

This commit is contained in:
Moritz Böhme 2023-10-01 21:17:43 +02:00
commit bd2b6d1af3
Signed by: moritz
GPG key ID: 970C6E89EB0547A9
3 changed files with 3 additions and 1 deletions

View file

@ -29,7 +29,7 @@
name = "zfs-diff"; name = "zfs-diff";
runtimeInputs = with pkgs; [ zfs coreutils parallel tree ]; runtimeInputs = with pkgs; [ zfs coreutils parallel tree ];
text = '' text = ''
sudo zfs diff zroot/encrypted/root@blank | cut -f2 | parallel 'test -d /persist/{} || echo {}' | tree --fromfile . zfs diff -F zroot/encrypted/root@blank | awk '$2 == "F" && system("test -e /persist/"$3) != 0 { print $3 }' 2>/dev/null | tree --fromfile . "$@"
''; '';
} }
) )

View file

@ -38,6 +38,7 @@
".config/Nextcloud" ".config/Nextcloud"
".config/keepassxc" ".config/keepassxc"
".local/share/direnv" ".local/share/direnv"
".local/share/nvim"
".local/share/zoxide" ".local/share/zoxide"
".local/state/nvim" ".local/state/nvim"
".mozilla" ".mozilla"

View file

@ -51,6 +51,7 @@ in
}; };
wallpapers.enable = true; wallpapers.enable = true;
services.dunst.enable = true; services.dunst.enable = true;
services.wallpaper.enable = true;
}; };
home-manager.users.moritz = { home-manager.users.moritz = {