pc: enable ttyd

This reverts commit 3a60acebb5.

.gitattributes

@@ -1 +1,2 @@
 *.png filter=lfs diff=lfs merge=lfs -text
+*.icm filter=lfs diff=lfs merge=lfs -text

.sops.yaml

@@ -3,7 +3,7 @@ keys: # cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age
   - &pc age1ffvr5pqd2lfj24e3fh53s92z6h76fda3du4y4k6r3yjumdwvpfgqzj033a
   - &vps6 age164tyqklwhdm57tfm5u863mdt2xrzrrzac4py8a0j9y6kzqcjy9zsp073t6
   - &vps7 age137x7csalutwvfygvvzpemlsywvdxj3j4z93a50z2sjx03w6zau8q3r5902
-  - &yoga age1qrea4twxdhd7fnvlq5v45528c90qy6hp2wa55kghsxzgut6n6fxs7w6u42
+  - &surface age1ck5vzs0xqx0jplmuksrkh45xwmkm2t05m2wyq5k2w2mnkmn79fxs6tvl3l
   - &nas age19lhcwk37jmvn6z0v4dpdfh0k4u23f76twdjknc0p7atktf37rd7s4t4wj3
   - &xmupc1 age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m
 creation_rules:
@@ -27,15 +27,11 @@ creation_rules:
     - age:
       - *chn
       - *nas
-  - path_regex: secrets/xmupc1/.*$
+  - path_regex: secrets/surface/.*$
     key_groups:
     - age:
       - *chn
-  - path_regex: secrets/yoga/.*$
-    key_groups:
-    - age:
-      - *chn
-      - *yoga
+      - *surface
   - path_regex: secrets/xmupc1/.*$
     key_groups:
     - age:

devices/nas/default.nix

@@ -44,12 +44,10 @@ inputs:
         nixpkgs.march = "silvermont";
         nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
         kernel.patches = [ "cjktty" ];
-        impermanence.enable = true;
         networking.hostname = "nas";
-        gui.preferred = false;
       };
       hardware = { cpus = [ "intel" ]; gpus = [ "intel" ]; };
-      packages.packageSet = "desktop";
+      packages.packageSet = "server";
       services =
       {
         snapper.enable = true;
@@ -61,14 +59,13 @@ inputs:
           shares = { home.path = "/home"; root.path = "/"; };
         };
         sshd = { enable = true; passwordAuthentication = true; };
-        xrayClient =
+        xray.client =
         {
           enable = true;
           serverAddress = "74.211.99.69";
           serverName = "vps6.xserver.chn.moe";
           dns.extraInterfaces = [ "docker0" ];
         };
-        xrdp = { enable = true; hostname = [ "nas.chn.moe" "office.chn.moe" ]; };
         groupshare.enable = true;
         smartd.enable = true;
         beesd =

devices/pc/default.nix

@@ -50,12 +50,10 @@ inputs:
             # SERIALIZE SGX WAITPKG WIDEKL XSAVE XSAVEOPT
             "alderlake"
           ];
-          keepOutputs = true;
         };
         nixpkgs =
           { march = "znver4"; cuda = { enable = true; capabilities = [ "8.9" ]; forwardCompat = false; }; };
         kernel.patches = [ "cjktty" "lantian" ];
-        impermanence.enable = true;
         networking.hostname = "pc";
         sysctl.laptop-mode = 5;
       };
@@ -75,7 +73,6 @@ inputs:
         waydroid.enable = true;
         docker.enable = true;
         kvmHost = { enable = true; gui = true; autoSuspend = [ "win10" "hardconnect" ]; };
-        # kvmGuest.enable = true;
         nspawn = [ "arch" "ubuntu-22.04" "fedora" ];
       };
       services =
@@ -96,7 +93,7 @@ inputs:
           };
         };
         sshd.enable = true;
-        xrayClient =
+        xray.client =
         {
           enable = true;
           serverAddress = "74.211.99.69";
@@ -128,7 +125,7 @@ inputs:
         nix-serve = { enable = true; hostname = "nix-store.chn.moe"; };
         smartd.enable = true;
         misskey.instances.misskey.hostname = "xn--qbtm095lrg0bfka60z.chn.moe";
-        beesd = { enable = true; instances.root = { device = "/"; hashTableSizeMB = 2048; }; };
+        beesd = { enable = true; instances.root = { device = "/"; hashTableSizeMB = 2048; threads = 4; }; };
         wireguard =
         {
           enable = true;
@@ -137,7 +134,21 @@ inputs:
           wireguardIp = "192.168.83.3";
         };
       };
-      bugs = [ "xmunet" "suspend-hibernate-waydroid" "backlight" "amdpstate" ];
+      bugs = [ "xmunet" "backlight" "amdpstate" ];
+    };
+    # use plasma-x11 as default, instead of plasma-wayland
+    services.xserver.displayManager =
+    {
+      defaultSession = inputs.lib.mkForce "plasma";
+      setupCommands = "${inputs.pkgs.xcalib}/bin/xcalib -d :0 ${./color/TPLCD_161B_Default.icm}";
+    };
+    virtualisation.virtualbox.host = { enable = true; enableExtensionPack = true; };
+    hardware.nvidia.forceFullCompositionPipeline = true;
+    services.ttyd =
+    {
+      enable = true;
+      username = "ttyd";
+      passwordFile = inputs.pkgs.writeText "ttydpw" "0000";
     };
   };
 }

devices/surface/default.nix

@@ -1,5 +1,6 @@
 inputs:
 {
+  imports = inputs.localLib.mkModules [ inputs.topInputs.nixos-hardware.nixosModules.microsoft-surface-pro-intel ];
   config =
   {
     nixos =
@@ -10,23 +11,27 @@ inputs:
         {
           mount =
           {
-            vfat."/dev/disk/by-uuid/86B8-CF80" = "/boot/efi";
+            vfat."/dev/disk/by-uuid/7179-9C69" = "/boot/efi";
             btrfs =
             {
-              "/dev/disk/by-uuid/e252f81d-b4b3-479f-8664-380a9b73cf83"."/boot" = "/boot";
+              "/dev/disk/by-uuid/c6d35075-85fe-4129-aaa8-f436ab85ce43"."/boot" = "/boot";
               "/dev/mapper/root" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
             };
           };
-          decrypt.auto."/dev/disk/by-uuid/8186d34e-005c-4461-94c7-1003a5bd86c0" =
-            { mapper = "root"; ssd = true; };
-          swap = [ "/nix/swap/swap" ];
+          decrypt.auto =
+          {
+            "/dev/disk/by-uuid/4f7420f9-ea19-4713-b084-2ac8f0a963ac" = { mapper = "root"; ssd = true; };
+            "/dev/disk/by-uuid/88bd9d44-928b-40a2-8f3d-6dcd257c4601" =
+              { mapper = "swap"; ssd = true; before = [ "root" ]; };
+          };
+          swap = [ "/dev/mapper/swap" ];
+          resume = "/dev/mapper/swap";
           rollingRootfs = { device = "/dev/mapper/root"; path = "/nix/rootfs"; };
         };
         nixpkgs.march = "skylake";
         grub.installDevice = "efi";
         nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
-        kernel.patches = [ "cjktty" ];
-        impermanence.enable = true;
+        kernel.patches = [ "cjktty" "lantian" ];
         networking.hostname = "surface";
       };
       hardware =
@@ -39,13 +44,13 @@ inputs:
         sound.enable = true;
       };
       packages.packageSet = "desktop-fat";
-      virtualization.docker.enable = true;
+      virtualization = { docker.enable = true; waydroid.enable = true; };
       services =
       {
         snapper.enable = true;
         fontconfig.enable = true;
         sshd.enable = true;
-        xrayClient =
+        xray.client =
         {
           enable = true;
           serverAddress = "74.211.99.69";
@@ -56,5 +61,21 @@ inputs:
       };
       bugs = [ "xmunet" ];
     };
+    boot.kernelPackages =
+      let
+        originalKernel = inputs.pkgs.linuxPackages_xanmod_latest.kernel;
+        version = originalKernel.version;
+        majorVersion =
+          let versionArray = builtins.splitVersion version;
+          in "${builtins.elemAt versionArray 0}.${builtins.elemAt versionArray 1}";
+        repoFile = "${inputs.topInputs.nixos-hardware}/microsoft/surface/common/kernel/linux-package.nix";
+        inherit (inputs.pkgs.callPackage repoFile {}) repos;
+        patchDir = repos.linux-surface + "/patches/${majorVersion}";
+        patchFile = "${inputs.topInputs.nixos-hardware}/microsoft/surface/common/kernel/linux-6.6.x/patches.nix";
+        kernelPatches = inputs.pkgs.callPackage patchFile { inherit (inputs.lib) kernel; inherit version patchDir; };
+      in
+        inputs.lib.mkForce (inputs.pkgs.linuxPackagesFor (originalKernel.override
+          (prev: { kernelPatches = prev.kernelPatches ++ kernelPatches; })));
+    environment.systemPackages = with inputs.pkgs; [ maliit-keyboard maliit-framework ];
   };
 }

devices/vps6/default.nix

@@ -29,7 +29,6 @@ inputs:
         nixpkgs.march = "sandybridge";
         nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
         initrd.sshd.enable = true;
-        impermanence.enable = true;
         networking.hostname = "vps6";
       };
       packages.packageSet = "server";
@@ -37,7 +36,7 @@ inputs:
       {
         snapper.enable = true;
         sshd.enable = true;
-        xrayServer = { enable = true; serverName = "vps6.xserver.chn.moe"; };
+        xray.server = { enable = true; serverName = "vps6.xserver.chn.moe"; };
         frpServer = { enable = true; serverName = "frp.chn.moe"; };
         nginx =
         {
@@ -75,7 +74,7 @@ inputs:
           peers = [ "pc" "nas" "vps7" ];
           publicKey = "AVOsYUKQQCvo3ctst3vNi8XSVWo1Wh15066aHh+KpF4=";
           wireguardIp = "192.168.83.1";
-          externalIp = "74.211.99.69";
+          listenIp = "74.211.99.69";
           lighthouse = true;
         };
       };

devices/vps7/default.nix

@@ -29,11 +29,9 @@ inputs:
         nixpkgs.march = "broadwell";
         nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
         initrd.sshd.enable = true;
-        impermanence.enable = true;
         networking.hostname = "vps7";
-        gui.preferred = false;
       };
-      packages.packageSet = "desktop";
+      packages.packageSet = "server";
       services =
       {
         snapper.enable = true;
@@ -51,7 +49,6 @@ inputs:
           synapse.matrixHostname = "synapse.chn.moe";
           matrix = { port = 8009; redisPort = 6380; slidingSyncPort = 9001; };
         };
-        xrdp = { enable = true; hostname = [ "vps7.chn.moe" ]; };
         vaultwarden.enable = true;
         beesd = { enable = true; instances.root = { device = "/"; hashTableSizeMB = 1024; }; };
         photoprism.enable = true;
@@ -62,7 +59,6 @@ inputs:
         fz-new-order.enable = true;
         nginx.applications = { kkmeeting.enable = true; webdav.instances."webdav.chn.moe" = {}; };
         httpapi.enable = true;
-        mastodon.enable = true;
         gitea.enable = true;
         grafana.enable = true;
         fail2ban.enable = true;
@@ -72,7 +68,7 @@ inputs:
           peers = [ "vps6" ];
           publicKey = "n056ppNxC9oECcW7wEbALnw8GeW7nrMImtexKWYVUBk=";
           wireguardIp = "192.168.83.2";
-          externalIp = "95.111.228.40";
+          listenIp = "95.111.228.40";
         };
       };
     };

devices/xmupc1/default.nix

@@ -42,7 +42,6 @@ inputs:
         };
         gui.preferred = false;
         kernel.patches = [ "cjktty" ];
-        impermanence.enable = true;
         networking.hostname = "xmupc1";
       };
       hardware =
@@ -75,7 +74,7 @@ inputs:
           };
         };
         sshd.enable = true;
-        xrayClient =
+        xray.client =
         {
           enable = true;
           serverAddress = "74.211.99.69";

flake.nix

@@ -4,7 +4,7 @@
   inputs =
   {
     nixpkgs.url = "github:CHN-beta/nixpkgs/nixos-23.11";
-    nixpkgs-unstable.url = "github:CHN-beta/nixpkgs/nixos-unstable";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs-2305.url = "github:CHN-beta/nixpkgs/nixos-23.05";
     home-manager = { url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; };
     sops-nix =
@@ -13,7 +13,7 @@
       inputs = { nixpkgs.follows = "nixpkgs"; nixpkgs-stable.follows = "nixpkgs"; };
     };
     aagl = { url = "github:ezKEa/aagl-gtk-on-nix"; inputs.nixpkgs.follows = "nixpkgs"; };
-    nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; };
+    nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs-unstable"; };
     nur.url = "github:nix-community/NUR";
     nixos-cn = { url = "github:nixos-cn/flakes"; inputs.nixpkgs.follows = "nixpkgs"; };
     nur-xddxdd = { url = "github:xddxdd/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; };
@@ -24,13 +24,15 @@
       inputs = { nixpkgs.follows = "nixpkgs"; nix-index-database.follows = "nix-index-database"; };
     };
     impermanence.url = "github:nix-community/impermanence";
-    qchem = { url = "github:Nix-QChem/NixOS-QChem"; inputs.nixpkgs.follows = "nixpkgs"; };
+    qchem = { url = "github:Nix-QChem/NixOS-QChem/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; };
     nixd = { url = "github:nix-community/nixd"; inputs.nixpkgs.follows = "nixpkgs"; };
     napalm = { url = "github:nix-community/napalm"; inputs.nixpkgs.follows = "nixpkgs"; };
     nixpak = { url = "github:nixpak/nixpak"; inputs.nixpkgs.follows = "nixpkgs"; };
     deploy-rs = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; };
     pnpm2nix-nzbr = { url = "github:CHN-beta/pnpm2nix-nzbr"; inputs.nixpkgs.follows = "nixpkgs"; };
+    # oneapi
     lmix = { url = "github:CHN-beta/lmix"; inputs.nixpkgs.follows = "nixpkgs"; };
+    # nvhpc
     dguibert-nur-packages = { url = "github:CHN-beta/dguibert-nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; };
     plasma-manager =
     {
@@ -39,6 +41,22 @@
     };
     nix-doom-emacs = { url = "github:nix-community/nix-doom-emacs"; inputs.nixpkgs.follows = "nixpkgs"; };
     nur-linyinfeng = { url = "github:linyinfeng/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; };
+    nixos-hardware.url = "github:NixOS/nixos-hardware";
+    envfs = { url = "github:Mic92/envfs"; inputs.nixpkgs.follows = "nixpkgs"; };
+
+    misskey = { url = "git+https://github.com/CHN-beta/misskey?submodules=1"; flake = false; };
+    rsshub = { url = "github:DIYgod/RSSHub"; flake = false; };
+    zpp-bits = { url = "github:eyalz800/zpp_bits"; flake = false; };
+    citation-style-language = { url = "git+https://github.com/zepinglee/citeproc-lua?submodules=1"; flake = false; };
+    concurrencpp = { url = "github:David-Haim/concurrencpp"; flake = false; };
+    cppcoro = { url = "github:Garcia6l20/cppcoro"; flake = false; };
+    date = { url = "github:HowardHinnant/date"; flake = false; };
+    eigen = { url = "gitlab:libeigen/eigen"; flake = false; };
+    matplotplusplus = { url = "github:alandefreitas/matplotplusplus"; flake = false; };
+    nameof = { url = "github:Neargye/nameof"; flake = false; };
+    nodesoup = { url = "github:olvb/nodesoup"; flake = false; };
+    tgbot-cpp = { url = "github:reo7sp/tgbot-cpp"; flake = false; };
+    v-sim = { url = "gitlab:l_sim/v_sim"; flake = false; };
   };
 
   outputs = inputs:
@@ -75,8 +93,11 @@
             specialArgs = { topInputs = inputs; inherit localLib; };
             modules = localLib.mkModules
             [
-              (inputs: { config.nixpkgs.overlays = [(final: prev:
-                { localPackages = (import ./local/pkgs { inherit (inputs) lib; pkgs = final; }); })]; })
+              (moduleInputs:
+              {
+                config.nixpkgs.overlays = [(final: prev: { localPackages =
+                  import ./local/pkgs { inherit (moduleInputs) lib; pkgs = final; topInputs = inputs; };})];
+              })
               ./modules
               ./devices/${system}
             ];
@@ -118,10 +139,11 @@
                 inputs.self.nixosConfigurations.${node};
             };
           })
-          [ "vps6" "vps7" "nas" "yoga" ]);
+          [ "vps6" "vps7" "nas" "surface" ]);
       };
       checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks inputs.self.deploy) inputs.deploy-rs.lib;
       overlays.default = final: prev:
         { localPackages = (import ./local/pkgs { inherit (inputs) lib; pkgs = final; }); };
+      config.archive = false;
     };
 }

local/pkgs/citation-style-language/default.nix

@@ -1,22 +1,14 @@
-{ stdenvNoCC, texlive, fetchFromGitHub }: stdenvNoCC.mkDerivation (finalAttrs: rec
+{ stdenvNoCC, texlive, src }: stdenvNoCC.mkDerivation (finalAttrs:
 {
-  pname = "citation-style-language";
-  version = "0.4.5";
-  passthru = {
+  name = "citation-style-language";
+  inherit src;
+  passthru =
+  {
     pkgs = [ finalAttrs.finalPackage ];
     tlDeps = with texlive; [ latex ];
     tlType = "run";
   };
 
-  src = fetchFromGitHub
-  {
-    owner = "zepinglee";
-    repo = "citeproc-lua";
-    rev = "v${version}";
-    sha256 = "XH+GH+t/10hr4bfaod8F9JPxmBnAQlDmpSvQNDQsslM=";
-    fetchSubmodules = true;
-  };
-
   nativeBuildInputs = [ texlive.combined.scheme-full ];
   dontConfigure = true;
   dontBuild = true;

local/pkgs/concurrencpp/default.nix

@@ -1,13 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec
+{ stdenv, cmake, src }: stdenv.mkDerivation
 {
-  pname = "concurrencpp";
-  version = "0.1.7";
-  src = fetchFromGitHub
-  {
-    owner = "David-Haim";
-    repo = "concurrencpp";
-    rev = "v.${version}";
-    sha256 = "4qT29YVjKEWcMrI5R5Ps8aD4grAAgz5VOxANjpp1oTo=";
-  };
+  name = "concurrencpp";
+  inherit src;
   nativeBuildInputs = [ cmake ];
 }

local/pkgs/cppcoro/default.nix

@@ -1,13 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation
+{ stdenv, cmake, src }: stdenv.mkDerivation
 {
   name = "cppcoro";
-  src = fetchFromGitHub
-  {
-    owner = "Garcia6l20";
-    repo = "cppcoro";
-    rev = "e1d53e620b0eee828915ada179cd7ca8e66ca855";
-    sha256 = "luBkf1x5kqXaVbQM01yWRmA5QvrQNZkFVCjRctJdnXc=";
-  };
+  inherit src;
   nativeBuildInputs = [ cmake ];
   patches = [ ./cppcoro-include-utility.patch ];
 }

local/pkgs/date/default.nix

@@ -1,18 +1,13 @@
-{ stdenv, fetchFromGitHub }: stdenv.mkDerivation
+{ stdenv, src }: stdenv.mkDerivation
 {
   name = "date";
-  src = fetchFromGitHub
-  {
-    owner = "HowardHinnant";
-    repo = "date";
-    rev = "cc4685a21e4a4fdae707ad1233c61bbaff241f93";
-    sha256 = "KilhBEeLMvHtS76Gu0UhzE8lhS1+sCwQ1UL4pswKXTs=";
-  };
+  inherit src;
   phases = [ "installPhase" ];
   installPhase =
   ''
     runHook preInstall
     mkdir -p $out
     cp -r $src/{include,src} $out
+    runHook postInstall
   '';
 }

local/pkgs/default.nix

@@ -1,10 +1,10 @@
-{ lib, pkgs }: with pkgs; rec
+{ lib, pkgs, topInputs }: with pkgs; rec
 {
   typora = callPackage ./typora {};
   vesta = callPackage ./vesta {};
   oneapi = callPackage ./oneapi {};
-  rsshub = callPackage ./rsshub {};
-  misskey = callPackage ./misskey { nodejs = nodejs_21; };
+  rsshub = callPackage ./rsshub { src = topInputs.rsshub; };
+  misskey = callPackage ./misskey { nodejs = nodejs_21; src = topInputs.misskey; };
   mk-meili-mgn = callPackage ./mk-meili-mgn {};
   # vasp = callPackage ./vasp
   # {
@@ -18,28 +18,28 @@
     openmpi = pkgs.openmpi.override { cudaSupport = false; };
   };
   vaspkit = callPackage ./vaspkit { attrsToList = (import ../lib lib).attrsToList; };
-  v_sim = callPackage ./v_sim {};
-  concurrencpp = callPackage ./concurrencpp { stdenv = gcc13Stdenv; };
+  v-sim = callPackage ./v-sim { src = topInputs.v-sim; };
+  concurrencpp = callPackage ./concurrencpp { stdenv = gcc13Stdenv; src = topInputs.concurrencpp; };
   eigengdb = python3Packages.callPackage ./eigengdb {};
-  nodesoup = callPackage ./nodesoup {};
-  matplotplusplus = callPackage ./matplotplusplus { inherit nodesoup glad; };
-  zpp-bits = callPackage ./zpp-bits {};
-  eigen = callPackage ./eigen {};
-  nameof = callPackage ./nameof {};
+  nodesoup = callPackage ./nodesoup { src = topInputs.nodesoup; };
+  matplotplusplus = callPackage ./matplotplusplus { inherit nodesoup glad; src = topInputs.matplotplusplus; };
+  zpp-bits = callPackage ./zpp-bits { src = topInputs.zpp-bits; };
+  eigen = callPackage ./eigen { src = topInputs.eigen; };
+  nameof = callPackage ./nameof { src = topInputs.nameof; };
   pslist = callPackage ./pslist {};
   glad = callPackage ./glad {};
   chromiumos-touch-keyboard = callPackage ./chromiumos-touch-keyboard {};
   yoga-support = callPackage ./yoga-support {};
-  tgbot-cpp = callPackage ./tgbot-cpp {};
+  tgbot-cpp = callPackage ./tgbot-cpp { src = topInputs.tgbot-cpp; };
   biu = callPackage ./biu { inherit concurrencpp tgbot-cpp nameof; stdenv = gcc13Stdenv; };
-  citation-style-language = callPackage ./citation-style-language {};
+  citation-style-language = callPackage ./citation-style-language { src = topInputs.citation-style-language; };
   mirism = callPackage ./mirism
   {
     inherit cppcoro nameof tgbot-cpp date;
     nghttp2 = nghttp2-2305.override { enableAsioLib = true; };
   };
-  cppcoro = callPackage ./cppcoro {};
-  date = callPackage ./date {};
+  cppcoro = callPackage ./cppcoro { src = topInputs.cppcoro; };
+  date = callPackage ./date { src = topInputs.date; };
   esbonio = python3Packages.callPackage ./esbonio {};
   pix2tex = python3Packages.callPackage ./pix2tex {};
   pyreadline3 = python3Packages.callPackage ./pyreadline3 {};

local/pkgs/eigen/default.nix

@@ -1,12 +1,6 @@
-{ lib, stdenv, fetchFromGitLab, cmake }: stdenv.mkDerivation rec
+{ lib, stdenv, cmake, src }: stdenv.mkDerivation
 {
   name = "eigen";
-  src = fetchFromGitLab
-  {
-    owner = "libeigen";
-    repo = name;
-    rev = "6d829e766ff1b1ab867d93631163cbc63ed5798f";
-    sha256 = "BXUnizcRPrOyiPpoyYJ4VVOjlG49aj80mgzPKmEYPKU=";
-  };
+  inherit src;
   nativeBuildInputs = [ cmake ];
 }

local/pkgs/esbonio/default.nix

@@ -1,11 +1,11 @@
 { lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec
 {
   pname = "esbonio";
-  version = "0.16.3";
+  version = "0.16.4";
   src = fetchPypi
   {
     inherit pname version;
-    sha256 = "1ggxdzl95fy0zxpyd1pcylhif1x604wk4wy7sv9322hc84b708zx";
+    sha256 = "1MBNBLCEBD6HtlxEASc4iZaXYyNdih2MIHoxK84jMdI=";
   };
   doCheck = false;
 }

local/pkgs/matplotplusplus/default.nix

@@ -1,17 +1,10 @@
 {
-  stdenv, fetchFromGitHub, cmake, pkg-config, substituteAll,
+  stdenv, src, cmake, pkg-config, substituteAll,
   gnuplot, libjpeg, libtiff, zlib, libpng, lapack, blas, fftw, opencv, nodesoup, cimg, glfw, libGL, python3, glad
 }: stdenv.mkDerivation
 {
-  pname = "matplotplusplus";
-  version = "1.2.0";
-  src = fetchFromGitHub
-  {
-    owner = "alandefreitas";
-    repo = "matplotplusplus";
-    rev = "a40344efa9dc5ea0c312e6e9ef4eb7238d98dc12";
-    sha256 = "6/dH/Rl2aAb8b+Ji5LwzkC+GWPOCBnYCrjy0qk8u/+I=";
-  };
+  name = "matplotplusplus";
+  inherit src;
   cmakeFlags =
   [
     "-DBUILD_SHARED_LIBS=ON" "-DMATPLOTPP_BUILD_SHARED_LIBS=ON" "-DMATPLOTPP_BUILD_EXAMPLES=OFF"

local/pkgs/mirism/default.nix

@@ -8,7 +8,7 @@
   src = requireFile
   {
     inherit name;
-    sha256 = "1q3f4q4ln9dz68dfc35jybgv861f7acqiiykkm7jxviz8jdgn8c7";
+    sha256 = "0f50pvdafhlmrlbf341mkp9q50v4ld5pbx92d2w1633f18zghbzf";
     hashMode = "recursive";
     message = "Source file not found.";
   };

local/pkgs/misskey/default.nix

@@ -1,21 +1,12 @@
 {
-  lib, stdenv, mkPnpmPackage, fetchFromGitHub, fetchurl, nodejs, writeShellScript, buildFHSEnv,
-  bash, cypress, vips, pkg-config
+  lib, stdenv, mkPnpmPackage, fetchurl, nodejs, writeShellScript, buildFHSEnv,
+  bash, cypress, vips, pkg-config, src
 }:
 let
-  pname = "misskey";
-  version = "2023.12.2";
-  src = fetchFromGitHub
-  {
-    owner = "CHN-beta";
-    repo = "misskey";
-    rev = "cd1d0ab06eb6b7e06afdfae9a12b2d2829564229";
-    hash = "sha256-sKEZ1ZpyA/02CNwiOMIOS5f/csx6ELDwCVJYc+oMChM=";
-    fetchSubmodules = true;
-  };
+  name = "misskey";
   originalPnpmPackage = mkPnpmPackage
   {
-    inherit pname version src nodejs;
+    inherit name src nodejs;
     copyPnpmStore = true;
   };
   startScript = writeShellScript "misskey"
@@ -28,7 +19,7 @@ let
 in
   stdenv.mkDerivation rec
   {
-    inherit version src pname;
+    inherit src name;
     buildInputs =
     [
       bash nodejs nodejs.pkgs.typescript nodejs.pkgs.pnpm nodejs.pkgs.gulp cypress vips pkg-config

local/pkgs/nameof/default.nix

@@ -1,14 +1,7 @@
-{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec
+{ lib, stdenv, src }: stdenv.mkDerivation
 {
-  pname = "nameof";
-  version = "0.10.3";
-  src = fetchFromGitHub
-  {
-    owner = "Neargye";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "eHG0Y/BQGbwTrBHjq9SeSiIXaVqWp7PxIq7vCIECYPk=";
-  };
+  name = "nameof";
+  inherit src;
   phases = [ "installPhase" ];
   installPhase =
   ''

local/pkgs/nodesoup/default.nix

@@ -1,13 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, cairo, pcre2, xorg }: stdenv.mkDerivation rec
+{ stdenv, src, cmake, pkg-config, cairo, pcre2, xorg }: stdenv.mkDerivation
 {
   name = "nodesoup";
-  src = fetchFromGitHub
-  {
-    owner = "olvb";
-    repo = "nodesoup";
-    rev = "3158ad082bb0cd1abee75418b12b35522dbca74f";
-    sha256 = "tFLq6QC3U3uvcuWsdRy2wnwcmAfH2MkI2oMcAiUBHSo=";
-  };
+  inherit src;
   buildInputs = [ cairo pcre2.dev xorg.libXdmcp.dev ];
   nativeBuildInputs = [ cmake pkg-config ];
 }

local/pkgs/rsshub/default.nix

@@ -1,16 +1,9 @@
 {
-  lib, stdenv, mkPnpmPackage, fetchFromGitHub, nodejs, writeShellScript,
-  chromium, bash
+  lib, stdenv, mkPnpmPackage, nodejs, writeShellScript,
+  chromium, bash, src
 }:
 let
   name = "rsshub";
-  src = fetchFromGitHub
-  {
-    owner = "DIYgod";
-    repo = "RSSHub";
-    rev = "38a5b0c193bf77d71c4eea33db6e76bc8b565d0b";
-    hash = "sha256-gJsT9W2fFiy2IG89E5th49DpBHsPMfsdONyzAKDG48c=";
-  };
   originalPnpmPackage = mkPnpmPackage { inherit name src nodejs; };
   nodeModules = originalPnpmPackage.nodeModules.overrideAttrs { PUPPETEER_SKIP_DOWNLOAD = true; };
   rsshub-unwrapped = stdenv.mkDerivation

local/pkgs/tgbot-cpp/default.nix

@@ -1,14 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, pkg-config, boost, openssl, zlib, curl }: stdenv.mkDerivation rec
+{ stdenv, src, cmake, pkg-config, boost, openssl, zlib, curl }: stdenv.mkDerivation rec
 {
-  pname = "tgbot-cpp";
-  version = "1.7.2";
-  src = fetchFromGitHub
-  {
-    owner = "reo7sp";
-    repo = "tgbot-cpp";
-    rev = "v${version}";
-    sha256 = "TKirSxEUqFB1WtzNEfU4EJK3p7V5xcFIvA2+QVX7TlA=";
-  };
+  name = "tgbot-cpp";
+  inherit src;
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ boost openssl zlib curl.dev ];
   propagatedBuildInputs = buildInputs;

local/pkgs/typora/default.nix

@@ -3,11 +3,11 @@ let
   typora-dist = stdenv.mkDerivation rec
   {
     pname = "typora-dist";
-    version = "1.7.6";
+    version = "1.8.2-dev";
     src = fetchurl
     {
       url = "https://download.typora.io/linux/typora_${version}_amd64.deb";
-      sha256 = "19xgv83zk3mhniswwrb341sr9j4sb9pqy47jamrmkc3w8famxpd3";
+      sha256 = "0abi9m8h8k0228ajag26lxk756a7aqqixg608k85gnkdmibnq6mv";
     };
 
     dontFixup = true;

local/pkgs/v-sim/default.nix

@@ -1,19 +1,12 @@
 {
-  stdenv, lib, fetchFromGitLab,
+  stdenv, lib, src,
   wrapGAppsHook, autoreconfHook, autoconf, libtool, intltool, gettext, automake, gtk-doc, pkg-config, gfortran, libxslt,
   glib, gtk3, epoxy, libyaml
 }:
 stdenv.mkDerivation
 {
-  pname = "v_sim";
-  version = "3.8.0_p20230824";
-  src = fetchFromGitLab
-  {
-    owner = "l_sim";
-    repo = "v_sim";
-    rev = "8abc67b56795c19a8e2357d442b556c71d2441cb";
-    sha256 = "KQNd3BGvkZVsfIPVLEEMBptiFQYeCbWGR28ds2Y+w2Y=";
-  };
+  name = "v-sim";
+  inherit src;
   buildInputs = [ glib gtk3 epoxy libyaml ];
   nativeBuildInputs =
   [

local/pkgs/zpp-bits/default.nix

@@ -1,14 +1,7 @@
-{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec
+{ stdenv, src }: stdenv.mkDerivation
 {
-  pname = "zpp-bits";
-  version = "4.4.19";
-  src = fetchFromGitHub
-  {
-    owner = "eyalz800";
-    repo = "zpp_bits";
-    rev = "v${version}";
-    sha256 = "ejIwrvCFALuBQbQhTfzjBb11oMR/akKnboB60GWbjlQ=";
-  };
+  inherit src;
+  name = "zpp-bits";
   phases = [ "installPhase" ];
   installPhase =
   ''

modules/packages/desktop-fat/default.nix

@@ -17,7 +17,7 @@ inputs:
           _packages =
           [
             # system management
-            etcher btrfs-assistant snapper-gui libsForQt5.qtstyleplugin-kvantum
+            etcher btrfs-assistant snapper-gui libsForQt5.qtstyleplugin-kvantum ventoy-full
             # password and key management
             yubikey-manager yubikey-manager-qt yubikey-personalization yubikey-personalization-gui bitwarden
             # download
@@ -25,7 +25,8 @@ inputs:
             # development
             scrcpy weston cage openbox krita
             # media
-            spotify yesplaymusic simplescreenrecorder imagemagick gimp netease-cloud-music-gtk vlc
+            spotify yesplaymusic simplescreenrecorder imagemagick gimp netease-cloud-music-gtk vlc obs-studio
+            waifu2x-converter-cpp inkscape blender
             # editor
             localPackages.typora
             # themes
@@ -33,13 +34,17 @@ inputs:
             # news
             fluent-reader
             # nix tools
-            deploy-rs.deploy-rs nixpkgs-fmt
+            deploy-rs.deploy-rs nixpkgs-fmt appimage-run nixd nix-serve node2nix nix-prefetch-github prefetch-npm-deps
+            nix-prefetch-docker
             # instant messager
-            element-desktop telegram-desktop discord fluffychat
+            element-desktop telegram-desktop discord fluffychat zoom-us signal-desktop slack nur-linyinfeng.wemeet
             # browser
             google-chrome
             # office
-            crow-translate zotero pandoc ydict
+            crow-translate zotero pandoc ydict libreoffice-qt texstudio poppler_utils pdftk gnuplot pdfchain hdfview
+            (texlive.combine { inherit (texlive) scheme-full; inherit (localPackages) citation-style-language; })
+            # math, physics and chemistry
+            octaveFull root ovito localPackages.vesta localPackages.vaspkit localPackages.v-sim
           ] ++ (with inputs.lib; filter isDerivation (attrValues plasma5Packages.kdeGear));
         };
       };

modules/packages/desktop/default.nix

@@ -11,15 +11,26 @@ inputs:
         packages._packages = with inputs.pkgs;
         [
           # system management
-          gparted wl-clipboard-x11 kio-fuse
-          wayland-utils clinfo glxinfo vulkan-tools dracut
+          gparted kio-fuse wayland-utils clinfo glxinfo vulkan-tools dracut
+          (
+            writeShellScriptBin "xclip"
+            ''
+              #!${bash}/bin/bash
+              if [ "$XDG_SESSION_TYPE" = "x11" ]; then
+                exec ${xclip}/bin/xclip "$@"
+              else
+                exec ${wl-clipboard-x11}/bin/xclip "$@"
+              fi
+            ''
+          )
+          # color management
+          argyllcms xcalib
           # networking
           remmina putty mtr-gui
           # media
           mpv nomacs
           # themes
           tela-circle-icon-theme
-          firefoxpwa
         ];
         users.sharedModules =
         [{
@@ -34,12 +45,7 @@ inputs:
       {
         adb.enable = true;
         wireshark = { enable = true; package = inputs.pkgs.wireshark; };
-        firefox =
-        {
-          enable = true;
-          languagePacks = [ "zh-CN" "en-US" ];
-          nativeMessagingHosts.packages = [ inputs.pkgs.firefoxpwa ];
-        };
+        firefox = { enable = true; languagePacks = [ "zh-CN" "en-US" ]; };
         vim.package = inputs.pkgs.vim-full;
       };
       nixpkgs.config.packageOverrides = pkgs: 

modules/packages/server/default.nix

@@ -25,7 +25,7 @@ inputs:
             beep dos2unix gnugrep pv tmux screen parallel tldr cowsay jq zellij neofetch ipfetch localPackages.pslist
             fastfetch reptyr
             # lsxx
-            pciutils usbutils lshw util-linux lsof
+            pciutils usbutils lshw util-linux lsof dmidecode
             # top
             iotop iftop htop btop powertop s-tui
             # editor

modules/packages/server/ssh/default.nix

@@ -41,6 +41,11 @@ inputs:
               ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAoMu0HEaFQsnlJL0L6isnkNZdRq0OiDXyaX3+fl3NjT";
               hostnames = [ "initrd.nas.chn.moe" "[office.chn.moe]:5440" "192.168.1.185" ];
             };
+            surface =
+            {
+              ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFdm3DcfHdcLP0oSpVrWwIZ/b9lZuakBSPwCFz2BdTJ7";
+              hostnames = [ "192.168.1.166" ];
+            };
             pc =
             {
               ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMSfREi19OSwQnhdsE8wiNwGSFFJwNGN0M5gN+sdrrLJ";
@@ -161,6 +166,7 @@ inputs:
           // {
             xmupc1 = { host = "xmupc1"; hostname = "office.chn.moe"; port = 6007; };
             nas = { host = "nas"; hostname = "office.chn.moe"; port = 5440; };
+            surface = { host = "surface"; hostname = "192.168.1.166"; };
             gitea = { host = "gitea"; hostname = "ssh.git.chn.moe"; };
           };
         };

modules/packages/server/ssh/surface_rsa.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJAyDl52UVGFPTV/rXFERrXAMY5qZ3g+tpg9HOGdw86G4Nr8Xp/cTxZjF4kSfIkSrGblAV9Lm4US0fW3pGOQu5qQrSAENxqHxdlEyzt7izyF2CklDUeTjs3KHOIZMvSli4z014NPcswBbjwB9Lyrw0fCQ9P1vYkrUHEzL2SMxdack1EQPcMF4MxblDqc+eQhdMCkKE8T1Cb1ZqxeLVMPn9CwjG18JoxL+/xs+MjcsSXYWcoqYTfgfhguMbh0D4Eo32MHS/IzRSxnOHJxhG5xYePcyBlb/CxQuYA+RTqKNE85j7GcL2oEmeZ1b++/9qFT9grwVh+UOBRO2xiMzKDF24nXPJ+eLyd6Z/3swGT4rTVDnrXV5eZUkWLHN093IdLJCTtPVrKV9OxEKr5sU2W0edpirNrlGq7/MYkJX9EbQctDFA69XfQkZlGK9xGutqSgEaVlY54fS0Due+NDrNBPfMKJ9MTmFDOY+NYn05El2rMD39OKbGbCR5ASwSSBlcQeE=

modules/packages/workstation/default.nix

@@ -14,27 +14,21 @@ inputs:
             # password and key management
             electrum jabref
             # system management
-            wl-mirror ventoy-full
+            wl-mirror
             # nix tools
-            nix-template appimage-run nil nixd nix-alien nix-serve node2nix nix-prefetch-github prefetch-npm-deps
-            nix-prefetch-docker pnpm-lock-export bundix
+            nix-template nil nix-alien pnpm-lock-export bundix
             # instant messager
-            zoom-us signal-desktop qq nur-xddxdd.wechat-uos slack nur-linyinfeng.wemeet
-            cinny-desktop nheko
-            # office
-            libreoffice-qt texstudio poppler_utils pdftk gnuplot pdfchain hdfview
-            (texlive.combine { inherit (texlive) scheme-full; inherit (localPackages) citation-style-language; })
+            qq nur-xddxdd.wechat-uos cinny-desktop nheko
             # development
             jetbrains.clion android-studio dbeaver cling clang-tools_16 ccls fprettify aircrack-ng
             # media
-            nur-xddxdd.svp obs-studio waifu2x-converter-cpp inkscape blender
+            nur-xddxdd.svp
             # virtualization
             wineWowPackages.stagingFull virt-viewer bottles # wine64
             # text editor
             appflowy notion-app-enhanced joplin-desktop standardnotes logseq
             # math, physics and chemistry
-            mathematica octaveFull root ovito paraview localPackages.vesta # qchem.quantum-espresso
-            localPackages.vasp localPackages.vaspkit jmol localPackages.v_sim
+            mathematica paraview localPackages.vasp jmol # qchem.quantum-espresso
             # encryption and password management
             john crunch hashcat
             # container and vm
@@ -43,13 +37,14 @@ inputs:
             microsoft-edge
             # news
             rssguard newsflash newsboat
+            yuzu-early-access
           ];
           _pythonPackages = [(pythonPackages: with pythonPackages;
           [
             phonopy tensorflow keras openai scipy scikit-learn jupyterlab autograd
             # localPackages.pix2tex
             inquirerpy requests python-telegram-bot tqdm fastapi pypdf2 pandas matplotlib plotly gunicorn redis jinja2
-            certifi charset-normalizer idna orjson psycopg2 localPackages.eigengdb
+            certifi charset-normalizer idna orjson psycopg2
           ])];
           _prebuildPackages =
           [

modules/services/beesd.nix

@@ -8,8 +8,14 @@ inputs:
       type = types.attrsOf (types.oneOf
       [
         types.nonEmptyStr
-        (types.submodule { options =
-          { device = mkOption { type = types.nonEmptyStr; }; hashTableSizeMB = mkOption { type = types.int; }; };})
+        (types.submodule
+        {
+          options =
+          {
+            device = mkOption { type = types.nonEmptyStr; };
+            hashTableSizeMB = mkOption { type = types.ints.unsigned; default = 1024; };
+            threads = mkOption { type = types.ints.unsigned; default = 1; };
+          };})
       ]);
       default = {};
     };
@@ -30,7 +36,7 @@ inputs:
             {
               spec = instance.value.device or instance.value;
               hashTableSizeMB = instance.value.hashTableSizeMB or 1024;
-              extraOptions = [ "--thread-count" "1" "--scan-mode" "3" ];
+              extraOptions = [ "--thread-count" "${toString instance.value.threads or 1}" "--scan-mode" "3" ];
             };
           })
           (attrsToList beesd.instances));

modules/services/wireguard.nix

@@ -3,45 +3,88 @@ inputs:
   options.nixos.services.wireguard = let inherit (inputs.lib) mkOption types; in
   {
     enable = mkOption { type = types.bool; default = false; };
-    peers = mkOption { type = types.nonEmptyListOf types.nonEmptyStr; default = []; };
     # wg genkey | wg pubkey
     publicKey = mkOption { type = types.nonEmptyStr; };
-    wireguardIp = mkOption { type = types.nonEmptyStr; };
-    externalIp = mkOption { type = types.nullOr types.nonEmptyStr; default = null; };
     lighthouse = mkOption { type = types.bool; default = false; };
+    behindNat = mkOption
+    {
+      type = types.bool;
+      default = inputs.config.nixos.services.xray.client.enable;
+    };
+    listenIp = mkOption { type = types.nullOr types.nonEmptyStr; default = null; };
+    # if the host is behind xray, it should listen on another port, to make xray succeffully listen on 51820
+    listenPort = mkOption
+    {
+      type = types.ints.unsigned;
+      default = if inputs.config.nixos.services.wireguard.behindNat then 51821 else 51820;
+    };
+    wireguardIp = mkOption { type = types.nonEmptyStr; };
+    peers = mkOption { type = types.nonEmptyListOf types.nonEmptyStr; default = []; };
   };
   config =
     let
-      inherit (inputs.lib) mkIf;
+      inherit (inputs.lib) mkIf mkMerge;
       inherit (inputs.config.nixos.services) wireguard;
-      inherit (builtins) map toString;
-    in mkIf wireguard.enable
-    {
-      networking =
-        let
-          # if the host is behind xray, it should listen on another port, to make xray succeffully listen on 51820
-          port = 51820 + (if inputs.config.nixos.services.xrayClient.enable then 1 else 0);
-        in
+      inherit (builtins) map toString listToAttrs filter;
+    in mkMerge
+    [
+      {
+        assertions =
+        [{
+          assertion = !wireguard.behindNat -> wireguard.listenIp != null;
+          message = "wireguard.listenIp should be not null when behindNat is false.";
+        }];
+      }
+      (
+        mkIf wireguard.enable
         {
-          firewall = { allowedUDPPorts = [ port ]; trustedInterfaces = [ "wireguard" ]; };
-          wireguard.interfaces.wireguard =
+          networking =
           {
-            ips = [ "${wireguard.wireguardIp}/24" ];
-            listenPort = port;
-            privateKeyFile = inputs.config.sops.secrets."wireguard/privateKey".path;
-            peers = map
+            firewall = { allowedUDPPorts = [ wireguard.listenPort ]; trustedInterfaces = [ "wireguard" ]; };
+            wireguard.interfaces.wireguard =
+            {
+              ips = [ "${wireguard.wireguardIp}/24" ];
+              inherit (wireguard) listenPort;
+              privateKeyFile = inputs.config.sops.secrets."wireguard/privateKey".path;
+              peers = map
+                (peer:
+                {
+                  publicKey = peer.publicKey;
+                  allowedIPs = [ (if peer.lighthouse then "192.168.83.0/24" else "${peer.wireguardIp}/32") ];
+                  endpoint = mkIf (!peer.behindNat) "${peer.listenIp}:${builtins.toString peer.listenPort}";
+                  persistentKeepalive = 3;
+                })
+                (map
+                  (peer: inputs.topInputs.self.nixosConfigurations.${peer}.config.nixos.services.wireguard)
+                  wireguard.peers);
+            };
+          };
+          sops.secrets."wireguard/privateKey" = {};
+          # somehow fix wireguard connection
+          systemd.services = mkIf wireguard.behindNat (listToAttrs (map
+            (peer:
+            {
+              name = "wireguard-ping-${peer.name}";
+              value =
+              {
+                description = "ping ${peer.name}";
+                after = [ "network.target" ];
+                wantedBy = [ "multi-user.target" ];
+                serviceConfig =
+                {
+                  ExecStart = "${inputs.pkgs.iputils}/bin/ping -i 3 ${peer.value.wireguardIp}";
+                  Restart = "always";
+                };
+              };
+            })
+            (filter (peer: !peer.value.behindNat) (map
               (peer:
               {
-                publicKey = peer.publicKey;
-                allowedIPs = [ (if peer.lighthouse then "192.168.83.0/24" else "${peer.wireguardIp}/32") ];
-                endpoint = mkIf (peer.externalIp != null) "${peer.externalIp}:51820";
-                persistentKeepalive = 3;
+                name = peer;
+                value = inputs.topInputs.self.nixosConfigurations.${peer}.config.nixos.services.wireguard;
               })
-              (map
-                (peer: inputs.topInputs.self.nixosConfigurations.${peer}.config.nixos.services.wireguard)
-                wireguard.peers);
-          };
-        };
-      sops.secrets."wireguard/privateKey" = {};
-    };
+              wireguard.peers))));
+        }
+      )
+    ];
 }

modules/services/xray.nix

@@ -1,8 +1,8 @@
 inputs:
 {
-  options.nixos.services = let inherit (inputs.lib) mkOption types; in
+  options.nixos.services.xray = let inherit (inputs.lib) mkOption types; in
   {
-    xrayClient =
+    client =
     {
       enable = mkOption { type = types.bool; default = false; };
       serverAddress = mkOption { type = types.nonEmptyStr; };
@@ -13,7 +13,7 @@ inputs:
         extraInterfaces = mkOption { type = types.listOf types.nonEmptyStr; default = []; };
       }; }; };
     };
-    xrayServer =
+    server =
     {
       enable = mkOption { type = types.bool; default = false; };
       serverName = mkOption { type = types.nonEmptyStr; };
@@ -23,12 +23,19 @@ inputs:
     let
       inherit (inputs.lib) mkMerge mkIf;
       inherit (inputs.localLib) stripeTabs attrsToList;
-      inherit (inputs.config.nixos.services) xrayClient xrayServer;
+      inherit (inputs.config.nixos.services) xray;
       inherit (builtins) map listToAttrs toString genList length concatStringsSep;
     in mkMerge
     [
+      {
+        assertions =
+        [{
+          assertion = !(xray.client.enable && xray.server.enable);
+          message = "Currenty xray.client and xray.server could not be simutaniusly enabled.";
+        }];
+      }
       (
-        mkIf xrayClient.enable
+        mkIf xray.client.enable
         {
           services =
           {
@@ -40,14 +47,10 @@ inputs:
                 no-poll = true;
                 log-queries = true;
                 server = [ "127.0.0.1#10853" ];
-                interface = xrayClient.dns.extraInterfaces ++ [ "lo" ];
+                interface = xray.client.dns.extraInterfaces ++ [ "lo" ];
                 bind-dynamic = true;
-                ipset =
-                [
-                  "/developer.download.nvidia.com/noproxy_net"
-                  "/yuanshen.com/noproxy_net"
-                ];
-                address = map (host: "/${host.name}/${host.value}") (attrsToList xrayClient.dns.hosts);
+                ipset = [ "/yuanshen.com/noproxy_net" ];
+                address = map (host: "/${host.name}/${host.value}") (attrsToList xray.client.dns.hosts);
               };
             };
             xray = { enable = true; settingsFile = inputs.config.sops.templates."xray-client.json".path; };
@@ -130,7 +133,7 @@ inputs:
                       protocol = "vless";
                       settings.vnext =
                       [{
-                        address = xrayClient.serverAddress;
+                        address = xray.client.serverAddress;
                         port = 443;
                         users =
                         [{
@@ -145,7 +148,7 @@ inputs:
                         security = "reality";
                         realitySettings =
                         {
-                          serverName = xrayClient.serverName;
+                          serverName = xray.client.serverName;
                           publicKey = "Nl0eVZoDF9d71_3dVsZGJl3UWR9LCv3B14gu7G6vhjk";
                           fingerprint = "firefox";
                         };
@@ -308,7 +311,7 @@ inputs:
         }
       )
       (
-        mkIf xrayServer.enable (let userList = genList (n: n) 30; in
+        mkIf xray.server.enable (let userList = genList (n: n) 30; in
         {
           services.xray = { enable = true; settingsFile = inputs.config.sops.templates."xray-server.json".path; };
           sops =
@@ -351,7 +354,7 @@ inputs:
                         realitySettings =
                         {
                           dest = "127.0.0.1:${fallbackPort}";
-                          serverNames = [ xrayServer.serverName ];
+                          serverNames = [ xray.server.serverName ];
                           privateKey = inputs.config.sops.placeholder."xray-server/private-key";
                           minClientVer = "1.8.0";
                           shortIds = [ "" ];
@@ -493,12 +496,12 @@ inputs:
           };
           nixos.services =
           {
-            acme = { enable = true; cert.${xrayServer.serverName}.group = inputs.config.users.users.nginx.group; };
+            acme = { enable = true; cert.${xray.server.serverName}.group = inputs.config.users.users.nginx.group; };
             nginx =
             {
               enable = true;
-              transparentProxy.map."${xrayServer.serverName}" = 4726;
-              https."${xrayServer.serverName}" =
+              transparentProxy.map."${xray.server.serverName}" = 4726;
+              https."${xray.server.serverName}" =
               {
                 listen.main = { proxyProtocol = false; addToTransparentProxy = false; };
                 location."/".return.return = "400";

modules/system/default.nix

@@ -16,6 +16,7 @@ inputs:
     ./sops.nix
     ./user.nix
     ./sysctl.nix
+    ./envfs.nix
   ];
   config =
   {
@@ -24,7 +25,7 @@ inputs:
     boot =
     {
       supportedFilesystems = [ "ntfs" ];
-      consoleLogLevel = 7;
+      # consoleLogLevel = 7;
     };
     hardware.enableAllFirmware = true;
     environment.sessionVariables = rec

modules/system/envfs.nix

@@ -0,0 +1,12 @@
+inputs:
+{
+  options.nixos.system.envfs = let inherit (inputs.lib) mkOption types; in
+  {
+    enable = mkOption { type = types.bool; default = true; };
+  };
+  config = inputs.lib.mkMerge
+  [
+    (builtins.elemAt inputs.topInputs.envfs.nixosModules.envfs.imports 0 inputs)
+    { environment.variables.ENVFS_RESOLVE_ALWAYS = "1"; }
+  ];
+}

modules/system/grub.nix

@@ -7,44 +7,78 @@ inputs:
     # "efi" using efi, "efiRemovable" using efi with install grub removable, or dev path like "/dev/sda" using bios
     installDevice = mkOption { type = types.str; };
   };
-  config =
-    let
-      inherit (inputs.lib) mkIf;
-      inherit (inputs.localLib) mkConditional attrsToList stripeTabs;
-      inherit (inputs.config.nixos.system) grub;
-      inherit (builtins) concatStringsSep map;
-    in { boot.loader =
+  config = let inherit (inputs.config.nixos.system) grub; in inputs.lib.mkMerge
+  [
+    # general settings
+    { boot.loader.grub = { enable = true; useOSProber = false; }; }
+    # grub timeout
+    { boot.loader.timeout = grub.timeout; }
+    # grub install
     {
-      timeout = grub.timeout;
-      grub =
+      boot.loader =
       {
-        enable = true;
-        useOSProber = false;
-        extraEntries = concatStringsSep "\n" (map
-          (system:
-          ''
-            menuentry "${system.value}" {
-              insmod part_gpt
-              insmod fat
-              insmod search_fs_uuid
-              insmod chain
-              search --fs-uuid --set=root ${system.name}
-              chainloader /EFI/Microsoft/Boot/bootmgfw.efi
-            }
-          '')
-          (attrsToList grub.windowsEntries));
-        device =
-          if grub.installDevice == "efi" || grub.installDevice == "efiRemovable" then "nodev"
-          else grub.installDevice;
-        efiSupport = grub.installDevice == "efi" || grub.installDevice == "efiRemovable";
-        efiInstallAsRemovable = grub.installDevice == "efiRemovable";
+        grub =
+        {
+          device = if builtins.elem grub.installDevice [ "efi" "efiRemovable" ] then "nodev" else grub.installDevice;
+          efiSupport = builtins.elem grub.installDevice [ "efi" "efiRemovable" ];
+          efiInstallAsRemovable = grub.installDevice == "efiRemovable";
+        };
+        efi =
+        {
+          canTouchEfiVariables = grub.installDevice == "efi";
+          efiSysMountPoint = inputs.lib.mkIf (builtins.elem grub.installDevice [ "efi" "efiRemovable" ]) "/boot/efi";
+        };
       };
-      efi =
+    }
+    # extra grub entries
+    {
+      boot.loader.grub =
       {
-        canTouchEfiVariables = grub.installDevice == "efi";
-        efiSysMountPoint =
-          if grub.installDevice == "efi" || grub.installDevice == "efiRemovable" then "/boot/efi"
-          else inputs.options.boot.loader.efi.efiSysMountPoint.default;
+        memtest86.enable = true;
+        extraFiles = inputs.lib.mkIf (builtins.elem grub.installDevice [ "efi" "efiRemovable" ])
+          { "shell.efi" = "${inputs.pkgs.edk2-uefi-shell}/shell.efi"; };
+        extraEntries = inputs.lib.mkMerge (builtins.concatLists
+        [
+          (builtins.map
+            (system:
+            ''
+              menuentry "${system.value}" {
+                insmod part_gpt
+                insmod fat
+                insmod search_fs_uuid
+                insmod chain
+                search --fs-uuid --set=root ${system.name}
+                chainloader /EFI/Microsoft/Boot/bootmgfw.efi
+              }
+            '')
+            (inputs.localLib.attrsToList grub.windowsEntries))
+          [
+            ''
+              menuentry "System shutdown" {
+                echo "System shutting down..."
+                halt
+              }
+              menuentry "System restart" {
+                echo "System rebooting..."
+                reboot
+              }
+            ''
+            (
+              inputs.lib.optionalString (builtins.elem grub.installDevice [ "efi" "efiRemovable" ])
+              ''
+                menuentry 'UEFI Firmware Settings' --id 'uefi-firmware' {
+                  fwsetup
+                }
+                menuentry "UEFI Shell" {
+                  insmod fat
+                  insmod chain
+                  chainloader @bootRoot@/shell.efi
+                }
+              ''
+            )
+          ]
+        ]);
       };
-    };};
+    }
+  ];
 }

modules/system/gui.nix

@@ -17,7 +17,7 @@ inputs:
       services.xserver =
       {
         enable = true;
-        displayManager = { sddm.enable = true; defaultSession = "plasma"; };
+        displayManager = { sddm.enable = true; defaultSession = "plasmawayland"; };
         desktopManager.plasma5.enable = true;
         videoDrivers = inputs.config.nixos.hardware.gpus;
       };

modules/system/impermanence.nix

@@ -2,7 +2,7 @@ inputs:
 {
   options.nixos.system.impermanence = let inherit (inputs.lib) mkOption types; in
   {
-    enable = mkOption { type = types.bool; default = false; };
+    enable = mkOption { type = types.bool; default = true; };
     persistence = mkOption { type = types.nonEmptyStr; default = "/nix/persistent"; };
     root = mkOption { type = types.nonEmptyStr; default = "/nix/rootfs/current"; };
     nodatacow = mkOption { type = types.nullOr types.nonEmptyStr; default = "/nix/nodatacow"; };

modules/system/kernel.nix

@@ -33,7 +33,6 @@ inputs:
       extraModulePackages = (with inputs.config.boot.kernelPackages; [ v4l2loopback ]) ++ kernel.modules.install;
       extraModprobeConfig = builtins.concatStringsSep "\n" kernel.modules.modprobeConfig;
       kernelParams = [ "delayacct" "acpi_osi=Linux" "acpi.ec_no_wakeup=1" ];
-      blacklistedKernelModules = [ "ideapad_laptop" ];
       kernelPackages = inputs.pkgs.linuxPackages_xanmod_latest;
       kernelPatches =
         let

modules/system/nix.nix

@@ -4,61 +4,82 @@ inputs:
   {
     # marches allowed to be compiled on this machine
     marches = mkOption { type = types.nullOr (types.listOf types.nonEmptyStr); default = null; };
-    keepOutputs = mkOption { type = types.bool; default = false; };
+    includeBuildDependencies = mkOption { type = types.bool; default = inputs.topInputs.self.config.archive; };
     substituters = mkOption { type = types.nullOr (types.listOf types.nonEmptyStr); default = null; };
-    autoOptimiseStore = mkOption { type = types.bool; default = true; };
+    autoOptimiseStore = mkOption { type = types.bool; default = false; };
   };
-  config =
-    let
-      inherit (inputs.config.nixos.system) nix;
-    in
+  config = let inherit (inputs.config.nixos.system) nix; in inputs.lib.mkMerge
+  [
+    # general nix config
+    {
+      nix.settings =
       {
-        nix =
+        system-features = [ "big-parallel" "nixos-test" "benchmark" ];
+        experimental-features = [ "nix-command" "flakes" ];
+        keep-failed = true;
+        max-substitution-jobs = 1;
+        trusted-public-keys = [ "chn:Cc+nowW1LIpe1kyXOZmNaznFDiH1glXmpb4A+WD/DTE=" ];
+        show-trace = true;
+        max-jobs = 1;
+        cores = 0;
+        keep-going = true;
+      };
+      systemd.services.nix-daemon = { serviceConfig.CacheDirectory = "nix"; environment.TMPDIR = "/var/cache/nix"; };
+    }
+    # nix daemon use lower io/cpu priority
+    {
+      nix = { daemonIOSchedClass = "idle"; daemonCPUSchedPolicy = "idle"; };
+      systemd.services.nix-daemon.serviceConfig = { Slice = "-.slice"; Nice = "19"; };
+    }
+    # nix channel & nix flake registry
+    {
+      nix =
+      {
+        registry =
         {
-          settings =
-          {
-            system-features = [ "big-parallel" "nixos-test" "benchmark" ] ++ (map
-              (march: "gccarch-${march}")
-              (
-                if nix.marches == null then
-                  (with inputs.config.nixos.system.nixpkgs; if march == null then [] else [ march ])
-                else nix.marches
-              ));
-            experimental-features = [ "nix-command" "flakes" ];
-            keep-outputs = nix.keepOutputs;
-            keep-failed = true;
-            auto-optimise-store = nix.autoOptimiseStore;
-            substituters = if nix.substituters == null then [ "https://cache.nixos.org/" ] else nix.substituters;
-            trusted-public-keys = [ "chn:Cc+nowW1LIpe1kyXOZmNaznFDiH1glXmpb4A+WD/DTE=" ];
-            show-trace = true;
-            max-jobs = 2;
-            cores = 0;
-            keep-going = true;
-          };
-          daemonIOSchedClass = "idle";
-          daemonCPUSchedPolicy = "idle";
-          registry =
-          {
-            nixpkgs.flake = inputs.topInputs.nixpkgs;
-            nixpkgs-unstable.flake = inputs.topInputs.nixpkgs-unstable;
-            nixos.flake = inputs.topInputs.self;
-          };
-          nixPath = [ "nixpkgs=${inputs.topInputs.nixpkgs}" ];
+          nixpkgs.flake = inputs.topInputs.nixpkgs;
+          nixpkgs-unstable.flake = inputs.topInputs.nixpkgs-unstable;
+          nixos.flake = inputs.topInputs.self;
         };
-        systemd.services.nix-daemon =
-        {
-          serviceConfig = { CacheDirectory = "nix"; Slice = "-.slice"; Nice = "19"; };
-          environment = { TMPDIR = "/var/cache/nix"; };
-        };
-        environment.etc =
+        nixPath = [ "nixpkgs=${inputs.topInputs.nixpkgs}" ];
+      };
+      environment =
+      {
+        etc =
         {
           "channels/nixpkgs".source = inputs.topInputs.nixpkgs.outPath;
           "channels/nixpkgs-unstable".source = inputs.topInputs.nixpkgs-unstable.outPath;
           "nixos".source = inputs.topInputs.self.outPath;
         };
-        # environment.pathsToLink = [ "/include" ];
-        # environment.variables.CPATH = "/run/current-system/sw/include";
-        # environment.variables.LIBRARY_PATH = "/run/current-system/sw/lib";
-        # gui.enable
+        variables.COMMA_NIXPKGS_FLAKE = "nixpkgs-unstable";
       };
+    }
+    # marches
+    {
+      nix.settings.system-features = map
+        (march: "gccarch-${march}")
+        (
+          if nix.marches == null then
+            (with inputs.config.nixos.system.nixpkgs; if march == null then [] else [ march ])
+          else nix.marches
+        );
+    }
+    # includeBuildDependencies
+    {
+      nix.settings.keep-outputs = nix.includeBuildDependencies;
+      system.includeBuildDependencies = nix.includeBuildDependencies;
+    }
+    # substituters
+    {
+      nix.settings.substituters = if nix.substituters == null then [ "https://cache.nixos.org/" ] else nix.substituters;
+    }
+    # autoOptimiseStore
+    {
+      nix.settings.auto-optimise-store = nix.autoOptimiseStore;
+    }
+    # c++ include path
+    # environment.pathsToLink = [ "/include" ];
+    # environment.variables.CPATH = "/run/current-system/sw/include";
+    # environment.variables.LIBRARY_PATH = "/run/current-system/sw/lib";
+  ];
 }

modules/system/nixpkgs.nix

@@ -24,7 +24,7 @@ inputs:
         nixpkgs =
           let
             permittedInsecurePackages =
-              [ "openssl_1_1" "electron_19" "python2" "electron_12" "electron_24" "zotero" ];
+              [ "openssl_1_1" "electron_19" "python2" "electron_12" "electron_24" "zotero" "electron_25" ];
             hostPlatform = mkConditional (nixpkgs.march != null)
               { system = "x86_64-linux"; gcc = { arch = nixpkgs.march; tune = nixpkgs.march; }; }
               "x86_64-linux";

modules/users/chn/plasma.nix

@@ -1,104 +1,158 @@
+inputs:
 {
-  # plasma-manager is not mature, so only use 
   config.home-manager.users.chn.config.programs.plasma =
   {
     enable = true;
-    shortcuts =
-    {
+    shortcuts = inputs.lib.mkMerge
+    [
+      # firefox
+      { "firefox.desktop"._launch = "Meta+B"; }
       # crow translate
-      "io.crow_translate.CrowTranslate.desktop"."TranslateSelectedText" = "Ctrl+Alt+E";
-
+      { "io.crow_translate.CrowTranslate.desktop".TranslateSelectedText = "Ctrl+Alt+E"; }
       # display
-      "kded5"."display" = [ "Display" "Meta+P" ];
-      "kwin"."view_actual_size" = "Meta+0";
-      "kwin"."view_zoom_in" = ["Meta++" "Meta+="];
-      "kwin"."view_zoom_out" = "Meta+-";
-      "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down";
-      "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up";
-
-      # volume
-      "kmix" =
       {
-        "decrease_volume" = "Volume Down";
-        "increase_volume" = "Volume Up";
-        "mic_mute" = [ "Meta+Volume Mute" ];
-        "mute" = "Volume Mute";
-      };
-
+        kded5.display = [ "Display" "Meta+P" ];
+        kwin = { view_actual_size = "Meta+0"; view_zoom_in = [ "Meta++" "Meta+=" ]; view_zoom_out = "Meta+-"; };
+        org_kde_powerdevil =
+        {
+          "Decrease Screen Brightness" = "Monitor Brightness Down";
+          "Increase Screen Brightness" = "Monitor Brightness Up";
+        };
+      }
+      # volume
+      {
+        kmix =
+        {
+          decrease_volume = "Volume Down";
+          increase_volume = "Volume Up";
+          mic_mute = [ "Meta+Volume Mute" ];
+          mute = "Volume Mute";
+        };
+      }
       # session
-      "ksmserver"."Lock Session" = [ "Meta+L" "Screensaver" ];
-      "ksmserver"."Log Out" = "Ctrl+Alt+Del";
-      "org_kde_powerdevil"."Turn Off Screen" = "Meta+Ctrl+L";
-
-      # mouse
-      "kwin"."MoveMouseToCenter" = "Meta+F6";
-
+      {
+        ksmserver = { "Lock Session" = [ "Meta+L" "Screensaver" ]; "Log Out" = "Ctrl+Alt+Del"; };
+        org_kde_powerdevil."Turn Off Screen" = "Meta+Ctrl+L";
+      }
       # window
-      "kwin"."Overview" = "Meta+Tab";
-      "kwin"."Show Desktop" = "Meta+D";
-      "kwin"."Suspend Compositing" = "Alt+Shift+F12";
-      "kwin"."Walk Through Windows" = "Alt+Tab";
-      "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab";
-      "kwin"."Window Above Other Windows" = "Meta+Shift+PgUp";
-      "kwin"."Window Below Other Windows" = "Meta+Shift+PgDown";
-      "kwin"."Window Close" = "Alt+F4";
-      "kwin"."Window Maximize" = "Meta+PgUp";
-      "kwin"."Window Minimize" = "Meta+PgDown";
-      "kwin"."Window Operations Menu" = "Alt+F3";
-      "kwin"."Window Quick Tile Bottom" = "Meta+Down";
-      "kwin"."Window Quick Tile Left" = "Meta+Left";
-      "kwin"."Window Quick Tile Right" = "Meta+Right";
-      "kwin"."Window Quick Tile Top" = "Meta+Up";
-
+      {
+        kwin =
+        {
+          Overview = "Meta+Tab";
+          "Show Desktop" = "Meta+D";
+          "Suspend Compositing" = "Alt+Shift+F12";
+          "Walk Through Windows" = "Alt+Tab";
+          "Walk Through Windows (Reverse)" = "Alt+Shift+Backtab";
+          "Window Above Other Windows" = "Meta+Shift+PgUp";
+          "Window Below Other Windows" = "Meta+Shift+PgDown";
+          "Window Close" = "Alt+F4";
+          "Window Maximize" = "Meta+PgUp";
+          "Window Minimize" = "Meta+PgDown";
+          "Window Operations Menu" = "Alt+F3";
+          "Window Quick Tile Bottom" = "Meta+Down";
+          "Window Quick Tile Left" = "Meta+Left";
+          "Window Quick Tile Right" = "Meta+Right";
+          "Window Quick Tile Top" = "Meta+Up";
+        };
+      }
       # virtual desktop
-      "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down";
-      "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up";
-      "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left";
-      "kwin"."Switch One Desktop to the Right" = "Meta+Ctrl+Right";
-      "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down";
-      "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up";
-      "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left";
-      "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right";
-
+      {
+        kwin =
+        {
+          "Switch One Desktop Down" = "Meta+Ctrl+Down";
+          "Switch One Desktop Up" = "Meta+Ctrl+Up";
+          "Switch One Desktop to the Left" = "Meta+Ctrl+Left";
+          "Switch One Desktop to the Right" = "Meta+Ctrl+Right";
+          "Window One Desktop Down" = "Meta+Ctrl+Shift+Down";
+          "Window One Desktop Up" = "Meta+Ctrl+Shift+Up";
+          "Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left";
+          "Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right";
+        };
+      }
       # media
-      "mediacontrol"."nextmedia" = "Media Next";
-      "mediacontrol"."pausemedia" = "Media Pause";
-      "mediacontrol"."playpausemedia" = [ "Pause" "Media Play" ];
-      "mediacontrol"."previousmedia" = "Media Previous";
-      "mediacontrol"."stopmedia" = "Media Stop";
-
+      {
+        mediacontrol =
+        {
+          nextmedia = "Media Next";
+          pausemedia = "Media Pause";
+          playpausemedia = [ "Pause" "Media Play" ];
+          previousmedia = "Media Previous";
+          stopmedia = "Media Stop";
+        };
+      }
       # dolphin
-      "org.kde.dolphin.desktop"."_launch" = "Meta+E";
-
+      { "org.kde.dolphin.desktop"._launch = "Meta+E"; }
       # konsole
-      "org.kde.konsole.desktop"."_launch" = "Ctrl+Alt+T";
-
+      { "org.kde.konsole.desktop"._launch = "Ctrl+Alt+T"; }
       # krunner
-      "org.kde.krunner.desktop"."_launch" = "Alt+Space";
-
+      { "org.kde.krunner.desktop"._launch = "Alt+Space"; }
       # screenshot
-      "org.kde.spectacle.desktop"."ActiveWindowScreenShot" = "Meta+Print";
-      "org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = [ ];
-      "org.kde.spectacle.desktop"."FullScreenScreenShot" = "Shift+Print";
-      "org.kde.spectacle.desktop"."OpenWithoutScreenshot" = [ ];
-      "org.kde.spectacle.desktop"."RectangularRegionScreenShot" = "Meta+Shift+Print";
-      "org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = "Meta+Ctrl+Print";
-      "org.kde.spectacle.desktop"."_launch" = "Print";
-
+      {
+        "org.kde.spectacle.desktop" =
+        {
+          OpenWithoutScreenshot = "Ctrl+Print";
+          RectangularRegionScreenShot = "Print";
+        };
+      }
       # settings
-      "systemsettings.desktop"."_launch" = "Meta+I";
-
+      { "systemsettings.desktop"._launch = "Meta+I"; }
       # yakuake
-      "yakuake"."toggle-window-state" = "Meta+Space";
-    };
-    configFile =
-    {
+      { yakuake.toggle-window-state = "Meta+Space"; }
+      # virt-manager
+      { "virt-manager.desktop"._launch = "Meta+V"; }
+    ];
+    configFile = inputs.lib.mkMerge
+    [
       # baloo
       # "baloofilerc"."Basic Settings"."Indexing-Enabled" = false;
-
       # dolphin
-      "dolphinrc"."General"."ShowFullPath" = true;
-      "dolphinrc"."PreviewSettings"."Plugins" = "blenderthumbnail,comicbookthumbnail,djvuthumbnail,ebookthumbnail,exrthumbnail,marble_thumbnail_geojson,marble_thumbnail_gpx,jpegthumbnail,marble_thumbnail_kmz,marble_thumbnail_kml,kraorathumbnail,windowsimagethumbnail,windowsexethumbnail,mltpreview,mobithumbnail,opendocumentthumbnail,marble_thumbnail_osm,palathumbcreator,gsthumbnail,rawthumbnail,svgthumbnail,imagethumbnail,fontthumbnail,directorythumbnail,textthumbnail,webarchivethumbnail,ffmpegthumbs,audiothumbnail";
+      {
+        dolphinrc =
+        {
+          General = { ShowFullPath = true; FilterBar = true; RememberOpenedTabs = false; };
+          PreviewSettings.Plugins = builtins.concatStringsSep ","
+          [
+            "blenderthumbnail"
+            "comicbookthumbnail"
+            "djvuthumbnail"
+            "ebookthumbnail"
+            "exrthumbnail"
+            "marble_thumbnail_geojson"
+            "marble_thumbnail_gpx"
+            "jpegthumbnail"
+            "marble_thumbnail_kmz"
+            "marble_thumbnail_kml"
+            "kraorathumbnail"
+            "windowsimagethumbnail"
+            "windowsexethumbnail"
+            "mltpreview"
+            "mobithumbnail"
+            "opendocumentthumbnail"
+            "marble_thumbnail_osm"
+            "palathumbcreator"
+            "gsthumbnail"
+            "rawthumbnail"
+            "svgthumbnail"
+            "imagethumbnail"
+            "fontthumbnail"
+            "directorythumbnail"
+            "textthumbnail"
+            "webarchivethumbnail"
+            "ffmpegthumbs"
+            "audiothumbnail"
+          ];
+        };
+      }
+      # theme
+      {
+        kcminputrc.Mouse.cursorTheme = "breeze_cursors";
+      }
+
+    ]
+    {
+
+
+
 
       "kcminputrc"."Mouse"."cursorTheme" = "breeze_cursors";
       "kdeglobals"."KDE"."widgetStyle" = "kvantum";

secrets/surface/default.yaml

@@ -1,5 +1,5 @@
 xray-client:
-    uuid: ENC[AES256_GCM,data:WQUDaTeOsY61st6HQKjGKuVoQIy6Gpf0dMzJeIqMUV/4sihj,iv:R6IZzIAmn7rknxD5HWGRE618pdUyEWB0F2tO9+EfunI=,tag:u+50NAK8LwzyUNt0GVyabw==,type:str]
+    uuid: ENC[AES256_GCM,data:WEBAH3PQM5ahNpH/kvTtcjcJ2GllmmRlBR2oclG6AimGenSg,iv:TMp0WTOe9fuELSZoVGenl5XSZUFoiYUBEMWMn4NFv1g=,tag:GJTE0EELcZkrnGAKLYer1g==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -9,23 +9,23 @@ sops:
         - recipient: age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaTmlZdld6eWtrZzVTR1Fs
-            RXhTczRsOVNrMWIyWm9ud1lzYVJUbGJnc2drCmVKTHlVNXFZUTh5bmlncHA1MmlE
-            UnovM0tONHBHTkY4TS9FRmRkRFkrcjgKLS0tIGxxbzV4Z09CdWkyY3d1MFBNL2dO
-            MGFMaGM3WW5LRXd1T2ZPTkpBdWRTR00Ktnuqblw4rS9fXb2CTzY7BjpDK6K1wx97
-            tV1FeuKcEXpp8AMKOdbKTOznnolI4sTnz2l0iP1m7bk6f9PGNjyQhw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzV1pvWkVGSFg5TVAvRlhu
+            TnFnMEszcDRWWHlQanAyRkRpQWdqQkdhTzFvCjBqUG4xNFBiRnlSeTNQSmdkVkdD
+            UlVCQjRFVExuZHdrSnViajZGZ3c2dWsKLS0tIHlQYU5VeGpEQzllMmxLSnJZZzZx
+            N1R3Mkhxa0dOVlJiU0V2OEZVVzZVMFkKae3c1axl22uxh9wMygAHs6q1WA5ImOS8
+            uzKSthWSqtC7DMqgUFaaSjBYM2TN3l402syx71xVFyyAmCcGZbbJcg==
             -----END AGE ENCRYPTED FILE-----
-        - recipient: age1qrea4twxdhd7fnvlq5v45528c90qy6hp2wa55kghsxzgut6n6fxs7w6u42
+        - recipient: age1ck5vzs0xqx0jplmuksrkh45xwmkm2t05m2wyq5k2w2mnkmn79fxs6tvl3l
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaQkxFc1U2R2RndVRHcisv
-            ZGg0VXhDYnpsQVV0Q3habXRiSHhTVTVUOUZ3CkFMUTMzL3NFcHpwaklZZStIYktW
-            WUpwWi9xQ3MyNXl1aVREcC9KeFlsWE0KLS0tIEJVR1VFRHNBSVVaVlJsNFJtWXAv
-            YmphYnp4YTQyV0VrT0h4RlNSRVptbkEKao+OYKlwgLcbMe75+RcdlxmYtvgheqp2
-            SwEhhlV8QNWylkOU+S38C3+oiQqlPZQkwOyBMfB5eoTUM8xCLjf1og==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCSHJVRGIwQUFpVER5SWxq
+            YjJOT0lXN3dFOFpjMFlWV3JCbmZFN0hnNEJBClpQUEczK2RWTGlVTmJRbVZaUC8y
+            bEFrL1RjTTNlYVNnRVRBZlRjaTlnUEEKLS0tIE5GM01pTGFFcWVVSWEvUHE3Z08r
+            a2xybTRFUFZZN20zajZJTVNwVEpGcEEKglmFMk7z1q5IlZ+lZf9M0HtknmvcYt/P
+            2/z5e8wLN1Hy0Zsbv0yIL/NmqwxAOGJOdzz7ElJszk/Y4kUr9aRasg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-08-20T18:23:21Z"
-    mac: ENC[AES256_GCM,data:Dn2yxA/8GjPpmI5oWybiv0JNiiHDbleTtYZaM7GTMStP15N4Yo1tzVqlfzy6QWdLvcyZtoodamnry9yj+A7dP1sj0Fgkiq2FnzIp+JuJXkKH7AYWKugOmzKz7Kky2SEDU2r1UoucIbW9SRbgyukXPLpGRUGqIZNLR6OZ3w0atTA=,iv:sKyg1opbnQsQs/ZteTjEyarFU/HgmSSe+Frmvwfpylk=,tag:Sc6z4SnXOxICQ+TN7C6ZVA==,type:str]
+    lastmodified: "2024-01-17T08:21:40Z"
+    mac: ENC[AES256_GCM,data:8+nUsgM47gMZmCQwPgqzM95UuYgF3UStE+XiOPPaed/VIk9e2fNLu9vR+wEgb04pR29BQTWV0qx7xqF/IzFbMYLfujgfDQoOf5pTFi5E6WTFp/MDlq8DSwxJqegEvshoAcRMt2Ur8VKbEZ/ya+yZipEZBPyGHkvi0kS8AOULbb8=,iv:txSZzGGtMVMwi1ogcAJdNqm0bb8so0RVJvkbu0QMHT4=,tag:6TQ7LYfoOrCTPMBAPQqwyg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.7.3
+    version: 3.8.1