feat: massive refactor

config/base.nix

@@ -1,42 +0,0 @@
-{
-  config,
-  hostname,
-  ...
-}:
-{
-  # I prefer this to the default issue text
-  # ported from ArchLinux IIRC
-  environment.etc.issue.text = "\\e{lightcyan}\\S\\e{reset} Login (\\l)\n\n";
-  networking.hostName = hostname;
-  # don't change this unless you know what you are doing!
-  # for further information, see wiki.nixos.org
-  system.stateVersion = "24.11";
-  # disable this since we already have machine-id persisted
-  systemd.services."systemd-machine-id-commit".enable = !config.my.persist.enable;
-
-  my = {
-    hm = {
-      # nicely reload system units when changing configs
-      systemd.user.startServices = "sd-switch";
-      home.stateVersion = "24.11";
-    };
-
-    xdg.enable = true;
-    persist = {
-      nixosDirs = [
-        "/root"
-        "/var"
-        "/etc/ssh"
-      ];
-      nixosFiles = [
-        "/etc/machine-id"
-      ];
-      homeDirs = [
-        {
-          directory = ".ssh";
-          mode = "0700";
-        }
-      ];
-    };
-  };
-}

config/hosts/imxyy-nix-server/net.nix

@@ -175,8 +175,8 @@
     config.sops.secrets.frp-env.path
   ];
   services.frp = {
-    enable = true;
     instances."" = {
+      enable = true;
       role = "client";
       settings = {
         serverAddr = "{{ .Envs.FRP_SERVER_ADDR }}";
@@ -384,7 +384,6 @@
             customDomains = [ "memo.imxyy.top" ];
           }
 
-
           {
             name = "efl-matrix-http";
             type = "http";

config/hosts/imxyy-nix-server/nixos.nix

@@ -6,24 +6,6 @@
   ...
 }:
 {
-  boot.loader = {
-    efi.canTouchEfiVariables = true;
-    systemd-boot = {
-      enable = true;
-      configurationLimit = 10;
-    };
-    grub.enable = false;
-    timeout = 0;
-  };
-
-  systemd.services.nix-daemon = {
-    environment.TMPDIR = "/var/cache/nix";
-    serviceConfig.CacheDirectory = "nix";
-  };
-  environment.variables.NIX_REMOTE = "daemon";
-
-  my.audio.enable = false;
-
   sops.secrets.imxyy-nix-server-hashed-password = {
     sopsFile = secrets.imxyy-nix-server-hashed-password;
     format = "binary";

config/hosts/imxyy-nix-x16/net.nix

@@ -9,6 +9,7 @@
     "biosdevname=0"
     "net.ifnames=0"
   ];
+  my.persist.nixosDirs = [ "/etc/NetworkManager/system-connections" ];
   networking = {
     networkmanager.enable = true;
     firewall.enable = false;

config/hosts/imxyy-nix-x16/nixos.nix

@@ -6,40 +6,10 @@
   ...
 }:
 {
-  security.pam.loginLimits = [
-    {
-      domain = "*";
-      type = "soft";
-      item = "nofile";
-      value = "524288";
-    }
-  ];
-
   boot.kernelParams = [
     "usbcore.autosuspend=-1" # Avoid usb autosuspend (for usb bluetooth adapter)
   ];
 
-  boot.loader = {
-    efi.canTouchEfiVariables = true;
-    systemd-boot = {
-      enable = true;
-      configurationLimit = 10;
-    };
-    grub.enable = false;
-    timeout = 0;
-  };
-
-  hardware.graphics.enable = true;
-  hardware.graphics.enable32Bit = true;
-
-  systemd.services.nix-daemon = {
-    environment.TMPDIR = "/var/cache/nix";
-    serviceConfig.CacheDirectory = "nix";
-  };
-  environment.variables.NIX_REMOTE = "daemon";
-
-  services.printing.enable = true;
-
   services.upower.enable = true;
   services.power-profiles-daemon.enable = true;
 
@@ -59,8 +29,6 @@
     };
   };
 
-  services.gvfs.enable = true;
-
   services.openssh = {
     enable = true;
     settings = {
@@ -96,6 +64,4 @@
       ];
     };
   };
-
-  my.persist.nixosDirs = [ "/etc/NetworkManager/system-connections" ];
 }

config/hosts/imxyy-nix/home.nix

@@ -160,6 +160,9 @@
         ".claude"
         ".claude-code-router"
       ];
+      homeFiles = [
+        ".claude.json"
+      ];
     };
   };
 }

config/hosts/imxyy-nix/nixos.nix

@@ -25,46 +25,17 @@ let
   '';
 in
 {
-  security.pam.loginLimits = [
-    {
-      domain = "*";
-      type = "soft";
-      item = "nofile";
-      value = "524288";
-    }
-  ];
-
   systemd.services.btreset = {
     script = lib.getExe btreset;
     wantedBy = [ "multi-user.target" ];
     serviceConfig.Type = "oneshot";
   };
+
   boot.kernelParams = [
     "usbcore.autosuspend=-1" # Avoid usb autosuspend (for usb bluetooth adapter)
     "fsck.mode=skip"
   ];
 
-  boot.loader = {
-    efi.canTouchEfiVariables = true;
-    systemd-boot = {
-      enable = true;
-      configurationLimit = 10;
-    };
-    grub.enable = false;
-    timeout = 0;
-  };
-
-  hardware.graphics.enable = true;
-  hardware.graphics.enable32Bit = true;
-
-  systemd.services.nix-daemon = {
-    environment.TMPDIR = "/var/cache/nix";
-    serviceConfig.CacheDirectory = "nix";
-  };
-  environment.variables.NIX_REMOTE = "daemon";
-
-  services.printing.enable = true;
-
   services.keyd = {
     enable = true;
     keyboards = {
@@ -87,8 +58,6 @@ in
     };
   };
 
-  services.gvfs.enable = true;
-
   programs.wireshark.enable = true;
   programs.wireshark.package = pkgs.wireshark;
   users.users.${username}.extraGroups = [ "wireshark" ];