coolneng
/
zion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: coolneng:68fa9ec21e183ecf1f80370ea8ac5dd48423b0f3
Branches Tags
coolneng:master
..
compare: coolneng:d2ed4afa8636110069e14ea2eb62fe0c8137c32f
Branches Tags
coolneng:master

No commits in common. "68fa9ec21e183ecf1f80370ea8ac5dd48423b0f3" and "d2ed4afa8636110069e14ea2eb62fe0c8137c32f" have entirely different histories.
68fa9ec21e ... d2ed4afa86

2 changed files with 29 additions and 33 deletions
Show Stats Expand all files Collapse all files

4
configuration.nix
View File

@ -22,7 +22,6 @@ with pkgs;
services.openssh = { services.openssh = {
enable = true; enable = true;
permitRootLogin = "yes"; permitRootLogin = "yes";
passwordAuthentication = false;
}; };
# Cleanup tmp on startup # Cleanup tmp on startup
@ -34,10 +33,7 @@ with pkgs;
home = "/home/coolneng"; home = "/home/coolneng";
extraGroups = [ "wheel" "docker" ]; extraGroups = [ "wheel" "docker" ];
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
# panacea
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFRqINHR7/zc+c3/PuR+NeSsBHXXzBiEtFWSK6QaxQTW coolneng@panacea" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFRqINHR7/zc+c3/PuR+NeSsBHXXzBiEtFWSK6QaxQTW coolneng@panacea"
# caravanserai
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTBWNtNp+vI2So4vISZX/yQv754ZzXqobFgUP3zk4FY zion"
]; ];
shell = "${fish}/bin/fish"; shell = "${fish}/bin/fish";
}; };

58
modules/hardware-configuration.nix
View File

@ -33,8 +33,8 @@
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/var/lib/signald" = fileSystems."/var/lib/matrix-as-telegram" =
{ device = "vault/state_directories/signald"; { device = "vault/state_directories/matrix-as-telegram";
fsType = "zfs"; fsType = "zfs";
}; };
@ -43,13 +43,13 @@
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/var/lib/wallabag" = fileSystems."/var/lib/matrix-as-signal" =
{ device = "vault/state_directories/wallabag"; { device = "vault/state_directories/matrix-as-signal";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/var/lib/matrix-as-signal" = fileSystems."/var/lib/wallabag" =
{ device = "vault/state_directories/matrix-as-signal"; { device = "vault/state_directories/wallabag";
fsType = "zfs"; fsType = "zfs";
}; };
@ -63,27 +63,17 @@
fsType = "tmpfs"; fsType = "tmpfs";
}; };
fileSystems."/var/lib/containers/storage/zfs-containers/18aaf1ac7583433d84488ea6594032549dc37d959751c096780f03cfa8a31ae7/userdata/shm" =
{ device = "shm";
fsType = "tmpfs";
};
fileSystems."/var/lib/matrix-as-telegram" =
{ device = "vault/state_directories/matrix-as-telegram";
fsType = "zfs";
};
fileSystems."/var/lib/containers/storage/zfs-containers/1996d0540bceeb3dea027b3e5ef9e6cd94ea527ce657bf6461286d7b4afa637f/userdata/shm" = fileSystems."/var/lib/containers/storage/zfs-containers/1996d0540bceeb3dea027b3e5ef9e6cd94ea527ce657bf6461286d7b4afa637f/userdata/shm" =
{ device = "shm"; { device = "shm";
fsType = "tmpfs"; fsType = "tmpfs";
}; };
fileSystems."/var/lib/containers/storage/zfs-containers/1dece57fa7124ac19a7f9b1b97b32d1ea137775ec33a35375741f3e74be3e85e/userdata/shm" = fileSystems."/var/lib/signald" =
{ device = "shm"; { device = "vault/state_directories/signald";
fsType = "tmpfs"; fsType = "zfs";
}; };
fileSystems."/var/lib/containers/storage/zfs-containers/737d2ce2ce884a2dffe6640ad1e0ea8fe2cf0a200f13a9490bb7f89bb19940cb/userdata/shm" = fileSystems."/var/lib/containers/storage/zfs-containers/1dece57fa7124ac19a7f9b1b97b32d1ea137775ec33a35375741f3e74be3e85e/userdata/shm" =
{ device = "shm"; { device = "shm";
fsType = "tmpfs"; fsType = "tmpfs";
}; };
@ -93,9 +83,9 @@
fsType = "tmpfs"; fsType = "tmpfs";
}; };
fileSystems."/vault/backups" = fileSystems."/var/lib/containers/storage/zfs-containers/737d2ce2ce884a2dffe6640ad1e0ea8fe2cf0a200f13a9490bb7f89bb19940cb/userdata/shm" =
{ device = "vault/backups"; { device = "shm";
fsType = "zfs"; fsType = "tmpfs";
}; };
fileSystems."/vault/git" = fileSystems."/vault/git" =
@ -103,13 +93,18 @@
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/vault/syncthing" =
{ device = "vault/syncthing";
fsType = "zfs";
};
fileSystems."/vault/radicale" = fileSystems."/vault/radicale" =
{ device = "vault/radicale"; { device = "vault/radicale";
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/vault/syncthing" = fileSystems."/vault/backups" =
{ device = "vault/syncthing"; { device = "vault/backups";
fsType = "zfs"; fsType = "zfs";
}; };
@ -123,13 +118,18 @@
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/var/lib/containers/storage/zfs-containers/bdf459f14fb37fc18ea348e6344edf3107b797a8fc3e281d44778550a4a058d2/userdata/shm" = fileSystems."/vault/backups/zion/databases" =
{ device = "vault/backups/zion/databases";
fsType = "zfs";
};
fileSystems."/var/lib/containers/storage/zfs-containers/18aaf1ac7583433d84488ea6594032549dc37d959751c096780f03cfa8a31ae7/userdata/shm" =
{ device = "shm"; { device = "shm";
fsType = "tmpfs"; fsType = "tmpfs";
}; };
fileSystems."/var/lib/containers/storage/zfs/graph/46fdb9b91b2e60fc56d521f03e2d7b5ee901670d481ced7553d3208d16f654b5" = fileSystems."/var/lib/containers/storage/zfs/graph/9aa4f86c914c513dc7b9ac213850d9f011668f4fd8757c6dcccae60e89eac623" =
{ device = "vault/containers/46fdb9b91b2e60fc56d521f03e2d7b5ee901670d481ced7553d3208d16f654b5"; { device = "vault/containers/9aa4f86c914c513dc7b9ac213850d9f011668f4fd8757c6dcccae60e89eac623";
fsType = "zfs"; fsType = "zfs";
}; };
@ -142,7 +142,7 @@
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.cni-podman0.useDHCP = lib.mkDefault true; # networking.interfaces.cni-podman0.useDHCP = lib.mkDefault true;
# networking.interfaces.eth0.useDHCP = lib.mkDefault true; # networking.interfaces.eth0.useDHCP = lib.mkDefault true;
# networking.interfaces.vethbb9fbdc4.useDHCP = lib.mkDefault true; # networking.interfaces.vethede24a17.useDHCP = lib.mkDefault true;
# networking.interfaces.wg0.useDHCP = lib.mkDefault true; # networking.interfaces.wg0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlan0.useDHCP = lib.mkDefault true; # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;