some clean

configurations/default.nix

@@ -0,0 +1,12 @@
+{ ... }@flakeContext:
+{
+  nixosConfigurations = {
+    atoridu = import ./mini-pc.nix flakeContext; # atoridu
+    lamet = import ./mini-laptop.nix flakeContext; # lamet
+    otreca = import ./vds.nix flakeContext; # vds
+    sapphira = import ./server.nix flakeContext; # sapphira
+    wsl = import ./wsl.nix flakeContext; # wsl
+
+    pub-vds = import ./pub-vds.nix flakeContext;
+  };
+}

configurations/hardware/server.nix

@@ -47,7 +47,9 @@
     };
   };
 
-  swapDevices = [ ];
+  swapDevices = [
+    { device = "/dev/disk/by-partlabel/disk-main-swap"; }
+  ];
 
   # 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

flake.nix

@@ -98,8 +98,8 @@
       flakeContext = { inherit inputs; };
     in
     { }
-    // (import ./homeConfigurations flakeContext)
+    // (import ./home flakeContext)
-    // (import ./nixosConfigurations flakeContext)
+    // (import ./configurations flakeContext)
-    // (import ./nixosModules flakeContext)
+    // (import ./modules flakeContext)
     // (import ./pkgs flakeContext);
 }

home/apps/default.nix

@@ -3,7 +3,6 @@
 }:
 {
   imports = [
-    # ./gimp.nix
     ./gramps.nix
     ./streamrip.nix
     ./yt-dlp.nix

home/wsl.nix

@@ -13,7 +13,7 @@ let
 in
 {
   imports = [
-    ./wsl-apps
+    ./apps
     ./minimal.nix
   ];
   xdg = {

homeConfigurations/pub-vds.nix

@@ -1,27 +0,0 @@
-{
-  config,
-  pkgs,
-  xlib,
-  ...
-}:
-{
-  imports = [
-    ./minimal.nix
-  ];
-  xdg = {
-    enable = true;
-    autostart.enable = true;
-    userDirs = {
-      enable = true;
-      createDirectories = false;
-      desktop = null;
-      documents = null;
-      download = null;
-      music = null;
-      pictures = null;
-      publicShare = null;
-      templates = null;
-      videos = null;
-    };
-  };
-}

homeConfigurations/wsl-apps/gimp.nix

@@ -1,12 +0,0 @@
-{
-  config,
-  pkgs,
-  xlib,
-  inputs,
-  ...
-}:
-{
-  home.packages = [
-    pkgs.gimp
-  ];
-}

nixosConfigurations/default.nix

@@ -1,12 +0,0 @@
-{ ... }@flakeContext:
-{
-  nixosConfigurations = {
-    atoridu = import ./hosts/mini-pc.nix flakeContext; # atoridu
-    lamet = import ./hosts/mini-laptop.nix flakeContext; # lamet
-    otreca = import ./hosts/vds.nix flakeContext; # vds
-    sapphira = import ./hosts/server.nix flakeContext; # sapphira
-    wsl = import ./hosts/wsl.nix flakeContext; # wsl
-
-    pub-vds = import ./hosts/pub-vds.nix flakeContext;
-  };
-}

nixosConfigurations/hosts/hardware/laptop.nix

@@ -1,59 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  boot = {
-    initrd = {
-      availableKernelModules = [
-        "nvme"
-        "xhci_pci"
-        "usbhid"
-        "usb_storage"
-        "uas"
-        "sd_mod"
-      ];
-      kernelModules = [ ];
-    };
-    kernelModules = [ "kvm-amd" ];
-    extraModulePackages = [ ];
-  };
-
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-uuid/5938c796-6ff5-49d9-a3a6-022b4c32beeb";
-      fsType = "ext4";
-    };
-    "/boot" = {
-      device = "/dev/disk/by-uuid/61BF-3342";
-      fsType = "vfat";
-      options = [
-        "fmask=0077"
-        "dmask=0077"
-      ];
-    };
-  };
-
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/d89bccd2-0672-4855-9d87-40e2688cdec4"; }
-  ];
-
-  # 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.enp2s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.tailscale0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-}