update installation script

install/install-zfs-enc-boot.sh

@@ -19,6 +19,7 @@ ITER_TIME=2000
 PERSIST_MODULE=true
 PERSIST_ROOT=/persistent
 MAINUSER_NAME=alukard
+ASHIFT=13
 
 if [[ "$IS_VM" = true ]]; then
     DISK_DEV_NODES="/dev/disk/by-path"
@@ -128,7 +129,7 @@ fi
 pprint "Create ZFS root pool on $ROOT_POOL"
 zpool create \
     -f \
-    -o ashift=12 \
+    -o ashift=$ASHIFT \
     -o autotrim=on \
     -O acltype=posixacl \
     -O atime=on \
@@ -167,6 +168,8 @@ zfs create -o canmount=on -o mountpoint=/nix rpool/persistent/nix
 zfs create -o canmount=on -o mountpoint=/var/log rpool/persistent/log
 zfs create -o canmount=noauto -o atime=off rpool/persistent/lxd
 zfs create -o canmount=on -o mountpoint=/var/lib/docker -o atime=off rpool/persistent/docker
+zfs create -o canmount=on -o mountpoint=/var/lib/podman -o atime=off rpool/persistent/podman
+zfs create -o canmount=on -o mountpoint=/var/lib/nixos-containers -o atime=off rpool/persistent/nixos-containers
 zfs create -o canmount=on -o mountpoint=/media/bittorrent -o atime=off -o recordsize=256K rpool/persistent/bittorrent
 zfs create -o canmount=on -o mountpoint=/media/libvirt -o atime=off -o recordsize=64K rpool/persistent/libvirt
 
@@ -191,7 +194,7 @@ pprint "Create ZFS boot pool on $BOOT_POOL"
 zpool create \
     -f \
     -o compatibility=grub2 \
-    -o ashift=12 \
+    -o ashift=$ASHIFT \
     -o autotrim=on \
     -O acltype=posixacl \
     -O atime=on \

machines/AMD-Workstation/default.nix

@@ -7,7 +7,7 @@
     nixosProfiles.a2ln-server
     nixosProfiles.sunshine
 
-    # nixosModules.passthrough
+    # customModules.passthrough
   ];
 
   deviceSpecific.devInfo = {

machines/Dell-Laptop/default.nix

@@ -1,5 +1,5 @@
 { inputs, config, pkgs, ... }: {
-  imports = with inputs.self.nixosModules; [
+  imports = with inputs.self.customModules; [
     ./hardware-configuration.nix
     inputs.self.nixosRoles.desktop
   ];

machines/NixOS-CT/default.nix

@@ -1,5 +1,5 @@
-{ inputs, lib, ... }: {
-  imports = with inputs.self.nixosModules; with inputs.self.nixosProfiles; [
+{ inputs, lib, config, ... }: {
+  imports = with inputs.self.customModules; with inputs.self.nixosProfiles; [
     ./hardware-configuration.nix
     inputs.self.nixosRoles.container
 

machines/NixOS-CT/hardware-configuration.nix

@@ -1,3 +1,3 @@
 { config, lib, pkgs, modulesPath, ... }: {
-  imports = [ (modulesPath + "/virtualisation/lxc-container.nix") ];
+  imports = [ "${toString modulesPath}/virtualisation/lxc-container.nix" ];
 }

roles/base.nix

@@ -1,5 +1,5 @@
 { inputs, ... }: {
-  imports = with inputs.self.nixosModules; with inputs.self.nixosProfiles; [
+  imports = with inputs.self.customModules; with inputs.self.nixosProfiles; [
     inputs.home-manager.nixosModules.home-manager {
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;

roles/container.nix

@@ -1,5 +1,5 @@
 { inputs, pkgs, ... }: {
-  imports = with inputs.self.nixosModules; with inputs.self.nixosProfiles; [
+  imports = with inputs.self.customModules; with inputs.self.nixosProfiles; [
     inputs.home-manager.nixosModules.home-manager {
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;

roles/desktop.nix

@@ -1,5 +1,5 @@
 { inputs, ... }: {
-  imports = with inputs.self.nixosModules; with inputs.self.nixosProfiles; [
+  imports = with inputs.self.customModules; with inputs.self.nixosProfiles; [
     ./base.nix
     inputs.base16.hmModule
 

roles/hypervisor.nix

@@ -1,5 +1,5 @@
 { inputs, pkgs, ... }: {
-  imports = with inputs.self.nixosModules; with inputs.self.nixosProfiles; [
+  imports = with inputs.self.customModules; with inputs.self.nixosProfiles; [
     inputs.home-manager.nixosModules.home-manager {
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;