diff --git a/home-manager/nathan/default.nix b/home-manager/nathan/default.nix index 9b6d927..e7376c6 100644 --- a/home-manager/nathan/default.nix +++ b/home-manager/nathan/default.nix @@ -5,7 +5,6 @@ ./services ./packages ./dotfiles - ./impermanence ]; options.homeconfig = { diff --git a/home-manager/nathan/impermanence/default.nix b/home-manager/nathan/impermanence/default.nix deleted file mode 100644 index 76a3ac3..0000000 --- a/home-manager/nathan/impermanence/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ config, lib, inputs, ... }: { - - imports = [ - inputs.impermanence.nixosModules.home-manager.impermanence - ]; - - options.homeconfig.impermanence.enable = lib.options.mkOption { - type = lib.types.bool; - default = false; - }; - - config = lib.mkIf config.homeconfig.impermanence.enable { - - home.persistence."/persist/home/nathan" = { - - directories = [ - "Documents" - "Music" - "Pictures/Photos" - "Projects" - "Videos" - ".ssh" - ".local/share/zoxide" - ".config/sops" - ]; - files = [ - ".zsh_history" - ]; - allowOther = true; - }; - - }; -} diff --git a/system-config/configuration/homebox/default.nix b/system-config/configuration/homebox/default.nix index d724eb3..97ff1d5 100644 --- a/system-config/configuration/homebox/default.nix +++ b/system-config/configuration/homebox/default.nix @@ -9,8 +9,6 @@ (import ./disko.nix { device1 = "/dev/nvme0n1"; device2 = "/dev/nvme1n1"; device3 = "/dev/sda"; }) - inputs.impermanence.nixosModules.impermanence - inputs.sops-nix.nixosModules.sops inputs.home-manager.nixosModules.default @@ -136,57 +134,8 @@ docker-compose ]; - - boot.initrd.postDeviceCommands = lib.mkAfter '' - mkdir /btrfs_tmp - mount /dev/root_vg/root /btrfs_tmp - if [[ -e /btrfs_tmp/root ]]; then - mkdir -p /btrfs_tmp/old_roots - timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S") - mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp" - fi - - delete_subvolume_recursively() { - IFS=$'\n' - for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do - delete_subvolume_recursively "/btrfs_tmp/$i" - done - btrfs subvolume delete "$1" - } - - for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do - delete_subvolume_recursively "$i" - done - - btrfs subvolume create /btrfs_tmp/root - umount /btrfs_tmp - ''; - - fileSystems."/persist".neededForBoot = true; - environment.persistence."/persist/system" = { - hideMounts = true; - directories = [ - "/etc/nixos" - "/var/log" - "/var/lib/bluetooth" - "/var/lib/nixos" - "/var/lib/nixos-containers" - "/var/lib/systemd/coredump" - "/var/lib/docker" - "/var/lib/mcservers" - "/etc/NetworkManager/system-connections" - ]; - files = [ - "/etc/machine-id" - "/etc/ssh/ssh_host_ed25519_key" - "/etc/ssh/ssh_host_ed25519_key.pub" - "/etc/ssh/ssh_host_rsa_key" - "/etc/ssh/ssh_host_rsa_key.pub" - ]; - }; - sops = { - age.keyFile = "/persist/home/nathan/.config/sops/age/keys.txt"; + age.keyFile = "/home/nathan/.config/sops/age/keys.txt"; defaultSopsFile = ./secrets.yaml; defaultSopsFormat = "yaml"; @@ -215,7 +164,6 @@ host = "homebox"; minimal = false; wayvnc.enable = true; - impermanence.enable = true; hyprland.enable = true; swaylock.enable = true; wal.enable = true;