patching for migration to 25.05

hosts/katana.nix

@@ -6,7 +6,6 @@
   hardware = {
     enableRedistributableFirmware = lib.mkDefault true;
     cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-    pulseaudio.enable = false;
     bluetooth = {
       enable = true; # enables support for Bluetooth
       powerOnBoot = true; # powers up the default Bluetooth controller on boot
@@ -34,18 +33,21 @@
     readOnlyNixStore = true;
   };
 
-  fileSystems = {
-    "/" = {
-        device = "/dev/disk/by-uuid/55c746b3-b9dc-4c9b-ab56-de68a561f9a3";
-        fsType = "ext4";
-    };
-    "/boot" = {
-        device = "/dev/disk/by-uuid/0C59-9996";
-        fsType = "vfat";
-    };
+  fileSystems."/" = {
+    device = "UUID=7a97edd8-c5a9-4354-a461-24c0f311e61b";
+    fsType = "ext4";
   };
 
-  swapDevices = [ ];
+  fileSystems."/boot" = {
+    device = "UUID=F0BD-FE72";
+    fsType = "vfat";
+  };
+
+  swapDevices = [
+    {
+      device = "UUID=e107d78d-d934-4939-889d-1860410321d5";
+    }
+  ];
  
   # Networking
   networking = {
@@ -58,8 +60,6 @@
     };
   };
 
-  # Sound
-  sound.enable = true;
   
   # Localization
   time.timeZone = "America/Detroit";
@@ -81,10 +81,13 @@
   # Services.
   services = {
     blueman.enable = true;
+    pulseaudio.enable = false;
     printing.enable = true;
     xserver = {
-      layout = "us";
-      xkbVariant = "";
+      xkb = {
+	layout = "us";
+      	variant = "";
+      };
     };
   };
 
@@ -100,8 +103,6 @@
   };
 
   nix = {
-    # Sets flakes to unstable track instead of stable #
-    package = pkgs.nixUnstable; # or versioned attributes like nix_2_4
     # Enable flakes and nix-command
     extraOptions = ''experimental-features = nix-command flakes'';
     # Auto maintainence
@@ -136,13 +137,12 @@
         bottom
         felix-fm
         zulip
-        vscode
         discord
-        obsidian
   ];
   
   # Fonts
-  fonts.packages = with pkgs; [
-    (nerdfonts.override { fonts = [ "SourceCodePro" "DroidSansMono" ]; })
+  fonts.packages = [
+      pkgs.nerd-fonts.droid-sans-mono
   ];
+
 }