merge common-*.nix files

modules/desktop-common.nix

@@ -10,10 +10,7 @@
 }:
 {
   imports = [
-    # shared across all hosts
-    ./common-doas.nix
-    ./common-shell-fish.nix
-    ./common-nix.nix
+    ./common.nix
 
     # desktop-only modules
     ./desktop-vm.nix
@@ -31,11 +28,6 @@
   # allow overclocking (I actually underclock but lol)
   hardware.amdgpu.overdrive.ppfeaturemask = "0xFFFFFFFF";
 
-  hardware.enableRedistributableFirmware = true;
-  hardware.cpu.amd.updateMicrocode = true;
-
-  services.kmscon.enable = true;
-
   # Add niri to display manager session packages
   services.displayManager.sessionPackages = [ niri-package ];
 
@@ -350,23 +342,10 @@
       # 1gb huge pages
       "hugepagesz=1G"
       "hugepages=3"
-
     ];
-
-  };
-
-  environment.etc = {
-    # override default nixos /etc/issue
-    "issue".text = "";
   };
 
   services = {
-    # fwupd for updating firmware
-    fwupd = {
-      enable = true;
-      extraRemotes = [ "lvfs-testing" ];
-    };
-
     # auto detect network printers
     avahi = {
       enable = true;
@@ -466,8 +445,6 @@
 
     dmidecode
 
-    doas-sudo-shim
-
     glib
     usbutils
     libmtp