set gcc flags for unstablePackages

This reverts commit fd13864f48.

.sops.yaml

@@ -5,6 +5,7 @@ keys: # cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age
   - &vps7 age137x7csalutwvfygvvzpemlsywvdxj3j4z93a50z2sjx03w6zau8q3r5902
   - &yoga age1qrea4twxdhd7fnvlq5v45528c90qy6hp2wa55kghsxzgut6n6fxs7w6u42
   - &pe age1cahahn9hp265dkhduaec65vugk8fct2vt9ur6y54m4mgmyx4v4fq0etjhv
+  - &nas age19lhcwk37jmvn6z0v4dpdfh0k4u23f76twdjknc0p7atktf37rd7s4t4wj3
 creation_rules:
   - path_regex: secrets/pc\.yaml$
     key_groups:
@@ -29,6 +30,7 @@ creation_rules:
     key_groups:
     - age:
       - *chn
+      - *nas
   - path_regex: secrets/xmupc1\.yaml$
     key_groups:
     - age:

flake.lock

@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1691174970,
-        "narHash": "sha256-8QpyT2OXYcXSdj8hM9uSSnApTOpzhndzNF+9a5pYuA0=",
+        "lastModified": 1693886279,
+        "narHash": "sha256-oVCA5yz6zcsFzGCCwRpVDuDml7Z0sWQqW1fEWWcC0xM=",
         "owner": "ezKEa",
         "repo": "aagl-gtk-on-nix",
-        "rev": "79ee3b5d776cb268e481d4d2ad5960b92e3e61a6",
+        "rev": "8fc45fabbedef44a481c3bcabd9512732c0ade91",
         "type": "github"
       },
       "original": {
@@ -30,11 +30,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1686747123,
-        "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=",
+        "lastModified": 1694158470,
+        "narHash": "sha256-yWx9eBDHt6WR3gr65+J85KreHdMypty/P6yM35tIYYM=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "724463b5a94daa810abfc64a4f87faef4e00f984",
+        "rev": "d0cfc042eba92eb206611c9e8784d41a2c053bab",
         "type": "github"
       },
       "original": {
@@ -165,11 +165,11 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1668681692,
+        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
         "type": "github"
       },
       "original": {
@@ -226,6 +226,22 @@
         "type": "github"
       }
     },
+    "flake-compat_6": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -269,11 +285,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1690933134,
-        "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=",
+        "lastModified": 1693611461,
+        "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb",
+        "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca",
         "type": "github"
       },
       "original": {
@@ -307,7 +323,7 @@
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems"
       },
       "locked": {
         "lastModified": 1689068808,
@@ -346,7 +362,7 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1685518550,
@@ -363,15 +379,12 @@
       }
     },
     "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_5"
-      },
       "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
@@ -382,7 +395,7 @@
     },
     "flake-utils_4": {
       "inputs": {
-        "systems": "systems_6"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1689068808,
@@ -400,7 +413,7 @@
     },
     "flake-utils_5": {
       "inputs": {
-        "systems": "systems_7"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -417,15 +430,12 @@
       }
     },
     "flake-utils_6": {
-      "inputs": {
-        "systems": "systems_8"
-      },
       "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "lastModified": 1638122382,
+        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
         "type": "github"
       },
       "original": {
@@ -436,14 +446,14 @@
     },
     "flake-utils_7": {
       "inputs": {
-        "systems": "systems_9"
+        "systems": "systems_6"
       },
       "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "lastModified": 1692799911,
+        "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
         "type": "github"
       },
       "original": {
@@ -454,7 +464,7 @@
     },
     "flake-utils_8": {
       "inputs": {
-        "systems": "systems_10"
+        "systems": "systems_7"
       },
       "locked": {
         "lastModified": 1685518550,
@@ -490,7 +500,7 @@
       "inputs": {
         "flake-parts": "flake-parts_4",
         "haskell-flake": "haskell-flake",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1688568579,
@@ -538,16 +548,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1691506824,
-        "narHash": "sha256-Z2Ms7036CCEAfCmDBDy+sFauO6/7fx2UN3aoPCpp4tA=",
+        "lastModified": 1693208669,
+        "narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7b8d43fbaf8450c30caaed5eab876897d0af891b",
+        "rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "master",
+        "ref": "release-23.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -630,11 +640,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1672245824,
-        "narHash": "sha256-i596lbPiA/Rfx3DiJiCluxdgxWY7oGSgYMT7OmM+zik=",
+        "lastModified": 1693989153,
+        "narHash": "sha256-gx39Y3opGB25+44OjM+h1bdJyzgLD963va8ULGYlbhM=",
         "owner": "nix-community",
         "repo": "napalm",
-        "rev": "7c25a05cef52dc405f4688422ce0046ca94aadcf",
+        "rev": "a8215ccf1c80070f51a92771f3bc637dd9b9f7ee",
         "type": "github"
       },
       "original": {
@@ -678,11 +688,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1690903419,
-        "narHash": "sha256-ciRzOsKNtAZDahTn0Y0zW7AgyrVh+b1WaW+sBDiV5PA=",
+        "lastModified": 1693880502,
+        "narHash": "sha256-krCRVLNdlCI7l7F1Bb2ovkgac8hoz015LyYvm/+aYZw=",
         "owner": "thiagokokada",
         "repo": "nix-alien",
-        "rev": "e1c6e6015e3c9a07d20c1e598dfea539b6337150",
+        "rev": "0fbd284930bcf1a5d1e3d07f2973e6f1738505cc",
         "type": "github"
       },
       "original": {
@@ -698,11 +708,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1691292840,
-        "narHash": "sha256-NA+o/NoOOQhzAQwB2JpeKoG+iYQ6yn/XXVxaGd5HSQI=",
+        "lastModified": 1693711723,
+        "narHash": "sha256-5QmlVzskLciJ0QzYmZ6ULvKA7bP6pgV9wwrLBB0V3j0=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "6c626d54d0414d34c771c0f6f9d771bc8aaaa3c4",
+        "rev": "aca56a79afb82208af2b39d8459dd29c10989135",
         "type": "github"
       },
       "original": {
@@ -720,11 +730,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1693444987,
-        "narHash": "sha256-XzFFVOCtOTmaKtnE3Y/iOC0i3ZAj2tdO5aWOa6J7IDc=",
+        "lastModified": 1694222210,
+        "narHash": "sha256-PzfwrGQMEpJk4lMK2a47bFbJpJFlAG/ihvZsL9U1Lik=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "f878309889d6d91867f4455d223df0f521e2a6d1",
+        "rev": "5a63908466573a4a1c0466e38f33c42c73ec5136",
         "type": "github"
       },
       "original": {
@@ -736,7 +746,9 @@
     "nixd": {
       "inputs": {
         "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1693052712,
@@ -782,11 +794,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692283173,
-        "narHash": "sha256-6bt+X2PpoyUAtEDWJM0XT0Z54JA2YHw62VoZRTRkz7s=",
+        "lastModified": 1694192131,
+        "narHash": "sha256-nt5ypVXKh65lQFqKqWgytEzI841yUhpl6E291Briu+g=",
         "owner": "nixpak",
         "repo": "nixpak",
-        "rev": "eef08f1a7e871e3017edbc54d0374292a9b6f67a",
+        "rev": "16bd2860238c53bb7a31f745693d7d3c33a1490c",
         "type": "github"
       },
       "original": {
@@ -879,29 +891,29 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable_2": {
+    "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1691421349,
-        "narHash": "sha256-RRJyX0CUrs4uW4gMhd/X4rcDG8PTgaaCQM5rXEJOx6g=",
-        "owner": "NixOS",
+        "lastModified": 1694233973,
+        "narHash": "sha256-LPFbAgsJhj5l64bwmeA2POGrdtEm6+WyGwyNVbGRl9A=",
+        "owner": "CHN-beta",
         "repo": "nixpkgs",
-        "rev": "011567f35433879aae5024fc6ec53f2a0568a6c4",
+        "rev": "6b10eef17e5f6fbbb07b38015ce3dc0d5e463282",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.05",
+        "owner": "CHN-beta",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1689352711,
-        "narHash": "sha256-xWYFt8vWnstDIVsZ26y9mf6h3714lVmXd6l+hTQz6tw=",
+        "lastModified": 1692007866,
+        "narHash": "sha256-X8w0vPZjZxMm68VCwh/BHDoKRGp+BgzQ6w7Nkif6IVM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2047c642ce0f75307e8a0f2ec94715218c481184",
+        "rev": "de2b8ddf94d6cc6161b7659649594c79bd66c13b",
         "type": "github"
       },
       "original": {
@@ -912,22 +924,6 @@
       }
     },
     "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1686398752,
-        "narHash": "sha256-nGWNQVhSw4VSL+S0D0cbrNR9vs9Bq7rlYR+1K5f5j6w=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a30520bf8eabf8a5c37889d661e67a2dbcaa59e6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
       "locked": {
         "lastModified": 1688322751,
         "narHash": "sha256-eW62dC5f33oKZL7VWlomttbUnOTHrAbte9yNUNW8rbk=",
@@ -943,29 +939,29 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
       "locked": {
-        "lastModified": 1693843185,
-        "narHash": "sha256-/huFNnA50JSUyEg68v9uiC4xl8shVsS5LgtNRlzZvHo=",
+        "lastModified": 1694317825,
+        "narHash": "sha256-ud2qoXA90zSWBUeJqh/5tM055TlSe3HvsEma7Wm0V/Y=",
         "owner": "CHN-beta",
         "repo": "nixpkgs",
-        "rev": "e7e8dca748d5fa1a29b5bb231bf8aa727c29b89c",
+        "rev": "8870ebda280940fcedca9bc35d56ed3bed9d2070",
         "type": "github"
       },
       "original": {
         "owner": "CHN-beta",
-        "ref": "nixos-unstable",
+        "ref": "nixos-23.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nur": {
       "locked": {
-        "lastModified": 1691559855,
-        "narHash": "sha256-UkXcNHsasO0sr8W8X8wGeM1bBuLC5tHEueryGSLaE+E=",
+        "lastModified": 1694237951,
+        "narHash": "sha256-6gql7EJIWwn3mUvG/RHf1iGUA3Ptfmalz9WdgX3noSY=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "c987eac4f579d9e989d5a0cde93d688592bda990",
+        "rev": "19674a713837dcfbef704a16815a4bbc462cd57a",
         "type": "github"
       },
       "original": {
@@ -980,14 +976,15 @@
         "flake-utils-plus": "flake-utils-plus",
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "nvfetcher": "nvfetcher"
       },
       "locked": {
-        "lastModified": 1691561203,
-        "narHash": "sha256-GmujZtR1vlTkBMahLXLp3BXYYfC0vIczxkcd9XVt6/E=",
+        "lastModified": 1694239804,
+        "narHash": "sha256-C5ERSMRp8kQEqyKS2yggXSqaKZUgnNyQD+zjy6iqXm0=",
         "owner": "xddxdd",
         "repo": "nur-packages",
-        "rev": "52a85ab474601e3661f30796aa0d7fe995fc0122",
+        "rev": "ce48d1df62cab988a5e8eefdf97bec8bdc46392f",
         "type": "github"
       },
       "original": {
@@ -1014,6 +1011,32 @@
         "type": "github"
       }
     },
+    "nvfetcher": {
+      "inputs": {
+        "flake-compat": "flake-compat_6",
+        "flake-utils": [
+          "nur-xddxdd",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nur-xddxdd",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1693539235,
+        "narHash": "sha256-ACmCq1+RnVq+EB7yeN6fThUR3cCJZb6lKEfv937WG84=",
+        "owner": "berberman",
+        "repo": "nvfetcher",
+        "rev": "2bcf73dea96497ac9c36ed320b457caa705f9485",
+        "type": "github"
+      },
+      "original": {
+        "owner": "berberman",
+        "repo": "nvfetcher",
+        "type": "github"
+      }
+    },
     "pnpm2nix-nzbr": {
       "inputs": {
         "flake-utils": "flake-utils_8",
@@ -1042,11 +1065,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1691502026,
-        "narHash": "sha256-wGwoeLradgB38MqaUZrKQJIP5iPs4T15SxrVVtgORNo=",
+        "lastModified": 1693829707,
+        "narHash": "sha256-nBFIF+a1aqDIzmi+1Hue3zVXI4V4tK5R4aW2lyNXIXs=",
         "owner": "Nix-QChem",
         "repo": "NixOS-QChem",
-        "rev": "a03be624e055fc80d3b44619c9c179b4f96ab45a",
+        "rev": "ac7ffea07370d0df2c2b934ea582f0cc8acd0ae1",
         "type": "github"
       },
       "original": {
@@ -1070,8 +1093,8 @@
         "nixd": "nixd",
         "nixos-cn": "nixos-cn",
         "nixpak": "nixpak",
-        "nixpkgs": "nixpkgs_5",
-        "nixpkgs-stable": "nixpkgs-stable_2",
+        "nixpkgs": "nixpkgs_4",
+        "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur",
         "nur-xddxdd": "nur-xddxdd",
         "pnpm2nix-nzbr": "pnpm2nix-nzbr",
@@ -1086,15 +1109,15 @@
           "nixpkgs"
         ],
         "nixpkgs-stable": [
-          "nixpkgs-stable"
+          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1690199016,
-        "narHash": "sha256-yTLL72q6aqGmzHq+C3rDp3rIjno7EJZkFLof6Ika7cE=",
+        "lastModified": 1693898833,
+        "narHash": "sha256-OIrMAGNYNeLs6IvBynxcXub7aSW3GEUvWNsb7zx6zuU=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c36df4fe4bf4bb87759b1891cab21e7a05219500",
+        "rev": "faf21ac162173c2deb54e5fdeed002a9bd6e8623",
         "type": "github"
       },
       "original": {
@@ -1135,21 +1158,6 @@
         "type": "github"
       }
     },
-    "systems_10": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "systems_2": {
       "locked": {
         "lastModified": 1681028828,
@@ -1240,36 +1248,6 @@
         "type": "github"
       }
     },
-    "systems_8": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_9": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "touchix": {
       "inputs": {
         "nixpkgs": [
@@ -1291,15 +1269,12 @@
       }
     },
     "utils": {
-      "inputs": {
-        "systems": "systems"
-      },
       "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
         "type": "github"
       },
       "original": {
@@ -1310,7 +1285,7 @@
     },
     "utils_2": {
       "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1689068808,

flake.nix

@@ -3,13 +3,13 @@
 
   inputs =
   {
-    nixpkgs.url = "github:CHN-beta/nixpkgs/nixos-unstable";
-    nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.05";
-    home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; };
+    nixpkgs.url = "github:CHN-beta/nixpkgs/nixos-23.05";
+    nixpkgs-unstable.url = "github:CHN-beta/nixpkgs/nixos-unstable";
+    home-manager = { url = "github:nix-community/home-manager/release-23.05"; inputs.nixpkgs.follows = "nixpkgs"; };
     sops-nix =
     {
       url = "github:Mic92/sops-nix";
-      inputs = { nixpkgs.follows = "nixpkgs"; nixpkgs-stable.follows = "nixpkgs-stable"; };
+      inputs = { nixpkgs.follows = "nixpkgs"; nixpkgs-stable.follows = "nixpkgs"; };
     };
     touchix = { url = "github:CHN-beta/touchix"; inputs.nixpkgs.follows = "nixpkgs"; };
     aagl = { url = "github:ezKEa/aagl-gtk-on-nix"; inputs.nixpkgs.follows = "nixpkgs"; };
@@ -21,7 +21,7 @@
     nix-alien = { url = "github:thiagokokada/nix-alien"; inputs.nix-index-database.follows = "nix-index-database"; };
     impermanence.url = "github:nix-community/impermanence";
     qchem = { url = "github:Nix-QChem/NixOS-QChem"; inputs.nixpkgs.follows = "nixpkgs"; };
-    nixd.url = "github:nix-community/nixd";
+    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"; };
@@ -62,8 +62,8 @@
             modules = localLib.mkModules
             (
               [
-                (inputs: { config.nixpkgs.overlays = [(final: prev: { localPackages =
-                  (import ./local/pkgs { inherit (inputs) lib; pkgs = final; });})]; })
+                (inputs: { config.nixpkgs.overlays = [(final: prev:
+                  { localPackages = (import ./local/pkgs { inherit (inputs) lib; pkgs = final; }); })]; })
                 ./modules
               ]
               ++ system.value
@@ -402,29 +402,23 @@
                 {
                   mount =
                   {
+                    vfat."/dev/disk/by-uuid/13BC-F0C9" = "/boot/efi";
                     btrfs =
                     {
-                      "/dev/disk/by-uuid/a6460ff0-b6aa-4c1c-a546-8ad0d495bcf8"."/boot" = "/boot";
-                      "/dev/mapper/root" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
+                      "/dev/disk/by-uuid/0e184f3b-af6c-4f5d-926a-2559f2dc3063"."/boot" = "/boot";
+                      "/dev/mapper/root1" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
                     };
                   };
-                  decrypt.manual =
+                  decrypt.auto =
                   {
-                    enable = true;
-                    devices."/dev/disk/by-uuid/46e59fc7-7bb1-4534-bbe4-b948a9a8eeda" = { mapper = "root"; ssd = true; };
-                    delayedMount = [ "/" ];
+                    "/dev/disk/by-uuid/5cf1d19d-b4a5-4e67-8e10-f63f0d5bb649".mapper = "root1";
+                    "/dev/disk/by-uuid/aa684baf-fd8a-459c-99ba-11eb7636cb0d".mapper = "root2";
                   };
-                  swap = [ "/nix/swap/swap" ];
-                  rollingRootfs = { device = "/dev/mapper/root"; path = "/nix/rootfs"; };
+                  rollingRootfs = { device = "/dev/mapper/root1"; path = "/nix/rootfs"; };
                 };
-                grub.installDevice = "/dev/disk/by-path/pci-0000:00:04.0";
+                grub.installDevice = "efi";
                 nixpkgs.march = "silvermont";
                 nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ];
-                initrd =
-                {
-                  network.enable = true;
-                  sshd = { enable = true; hostKeys = [ "/nix/persistent/etc/ssh/initrd_ssh_host_ed25519_key" ]; };
-                };
                 kernel.patches = [ "preempt" ];
                 impermanence.enable = true;
                 networking.hostname = "nas";
@@ -659,7 +653,7 @@
                 sound.enable = true;
               };
               packages.packageSet = "desktop";
-              virtualization.docker.enable = true;
+              virtualization = { docker.enable = true; kvmGuest.enable = true; };
               services =
               {
                 snapper = { enable = true; configs.persistent = "/nix/persistent"; };
@@ -713,7 +707,7 @@
                   inputs.self.nixosConfigurations.${node};
             };
           })
-          [ "vps6" "vps4" "vps7" ]);
+          [ "vps6" "vps4" "vps7" "nas" ]);
       };
     };
 }

local/pkgs/default.nix

@@ -16,7 +16,13 @@
   #   intel-mpi = pkgs.lmix-pkgs.intel-oneapi-mpi_2021_9_0;
   #   ifort = pkgs.lmix-pkgs.intel-oneapi-ifort_2021_9_0;
   # };
-  vasp = callPackage ./vasp { openmp = llvmPackages.openmp; };
+  vasp = callPackage ./vasp
+  {
+    openmp = llvmPackages.openmp;
+    openmpi = pkgs.openmpi.override { cudaSupport = false; };
+  };
   vaspkit = callPackage ./vaspkit { attrsToList = (import ../lib lib).attrsToList; };
   # "12to11" = callPackage ./12to11 {};
+  huginn = callPackage ./huginn {};
+  v_sim = callPackage ./v_sim {};
 }

local/pkgs/huginn/default.nix

@@ -0,0 +1,29 @@
+{ lib, stdenv, bundlerEnv, fetchFromGitHub }:
+let
+  pname = "huginn";
+  version = "20230723";
+  src = fetchFromGitHub
+  {
+    owner = "CHN-beta";
+    repo = "huginn";
+    rev = "a02977ad420a01b6460634af19f714db4a8f8f36";
+    hash = "sha256-Ty2EDCIjbvcf3PzPupcV4s7ZfAFTuYEjSfy0m+Yt3j4=";
+  };
+  gems = bundlerEnv
+  {
+    name = "${pname}-${version}-gems";
+    gemdir  = "${src}";
+    gemfile = "${src}/Gemfile";
+    lockfile = "${src}/Gemfile.lock";
+    gemset  = "${src}/gemset.nix";
+    copyGemFiles = true;
+  };
+in stdenv.mkDerivation
+{
+  inherit pname version src;
+  buildInputs = [ gems gems.wrappedRuby ];
+  installPhase =
+  ''
+    false
+  '';
+}

local/pkgs/v_sim/default.nix

@@ -0,0 +1,28 @@
+{
+  stdenv, lib, fetchFromGitLab,
+  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=";
+  };
+  buildInputs = [ glib gtk3 epoxy libyaml ];
+  nativeBuildInputs =
+  [
+    autoreconfHook wrapGAppsHook autoconf libtool intltool gettext automake pkg-config
+    gtk-doc gfortran libxslt.bin
+  ];
+  enableParallelBuilding = true;
+  postPatch =
+  ''
+    ./autogen.sh
+  '';
+}

local/pkgs/vesta/default.nix

@@ -1,5 +1,5 @@
 {
-  lib, stdenv, fetchurl, autoPatchelfHook, wrapGAppsHook,
+  lib, stdenv, fetchurl, autoPatchelfHook, wrapGAppsHook, makeWrapper,
   glib, gtk2, xorg, libGLU, gtk3, writeShellScript, gsettings-desktop-schemas, xdg-utils
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec
     sha256 = "Tq4AzQgde2KIWKA1k6JlxvdphGG9JluHMZjVw0fBUeQ=";
   };
 
-  nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook ];
+  nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook makeWrapper ];
   buildInputs = [ glib gtk2 xorg.libXxf86vm libGLU gtk3 xorg.libXtst ];
 
   unpackPhase = "tar -xf ${src}";
@@ -35,13 +35,7 @@ stdenv.mkDerivation rec
     cp -r VESTA-gtk3 $out/opt/VESTA-gtk3
 
     mkdir -p $out/bin
-    tee $out/bin/vesta << EOF
-      #!${stdenv.shell}
-      export XDG_DATA_DIRS=$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS
-      export PATH="\$PATH\''${PATH:+:}${xdg-utils}/bin"
-      $out/opt/VESTA-gtk3/VESTA "\$@"
-    EOF
-    chmod +x $out/bin/vesta
+    makeWrapper $out/opt/VESTA-gtk3/VESTA $out/bin/vesta
 
     patchelf --remove-needed libjawt.so $out/opt/VESTA-gtk3/PowderPlot/libswt-awt-gtk-3346.so
   '';

modules/hardware/default.nix

@@ -101,7 +101,7 @@ inputs:
                 let
                   packages =
                   {
-                    intel = [ intel-compute-runtime intel-media-driver intel-vaapi-driver libvdpau-va-gl ];
+                    intel = [ intel-compute-runtime intel-media-driver libvdpau-va-gl ]; # intel-vaapi-driver
                     nvidia = [ vaapiVdpau ];
                   };
                 in

modules/packages/default.nix

@@ -48,7 +48,7 @@ inputs:
           # file manager
           tree exa trash-cli lsd broot file xdg-ninja mlocate
           # compress
-          pigz rar upx unzip inputs.topInputs.nixpkgs-stable.legacyPackages.x86_64-linux.zip lzip p7zip
+          pigz rar upx unzip zip lzip p7zip
           # file system management
           sshfs e2fsprogs adb-sync duperemove compsize
           # disk management
@@ -142,7 +142,7 @@ inputs:
             # download
             qbittorrent yt-dlp nur-xddxdd.baidupcs-go wgetpaste
             # office
-            crow-translate zotero pandoc
+            unstablePackages.crow-translate zotero pandoc
             # development
             scrcpy
             # media
@@ -155,7 +155,7 @@ inputs:
             # news
             fluent-reader rssguard
             # davinci-resolve playonlinux
-            weston cage
+            weston cage openbox krita
             genymotion
             (
               vscode-with-extensions.override
@@ -202,7 +202,7 @@ inputs:
             languagePacks = [ "zh-CN" "en-US" ];
             nativeMessagingHosts.firefoxpwa = true;
           };
-          vim.package = inputs.pkgs.vim-full;
+          vim.package = inputs.pkgs.genericPackages.vim-full;
         };
         nixpkgs.config.packageOverrides = pkgs: 
         {
@@ -224,7 +224,7 @@ inputs:
           [
             # 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
+            nix-prefetch-docker pnpm-lock-export bundix
             # instant messager
             zoom-us signal-desktop qq nur-xddxdd.wechat-uos slack # jail
             # office
@@ -238,8 +238,8 @@ inputs:
             # text editor
             appflowy notion-app-enhanced joplin-desktop standardnotes
             # math, physics and chemistry
-            mathematica octave root ovito paraview localPackages.vesta qchem.quantum-espresso # vsim
-            localPackages.vasp localPackages.phonon-unfolding localPackages.vaspkit
+            mathematica octave root ovito paraview localPackages.vesta qchem.quantum-espresso
+            localPackages.vasp localPackages.phonon-unfolding localPackages.vaspkit jmol localPackages.v_sim
             # news
             newsflash newsboat
           ];

modules/services/default.nix

@@ -137,7 +137,7 @@ inputs:
           fonts =
           {
             fontDir.enable = true;
-            packages = with inputs.pkgs;
+            fonts = with inputs.pkgs;
               [ noto-fonts source-han-sans source-han-serif source-code-pro hack-font jetbrains-mono nerdfonts ];
             fontconfig.defaultFonts =
             {

modules/services/meilisearch.nix

@@ -37,7 +37,7 @@ inputs:
                 Group = inputs.config.users.users.${instance.value.user}.group;
                 ExecStart =
                   let
-                    meilisearch = inputs.pkgs.meilisearch.overrideAttrs (prev:
+                    meilisearch = inputs.pkgs.unstablePackages.meilisearch.overrideAttrs (prev:
                     {
                       RUSTFLAGS = prev.RUSTFLAGS or [] ++ [ "-Clto=true" "-Cpanic=abort" "-Cembed-bitcode=yes"]
                         ++ (

modules/services/misskey.nix

@@ -54,6 +54,8 @@ inputs:
               ExecStart = "${WorkingDirectory}/bin/misskey";
               CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
               AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
+              Restart = "always";
+              RuntimeMaxSec = "1d";
             };
           };
           tmpfiles.rules = [ "d /var/lib/misskey/files 0700 misskey misskey" ];

modules/system/fileSystems.nix

@@ -198,7 +198,7 @@ inputs:
       # mdadm
       (
         mkIf (fileSystems.mdadm != null)
-          { boot.swraid = { enable = true; mdadmConf = fileSystems.mdadm; }; }
+          { boot.initrd.services.swraid = { enable = true; mdadmConf = fileSystems.mdadm; }; }
       )
       # swap
       { swapDevices = map (device: { device = device; }) fileSystems.swap; }

modules/system/kernel.nix

@@ -36,10 +36,10 @@ inputs:
           owner = "xanmod";
           repo = "linux";
           rev = modDirVersion;
-          sha256 = "sha256-rvSQJb9MIOXkGEjHOPt3x+dqp1AysvQg7n5yYsg95fk=";
+          hash = "sha256-EugTfBbeH9VTpIg1aDNfaY57NDCA70QIdsOfzxWMSeA=";
         };
-        version = "6.4.12";
-        modDirVersion = "6.4.12-xanmod1";
+        version = "6.4.14";
+        modDirVersion = "6.4.14-xanmod1";
       });
       kernelPatches =
         let
@@ -49,8 +49,8 @@ inputs:
             {
               patch = inputs.pkgs.fetchurl
               {
-                url = "https://raw.githubusercontent.com/zhmars/cjktty-patches/master/v6.x/cjktty-6.3.patch";
-                sha256 = "sha256-QnsWruzhtiZnqzTUXkPk9Hb19Iddr4VTWXyV4r+iLvE=";
+                url = "https://raw.githubusercontent.com/zhmars/cjktty-patches/master/v6.x/cjktty-6.4.patch";
+                sha256 = "1kvmddg18pw22valbgx2vlxiasgxvszzm5lzkz096xm51sz72rm0";
               };
               extraStructuredConfig =
                 { FONT_CJK_16x16 = inputs.lib.kernel.yes; FONT_CJK_32x32 = inputs.lib.kernel.yes; };

modules/system/nixpkgs.nix

@@ -22,8 +22,12 @@ inputs:
         {
           config.allowUnfree = true;
           config.cudaSupport = nixpkgs.cudaSupport;
-          overlays = [(final: prev: { genericPackages =
-            import inputs.topInputs.nixpkgs { system = "x86_64-linux"; config.allowUnfree = true; };})];
+          overlays = [(final: prev:
+          {
+            genericPackages =
+              import inputs.topInputs.nixpkgs { system = "x86_64-linux"; config.allowUnfree = true; };
+            waydroid = final.unstablePackages.waydroid;
+          })];
         };
       }
       (
@@ -33,6 +37,14 @@ inputs:
           {
             hostPlatform = { system = "x86_64-linux"; gcc = { arch = nixpkgs.march; tune = nixpkgs.march; }; };
             config = { qchem-config.optArch = nixpkgs.march; oneapiArch = nixpkgs.oneapiArch; };
+            overlays = [(final: prev:
+            {
+              unstablePackages = import inputs.topInputs.nixpkgs-unstable
+              {
+                localSystem = { system = "x86_64-linux"; gcc = { arch = nixpkgs.march; tune = nixpkgs.march; }; };
+                config.allowUnfree = true;
+              };
+            })];
           };
           boot.kernelPatches =
           [{
@@ -56,7 +68,14 @@ inputs:
               };
           }];
         }
-        { nixpkgs.hostPlatform = "x86_64-linux"; }
+        {
+          nixpkgs =
+          {
+            hostPlatform = "x86_64-linux";
+            overlays = [(final: prev: { unstablePackages = import inputs.topInputs.nixpkgs-unstable
+              { localSystem.system = "x86_64-linux"; config.allowUnfree = true; }; })];
+          };
+        }
       )
     ];
 }

modules/system/systemd.nix

@@ -14,6 +14,6 @@ inputs: { config =
     services.systemd-tmpfiles-setup.environment.SYSTEMD_TMPFILES_FORCE_SUBVOL = "0";
     # do not clean /tmp
     timers.systemd-tmpfiles-clean.enable = false;
-    coredump.enable = false;
+    coredump = { enable = true; extraConfig = "Storage=none"; };
   };
 };}

modules/users/default.nix

@@ -31,6 +31,11 @@ inputs:
               shell = inputs.pkgs.zsh;
               autoSubUidGidRange = true;
               hashedPassword = "$y$j9T$xJwVBoGENJEDSesJ0LfkU1$VEExaw7UZtFyB4VY1yirJvl7qS7oiF49KbEBrV0.hhC";
+              openssh.authorizedKeys.keys =
+              [
+                ("sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIPLByi05vCA95EfpgrCIXzkuyUWsyh"
+                  + "+Vso8FsUNFwPXFAAAABHNzaDo= chn@chn.moe")
+              ];
             };
           };
           mutableUsers = false;
@@ -165,7 +170,7 @@ inputs:
                           vps5 = "vps5.chn.moe";
                           vps6 = "vps6.chn.moe";
                           vps7 = "vps7.chn.moe";
-                          nas = "192.168.1.188";
+                          nas = "192.168.1.185";
                         }))
                       ++ (map
                         (host:
@@ -216,6 +221,7 @@ inputs:
                   {
                     enable = true;
                     defaultEditor = true;
+                    packageConfigurable = inputs.config.programs.vim.package;
                     settings =
                     {
                       number = true;
@@ -231,7 +237,6 @@ inputs:
                   };
                   chromium =
                   {
-                    package = inputs.topInputs.nixpkgs-stable.legacyPackages.x86_64-linux.chromium;
                     enable = inputs.config.programs.chromium.enable && gui;
                     extensions =
                     [

secrets/nas.yaml

@@ -1,5 +1,5 @@
 xray-client:
-    uuid: ENC[AES256_GCM,data:0q37D3FVH95eSmw1KPuQSbt6zgzdt9iyO6Mnsk/CiDtp36BR,iv:V0sZLD4VAPF6LQg+mrWxpvnKfkCwQlmwGuJ86XEe8Ik=,tag:UEQAcpkv1LmuIBF50PL0lQ==,type:str]
+    uuid: ENC[AES256_GCM,data:97aX07G5FPumdWcDxnYOs6fRgljXWuwyNXGg1d7zdbUUfNnb,iv:+wAC/DZXsg+evYFA4DMfLw5Ut3ExQl1RgZ/2AsNQDpo=,tag:ebD77muITHof+FQMydWobg==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -9,14 +9,23 @@ sops:
         - recipient: age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArbFR2bHMrRmdXWVVHTTlJ
-            VVFoMXNBWUU0MGkrOWl0bEphb3JlSTlsN25nCjE1NTZwTHM1b09ZeS9GQ09pRFB0
-            TFRPcW5MTGI1dTk0YXFsVmI1ZmVnTlUKLS0tIEpZNW1YMi9Gc0laRkxYbEw2TGd2
-            MVRPMDVCeHVlOTBnWVNJZ21kcmlBTFkKKbyR6MGaKRvk23toLEdD9s7deQN2Dp9U
-            fYn/X4SC7Wfm4atiDbLR3Jz6FhjRAN+s//lrojRb4yqoipa2AN5tPA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3aWJSUVUwMnYwN01vSEJO
+            cHV3Ylkzb1Z6Z1E3a2NwZXdIVlpacHJDNWhBCkZXZWx5M21HKy94WkhuaDhkVEFL
+            M01MdUlza0VmK1hKTExmeFdUWDllbTAKLS0tIE8wR1F6ZVZPNVYwU1Y3ZFJaUkhT
+            a3B1UzdQSjlzTmxReVhWMzhTaVdTRDgKG76K16V6NAMaeyfne4LL/zwa5+lfPz/y
+            1SX1JOaWNpXqfOIGflZUF88lxCLR8ttEFea391x2vhoKPZKCvIDGHw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-08-23T12:21:23Z"
-    mac: ENC[AES256_GCM,data:sUfKYYu4aQYa2hO09aRXDdlrxY9T8ePb4sMTf8hfHHZLRaxLubWy7JkzVdxlTDpCHEZIW5J5zpbcjpvE8ZC5G/m45iCLwJIqAM5teSoG5FW/hR2uzfSuRsF/5vh1xFREsGtMLYskBobvf9mssBwRXgaKOv4zAHzlBmEhTLTBFLg=,iv:TmjRAHISDSK1+M1WtrMYF20cdCPCqu05VhHl6/ipKB4=,tag:jwMdzZoFu1IOB3sg2/kxlg==,type:str]
+        - recipient: age19lhcwk37jmvn6z0v4dpdfh0k4u23f76twdjknc0p7atktf37rd7s4t4wj3
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4eXhkb1B3WXhGTTBLTDk2
+            ZmhTUDltWGk4ZU1PUk8vYkVaUkx0MDFEWUZNCjl2R25JR3Z0U3NKWWwzbjVsMXVq
+            NXMxOThGaFVHQ1ZacU4yUXVBVXNBNUkKLS0tIFkyUjhzMzlMVkM2WFZ1VUw5Zlcy
+            by9Rd0U0bzNiK21BQTNxN1RuQ09DQVkKJmSlzV5ppEkZFljsS17ZWmoI++fz4tJh
+            kTdoAStG1zsKASHyZTsmdm3RBDO3qV1KhQC2gC7d4EiwNZngxOOZJg==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2023-09-10T06:53:19Z"
+    mac: ENC[AES256_GCM,data:dBmJUijAS2iD86kHTzW4o6hs2DimDDWtq7Xtx9JWo+c8jTqeOMw40/4UeXSyS6uzK9s8tQiM5+IclKHxn/fjQa+vOJh94VkBa9zFgGGQB2PtCaoJi3BaMP7xJZgI5LUhxy0N0UYSAIYJcaqm9uWiuFm50r0/EDZzuxYX8JMnGIk=,iv:rrRJxXsgnBH69f3Wal/YakJRP+p0NfbxfuDttXIEUkE=,tag:iuL9kT6V8xkoUSVy2MNLyg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3