Revert "impermanence"

This reverts commit 9d0d0b10d1.
This commit is contained in:
2025-10-06 14:52:44 -04:00
parent 9d0d0b10d1
commit d55ff785cc
5 changed files with 2 additions and 104 deletions

View File

@@ -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 = {

View File

@@ -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;
}

16
flake.lock generated
View File

@@ -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",

View File

@@ -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!

View File

@@ -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"
];
};
};
}