aboutsummaryrefslogtreecommitdiff
path: root/hosts
diff options
context:
space:
mode:
authorCaroline Larimore <caroline@larimo.re>2024-07-25 19:50:36 -0700
committerCaroline Larimore <caroline@larimo.re>2024-07-25 19:50:36 -0700
commit427bff7d59080b7053ce37a88bfb42e078a40fba (patch)
tree3fa0de16dcf695c0b42b2a546de233fd3950d477 /hosts
parentde48344a6eb3ff2a7167c47c8929d37ec8349976 (diff)
Formatting tweaks
Diffstat (limited to 'hosts')
-rw-r--r--hosts/c-pc/configuration.nix2
-rw-r--r--hosts/c-pc/hardware.nix3
-rw-r--r--hosts/c-pc/home.nix4
-rw-r--r--hosts/copenhagen/configuration.nix2
-rw-r--r--hosts/copenhagen/hardware.nix3
-rw-r--r--hosts/copenhagen/home/c.nix3
6 files changed, 13 insertions, 4 deletions
diff --git a/hosts/c-pc/configuration.nix b/hosts/c-pc/configuration.nix
index 6b290c1..533d09a 100644
--- a/hosts/c-pc/configuration.nix
+++ b/hosts/c-pc/configuration.nix
@@ -12,6 +12,7 @@
environment.persistence."/persist/system" = {
hideMounts = true;
+
directories = [
"/etc/nixos"
"/var/log"
@@ -19,6 +20,7 @@
"/var/lib/systemd/coredump"
#"/var/lib/bluetooth"
];
+
files = [
"/etc/machine-id"
];
diff --git a/hosts/c-pc/hardware.nix b/hosts/c-pc/hardware.nix
index 020dab5..660ac7a 100644
--- a/hosts/c-pc/hardware.nix
+++ b/hosts/c-pc/hardware.nix
@@ -14,6 +14,7 @@
zfsSupport = true;
efiSupport = true;
efiInstallAsRemovable = true;
+
mirroredBoots = [
{ devices = [ "nodev" ]; path = "/boot"; }
];
@@ -40,10 +41,10 @@
fileSystems = {
"/" = { fsType = "zfs"; device = "zpool/root"; };
+ "/nix" = { fsType = "zfs"; device = "zpool/nix"; };
"/home" = { fsType = "zfs"; device = "zpool/home"; };
"/persist" = { fsType = "zfs"; device = "zpool/persist"; neededForBoot = true; };
"/secrets" = { fsType = "zfs"; device = "zpool/secure/secrets"; neededForBoot = true; };
- "/nix" = { fsType = "zfs"; device = "zpool/nix"; };
"/boot" = { fsType = "vfat"; device = "/dev/disk/by-uuid/12CE-A600"; };
diff --git a/hosts/c-pc/home.nix b/hosts/c-pc/home.nix
index 9ee1988..c2efb51 100644
--- a/hosts/c-pc/home.nix
+++ b/hosts/c-pc/home.nix
@@ -14,6 +14,8 @@
home.stateVersion = "23.11";
home.persistence."/persist/home" = {
+ allowOther = true;
+
directories = [
"Downloads"
"Documents"
@@ -66,10 +68,10 @@
".config/nicotine"
".local/share/nicotine"
];
+
files = [
".Xresources"
];
- allowOther = true;
};
programs = {
diff --git a/hosts/copenhagen/configuration.nix b/hosts/copenhagen/configuration.nix
index f89d04b..1e392f6 100644
--- a/hosts/copenhagen/configuration.nix
+++ b/hosts/copenhagen/configuration.nix
@@ -11,6 +11,7 @@
environment.persistence."/persist/system" = {
hideMounts = true;
+
directories = [
"/etc/nixos"
"/var/log"
@@ -20,6 +21,7 @@
"/srv/web"
"/srv/minecraft"
];
+
files = [
"/etc/machine-id"
];
diff --git a/hosts/copenhagen/hardware.nix b/hosts/copenhagen/hardware.nix
index 061700b..8ba2b70 100644
--- a/hosts/copenhagen/hardware.nix
+++ b/hosts/copenhagen/hardware.nix
@@ -12,6 +12,7 @@
zfsSupport = true;
efiSupport = true;
efiInstallAsRemovable = true;
+
mirroredBoots = [
{ devices = [ "nodev" ]; path = "/boot"; }
];
@@ -38,10 +39,10 @@
fileSystems = {
"/" = { fsType = "zfs"; device = "zpool/root"; };
+ "/nix" = { fsType = "zfs"; device = "zpool/nix"; };
"/home" = { fsType = "zfs"; device = "zpool/home"; };
"/persist" = { fsType = "zfs"; device = "zpool/persist"; neededForBoot = true; };
"/secrets" = { fsType = "zfs"; device = "zpool/secrets"; neededForBoot = true; };
- "/nix" = { fsType = "zfs"; device = "zpool/nix"; };
"/boot" = { fsType = "vfat"; device = "/dev/disk/by-uuid/DF61-E3BD"; };
diff --git a/hosts/copenhagen/home/c.nix b/hosts/copenhagen/home/c.nix
index 9d8bbe6..718b382 100644
--- a/hosts/copenhagen/home/c.nix
+++ b/hosts/copenhagen/home/c.nix
@@ -8,13 +8,14 @@
home.stateVersion = "23.11";
home.persistence."/persist/home/c" = {
+ allowOther = true;
+
directories = [
".gnupg"
".ssh"
".local/bin"
];
- allowOther = true;
};