diff --git a/configuration.nix b/configuration.nix index 5614204..9378fac 100644 --- a/configuration.nix +++ b/configuration.nix @@ -13,7 +13,6 @@ imports = [ ./hardware.nix ./zfs.nix - ./impermanence.nix ./services/postgresql.nix ./services/jellyfin.nix @@ -98,7 +97,6 @@ initrd = { compressor = "zstd"; - supportedFilesystems = [ "f2fs" ]; }; loader.systemd-boot.enable = lib.mkForce false; @@ -121,14 +119,6 @@ chown -R root:wheel ${config.boot.lanzaboote.pkiBundle} chmod -R 500 ${config.boot.lanzaboote.pkiBundle} ''; - - # ensure persistent directories exist - "persistent-dirs".text = '' - mkdir -p /persistent/etc/ssh - mkdir -p /persistent/var/lib - mkdir -p /persistent/etc/nixos - mkdir -p /persistent/var/log - ''; }; environment.etc = { diff --git a/disk-config.nix b/disk-config.nix index 63acb14..25580ff 100644 --- a/disk-config.nix +++ b/disk-config.nix @@ -15,29 +15,17 @@ mountpoint = "/boot"; }; }; - persistent = { + root = { size = "100%"; content = { type = "filesystem"; format = "f2fs"; - mountpoint = "/persistent"; + mountpoint = "/"; }; }; }; }; }; }; - nodev = { - "/" = { - fsType = "tmpfs"; - mountOptions = [ - "defaults" - "size=2G" - "mode=755" - ]; - }; - }; }; - - fileSystems."/persistent".neededForBoot = true; } diff --git a/flake.lock b/flake.lock index 373f2e7..32e1599 100644 --- a/flake.lock +++ b/flake.lock @@ -205,21 +205,6 @@ "type": "github" } }, - "impermanence": { - "locked": { - "lastModified": 1737831083, - "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", - "owner": "nix-community", - "repo": "impermanence", - "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "impermanence", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", @@ -363,7 +348,6 @@ "deploy-rs": "deploy-rs", "disko": "disko", "home-manager": "home-manager", - "impermanence": "impermanence", "lanzaboote": "lanzaboote", "llamacpp": "llamacpp", "nix-minecraft": "nix-minecraft", diff --git a/flake.nix b/flake.nix index ca52512..ee2a5db 100644 --- a/flake.nix +++ b/flake.nix @@ -43,10 +43,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - impermanence = { - url = "github:nix-community/impermanence"; - }; - senior_project-website = { url = "github:Titaniumtown/senior-project-website"; flake = false; @@ -70,7 +66,6 @@ disko, srvos, deploy-rs, - impermanence, ... }@inputs: let @@ -201,8 +196,6 @@ disko.nixosModules.disko ./configuration.nix - impermanence.nixosModules.impermanence - vpn-confinement.nixosModules.default # get nix-minecraft working! diff --git a/impermanence.nix b/impermanence.nix deleted file mode 100644 index 6406d95..0000000 --- a/impermanence.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - config, - lib, - pkgs, - username, - service_configs, - ... -}: -{ - environment.persistence."/persistent" = { - hideMounts = true; - directories = [ - # System directories - "/etc/nixos" - "/var/log" - "/var/lib/nixos" - "/var/lib/systemd/coredump" - "/etc/NetworkManager/system-connections" - "/etc/ssh" - - # Wireguard - "/etc/wireguard" - - # Systemd persistent timers and state - "/var/lib/systemd/timers" - ]; - - files = [ - # SSH host keys - "/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" - - # Machine ID - "/etc/machine-id" - - # ZFS cache - "/etc/zfs/zpool.cache" - ]; - - users.${username} = { - directories = [ - ".ssh" - ".config/fish" - ".local/share/fish" - ".cache" - ".config/helix" - ]; - - files = [ - ".bash_history" - ]; - }; - }; - -}