merge common-*.nix files

hosts/muffin/default.nix

@@ -11,10 +11,7 @@
 }:
 {
   imports = [
-    # common across all hosts
-    ../../modules/common-doas.nix
-    ../../modules/common-shell-fish.nix
-    ../../modules/common-nix.nix
+    ../../modules/common.nix
 
     # muffin-only system modules
     ./hardware.nix
@@ -95,8 +92,6 @@
 
   services.deployGuard.enable = true;
 
-  services.kmscon.enable = true;
-
   # Disable serial getty on ttyS0 to prevent dmesg warnings
   systemd.services."serial-getty@ttyS0".enable = false;
 
@@ -154,10 +149,6 @@
     };
   };
 
-  environment.etc = {
-    "issue".text = "";
-  };
-
   # Set your time zone.
   time.timeZone = "America/New_York";
 
@@ -170,19 +161,12 @@
     ];
   };
 
-  #fwupd for updating firmware
-  services.fwupd = {
-    enable = true;
-    extraRemotes = [ "lvfs-testing" ];
-  };
-
   environment.systemPackages = with pkgs; [
     helix
     lm_sensors
     bottom
     htop
 
-    doas-sudo-shim
     neofetch
 
     borgbackup
@@ -275,9 +259,6 @@
     hashedPasswordFile = config.age.secrets.hashedPass.path;
   };
 
-  # programs.fish + bash→fish redirect and security.doas block are in
-  # modules/common-shell-fish.nix and modules/common-doas.nix.
-
   services.murmur = {
     enable = true;
     openFirewall = true;