123

devices/disko/vds.nix

@@ -11,16 +11,16 @@
               type = "EF02";
               size = "1M";
             };
-            ESP = {
+            #             ESP = {
-              size = "500M";
+            #               size = "500M";
-              type = "EF00";
+            #               type = "EF00";
-              content = {
+            #               content = {
-                type = "filesystem";
+            #                 type = "filesystem";
-                format = "vfat";
+            #                 format = "vfat";
-                mountpoint = "/boot";
+            #                 mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
+            #                 mountOptions = [ "umask=0077" ];
-              };
+            #               };
-            };
+            #             };
             root = {
               size = "100%";
               content = {
@@ -30,7 +30,7 @@
               };
             };
             swap = {
-              size = "2G";
+              size = "256M";
               content = {
                 type = "swap";
               };

devices/hardware/vds.nix

@@ -10,46 +10,24 @@
     (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"
-  #     ];
-  #  };
-
   fileSystems = {
     "/" = {
       device = lib.mkForce "/dev/disk/by-partlabel/disk-main-root"; # "/dev/disk/by-partlabel/disk-main-root";
       fsType = "ext4";
     };
-    "/boot" = {
+    #     "/boot" = {
-      device = lib.mkForce "/dev/disk/by-partlabel/disk-main-ESP";
+    #       device = lib.mkForce "/dev/disk/by-partlabel/disk-main-ESP";
-      fsType = "vfat";
+    #       fsType = "vfat";
-      options = [
+    #       options = [
-        "fmask=0022"
+    #         "fmask=0022"
-        "dmask=0022"
+    #         "dmask=0022"
-      ];
+    #       ];
-    };
+    #     };
   };
 
-  #       swapDevices = [
+  swapDevices = [
-  #         { device = "/dev/disk/by-partlabel/disk-main-swap"; }
+    { 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

modules/essentials/tty.nix

@@ -28,6 +28,8 @@
       s-1t = "ssh sapphira-1t";
       o-1 = "ssh otreca-1";
       o-1t = "ssh otreca-1t";
+      o-0 = "ssh otreca-0";
+      o-0t = "ssh otreca-0t";
 
       # Somethings
       reboot-bios = "sudo systemctl reboot --firmware-setup";