123

devices/disko/vds.nix

@@ -7,21 +7,21 @@
         content = {
           type = "gpt";
           partitions = {
-            ESP = {
-              type = "EF00";
-              size = "512M";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-              };
-            };
-            swap = {
-              size = "2G";
-              content = {
-                type = "swap";
-              };
-            };
+            #             ESP = {
+            #               type = "EF00";
+            #               size = "512M";
+            #               content = {
+            #                 type = "filesystem";
+            #                 format = "vfat";
+            #                 mountpoint = "/boot";
+            #               };
+            #             };
+            #             swap = {
+            #               size = "2G";
+            #               content = {
+            #                 type = "swap";
+            #               };
+            #             };
             root = {
               size = "100%";
               content = {

devices/hardware/vds.nix

@@ -9,41 +9,34 @@
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
-  boot = {
-    initrd = {
-      availableKernelModules = [
-        "ahci"
-        "xhci_pci"
-        "usbhid"
-        "usb_storage"
-        "sd_mod"
-        "sdhci_pci"
-      ];
-    };
-    kernel = {
-      sysctl = {
-        "fs.inotify.max_user_watches" = "204800";
-      };
-    };
-    kernelModules = [
-      "kvm-intel"
-      "coretemp"
-    ];
-  };
+
+  #  boot = {
+  #     initrd = {
+  #       availableKernelModules = [
+  #         "ahci"
+  #         "xhci_pci"
+  #         "usbhid"
+  #         "usb_storage"
+  #         "sd_mod"
+  #         "sdhci_pci"
+  #       ];
+  #     };
+  #     kernel = {
+  #       sysctl = {
+  #         "fs.inotify.max_user_watches" = "204800";
+  #       };
+  #     };
+  #     kernelModules = [
+  #       "kvm-intel"
+  #       "coretemp"
+  #     ];
+  #  };
 
   fileSystems = {
     "/" = {
-      device = "/dev/disk/by-partlabel/disk-main-root";
+      device = "/dev/vda1"; # "/dev/disk/by-partlabel/disk-main-root";
       fsType = "ext4";
     };
-    "/boot" = {
-      device = "/dev/disk/by-partlabel/disk-main-ESP";
-      fsType = "vfat";
-      options = [
-        "fmask=0022"
-        "dmask=0022"
-      ];
-    };
   };
 
   #   fileSystems."/" =
@@ -62,7 +55,9 @@
   #       fsType = "ext4";
   #     };
 
-  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

devices/vds.nix

@@ -13,12 +13,12 @@ let
         (modulesPath + "/installer/scan/not-detected.nix")
         (modulesPath + "/profiles/qemu-guest.nix")
 
-        ./disko/vds.nix
+        #./disko/vds.nix
         ./hardware/vds.nix
 
-        disko.nixosModules.disko
+        #disko.nixosModules.disko
 
-        nixos-facter-modules.nixosModules.facter
+        #nixos-facter-modules.nixosModules.facter
 
         self.nixosModules.default
         #self.homeConfigurations.server.nixosModule # home-manager configuration module
@@ -39,18 +39,21 @@ let
       #         efiInstallAsRemovable = true;
       #       };
       boot = {
-        kernelPackages = pkgs.linuxPackages_xanmod_stable;
+        #kernelPackages = pkgs.linuxPackages_xanmod_stable;
         hardwareScan = true;
         loader = {
-          systemd-boot.enable = lib.mkDefault true;
-          efi.canTouchEfiVariables = lib.mkDefault true;
+          grub = {
+            enable = true;
+            device = "/dev/vda";
+            useOSProber = false;
+            efiSupport = false;
+            #efiInstallAsRemovable = true;
+          };
+          systemd-boot.enable = lib.mkDefault false;
+          #efi.canTouchEfiVariables = lib.mkDefault true;
         };
       };
 
-      swapDevices = [
-        { device = "/dev/disk/by-partlabel/disk-main-swap"; }
-      ];
-
       users = {
         users = {
           root = {