Bunch of configuration changes

hosts/desktop/home.nix

@@ -7,7 +7,6 @@
     ../../modules/home/programs/common.nix
     ../../modules/home/programs/develop.nix
     ../../modules/home/programs/firefox.nix
-    ../../modules/home/programs/kitty.nix
     ../../modules/home/programs/modrinth.nix
     ../../modules/home/programs/neovim
     ../../modules/home/programs/git.nix

hosts/laptop/default.nix

@@ -9,11 +9,9 @@
     ../../modules/system/programs/steam.nix
     ../../modules/system/programs/syncthing.nix
     ../../modules/system/programs/thunar.nix
-    ../../modules/system/programs/virtualization.nix
-    ../../modules/system/programs/waydroid.nix
     ../../modules/system/utils/common.nix
     ../../modules/system/utils/docker.nix
-    ../../modules/system/utils/fprint.nix
+#    ../../modules/system/utils/fprint.nix
     ../../modules/system/utils/garbage-collection.nix
     ../../modules/system/utils/locale.nix
   ];
@@ -23,11 +21,6 @@
 
     substituters = [
       "https://nix-community.cachix.org"
-#      "https://cache.nixos.org/"
-    ];
-    trusted-public-keys = [
-#      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-#      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
     ];
   };
 

hosts/laptop/hardware-configuration.nix

@@ -14,18 +14,17 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/e8be61cf-dea9-4a94-a414-38a4246c8a5b";
+    { device = "/dev/disk/by-uuid/4f1908a5-46e5-411e-a8ea-ef97e45337f0";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/0C1D-2896";
+    { device = "/dev/disk/by-uuid/B9AD-ABDC";
       fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
     };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/c6c5b3d7-7d49-4aff-ba91-cb0ac68808a6"; }
-    ];
+  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

hosts/laptop/home.nix

@@ -7,8 +7,6 @@
     ../../modules/home/programs/common.nix
     ../../modules/home/programs/firefox.nix
     ../../modules/home/programs/git.nix
-    ../../modules/home/programs/joplin.nix
-    ../../modules/home/programs/kitty.nix
     ../../modules/home/programs/modrinth.nix
     ../../modules/home/programs/neovim
     ../../modules/home/programs/ssh.nix