karaolidis/nix
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor persistence structure

Browse Source 
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
This commit is contained in:
Nick Karaolidis
2025-05-26 11:47:21 +01:00
parent b631d466ff
commit 19285a264f
48 changed files with 196 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hosts/common/configs/system/backup/backup.sh
View File

@@ -11,7 +11,7 @@ usage() {
} }
cleanup() { cleanup() {
if [ -d "/persist.bak" ]; then btrfs -q subvolume delete "/persist.bak"; fi if [ -d "/persist/user.bak" ]; then btrfs -q subvolume delete "/persist/user.bak"; fi
if [ -n "$backup_location" ]; then rm -f "$backup_location.tmp"; fi if [ -n "$backup_location" ]; then rm -f "$backup_location.tmp"; fi
if [ -n "$mount_location" ]; then if [ -n "$mount_location" ]; then
@@ -56,11 +56,11 @@ fi
backup_location="$backup_location/$(hostname)-$(date +%Y-%m-%d-%H-%M-%S).btrfs.gz" backup_location="$backup_location/$(hostname)-$(date +%Y-%m-%d-%H-%M-%S).btrfs.gz"
echo "Creating /persist snapshot..." echo "Creating /persist/user snapshot..."
btrfs -q subvolume snapshot -r "/persist" "/persist.bak" btrfs -q subvolume snapshot -r "/persist/user" "/persist/user.bak"
echo "Creating backup at $backup_location..." echo "Creating backup at $backup_location..."
btrfs -q send "/persist.bak" | gzip > "$backup_location.tmp" btrfs -q send "/persist/user.bak" | gzip > "$backup_location.tmp"
mv "$backup_location.tmp" "$backup_location" mv "$backup_location.tmp" "$backup_location"

4
hosts/common/configs/system/bluetooth/default.nix
View File

@@ -8,10 +8,10 @@
}; };
}; };
environment.persistence."/persist"."/var/lib/bluetooth" = { }; environment.persistence."/persist/state"."/var/lib/bluetooth" = { };
systemd.services.bluetooth.after = [ systemd.services.bluetooth.after = [
config.environment.persistence."/persist"."/var/lib/bluetooth".mount config.environment.persistence."/persist/state"."/var/lib/bluetooth".mount
]; ];
home-manager.sharedModules = [ { services.mpris-proxy.enable = config.services.pipewire.enable; } ]; home-manager.sharedModules = [ { services.mpris-proxy.enable = config.services.pipewire.enable; } ];

6
hosts/common/configs/system/docker/default.nix
View File

@@ -18,12 +18,12 @@
}; };
environment = { environment = {
persistence."/persist"."/var/lib/docker" = { }; persistence."/persist/state"."/var/lib/docker" = { };
systemPackages = with pkgs; [ docker-compose ]; systemPackages = with pkgs; [ docker-compose ];
}; };
systemd = { systemd = {
services.docker.after = [ config.environment.persistence."/persist"."/var/lib/docker".mount ]; services.docker.after = [ config.environment.persistence."/persist/state"."/var/lib/docker".mount ];
sockets.docker.after = [ config.environment.persistence."/persist"."/var/lib/docker".mount ]; sockets.docker.after = [ config.environment.persistence."/persist/state"."/var/lib/docker".mount ];
}; };
} }

12
hosts/common/configs/system/impermanence/default.nix
View File

@@ -38,11 +38,13 @@
ln -s ${config.sops.secrets."machineId".path} $out ln -s ${config.sops.secrets."machineId".path} $out
''; '';
persistence."/persist" = { persistence = {
"/etc/nixos" = { }; "/persist/user"."/etc/nixos" = { };
"/var/lib/nixos" = { }; "/persist/state" = {
"/var/lib/systemd" = { }; "/var/lib/nixos" = { };
"/var/log" = { }; "/var/lib/systemd" = { };
"/var/log" = { };
};
}; };
}; };
} }

2
hosts/common/configs/system/libvirt/default.nix
View File

@@ -41,7 +41,7 @@
"ovmf/edk2-i386-vars.fd".source = "ovmf/edk2-i386-vars.fd".source =
"${config.virtualisation.libvirtd.qemu.package}/share/qemu/edk2-i386-vars.fd"; "${config.virtualisation.libvirtd.qemu.package}/share/qemu/edk2-i386-vars.fd";
}; };
persistence."/persist"."/var/lib/libvirt" = { }; persistence."/persist/state"."/var/lib/libvirt" = { };
}; };
programs.virt-manager.enable = true; programs.virt-manager.enable = true;

4
hosts/common/configs/system/networkmanager/default.nix
View File

@@ -2,9 +2,9 @@
{ {
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
environment.persistence."/persist"."/etc/NetworkManager/system-connections" = { }; environment.persistence."/persist/state"."/etc/NetworkManager/system-connections" = { };
systemd.services.NetworkManager.after = [ systemd.services.NetworkManager.after = [
config.environment.persistence."/persist"."/etc/NetworkManager/system-connections".mount config.environment.persistence."/persist/state"."/etc/NetworkManager/system-connections".mount
]; ];
} }

15
hosts/common/configs/system/nix-install/install.sh
View File

@@ -63,8 +63,8 @@ prepare_disk() {
} }
copy_keys() { copy_keys() {
mkdir -p "$root/persist/etc/ssh" mkdir -p "$root/persist/state/etc/ssh"
cp -f "$flake/hosts/$host/secrets/ssh_host_ed25519_key" "$root/persist/etc/ssh/ssh_host_ed25519_key" cp -f "$flake/hosts/$host/secrets/ssh_host_ed25519_key" "$root/persist/state/etc/ssh/ssh_host_ed25519_key"
for path in "$flake/hosts/$host/users"/*; do for path in "$flake/hosts/$host/users"/*; do
if [[ -z "$key" ]]; then if [[ -z "$key" ]]; then
@@ -73,8 +73,8 @@ copy_keys() {
local user local user
user=$(basename "$path") user=$(basename "$path")
mkdir -p "$root/persist/home/$user/.config/sops-nix" mkdir -p "$root/persist/state/home/$user/.config/sops-nix"
cp -f "$flake/secrets/$key/key.txt" "$root/persist/home/$user/.config/sops-nix/key.txt" cp -f "$flake/secrets/$key/key.txt" "$root/persist/state/home/$user/.config/sops-nix/key.txt"
done done
} }
@@ -82,7 +82,7 @@ set_permissions() {
for path in "$flake/hosts/$host/users"/*; do for path in "$flake/hosts/$host/users"/*; do
local user local user
user=$(basename "$path") user=$(basename "$path")
chown -R "$(cat "$flake/hosts/$host/users/$user/uid"):100" "$root/persist/home/$user" chown -R "$(cat "$flake/hosts/$host/users/$user/uid"):100" "$root/persist/*/home/$user"
done done
} }
@@ -92,8 +92,9 @@ install() {
copy_config() { copy_config() {
echo "Copying configuration..." echo "Copying configuration..."
rm -rf "$root/persist/etc/nixos" mkdir -p "$root/persist/user/etc/nixos"
cp -r "$flake" "$root/persist/etc/nixos" rm -rf "$root/persist/user/etc/nixos"
cp -r "$flake" "$root/persist/user/etc/nixos"
} }
finish() { finish() {

2
hosts/common/configs/system/podman/default.nix
View File

@@ -14,7 +14,7 @@
}; };
environment = { environment = {
persistence."/persist"."/var/lib/containers" = { }; persistence."/persist/state"."/var/lib/containers" = { };
systemPackages = with pkgs; [ systemPackages = with pkgs; [
podman-compose podman-compose

10
hosts/common/configs/system/printing/default.nix
View File

@@ -18,19 +18,19 @@
}; };
}; };
environment.persistence."/persist" = { environment.persistence."/persist/state" = {
"/var/lib/cups/ppd" = { }; "/var/lib/cups/ppd" = { };
"/var/lib/cups/printers.conf" = { }; "/var/lib/cups/printers.conf" = { };
}; };
systemd = { systemd = {
services.cups.after = [ services.cups.after = [
config.environment.persistence."/persist"."/var/lib/cups/ppd".mount config.environment.persistence."/persist/state"."/var/lib/cups/ppd".mount
config.environment.persistence."/persist"."/var/lib/cups/printers.conf".mount config.environment.persistence."/persist/state"."/var/lib/cups/printers.conf".mount
]; ];
sockets.cups.after = [ sockets.cups.after = [
config.environment.persistence."/persist"."/var/lib/cups/ppd".mount config.environment.persistence."/persist/state"."/var/lib/cups/ppd".mount
config.environment.persistence."/persist"."/var/lib/cups/printers.conf".mount config.environment.persistence."/persist/state"."/var/lib/cups/printers.conf".mount
]; ];
}; };
} }

6
hosts/common/configs/system/sops/default.nix
View File

@@ -8,7 +8,7 @@
imports = [ inputs.sops-nix.nixosModules.sops ]; imports = [ inputs.sops-nix.nixosModules.sops ];
environment = { environment = {
persistence."/persist"."/etc/ssh/ssh_host_ed25519_key" = { }; persistence."/persist/state"."/etc/ssh/ssh_host_ed25519_key" = { };
systemPackages = with pkgs; [ systemPackages = with pkgs; [
sops sops
@@ -22,7 +22,9 @@
age = { age = {
generateKey = true; generateKey = true;
sshKeyPaths = [ config.environment.persistence."/persist"."/etc/ssh/ssh_host_ed25519_key".source ]; sshKeyPaths = [
config.environment.persistence."/persist/state"."/etc/ssh/ssh_host_ed25519_key".source
];
keyFile = "/var/lib/sops-nix/key.txt"; keyFile = "/var/lib/sops-nix/key.txt";
}; };
}; };

2
hosts/common/configs/system/sshd/default.nix
View File

@@ -2,7 +2,7 @@
{ {
environment = { environment = {
enableAllTerminfo = true; enableAllTerminfo = true;
persistence."/persist"."/var/lib/fail2ban" = { }; persistence."/persist/state"."/var/lib/fail2ban" = { };
}; };
services = { services = {

2
hosts/common/configs/system/zsh/default.nix
View File

@@ -6,7 +6,7 @@
}; };
environment = { environment = {
persistence."/persist"."/var/lib/zsh" = { }; persistence."/persist/state"."/var/lib/zsh" = { };
pathsToLink = [ "/share/zsh" ]; pathsToLink = [ "/share/zsh" ];
}; };

2
hosts/common/configs/user/console/android/default.nix
View File

@@ -17,7 +17,7 @@
users.users.${user}.extraGroups = [ "adbusers" ]; users.users.${user}.extraGroups = [ "adbusers" ];
environment.persistence."/persist" = { environment.persistence."/persist/state" = {
"${home}/.local/share/android/adbkey" = { }; "${home}/.local/share/android/adbkey" = { };
"${home}/.local/share/android/adbkey.pub" = { }; "${home}/.local/share/android/adbkey.pub" = { };
}; };

2
hosts/common/configs/user/console/btop/default.nix
View File

@@ -14,7 +14,7 @@
update_ms = 1000; update_ms = 1000;
proc_tree = true; proc_tree = true;
cpu_single_graph = true; cpu_single_graph = true;
disks_filter = "/ /nix /persist /cache"; disks_filter = "/ /nix /persist";
}; };
}; };
} }

6
hosts/common/configs/user/console/docker/default.nix
View File

@@ -37,14 +37,14 @@ lib.mkMerge [
}; };
} }
(lib.mkIf rootless { (lib.mkIf rootless {
environment.persistence."/persist"."${home}/.local/share/docker" = { }; environment.persistence."/persist/state"."${home}/.local/share/docker" = { };
systemd.user = { systemd.user = {
services.docker.after = [ services.docker.after = [
config.environment.persistence."/persist"."${home}/.local/share/docker".mount config.environment.persistence."/persist/state"."${home}/.local/share/docker".mount
]; ];
sockets.docker.after = [ sockets.docker.after = [
config.environment.persistence."/persist"."${home}/.local/share/docker".mount config.environment.persistence."/persist/state"."${home}/.local/share/docker".mount
]; ];
}; };
}) })

4
hosts/common/configs/user/console/kubernetes/default.nix
View File

@@ -10,8 +10,8 @@
}: }:
{ {
environment.persistence = { environment.persistence = {
"/persist"."${home}/.kube" = { }; "/persist/user"."${home}/.kube" = { };
"/cache"."${home}/.kube/cache" = { }; "/persist/cache"."${home}/.kube/cache" = { };
}; };
home-manager.users.${user} = { home-manager.users.${user} = {

4
hosts/common/configs/user/console/nix-direnv/default.nix
View File

@@ -115,7 +115,7 @@
}; };
environment.persistence = { environment.persistence = {
"/persist"."${home}/.local/share/direnv/allow" = { }; "/persist/state"."${home}/.local/share/direnv/allow" = { };
"/cache"."${home}/.cache/direnv" = { }; "/persist/cache"."${home}/.cache/direnv" = { };
}; };
} }

2
hosts/common/configs/user/console/nix/default.nix
View File

@@ -4,7 +4,7 @@
}: }:
{ pkgs, ... }: { pkgs, ... }:
{ {
environment.persistence."/cache"."${home}/.cache/nix" = { }; environment.persistence."/persist/cache"."${home}/.cache/nix" = { };
home-manager.users.${user} = { home-manager.users.${user} = {
home.packages = with pkgs; [ nurl ]; home.packages = with pkgs; [ nurl ];

4
hosts/common/configs/user/console/pipewire/default.nix
View File

@@ -4,10 +4,10 @@
}: }:
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
environment.persistence."/persist"."${home}/.local/state/wireplumber" = { }; environment.persistence."/persist/state"."${home}/.local/state/wireplumber" = { };
systemd.user.services.wireplumber.after = [ systemd.user.services.wireplumber.after = [
config.environment.persistence."/persist"."${home}/.local/state/wireplumber".mount config.environment.persistence."/persist/state"."${home}/.local/state/wireplumber".mount
]; ];
home-manager.users.${user} = { home-manager.users.${user} = {

2
hosts/common/configs/user/console/podman/default.nix
View File

@@ -9,7 +9,7 @@
... ...
}: }:
{ {
environment.persistence."/persist"."${home}/.local/share/containers" = { }; environment.persistence."/persist/state"."${home}/.local/share/containers" = { };
home-manager.users.${user} = { home-manager.users.${user} = {
imports = [ inputs.quadlet-nix.homeManagerModules.quadlet ]; imports = [ inputs.quadlet-nix.homeManagerModules.quadlet ];

2
hosts/common/configs/user/console/ranger/default.nix
View File

@@ -4,7 +4,7 @@
}: }:
{ ... }: { ... }:
{ {
environment.persistence."/cache"."${home}/.cache/ranger" = { }; environment.persistence."/persist/cache"."${home}/.cache/ranger" = { };
home-manager.users.${user}.programs = { home-manager.users.${user}.programs = {
ranger = { ranger = {

6
hosts/common/configs/user/console/sops/default.nix
View File

@@ -4,14 +4,14 @@
}: }:
{ config, inputs, ... }: { config, inputs, ... }:
{ {
environment.persistence."/persist"."${home}/.config/sops-nix/key.txt" = { }; environment.persistence."/persist/state"."${home}/.config/sops-nix/key.txt" = { };
home-manager.users.${user} = { home-manager.users.${user} = {
imports = [ inputs.sops-nix.homeManagerModules.sops ]; imports = [ inputs.sops-nix.homeManagerModules.sops ];
sops.age.keyFile = sops.age.keyFile =
config.environment.persistence."/persist"."${home}/.config/sops-nix/key.txt".source; config.environment.persistence."/persist/state"."${home}/.config/sops-nix/key.txt".source;
home.sessionVariables.SOPS_AGE_KEY_FILE = home.sessionVariables.SOPS_AGE_KEY_FILE =
config.environment.persistence."/persist"."${home}/.config/sops-nix/key.txt".source; config.environment.persistence."/persist/state"."${home}/.config/sops-nix/key.txt".source;
}; };
} }

2
hosts/common/configs/user/console/xdg/default.nix
View File

@@ -4,7 +4,7 @@
}: }:
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
environment.persistence."/persist" = { environment.persistence."/persist/user" = {
"${home}/Desktop" = { }; "${home}/Desktop" = { };
"${home}/Documents" = { }; "${home}/Documents" = { };
"${home}/Downloads" = { }; "${home}/Downloads" = { };

2
hosts/common/configs/user/console/zsh/default.nix
View File

@@ -5,7 +5,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
environment = { environment = {
persistence."/persist"."${home}/.local/share/zsh" = { }; persistence."/persist/state"."${home}/.local/share/zsh" = { };
# If we set this under home-manager.users.${user}.home.sessionVariables, # If we set this under home-manager.users.${user}.home.sessionVariables,
# it runs too late in the init process and zsh fails. # it runs too late in the init process and zsh fails.
sessionVariables.ZDOTDIR = "$HOME/.config/zsh"; sessionVariables.ZDOTDIR = "$HOME/.config/zsh";

4
hosts/common/configs/user/gui/chromium/default.nix
View File

@@ -20,8 +20,8 @@
}; };
environment.persistence = { environment.persistence = {
"/persist"."${home}/.config/chromium" = { }; "/persist/state"."${home}/.config/chromium" = { };
"/cache"."${home}/.cache/chromium" = { }; "/persist/cache"."${home}/.cache/chromium" = { };
}; };
home-manager.users.${user} = { home-manager.users.${user} = {

6
hosts/common/configs/user/gui/cliphist/default.nix
View File

@@ -12,7 +12,7 @@ let
hmConfig = config.home-manager.users.${user}; hmConfig = config.home-manager.users.${user};
in in
{ {
environment.persistence."/cache"."${home}/.cache/cliphist" = { }; environment.persistence."/persist/cache"."${home}/.cache/cliphist" = { };
home-manager.users.${user} = { home-manager.users.${user} = {
home.packages = with pkgs; [ cliphist ]; home.packages = with pkgs; [ cliphist ];
@@ -24,7 +24,7 @@ in
BindsTo = [ "graphical-session.target" ]; BindsTo = [ "graphical-session.target" ];
After = [ After = [
"graphical-session.target" "graphical-session.target"
config.environment.persistence."/cache"."${home}/.cache/cliphist".mount config.environment.persistence."/persist/cache"."${home}/.cache/cliphist".mount
]; ];
}; };
@@ -48,7 +48,7 @@ in
BindsTo = [ "graphical-session.target" ]; BindsTo = [ "graphical-session.target" ];
After = [ After = [
"graphical-session.target" "graphical-session.target"
config.environment.persistence."/cache"."${home}/.cache/cliphist".mount config.environment.persistence."/persist/cache"."${home}/.cache/cliphist".mount
]; ];
}; };

4
hosts/common/configs/user/gui/darktable/default.nix
View File

@@ -23,11 +23,11 @@ in
]; ];
environment.persistence = { environment.persistence = {
"/persist" = { "/persist/state" = {
"${home}/.config/darktable/data.db" = { }; "${home}/.config/darktable/data.db" = { };
"${home}/.config/darktable/library.db" = { }; "${home}/.config/darktable/library.db" = { };
}; };
"/cache"."${home}/.cache/darktable" = { }; "/persist/cache"."${home}/.cache/darktable" = { };
}; };
home-manager.users.${user} = { home-manager.users.${user} = {

2
hosts/common/configs/user/gui/discord/default.nix
View File

@@ -4,7 +4,7 @@
}: }:
{ lib, pkgs, ... }: { lib, pkgs, ... }:
{ {
environment.persistence."/persist"."${home}/.config/vesktop" = { }; environment.persistence."/persist/state"."${home}/.config/vesktop" = { };
home-manager.users.${user} = { home-manager.users.${user} = {
home.packages = with pkgs; [ vesktop ]; home.packages = with pkgs; [ vesktop ];

4
hosts/common/configs/user/gui/firefox/default.nix
View File

@@ -13,8 +13,8 @@ let
in in
{ {
environment.persistence = { environment.persistence = {
"/persist"."${home}/.mozilla" = { }; "/persist/state"."${home}/.mozilla" = { };
"/cache"."${home}/.cache/mozilla" = { }; "/persist/cache"."${home}/.cache/mozilla" = { };
}; };
home-manager.users.${user} = { home-manager.users.${user} = {

2
hosts/common/configs/user/gui/kitty/default.nix
View File

@@ -12,7 +12,7 @@ let
hmConfig = config.home-manager.users.${user}; hmConfig = config.home-manager.users.${user};
in in
{ {
environment.persistence."/cache"."${home}/.cache/kitty" = { }; environment.persistence."/persist/cache"."${home}/.cache/kitty" = { };
home-manager.users.${user} = { home-manager.users.${user} = {
programs.kitty = { programs.kitty = {

4
hosts/common/configs/user/gui/libreoffice/default.nix
View File

@@ -10,8 +10,8 @@
}: }:
{ {
environment.persistence = { environment.persistence = {
"/persist"."${home}/.config/libreoffice/4/user" = { }; "/persist/state"."${home}/.config/libreoffice/4/user" = { };
"/cache"."${home}/.config/libreoffice/4/cache" = { }; "/persist/cache"."${home}/.config/libreoffice/4/cache" = { };
}; };
home-manager.users.${user} = { home-manager.users.${user} = {

2
hosts/common/configs/user/gui/obs/default.nix
View File

@@ -13,7 +13,7 @@
}; };
environment.persistence = { environment.persistence = {
"/persist"."${home}/.config/obs-studio" = { }; "/persist/state"."${home}/.config/obs-studio" = { };
}; };
home-manager.users.${user}.programs.obs-studio.enable = true; home-manager.users.${user}.programs.obs-studio.enable = true;

8
hosts/common/configs/user/gui/obsidian/default.nix
View File

@@ -15,7 +15,7 @@ let
hmConfig = config.home-manager.users.${user}; hmConfig = config.home-manager.users.${user};
in in
{ {
environment.persistence."/cache"."${home}/.config/obsidian" = { }; environment.persistence."/persist/cache"."${home}/.config/obsidian" = { };
home-manager.users.${user} = { home-manager.users.${user} = {
programs.obsidian = { programs.obsidian = {
@@ -605,9 +605,9 @@ in
theme.template = lib.attrsets.mapAttrs' ( theme.template = lib.attrsets.mapAttrs' (
_: vault: _: vault:
lib.attrsets.nameValuePair lib.attrsets.nameValuePair "${vault.target}/.obsidian/plugins/obsidian-style-settings/data.json" {
"${vault.target}/.obsidian/plugins/obsidian-style-settings/data.json" source = ./theme.json;
{ source = ./theme.json; } }
) hmConfig.programs.obsidian.vaults; ) hmConfig.programs.obsidian.vaults;
sops.secrets."google/geocoding".sopsFile = ../../../../../../secrets/personal/secrets.yaml; sops.secrets."google/geocoding".sopsFile = ../../../../../../secrets/personal/secrets.yaml;

2
hosts/common/configs/user/gui/qalculate/default.nix
View File

@@ -9,7 +9,7 @@
... ...
}: }:
{ {
environment.persistence."/cache"."${home}/.config/qalculate/qalculate-gtk.history" = { }; environment.persistence."/persist/cache"."${home}/.config/qalculate/qalculate-gtk.history" = { };
home-manager.users.${user} = { home-manager.users.${user} = {
home.packages = with pkgs; [ qalculate-gtk ]; home.packages = with pkgs; [ qalculate-gtk ];

2
hosts/common/configs/user/gui/rofi/default.nix
View File

@@ -12,7 +12,7 @@ let
hmConfig = config.home-manager.users.${user}; hmConfig = config.home-manager.users.${user};
in in
{ {
environment.persistence."/cache"."${home}/.cache/rofi" = { }; environment.persistence."/persist/cache"."${home}/.cache/rofi" = { };
home-manager.users.${user} = { home-manager.users.${user} = {
programs.rofi = { programs.rofi = {

4
hosts/common/configs/user/gui/spicetify/default.nix
View File

@@ -28,8 +28,8 @@ in
}; };
environment.persistence = { environment.persistence = {
"/persist"."${home}/.config/spotify" = { }; "/persist/state"."${home}/.config/spotify" = { };
"/cache"."${home}/.cache/spotify" = { }; "/persist/cache"."${home}/.cache/spotify" = { };
}; };
home-manager.users.${user} = { home-manager.users.${user} = {

10
hosts/common/configs/user/gui/steam/default.nix
View File

@@ -9,7 +9,7 @@
... ...
}: }:
{ {
environment.persistence."/persist" = { environment.persistence."/persist/state" = {
"${home}/.steam" = { }; "${home}/.steam" = { };
"${home}/.local/share/Steam" = { }; "${home}/.local/share/Steam" = { };
}; };
@@ -49,8 +49,8 @@
Unit = { Unit = {
Description = "Sync Steam games with Games directory"; Description = "Sync Steam games with Games directory";
After = [ After = [
config.environment.persistence."/persist"."${home}/.local/share/Steam".mount config.environment.persistence."/persist/state"."${home}/.local/share/Steam".mount
config.environment.persistence."/persist"."${home}/Games".mount config.environment.persistence."/persist/user"."${home}/Games".mount
]; ];
DefaultDependencies = false; DefaultDependencies = false;
}; };
@@ -67,8 +67,8 @@
Unit = { Unit = {
Description = "Monitor Steam games directory for changes"; Description = "Monitor Steam games directory for changes";
After = [ After = [
config.environment.persistence."/persist"."${home}/.local/share/Steam".mount config.environment.persistence."/persist/state"."${home}/.local/share/Steam".mount
config.environment.persistence."/persist"."${home}/Games".mount config.environment.persistence."/persist/user"."${home}/Games".mount
]; ];
}; };

4
hosts/common/configs/user/gui/swww/default.nix
View File

@@ -26,7 +26,7 @@ let
); );
in in
{ {
environment.persistence."/cache"."${home}/.cache/swww" = { }; environment.persistence."/persist/cache"."${home}/.cache/swww" = { };
home-manager.users.${user} = { home-manager.users.${user} = {
home.packages = with pkgs; [ swww ]; home.packages = with pkgs; [ swww ];
@@ -37,7 +37,7 @@ in
BindsTo = [ "graphical-session.target" ]; BindsTo = [ "graphical-session.target" ];
After = [ After = [
"graphical-session.target" "graphical-session.target"
config.environment.persistence."/cache"."${home}/.cache/swww".mount config.environment.persistence."/persist/cache"."${home}/.cache/swww".mount
]; ];
}; };

2
hosts/common/configs/user/gui/theme/default.nix
View File

@@ -14,7 +14,7 @@ let
themeBin = lib.meta.getExe hmConfig.theme.pkg; themeBin = lib.meta.getExe hmConfig.theme.pkg;
in in
{ {
environment.persistence."/persist"."${home}/.config/theme" = { }; environment.persistence."/persist/state"."${home}/.config/theme" = { };
home-manager.users.${user} = { home-manager.users.${user} = {
imports = [ (import ./options.nix { inherit user home; }) ]; imports = [ (import ./options.nix { inherit user home; }) ];

4
hosts/common/configs/user/gui/vscode/default.nix
View File

@@ -12,9 +12,9 @@ let
hmConfig = config.home-manager.users.${user}; hmConfig = config.home-manager.users.${user};
in in
{ {
# Bastard: https://github.com/microsoft/vscode/issues/3884 # FIXME: https://github.com/microsoft/vscode/issues/3884
# Also for Discord, but those guys are even bigger bastards. # Also for Discord, but those guys are even bigger bastards.
environment.persistence."/persist"."${home}/.config/Code" = { }; environment.persistence."/persist/state"."${home}/.config/Code" = { };
home-manager.users.${user} = { home-manager.users.${user} = {
imports = [ ./options.nix ]; imports = [ ./options.nix ];

16
hosts/eirene/format.nix
View File

@@ -59,12 +59,20 @@
mountpoint = "/persist"; mountpoint = "/persist";
inherit mountOptions; inherit mountOptions;
}; };
"@nix" = { "@persist/user" = {
mountpoint = "/nix"; mountpoint = "/persist/user";
inherit mountOptions; inherit mountOptions;
}; };
"@cache" = { "@persist/state" = {
mountpoint = "/cache"; mountpoint = "/persist/state";
inherit mountOptions;
};
"@persist/cache" = {
mountpoint = "/persist/cache";
inherit mountOptions;
};
"@nix" = {
mountpoint = "/nix";
inherit mountOptions; inherit mountOptions;
}; };
}; };

16
hosts/elara/format.nix
View File

@@ -59,12 +59,20 @@
mountpoint = "/persist"; mountpoint = "/persist";
inherit mountOptions; inherit mountOptions;
}; };
"@nix" = { "@persist/user" = {
mountpoint = "/nix"; mountpoint = "/persist/user";
inherit mountOptions; inherit mountOptions;
}; };
"@cache" = { "@persist/state" = {
mountpoint = "/cache"; mountpoint = "/persist/state";
inherit mountOptions;
};
"@persist/cache" = {
mountpoint = "/persist/cache";
inherit mountOptions;
};
"@nix" = {
mountpoint = "/nix";
inherit mountOptions; inherit mountOptions;
}; };
}; };

2
hosts/elara/users/nikara/configs/console/go/default.nix
View File

@@ -4,7 +4,7 @@
}: }:
{ pkgs, ... }: { pkgs, ... }:
{ {
environment.persistence."/cache"."${home}/.local/share/go" = { }; environment.persistence."/persist/cache"."${home}/.local/share/go" = { };
home-manager.users.${user} = { home-manager.users.${user} = {
programs.go = { programs.go = {

2
hosts/elara/users/nikara/configs/console/gradle/default.nix
View File

@@ -7,7 +7,7 @@ let
hmConfig = config.home-manager.users.${user}; hmConfig = config.home-manager.users.${user};
in in
{ {
environment.persistence."/cache"."${home}/.local/share/gradle" = { }; environment.persistence."/persist/cache"."${home}/.local/share/gradle" = { };
home-manager.users.${user} = { home-manager.users.${user} = {
programs.gradle = { programs.gradle = {

51
hosts/himalia/format.nix
View File

@@ -43,32 +43,39 @@
content = { content = {
type = "btrfs"; type = "btrfs";
extraArgs = [ "-f" ]; extraArgs = [ "-f" ];
subvolumes = { subvolumes =
"@" = { let
mountpoint = "/";
};
"@persist" = {
mountpoint = "/persist";
mountOptions = [ mountOptions = [
"compress=zstd" "compress=zstd:1"
"noatime" "noatime"
]; ];
in
{
"@" = {
mountpoint = "/";
inherit mountOptions;
};
"@persist" = {
mountpoint = "/persist";
inherit mountOptions;
};
"@persist/user" = {
mountpoint = "/persist/user";
inherit mountOptions;
};
"@persist/state" = {
mountpoint = "/persist/state";
inherit mountOptions;
};
"@persist/cache" = {
mountpoint = "/persist/cache";
inherit mountOptions;
};
"@nix" = {
mountpoint = "/nix";
inherit mountOptions;
};
}; };
"@nix" = {
mountpoint = "/nix";
mountOptions = [
"compress=zstd"
"noatime"
];
};
"@cache" = {
mountpoint = "/cache";
mountOptions = [
"compress=zstd"
"noatime"
];
};
};
}; };
}; };
}; };

2
hosts/himalia/hardware/default.nix
View File

@@ -91,7 +91,7 @@
}; };
}; };
environment.persistence."/persist"."/etc/asusd/aura_19b6.ron" = { }; environment.persistence."/persist/state"."/etc/asusd/aura_19b6.ron" = { };
programs.gamescope.env = { programs.gamescope.env = {
__NV_PRIME_RENDER_OFFLOAD = "1"; __NV_PRIME_RENDER_OFFLOAD = "1";

16
hosts/installer/format.nix
View File

@@ -51,12 +51,20 @@
mountpoint = "/persist"; mountpoint = "/persist";
inherit mountOptions; inherit mountOptions;
}; };
"@nix" = { "@persist/user" = {
mountpoint = "/nix"; mountpoint = "/persist/user";
inherit mountOptions; inherit mountOptions;
}; };
"@cache" = { "@persist/state" = {
mountpoint = "/cache"; mountpoint = "/persist/state";
inherit mountOptions;
};
"@persist/cache" = {
mountpoint = "/persist/cache";
inherit mountOptions;
};
"@nix" = {
mountpoint = "/nix";
inherit mountOptions; inherit mountOptions;
}; };
}; };

61
lib/scripts/add-host.sh
View File

@@ -74,7 +74,7 @@ cat <<'EOF' > "./hosts/$host/format.nix"
{ {
disko.devices = { disko.devices = {
disk.main = { disk.main = {
device = ""; # Set this to the device you want to install to device = ""; # TODO: Set this to the device you want to install to
type = "disk"; type = "disk";
content = { content = {
type = "gpt"; type = "gpt";
@@ -95,6 +95,14 @@ cat <<'EOF' > "./hosts/$host/format.nix"
mountOptions = [ "umask=0077" ]; mountOptions = [ "umask=0077" ];
}; };
}; };
swap = {
name = "swap";
size = ""; # TODO: Set this to the swap size you want
content = {
type = "swap";
resumeDevice = true;
};
};
root = { root = {
name = "root"; name = "root";
size = "100%"; size = "100%";
@@ -108,32 +116,39 @@ cat <<'EOF' > "./hosts/$host/format.nix"
content = { content = {
type = "btrfs"; type = "btrfs";
extraArgs = [ "-f" ]; extraArgs = [ "-f" ];
subvolumes = { subvolumes =
"@" = { let
mountpoint = "/";
};
"@persist" = {
mountpoint = "/persist";
mountOptions = [ mountOptions = [
"compress=zstd" "compress=zstd:1"
"noatime" "noatime"
]; ];
in
{
"@" = {
mountpoint = "/";
inherit mountOptions;
};
"@persist" = {
mountpoint = "/persist";
inherit mountOptions;
};
"@persist/user" = {
mountpoint = "/persist/user";
inherit mountOptions;
};
"@persist/state" = {
mountpoint = "/persist/state";
inherit mountOptions;
};
"@persist/cache" = {
mountpoint = "/persist/cache";
inherit mountOptions;
};
"@nix" = {
mountpoint = "/nix";
inherit mountOptions;
};
}; };
"@nix" = {
mountpoint = "/nix";
mountOptions = [
"compress=zstd"
"noatime"
];
};
"@cache" = {
mountpoint = "/cache";
mountOptions = [
"compress=zstd"
"noatime"
];
};
};
}; };
}; };
}; };