Refactoring config preparing for server

hosts/piaf/default.nix

@@ -1,4 +1,4 @@
-{ config, nix-flatpak, nixos-hardware, disko, agenix, ... }:
+{ nix-flatpak, nixos-hardware, disko, agenix, ... }:
 
 {
   imports =
@@ -13,9 +13,9 @@
 
       ../../modules
       ../../modules/desktop
-      ../../modules/gaming
-      ../../modules/gnome
-      ../../modules/sway
+      ../../modules/desktop/gaming
+      ../../modules/desktop/gnome
+      ../../modules/desktop/sway
 
       nix-flatpak.nixosModules.nix-flatpak
       nixos-hardware.nixosModules.framework-16-7040-amd
@@ -25,7 +25,7 @@
 
   # Networking
   networking = {
-    hostName = "lyes-pc";
+    hostName = "piaf";
     hostId = "ed183b8f";
   };
 
@@ -36,5 +36,4 @@
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "22.11"; # Did you read the comment?
-  # home-manager.users.lyes.home.stateVersion = config.system.stateVersion;
 }

hosts/zora/default.nix

@@ -0,0 +1,32 @@
+{ disko, agenix, ... }:
+
+{
+  imports =
+    [
+      # Hosts
+      ./hardware-configuration.nix
+      ./hardware.nix
+      ./disko-config.nix
+
+      ../../users/lyes
+
+      ../../modules
+
+      disko.nixosModules.disko
+      agenix.nixosModules.default
+    ];
+
+  # Networking
+  networking = {
+    hostName = "lyes-pc";
+    # hostId = "ed183b8f";
+  };
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "25.05"; # Did you read the comment?
+}

hosts/zora/disko-config.nix

@@ -0,0 +1,71 @@
+{ disks ? [ "/dev/nvme0n1" ], ... }: {
+  disko.devices = {
+    disk = {
+      main = {
+        type = "disk";
+        device = builtins.elemAt disks 0;
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "1G";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ "nofail" ];
+              };
+            };
+            zfs = {
+              size = "100%";
+              content = {
+                type = "zfs";
+                pool = "zroot";
+              };
+            };
+          };
+        };
+      };
+    };
+    zpool = {
+      zroot = {
+        type = "zpool";
+        rootFsOptions = {
+          mountpoint = "none";
+          compression = "zstd";
+          acltype = "posixacl";
+          xattr = "sa";
+          "com.sun:auto-snapshot" = "false";
+        };
+        options.ashift = "12";
+        datasets = {
+          "root" = {
+            type = "zfs_fs";
+            options = {
+              encryption = "aes-256-gcm";
+              keyformat = "passphrase";
+              keylocation = "prompt";
+            };
+            mountpoint = "/";
+
+          };
+          "root/home" = {
+            type = "zfs_fs";
+            options."com.sun:auto-snapshot" = "true";
+            mountpoint = "/home";
+          };
+          "root/var" = {
+            type = "zfs_fs";
+            mountpoint = "/var";
+          };
+          "root/nix" = {
+            type = "zfs_fs";
+            options.mountpoint = "/nix";
+            mountpoint = "/nix";
+          };
+        };
+      };
+    };
+  };
+}

hosts/zora/hardware-configuration.nix

@@ -0,0 +1,25 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/zora/hardware.nix

@@ -0,0 +1,19 @@
+{ pkgs, ... }:
+
+{
+  # Kernel
+  boot.kernelPackages = pkgs.linuxPackages_6_16;
+
+  # Boot
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.systemd-boot.configurationLimit = 10;
+  # boot.loader.efi.canTouchEfiVariables = true;
+  # boot.kernelParams = [ "quiet" ];
+  boot.initrd.systemd = {
+    enable = true;
+    # network.enable = true;
+  };
+
+  # Swap
+  zramSwap.enable = true;
+}