From 89e06b584d4a382fbdc4fd7ac6a54de8f9f9ff5c Mon Sep 17 00:00:00 2001
From: fwastring <fredrik@wastring.com>
Date: Sun, 7 Sep 2025 21:25:28 +0200
Subject: [PATCH] added desktop

---
 maskiner/desktop/configuration.nix          |  4 +++-
 maskiner/desktop/hardware-configuration.nix | 11 +++++------
 moduler/k3s.nix                             | 12 ------------
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/maskiner/desktop/configuration.nix b/maskiner/desktop/configuration.nix
index 6287cb4..66f2e29 100644
--- a/maskiner/desktop/configuration.nix
+++ b/maskiner/desktop/configuration.nix
@@ -20,9 +20,11 @@
 
   environment.systemPackages = with pkgs; [
     unstable.lego
+	neovim
+
   ];
 
   networking.hostName = myhostname;
 
-  system.stateVersion = "23.11";
+  system.stateVersion = "25.05";
 }
diff --git a/maskiner/desktop/hardware-configuration.nix b/maskiner/desktop/hardware-configuration.nix
index 41d5f7c..8c44dcd 100644
--- a/maskiner/desktop/hardware-configuration.nix
+++ b/maskiner/desktop/hardware-configuration.nix
@@ -8,24 +8,23 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "uas" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/0f77fba6-7da6-4cb7-9607-b70b1964f1f7";
+    { device = "/dev/disk/by-uuid/938e8a9e-d02d-449e-9b60-199a047c4772";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/67FD-B0D4";
+    { device = "/dev/disk/by-uuid/8534-38E5";
       fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
     };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/87dbf5cf-5a06-4bf8-bd2c-bfd269249eae"; }
-    ];
+  swapDevices = [ ];
 
   # 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
diff --git a/moduler/k3s.nix b/moduler/k3s.nix
index 3a51f7a..a12ec40 100644
--- a/moduler/k3s.nix
+++ b/moduler/k3s.nix
@@ -19,18 +19,6 @@ in
       8384
       22000
     ];
-    allowedUDPPortRanges = [
-      {
-        from = 4000;
-        to = 4007;
-      }
-      {
-        from = 8000;
-        to = 8010;
-      }
-      22000
-      21027
-    ];
   };
   services.k3s = {
     enable = true;