chore: update secrets

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

@@ -3,7 +3,6 @@
     ./nixos.nix
     ./hardware.nix
     ./home.nix
-    ./virt.nix
     ./net.nix
   ];
 }

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

@@ -6,19 +6,14 @@
   ...
 }:
 let
-  btrfs = "/dev/disk/by-uuid/0404de0a-9c4d-4c98-b3e5-b8ff8115f36c";
+  btrfs = "/dev/disk/by-uuid/69ab72d4-6ced-4f70-8b5e-aa2daa8c0b6b";
 in
 {
   boot = {
     initrd = {
       kernelModules = [ "amdgpu" ];
       availableKernelModules = [
-        "xhci_pci"
+	"nvme" "xhci_pci" "thunderbolt" "uas" "sd_mod"
-        "ahci"
-        "nvme"
-        "usbhid"
-        "usb_storage"
-        "sd_mod"
       ];
       verbose = false;
     };
@@ -30,11 +25,6 @@ in
     kernel.sysctl = {
       "fs.file-max" = 9223372036854775807;
     };
-
-    resumeDevice = btrfs;
-    kernelParams = [
-      "resume_offset=6444127"
-    ];
   };
   services.scx.enable = true;
 
@@ -48,9 +38,9 @@ in
   };
 
   fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/843c36ae-f6d0-46a1-b5c7-8ab569e1e63f";
+    device = btrfs;
     fsType = "btrfs";
-    options = [ "compress=zstd" ];
+    options = [ "compress=zstd" "subvol=nix" ];
   };
 
   my.persist.location = "/nix/persist";
@@ -59,17 +49,7 @@ in
     fsType = "btrfs";
     options = [
       "compress=zstd"
-      "subvol=persistent"
+      "subvol=persist"
-    ];
-    neededForBoot = true;
-  };
-
-  fileSystems."/swap" = {
-    device = btrfs;
-    fsType = "btrfs";
-    options = [
-      "compress=zstd"
-      "subvol=swap"
     ];
     neededForBoot = true;
   };
@@ -100,7 +80,7 @@ in
   '';
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/B7DC-E9AC";
+    device = "/dev/disk/by-uuid/96D3-93B0";
     fsType = "vfat";
     options = [
       "uid=0"
@@ -110,49 +90,6 @@ in
     ];
   };
 
-  fileSystems."/home/${username}/Documents" = {
-    device = "/dev/disk/by-uuid/a4e37dcd-764a-418c-aa1c-484f1fbd4bbe";
-    fsType = "ext4";
-  };
-
-  fileSystems."/home/${username}/Downloads" = {
-    device = "/dev/disk/by-uuid/18717cb4-49ac-40fa-95d4-29523a458dd0";
-    fsType = "ext4";
-  };
-
-  fileSystems."/home/${username}/Videos" = {
-    device = "/dev/disk/by-uuid/b67bbeab-58bc-4814-b5e3-08404e78b25e";
-    fsType = "ext4";
-  };
-
-  fileSystems."/home/${username}/Pictures" = {
-    device = "/dev/disk/by-uuid/a31bfe7e-cc17-4bd2-af74-ae5de9be35d3";
-    fsType = "ext4";
-  };
-
-  fileSystems."/home/${username}/Music" = {
-    device = "//192.168.3.2/share/imxyy_soope_/Music";
-    fsType = "cifs";
-    options = [
-      "username=nas"
-      "password=nasshare"
-      "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"
-      "nodev"
-      "nofail"
-      "uid=1000"
-      "gid=100"
-      "vers=3"
-      "rw"
-    ];
-  };
-
-  swapDevices = [
-    {
-      device = "/swap/swapfile";
-      size = 32 * 1024;
-    }
-  ];
-
   networking.useDHCP = lib.mkDefault false;
 
   hardware.enableRedistributableFirmware = lib.mkDefault true;

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

@@ -34,58 +34,13 @@
       pamixer
     ];
     programs.zsh = {
-      shellAliases = {
-        cageterm = "cage -m DP-2 -s -- alacritty -o font.size=20";
-        cagefoot = "cage -m DP-2 -s -- foot --font=monospace:size=20";
-        cagekitty = "cage -m DP-2 -s -- kitty -o font_size=20";
-      };
       sessionVariables = {
-        no_proxy = "192.168.3.0/24";
         PATH = "/home/${username}/bin:$PATH";
       };
-      profileExtra = ''
-        if [ `tty` = "/dev/tty6" ]; then
-          clear
-        fi
-      '';
-    };
-
-    programs.niri.settings = {
-      environment.STEAM_FORCE_DESKTOPUI_SCALING = "1.25";
-      outputs = {
-        DP-2 = {
-          enable = true;
-          mode = {
-            width = 2560;
-            height = 1440;
-            refresh = 75.033;
-          };
-          scale = 1.25;
-          position = {
-            x = 0;
-            y = 0;
-          };
-        };
-        DP-3 = {
-          enable = true;
-          mode = {
-            width = 2560;
-            height = 1440;
-            refresh = 75.033;
-          };
-          scale = 1.25;
-        };
-      };
     };
   };
 
   my = {
-    autologin = {
-      enable = true;
-      user = username;
-      ttys = [ 6 ];
-    };
-
     gpg.enable = true;
     cli.all.enable = true;
     coding.all.enable = true;
@@ -142,7 +97,6 @@
           homedir = config.my.home.home.homeDirectory;
         in
         [
-          "file://${homedir}/Documents/%E7%8F%AD%E7%BA%A7%E4%BA%8B%E5%8A%A1 班级事务"
           "file://${homedir}/NAS NAS"
           "file://${homedir}/NAS/imxyy_soope_ NAS imxyy_soope_"
           "file://${homedir}/NAS/imxyy_soope_/OS NAS OS"
@@ -151,12 +105,14 @@
     persist = {
       enable = true;
       homeDirs = [
-        ".android"
+	"Documents"
-        "Android"
+	"Downloads"
+	"Videos"
+	"Music"
+	"Pictures"
 
         "bin"
         "workspace"
-        "Virt"
 
         ".cache"
         ".local/state"

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

@@ -10,8 +10,7 @@
     "biosdevname=0"
     "net.ifnames=0"
   ];
-  networking.wireless.enable = true;
+  networking.networkmanager.enable = true;
-  networking.wireless.userControlled = true;
 
   sops.secrets.dae-imxyy-nix-x16 = {
     sopsFile = sopsRoot + /dae-imxyy-nix-x16.dae;
@@ -40,8 +39,6 @@
   };
   environment.systemPackages = with pkgs; [
     easytier
-    wpa_supplicant
-    wpa_supplicant_gui
   ];
   systemd.services."easytier" = {
     enable = true;

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

@@ -169,4 +169,6 @@
       ];
     };
   };
+
+  my.persist.nixosDirs = [ "/etc/NetworkManager/system-connections" ];
 }

secrets/mihomo.yaml

@@ -25,7 +25,7 @@ proxies:
     - name: ENC[AES256_GCM,data:I/gOScJ4PYyG,iv:Wi3x1D25WX/m28FYenmU+g/laqosIHe0YpFQGYTIAAI=,tag:Vg/KqSIhxVetaloyeEp2FA==,type:str]
       type: ENC[AES256_GCM,data:C7hjfARP,iv:r+5/qimlashka+qMjrtlsOEMBFuN8/4SDrzzW/WM+KE=,tag:VVpvomQxVFxh/GTRW59p6g==,type:str]
       server: ENC[AES256_GCM,data:fByASUq0i6vl00aT,iv:m7iykG0sJnyjBSuu9qD78bS918FD3fj9Gak0cBSidJw=,tag:U0y1WHvOmQ6f3qnz1Qs+Ag==,type:str]
-      port: ENC[AES256_GCM,data:wpvzzg==,iv:AGIlXqbfSCNGpJ/vNlK/ruAsEbhSyOpC5whLph7zIgM=,tag:kucLLNp+QfAXeVI3HwwPew==,type:int]
+      port: ENC[AES256_GCM,data:x46frQ==,iv:y3ZtVJQP3q08duFGUXSH5xLo9Q6GZmGvhmCKzNiztfE=,tag:2k6WGrK1wGa4QwOYJHnwkw==,type:int]
       password: ENC[AES256_GCM,data:SoxJyZJLwxRQoErQ1ZHObnM=,iv:YVDRtTb0P15vA67ZUQgCBX1s16iqjrtG0oodE9RPDMI=,tag:zsKj2mwEWwDtJ9QGtbix2g==,type:str]
       sni: ENC[AES256_GCM,data:p7XIiaPEC5UUe0Hc,iv:CgLd9lQ9ivfouzxihzR/OX8KgvIvyj0DktI5YYZ6epE=,tag:EzBxiAuEeEz2jyF0M5Ee6A==,type:str]
       skip-cert-verify: ENC[AES256_GCM,data:uea1ExU=,iv:z7oRGpeLjzXA1RB5E3ucJu/bPo110v81AFR+4dDQYwA=,tag:AsorLzyJfwJNsJShlXQBtw==,type:bool]
@@ -46,7 +46,7 @@ proxies:
     - name: ENC[AES256_GCM,data:524kL2VUV/Zr,iv:up5Map4oTAPmalvdpiZAob4wrxMAPu9w3Nk8VclDPOI=,tag:9FKxdoiHzUI9LBpt9QOy4g==,type:str]
       type: ENC[AES256_GCM,data:C7hjfARP,iv:r+5/qimlashka+qMjrtlsOEMBFuN8/4SDrzzW/WM+KE=,tag:VVpvomQxVFxh/GTRW59p6g==,type:str]
       server: ENC[AES256_GCM,data:UlqxHe1H1J1OH4Ld,iv:um1xP8HAqMTv8sqZewFBFaIoKq5MaVqultx7q9A9v4A=,tag:gGR1Uxwcap2gZYBmPuG76A==,type:str]
-      port: ENC[AES256_GCM,data:+JoG2A==,iv:RmALJNa9sBPVHUIWj+cG7ns6xp4F0leMRj5NUxzl7ig=,tag:+EmugWC/7Rv641I70w7U1g==,type:int]
+      port: ENC[AES256_GCM,data:x46frQ==,iv:y3ZtVJQP3q08duFGUXSH5xLo9Q6GZmGvhmCKzNiztfE=,tag:2k6WGrK1wGa4QwOYJHnwkw==,type:int]
       password: ENC[AES256_GCM,data:SoxJyZJLwxRQoErQ1ZHObnM=,iv:YVDRtTb0P15vA67ZUQgCBX1s16iqjrtG0oodE9RPDMI=,tag:zsKj2mwEWwDtJ9QGtbix2g==,type:str]
       sni: ENC[AES256_GCM,data:rkDSKvEwqgNZE4Yh,iv:Nfi9j5/IKygbSDgBAvAzHrqEYFMQPXjdI3aKHNiFdFs=,tag:N7MZw4nUOGlo4RIo08DAmA==,type:str]
       skip-cert-verify: ENC[AES256_GCM,data:uea1ExU=,iv:z7oRGpeLjzXA1RB5E3ucJu/bPo110v81AFR+4dDQYwA=,tag:AsorLzyJfwJNsJShlXQBtw==,type:bool]
@@ -76,7 +76,7 @@ proxies:
 proxy-providers:
     ykk:
         type: ENC[AES256_GCM,data:QFH7Kw==,iv:uBwdbVdfQuoJ4wIxT9lAS/b0C167IwJbD2KhrB1VzkM=,tag:8ogC9VITAOfeMtceq20Wtw==,type:str]
-        url: ENC[AES256_GCM,data:lYAOja6fBCLlroGfOM6SNsz1iPEc62rCJocFbn+jcS0UHifYXq/EDRr7sFeNQ1kIzZF3U3QkQr3B1DEtciuiJkIOZ/uJniuHo1OzZoSx+PhYjorAtDA=,iv:yV/WRHPJDlYvKkwK3Q4AOjorBW3IprSksa9e/Pw6yJk=,tag:8xamIMGTqDeYuJTHF+PFeQ==,type:str]
+        url: ENC[AES256_GCM,data:aTVsXCfaCkdZes1CW8SJVQFiTZ/KbYky6ei0FKSmeCF8/TbaLIKKR46FX2yQ8682fdcLGcAB8ekblQ==,iv:7OQ69sjVWNyOrPVlA8DWTAbw/LIVzFFm5dK4FBcwvyk=,tag:gLVzTM5PypNLpaIOiPYc/Q==,type:str]
         proxy: ENC[AES256_GCM,data:BIEXrZQ=,iv:ZzEEJmLgbOhBTcZEgPfsL0AC72GpydlFTKhJ4+fgTec=,tag:v8URxwAU5wSHD5GPr/sTfw==,type:str]
         exclude-filter: ENC[AES256_GCM,data:Uc9L0zm7TWGAgIQq6thwK4evIuYoEJyRJ2M=,iv:CbJp7BcobOfkxyY7/fvaECif57yhPZ1/IuPjLwYUwUQ=,tag:xtGissYFtBX3OVinstWRug==,type:str]
 proxy-groups:
@@ -131,7 +131,7 @@ sops:
             Q2xnck11TXpVQzJWVWRrdlZWNkcwY0EKQiQJDUDU0ChvrdjqlOTngigPneFDWMIH
             i6T5x8cJ1w4MDm1izOHdf8XT1IO5h8OgcnazoVxQomNRxj3A930wiw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-05-25T04:04:00Z"
+    lastmodified: "2025-07-12T13:49:28Z"
-    mac: ENC[AES256_GCM,data:+WCayJ0HV1C53z9ChMfIWGyeNxy4FHpTIeUFIf0k8VjGy+tEbLEYG0Enow0eU+HTJFF+phgzyfpV9XTfWfzkJ+bL2hl8+z2x+dKFszOdi87/6uNdc/9hLgZ2qJcFmGjuEEoX8i8tv2NgU9mY7274snFlppKam5Q7JTutHwLWCJQ=,iv:Er0Ccn/He7H0UpNvL+kzxYoLRiHLnkkEUvZwM/oIn9k=,tag:I4534xc6f8aTaVaXj3WXrw==,type:str]
+    mac: ENC[AES256_GCM,data:/APVRajT68Ysyd8fPKrU3eHX9V1lyRVBhLFUh6rxkAudwmxqKP0O4AcNl5p1ICdPkItSBKGzxHlOkjDDIK5d/dYKJjGzLxAvyVxoJwcmLGHZuPEpLS1gsElw9lpQRJxVbbm7A0tb2PeoUgaPm/jMETrg0FL8jsstOQomd06izJQ=,iv:cdkRZjiBYIK+dIQ7pIclRTeDaPnJ/w6c9hs1ttywmOY=,tag:UlDYkcjkGqWKC4sDurwyfA==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.10.2