Tuning/refactoring/etc

hosts/workstation/default.nix

@@ -34,16 +34,12 @@ in {
   };
   imports = [
     inputs.catppuccin.nixosModules.catppuccin
-    # ../comon/tailscale.nix
-    ../../home
-    ../../home/gui
-    ../../home/gui/gnome-calenar.nix
-    ../../home/work
     ../vars.nix
+    ../common
+    ../../home
     ../wm
-    ../wm/greetd
-    ../workstation/games
-    ../workstation/kvm.nix
+    ./games
+    ./kvm.nix
     ../themes.nix
     ./detect-reboot-needed.nix
     ./kmscon.nix
@@ -53,7 +49,6 @@ in {
     ../systemd-primary.nix
     ./auto-cpufreq.nix
     ./tlp.nix
-    ../common/upgrade-diff.nix
     ./wine.nix
   ];
 
@@ -104,9 +99,7 @@ in {
   };
 
   networking = {
-    enableIPv6 = true;
     networkmanager = {
-      enable = true;
       wifi = {powersave = true;};
       dispatcherScripts = [
         {
@@ -124,26 +117,6 @@ in {
         }
       ];
     };
-    useDHCP = false;
-    firewall = {
-      enable = true;
-      trustedInterfaces = ["tailscale0"]; # always allow traffic from your Tailscale network
-      checkReversePath = "loose";
-      allowedUDPPorts = [config.services.tailscale.port];
-      allowedTCPPortRanges = [
-        {
-          from = 1714;
-          to = 1764;
-        }
-      ];
-      allowedUDPPortRanges = [
-        {
-          from = 1714;
-          to = 1764;
-        }
-      ];
-      allowedTCPPorts = [22];
-    };
   };
 
   # Set your time zone.
@@ -165,26 +138,8 @@ in {
   # Bootloader.
   boot = {
     binfmt.emulatedSystems = lib.optionals (pkgs.stdenv.hostPlatform.system != "aarch64-linux") [ "aarch64-linux" ];
-    # kernelPackages = pkgs.linuxPackages_latest;
     kernelPackages = pkgs.linuxPackages_zen;
-    kernelParams = ["consoleblank=60" "mem_sleep_default=deep"];
-    # extraModulePackages = [config.boot.kernelPackages.ddcci-driver];
-    # kernelModules = ["i2c-dev" "ddcci_backlight"];
-    loader =
-      if config.system != "aarch64-linux"
-      then {
-        systemd-boot = {enable = true;};
-        efi = {
-          canTouchEfiVariables = true;
-          efiSysMountPoint = "/boot";
-        };
-      }
-      else {
-        grub.enable = false;
-        generic-extlinux-compatible.enable = true;
-      };
-    plymouth = {enable = true;};
-    kernel = {sysctl = {"vm.swappiness" = 10;};};
+    kernelParams = ["consoleblank=60" "mem_sleep_default=deep" "quiet" "splash"];
   };
 
   security = {