mount everything with noatime

This reverts commit dfe5f20346.

flake.lock

@@ -197,11 +197,11 @@
     "flake-compat_4": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
@@ -398,11 +398,11 @@
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
         "type": "github"
       },
       "original": {
@@ -528,11 +528,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1695684520,
-        "narHash": "sha256-yORqGB0i1OtEf9MOCCT2BIbOd8txPZn216CM+ylMmhY=",
+        "lastModified": 1697031886,
+        "narHash": "sha256-oTMPX8dGC7yxSwrbF4NuPNQsUEcHB1dusW2yEbFD5zg=",
         "owner": "hercules-ci",
         "repo": "hercules-ci-effects",
-        "rev": "91fae5824f5f1199f61693c6590b4a89abaed9d7",
+        "rev": "178b36dc3a75c96efc25477d45eafc37ba1fafc3",
         "type": "github"
       },
       "original": {
@@ -564,11 +564,11 @@
     },
     "impermanence": {
       "locked": {
-        "lastModified": 1694622745,
-        "narHash": "sha256-z397+eDhKx9c2qNafL1xv75lC0Q4nOaFlhaU1TINqb8=",
+        "lastModified": 1697303681,
+        "narHash": "sha256-caJ0rXeagaih+xTgRduYtYKL1rZ9ylh06CIrt1w5B4g=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "e9643d08d0d193a2e074a19d4d90c67a874d932e",
+        "rev": "0f317c2e9e56550ce12323eb39302d251618f5b5",
         "type": "github"
       },
       "original": {
@@ -682,17 +682,18 @@
       "inputs": {
         "flake-compat": "flake-compat_4",
         "flake-utils": "flake-utils_4",
+        "nix-filter": "nix-filter",
         "nix-index-database": [
           "nix-index-database"
         ],
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1695714965,
-        "narHash": "sha256-uukcDCyFOIMo5vJWJbLJk2phHZtJ1DE7YrypSV48gII=",
+        "lastModified": 1698367638,
+        "narHash": "sha256-8g4HAU+kwTxb/RZBFxJw3wLckMGpKdN+7yDbTIGupVU=",
         "owner": "thiagokokada",
         "repo": "nix-alien",
-        "rev": "a948cf76e084f4ac770793c6ff9c57ad8b8c099f",
+        "rev": "7b3be1a706c8db4dcca777b6638bdb2ca4849176",
         "type": "github"
       },
       "original": {
@@ -701,6 +702,21 @@
         "type": "github"
       }
     },
+    "nix-filter": {
+      "locked": {
+        "lastModified": 1694857738,
+        "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=",
+        "owner": "numtide",
+        "repo": "nix-filter",
+        "rev": "41fd48e00c22b4ced525af521ead8792402de0ea",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "nix-filter",
+        "type": "github"
+      }
+    },
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
@@ -708,11 +724,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696131323,
-        "narHash": "sha256-Y47r8Jo+9rs+XUWHcDPZtkQs6wFeZ24L4CQTfVwE+vY=",
+        "lastModified": 1697946153,
+        "narHash": "sha256-7k7qIwWLaYPgQ4fxmEdew3yCffhK6rM4I4Jo3X/79DA=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "031d4b22505fdea47bd53bfafad517cd03c26a4f",
+        "rev": "5a2006282caaf32663cdcd582c5b18809c7d7d8d",
         "type": "github"
       },
       "original": {
@@ -752,11 +768,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1695137077,
-        "narHash": "sha256-wJ8EpYjsqrR4GFAF67wJKmZd4q86KuODWAag4acQL5Q=",
+        "lastModified": 1697038389,
+        "narHash": "sha256-hbzFPXyQQxJObRdb+CsylUXii29UfFV7866WWgWYs6Y=",
         "owner": "nix-community",
         "repo": "nixd",
-        "rev": "e8f144ca50fe71e74d247e5308ae7ce122f0a0e6",
+        "rev": "29904e121cc775e7caaf4fffa6bc7da09376a43b",
         "type": "github"
       },
       "original": {
@@ -795,11 +811,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696478570,
-        "narHash": "sha256-Zqktub0f4M8K0jDHFYaTwsGUddkH3UqHU0NNfGJmIKY=",
+        "lastModified": 1697683120,
+        "narHash": "sha256-sd0bjuGoUroCTkwjY2p1FwBPgAitK4qsN/P3jXk7rz0=",
         "owner": "nixpak",
         "repo": "nixpak",
-        "rev": "271e01d3912c5c622ca7fa99d63d790bea980de0",
+        "rev": "6b0b69f793390b4fe12821588b6c254b462a3e85",
         "type": "github"
       },
       "original": {
@@ -894,11 +910,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1696511470,
-        "narHash": "sha256-eSIw2JSXKHjZwkZGM2d6Cj2/ega6+cqoWZ+EM6lWY04=",
+        "lastModified": 1698416297,
+        "narHash": "sha256-Ne6TWm5lOaQAjT8aLimLmCufJbPAr8Z3GdPZNIj2HeA=",
         "owner": "CHN-beta",
         "repo": "nixpkgs",
-        "rev": "c3cf1cffb3e119bd166c51ca86605c1cf12988d9",
+        "rev": "4a5eef80f12698646b237de30d94fc1556eccaee",
         "type": "github"
       },
       "original": {
@@ -910,16 +926,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1692007866,
-        "narHash": "sha256-X8w0vPZjZxMm68VCwh/BHDoKRGp+BgzQ6w7Nkif6IVM=",
+        "lastModified": 1697723726,
+        "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "de2b8ddf94d6cc6161b7659649594c79bd66c13b",
+        "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -942,11 +958,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1696511131,
-        "narHash": "sha256-IIhn6F8D26Kix77guTW/4KdpwBzpSHJ3mjG1C8FAwHc=",
+        "lastModified": 1698911087,
+        "narHash": "sha256-5W0uKgIs2WJ61/r72WgjWtwjwJlM04XeodJJZUf36L8=",
         "owner": "CHN-beta",
         "repo": "nixpkgs",
-        "rev": "1bac8e4beb5b30458994710236b9db265829327b",
+        "rev": "5dc17816750da40fd9cac6d4be856010827bedd6",
         "type": "github"
       },
       "original": {
@@ -958,11 +974,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1696506445,
-        "narHash": "sha256-ozu7YxmHsvxSyQazVlkajF8A8U7TaXz3asCL5hFxgNk=",
+        "lastModified": 1698414381,
+        "narHash": "sha256-dqeFzaYrkL3swiQFY919hSqmd2D6D0AFBT6zvk/EUUE=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "0178289e0bd913fe9847605b01d6e15b7d076f6e",
+        "rev": "55831c4f594b877658d454d2a51aa06b989d79cc",
         "type": "github"
       },
       "original": {
@@ -981,11 +997,11 @@
         "nvfetcher": "nvfetcher"
       },
       "locked": {
-        "lastModified": 1696487499,
-        "narHash": "sha256-wvrBwhLpdF+oK5v3Lzgb1Yhz3vT1DHzIL3HKST/tCwU=",
+        "lastModified": 1698390460,
+        "narHash": "sha256-BSIac9PrpXaX6iFnUAljrHlFhx/+QhvUzY9Ublw1t1M=",
         "owner": "xddxdd",
         "repo": "nur-packages",
-        "rev": "9e53a952689cacfd88987c55466450e3076ced05",
+        "rev": "6f9992fe054792014bda7355f60f470956c1fe84",
         "type": "github"
       },
       "original": {
@@ -1066,11 +1082,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696260682,
-        "narHash": "sha256-iccjl57qw6aEe9nsCYFbF2bl7NEI/3Y4cn1U+QYvrFk=",
+        "lastModified": 1698164032,
+        "narHash": "sha256-YzlHV9N22v8WRTCyt/kMlAX7ntJGboHOh8heaPMfbG0=",
         "owner": "Nix-QChem",
         "repo": "NixOS-QChem",
-        "rev": "7324cb54b7687718ed7b05581998f105fe2fd3e3",
+        "rev": "77633a73b12ee27b9c64dcbbb627a91a904efad9",
         "type": "github"
       },
       "original": {
@@ -1114,11 +1130,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696320910,
-        "narHash": "sha256-fbuEc6wylH+0VxG48lhPBK+SQJHfo2lusUwWHZNipIM=",
+        "lastModified": 1698273636,
+        "narHash": "sha256-swsqg/ckSVJnravx7ie9NFQSKIH27owtlk0wh4+xStk=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "746c7fa1a64c1671a4bf287737c27fdc7101c4c2",
+        "rev": "014e44d334a39481223a5d163530d4c4ca2e75cb",
         "type": "github"
       },
       "original": {

flake.nix

@@ -44,7 +44,7 @@
         default = inputs.nixpkgs.legacyPackages.x86_64-linux.writeText "systems"
           (builtins.concatStringsSep "\n" (builtins.map
             (system: builtins.toString inputs.self.outputs.nixosConfigurations.${system}.config.system.build.toplevel)
-            [ "pc" "vps6" "vps7" "nas" "yoga" ]));
+            [ "pc" "vps6" "vps7" "nas" ]));
       }
       // (
         builtins.listToAttrs (builtins.map
@@ -127,12 +127,7 @@
                 };
                 nixpkgs = { march = "alderlake"; cudaSupport = true; };
                 gui = { enable = true; preferred = true; };
-                kernel =
-                {
-                  useLts = true;
-                  patches = [ "cjktty" "preempt" ];
-                  modules.modprobeConfig = [ "options iwlmvm power_scheme=1" "options iwlwifi uapsd_disable=1" ];
-                };
+                kernel.patches = [ "cjktty" "preempt" ];
                 impermanence.enable = true;
                 networking =
                   { hostname = "pc"; nebula = { enable = true; lighthouse = "vps6.chn.moe"; useRelay = true; }; };
@@ -226,7 +221,7 @@
               bugs =
               [
                 "intel-hdmi" "suspend-hibernate-no-platform" "hibernate-iwlwifi" "suspend-lid-no-wakeup" "xmunet"
-                "suspend-hibernate-waydroid" "embree" "nvme"
+                "suspend-hibernate-waydroid" "embree"
               ];
             };})
           ];
@@ -295,6 +290,7 @@
                       "nix-store.chn.moe" = { upstream = "internal.pc.chn.moe:443"; rewriteHttps = true; };
                       "anchor.fm" = { upstream = "anchor.fm:443"; rewriteHttps = true; };
                       "podcasters.spotify.com" = { upstream = "podcasters.spotify.com:443"; rewriteHttps = true; };
+                      "xlog.chn.moe" = { upstream = "cname.xlog.app:443"; rewriteHttps = true; };
                     };
                   };
                   applications =
@@ -419,6 +415,7 @@
                         "/nix/persistent" = "/nix/persistent";
                         "/nix/nodatacow" = "/nix/nodatacow";
                         "/nix/rootfs/current" = "/";
+                        "/nix/backup" = "/nix/backup";
                       };
                     };
                   };
@@ -541,11 +538,7 @@
                   substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
                 };
                 gui.enable = true;
-                kernel =
-                {
-                  patches = [ "cjktty" "preempt" ];
-                  modules.modprobeConfig = [ "options iwlmvm power_scheme=1" "options iwlwifi uapsd_disable=1" ];
-                };
+                kernel.patches = [ "cjktty" "preempt" ];
                 impermanence.enable = true;
                 networking.hostname = "xmupc1";
                 sops = { enable = true; keyPathPrefix = "/nix/persistent"; };
@@ -675,6 +668,7 @@
                 };
                 firewall.trustedInterfaces = [ "virbr0" ];
               };
+              bugs = [ "xmunet" "firmware-unstable" ];
             };})
           ];
         }));

local/pkgs/default.nix

@@ -7,7 +7,7 @@
   oneapi = callPackage ./oneapi {};
   send = callPackage ./send {};
   rsshub = callPackage ./rsshub {};
-  misskey = callPackage ./misskey { vips = unstablePackages.vips; };
+  misskey = callPackage ./misskey {};
   mk-meili-mgn = callPackage ./mk-meili-mgn {};
   phonon-unfolding = callPackage ./phonon-unfolding {};
   # vasp = callPackage ./vasp
@@ -38,4 +38,5 @@
   yoga-support = callPackage ./yoga-support {};
   tgbot-cpp = callPackage ./tgbot-cpp {};
   biu = callPackage ./biu { inherit concurrencpp tgbot-cpp nameof; stdenv = gcc13Stdenv; };
+  latex-citation-style-language = callPackage ./latex-citation-style-language {};
 }

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

@@ -0,0 +1,30 @@
+{ stdenvNoCC, texlive, fetchFromGitHub }: stdenvNoCC.mkDerivation (finalAttrs: rec
+{
+  pname = "latex-citation-style-language";
+  version = "0.4.5";
+  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;
+  installPhase =
+  ''
+    runHook preInstall
+    export TEXMFHOME=$out
+    l3build install
+    runHook postInstall
+  '';
+})

local/pkgs/misskey/default.nix

@@ -4,13 +4,13 @@
 }:
 let
   pname = "misskey";
-  version = "2023.10.1";
+  version = "2023.10.2";
   src = fetchFromGitHub
   {
     owner = "CHN-beta";
     repo = "misskey";
-    rev = "803dd3db7c34c8f77f16b5b6540281c620c34760";
-    sha256 = "dYMs7575e8spFmEPGaB9TqbKqJowIQE8SJUL+xDga5c=";
+    rev = "3f813d9808ebc1774457e02add8fe9c7a6937ff7";
+    sha256 = "63ZIil28jcMiL+c9FMj7m1OeCrLwsQZNHib+j8ar66s=";
     fetchSubmodules = true;
   };
   originalPnpmPackage = mkPnpmPackage

local/pkgs/rsshub/default.nix

@@ -8,8 +8,8 @@ let
   {
     owner = "DIYgod";
     repo = "RSSHub";
-    rev = "67d4a7ed3f877a8ceac6caebe874c4ce5c210bd8";
-    sha256 = "baJQWGrr1RdZoI2uAGp2uJO9epbjAUjks76knJSwVdE=";
+    rev = "4356fad91a268c81b8dacd2e3d9d07dbdce231a0";
+    sha256 = "rUfXHtePIkBGF1U/tqrXHEsYC5jah2A7hoJZfEAnCoQ=";
   };
   originalPnpmPackage = mkPnpmPackage { inherit name src nodejs; };
   nodeModules = originalPnpmPackage.nodeModules.overrideAttrs { PUPPETEER_SKIP_DOWNLOAD = true; };

local/pkgs/typora/default.nix

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

modules/bugs/default.nix

@@ -14,18 +14,23 @@ inputs:
         HibernateMode=shutdown
       '';
       # reload iwlwifi after resume from hibernate
-      hibernate-iwlwifi.systemd.services.reload-iwlwifi-after-hibernate =
+      hibernate-iwlwifi =
       {
-        description = "reload iwlwifi after resume from hibernate";
-        after = [ "systemd-hibernate.service" ];
-        serviceConfig.Type = "oneshot";
-        script = let modprobe = "${inputs.pkgs.kmod}/bin/modprobe"; in
-        ''
-          ${modprobe} -r iwlwifi
-          ${modprobe} iwlwifi
-          echo 0 > /sys/devices/system/cpu/intel_pstate/no_turbo
-        '';
-        wantedBy = [ "systemd-hibernate.service" ];
+        systemd.services.reload-iwlwifi-after-hibernate =
+        {
+          description = "reload iwlwifi after resume from hibernate";
+          after = [ "systemd-hibernate.service" ];
+          serviceConfig.Type = "oneshot";
+          script = let modprobe = "${inputs.pkgs.kmod}/bin/modprobe"; in
+          ''
+            ${modprobe} -r iwlwifi
+            ${modprobe} iwlwifi
+            echo 0 > /sys/devices/system/cpu/intel_pstate/no_turbo
+          '';
+          wantedBy = [ "systemd-hibernate.service" ];
+        };
+        nixos.system.kernel.modules.modprobeConfig =
+          [ "options iwlmvm power_scheme=1" "options iwlwifi uapsd_disable=1" ];
       };
       # disable wakeup on lid open
       suspend-lid-no-wakeup.systemd.services.lid-no-wakeup =
@@ -46,10 +51,8 @@ inputs:
         wantedBy = [ "multi-user.target" ];
       };
       # xmunet use old encryption
-      xmunet.nixpkgs.config.packageOverrides = pkgs: 
-      {
-        wpa_supplicant = pkgs.wpa_supplicant.overrideAttrs (attrs: { patches = attrs.patches ++ [ ./xmunet.patch ];});
-      };
+      xmunet.nixpkgs.config.packageOverrides = pkgs: { wpa_supplicant = pkgs.wpa_supplicant.overrideAttrs
+        (attrs: { patches = attrs.patches ++ [ ./xmunet.patch ];}); };
       suspend-hibernate-waydroid.systemd.services =
         let
           systemctl = "${inputs.pkgs.systemd}/bin/systemctl";
@@ -75,7 +78,8 @@ inputs:
       firefox.programs.firefox.enable = inputs.lib.mkForce false;
       embree.nixpkgs.overlays =
         [(final: prev: { embree = prev.embree.override { stdenv = final.genericPackages.stdenv; }; })];
-      nvme.boot.kernelParams = [ "nvme_core.default_ps_max_latency_us=0" "iommu=soft" "pcie_aspm=off" ];
+      firmware-unstable.nixpkgs.overlays =
+        [ (final: prev: { linux-firmware = final.unstablePackages.linux-firmware; }) ];
     };
   in
     {

modules/packages/ssh/github_ecdsa.pub

@@ -0,0 +1 @@
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=

modules/packages/ssh/github_rsa.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=

modules/packages/ssh/hpc_ecdsa.pub

@@ -0,0 +1 @@
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDkkl7A9kWWBoi4b5g6Vus70ja1KhPfcZZjeU1/QbYdN8PRRw/hsGklrhefslKRbym/TMFS0ko0g5WUi9G5vbGw=

modules/packages/ssh/hpc_rsa.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDgs8MvV2nczjGMZ548tuAhgvCEd4uHu0VhLDSwQG7Nh/UR4Pgc5T9Nf7Vfwg96Lah/pwD5my4RaWis6bLMmlkYyDBKFBOsGYQUe5J5XfZdxk8pz+7L0Hq6gPfAZAdNlUiuFVKsvkE+NF42NgJyXSYQicPbu5LQiFwZGXlW20+LO8uBQ1y1xabKVpg8XGwordduL99VepwEzeLK/st+UVfW+mKgxkf9TuxvD2fuYIDZM7y2rXqcjf4/6OXA5kACsYK1MgZSFxgO/m6+1uCC1qBDseMTA3D+Tsjf9VtcqUE9dMd/dJ/uuILHJ0+oIqkykTCecPLgJY3Vh8rAtln/lbId

modules/packages/ssh/nas_rsa.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC0+xafJMnOGCHv6OLljaq8iJ3ZBaIezv7AJ9rVWJXFg/QJRYBwct35c4zaVom7If8F+Ss+BTLMp33HZ8gLpoat6LkjARjy65Ycog3NOnEposX2JjZEYXDbovxEmcJkDXAIVmnaBUi3r22z4UI8OqsHPeRXj017O0yQrQQYEAw/IO/tSNQZt2k8JHxAX50UTqGFdgkriO1fYHBocq48m0nn3sXrMuM3yBe5zy3NngOHxMn7UxjECmAElsuu/nu1x083pRnv5NSa+JxDGJ+S6Zhj3nGGNwZesa51I4cJjsYLxgmO/NxL1J86bDp6HhK9C9799ruG60pGTw6HcvbKTgx7klUgn4936wsy7qukWqp53MvqrLSJkRb/HHU9zZqvzcjbwet+Iv1OAAok5QC88j7Jgenk3nbZw4BNFd2r/8rOZuXheDnMKOa61dXxnvoAO3Euk0RPdZqW1slT/DDyD/kB6TPY7yOywNURNnrwzfSsmravKi6bGA5t2Ehhpf2LETM=

modules/packages/ssh/pc_rsa.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDOyU7VvusseL2tDp7JkIXKGxRGQNHpYWVAPraUj17Xls7Z9e7HO6+GBiGP+bB9tZbzsoTNGHdXg8VaJmf98QAhhg0FcUb6IvWmfmPWzQ0MC8L+USqdDpaH7s9SOZF/yveNYCR5GOMmFdSW4OPVYIOrjPltDIe5S1SN2nOXvjxbLmuoMjg+5U4F0ii0ZaCRuMVDskeift+Amxe7iRnSzeDbECd0rJhaUb8gf3shz0Hp9lRUMej7cJH8LLP3m0s3Vk+kasKntz18MpJ6/3n+fR2aK75qkcq9FZaFA4tSIabh9eKoxlRCy7g8Qj6nNStW+ys/a1UYBFgAoTyE7e47o3dpcxR5oMLbeDwhOstWL0YOjEH1K5Wyj3eEOT71C6kuQBPcCJQ9q9hknRpW0mWe9Q6qaAzTgE9LLssijr/yTfYQk7zKEyo0i4f6buOfmyYZfnzfnCB3LiJKa98TVEEzrKYHIO44LwIkNf/YHOMDknzjYpav6HfDy+AebRHZFYhGax1YP/tP0Ve/FSq5rh6Vwuqa/zyfFUPZmZVf+EYXK7DdyuBhEZhBEu6QrjY60NRMTMLpnUZMcZXRAz9byMpAGcCYQv6gjU99ps8AkRjZNkn+FpAtDGT+oJxixQwyZMSxZ+ZuzkZGyBMeMplZXMMLICGZ2LRAgT0bxXLZUxHJBLwwnw==

modules/packages/ssh/vps6_rsa.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDYiP+ELuG5KTmafVjBkY0ZSggJg+mDkvZpF8d7NljMst0YwKWV3IgHnkAGXdTd7jlRgm9HH6oc8rP2R6Q8EJmfr+xcL1IQIWKuYAoddHlpe2Ds4EE74xbgm5Elf7FpdYNHUH9XyVmMmIhVSpLw2N10jUhvYqw+h+xC2nObEKZuBOt/lqrTGbC/EMv3+sDv0ApBh8lKt2yfjt88pnAj1LKPANDgIYSyQOllHQWeUY/eD/5Qc9XWR3uWclslVaxriRmEA0sNZlOFCeRIyDbYpSzQBdcnojkwt7Z5kjhaqGlT9g00fdiqO0OMaeY/G8ki3QxqjONqTEDqK+DpEZFO6jyZARcY6ki0ANc0AO4qosEC3gEbAvVwyPwDFtyDggMTHlTzaw8iakMGSDEk10zKaUOgZYLzC2yCWYYQS5mae9wC1gkXIGD51/laeq2E7NpM+nha6kp9weLVyvwf0DLfwsiP+0qlCLrxBLTSRa0HQ+BnQMi4r16Ss7YJwLf/oXrbOVk=

modules/packages/ssh/vps7_rsa.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDFwb7qi9/DvhpMvu43LRlTEC+3kPAA0KNeyk4FT4HlpRE/yxMxN6tgrP9vcx2c6TMfkRwIJKDcBuVVtKOVx+SDZo+nQBxpSz73v1qSmqlsy8D4gCk0a7cLgStb3Cvh0UZjJ5nVnxjzqY2CFnpnKYGmxL+a3qTj1KYPuA2wSsxkYVcHUfDj/uTtEDdRPaNTACsUxe1a57T/Tsjp+321+zKldYreozaABEBsexf9Z34+3vZvyQcfDB3QuxlBRPJBLik80QllpNpE1bqol8swoGEPbl/Ac7tNy+GtlwTG9SH1povmoT9K+8tjJaG2pD+z+vvgZQtJQh+aczYmEBJRZp3ksw1JH4eGqTWG/SDat9Isnx2NDhJe12b9izniDciuBScNySAazIDPidsCMUYjc9kgWdSOiODOtodj5IB+KazFVJgfpmzPv97LHVdjvR74usrgbFw2mYCw2YEiL3xjDYpQGmXSNklsQLwJiBe59oyS4QNpNYQzYD9StjgRIdvtmiM=

modules/services/default.nix

@@ -38,6 +38,7 @@ inputs:
     smartd.enable = mkOption { type = types.bool; default = false; };
     fileshelter.enable = mkOption { type = types.bool; default = false; };
     wallabag.enable = mkOption { type = types.bool; default = false; };
+    noisetorch.enable = mkOption { type = types.bool; default = inputs.config.nixos.system.gui.preferred; };
   };
   config =
     let
@@ -189,5 +190,6 @@ inputs:
           # };
         }
       )
+      (mkIf services.noisetorch.enable { programs.noisetorch.enable = true; })
     ];
 }

modules/services/groupshare.nix

@@ -30,7 +30,12 @@ inputs:
         (mountPoint:
         {
           name = mountPoint;
-          value = { device = "/var/lib/groupshare"; options = [ "bind" ]; depends = [ "/home" "/var/lib" ]; };
+          value =
+          {
+            device = "/var/lib/groupshare";
+            options = [ "bind" "private" "x-gvfs-hide" "X-fstrim.notrim" ];
+            depends = [ "/home" "/var/lib" ];
+          };
         })
         groupshare.mountPoints);
     };

modules/services/misskey.nix

@@ -58,12 +58,12 @@ inputs:
           "/var/lib/misskey/${instance.name}/work" =
           {
             device = "${inputs.pkgs.localPackages.misskey}";
-            options = [ "bind" "private" "x-gvfs-hide" ];
+            options = [ "bind" "private" "x-gvfs-hide" "X-fstrim.notrim" ];
           };
           "/var/lib/misskey/${instance.name}/work/files" =
           {
             device = "/var/lib/misskey/${instance.name}/files";
-            options = [ "bind" "private" "x-gvfs-hide" ];
+            options = [ "bind" "private" "x-gvfs-hide" "X-fstrim.notrim" ];
           };
         })
         (attrsToList misskey.instances));

modules/system/default.nix

@@ -19,13 +19,8 @@ inputs:
   {
     services =
     {
-      udev.extraRules =
-      ''
-        ACTION=="add|change", KERNEL=="[sv]d[a-z]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq"
-        ACTION=="add|change", KERNEL=="nvme[0-9]n[0-9]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq"
-      '';
       dbus.implementation = "broker";
-      fstrim.enable = true;
+      fstrim = { enable = true; interval = "daily"; };
     };
     time.timeZone = "Asia/Shanghai";
     boot =

modules/system/fileSystems/default.nix

@@ -87,7 +87,13 @@ inputs:
           (device:
           {
             name = device.value;
-            value = { device = device.name; fsType = "vfat"; neededForBoot = true; };
+            value =
+            {
+              device = device.name;
+              fsType = "vfat";
+              neededForBoot = true;
+              options = [ "noatime" ];
+            };
           })
           (attrsToList fileSystems.mount.vfat));
       }
@@ -115,7 +121,7 @@ inputs:
                     # zstd:15 5m33s 7.16G
                     # zstd:8 54s 7.32G
                     # zstd:3 17s 7.52G
-                    options = [ "compress-force=zstd" "subvol=${subvol.name}" "acl" ];
+                    options = [ "compress-force=zstd" "subvol=${subvol.name}" "acl" "noatime" ];
                     neededForBoot = true;
                   };
                 }
@@ -229,26 +235,35 @@ inputs:
       (
         mkIf (fileSystems.rollingRootfs != null)
         {
-          boot.initrd.systemd.services.roll-rootfs =
+          boot.initrd.systemd =
           {
-            wantedBy = [ "initrd.target" ];
-            after = [ "cryptsetup.target" "systemd-hibernate-resume.service" ];
-            before = [ "local-fs-pre.target" "sysroot.mount" ];
-            unitConfig.DefaultDependencies = false;
-            serviceConfig.Type = "oneshot";
-            script = let inherit (fileSystems.rollingRootfs) device path; in
-            ''
-              mount ${device} /mnt -m
-              if [ -f /mnt${path}/current/.timestamp ]
-              then
-                timestamp=$(cat /mnt${path}/current/.timestamp)
-                mv /mnt${path}/current /mnt${path}/$timestamp
-                btrfs property set -ts /mnt${path}/$timestamp ro true
-              fi
-              btrfs subvolume create /mnt${path}/current
-              echo $(date '+%Y%m%d%H%M%S') > /mnt${path}/current/.timestamp
-              umount /mnt
-            '';
+            extraBin =
+            {
+              grep = "${inputs.pkgs.gnugrep}/bin/grep";
+              awk = "${inputs.pkgs.gawk}/bin/awk";
+            };
+            services.roll-rootfs =
+            {
+              wantedBy = [ "initrd.target" ];
+              after = [ "cryptsetup.target" "systemd-hibernate-resume.service" ];
+              before = [ "local-fs-pre.target" "sysroot.mount" ];
+              unitConfig.DefaultDependencies = false;
+              serviceConfig.Type = "oneshot";
+              script = let inherit (fileSystems.rollingRootfs) device path; in
+              ''
+                mount ${device} /mnt -m
+                if [ -f /mnt${path}/current/.timestamp ]
+                then
+                  timestamp=$(cat /mnt${path}/current/.timestamp)
+                  subvolid=$(btrfs subvolume show /mnt${path}/current | grep 'Subvolume ID:' | awk '{print $NF}')
+                  mv /mnt${path}/current /mnt${path}/$timestamp-$subvolid
+                  btrfs property set -ts /mnt${path}/$timestamp-$subvolid ro true
+                fi
+                btrfs subvolume create /mnt${path}/current
+                echo $(date '+%Y%m%d%H%M%S') > /mnt${path}/current/.timestamp
+                umount /mnt
+              '';
+            };
           };
         }
       )

modules/system/nix.nix

@@ -38,6 +38,7 @@ inputs:
           registry =
           {
             nixpkgs.flake = inputs.topInputs.nixpkgs;
+            nixpkgs-unstable.flake = inputs.topInputs.nixpkgs-unstable;
             nixos.flake = inputs.topInputs.self;
           };
           nixPath = [ "nixpkgs=${inputs.topInputs.nixpkgs}" ];
@@ -55,6 +56,7 @@ inputs:
         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" ];

modules/system/security.nix

@@ -32,7 +32,6 @@ inputs:
       {
         enable = true;
         id = "91291";
-        authFile = inputs.pkgs.writeText "yubikey_mappings" "chn:cccccbgrhnub";
       };
     };
   };

modules/users/default.nix

@@ -181,6 +181,7 @@ inputs:
                   ))
               )
             ];
+            pam.yubico.authorizedYubiKeys.ids = [ "cccccbgrhnub" ];
           };
         };
         nixos.services.groupshare.mountPoints = [ "/home/chn/groupshare" ];