chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2026-01-12 00:49:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into production

Browse Source
This commit is contained in:
陈浩南
2025-12-25 09:13:40 +08:00
parent 5aebb72185 0211a71cfa
commit 3b7e22fc52
10 changed files with 134 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
devices/jykang/default.nix
View File

@@ -15,10 +15,11 @@ let
mkdir -p $out/bin mkdir -p $out/bin
ln -s ${python}/bin/python3 $out/bin/python-lyj ln -s ${python}/bin/python3 $out/bin/python-lyj
''; '';
in pkgs.symlinkJoin jykang = pkgs.symlinkJoin
{ {
name = "jykang"; name = "jykang";
paths = with pkgs; [ gnuplot localPackages.vaspkit pv python-lyj sqlite ]; paths = with pkgs; [ gnuplot localPackages.vaspkit pv python-lyj sqlite ];
postBuild = "echo ${inputs.self.rev or "dirty"} > $out/.version"; postBuild = "echo ${inputs.self.rev or "dirty"} > $out/.version";
passthru = { inherit pkgs; }; passthru = { inherit pkgs; archive = pkgs.closureInfo { rootPaths = [ jykang.drvPath ]; }; };
} };
in jykang

15
devices/wlin/default.nix
View File

@@ -5,10 +5,11 @@ let
inputs = { inherit (inputs.nixpkgs) lib; topInputs = inputs; }; inputs = { inherit (inputs.nixpkgs) lib; topInputs = inputs; };
nixpkgs = { march = "haswell"; nixRoot = "/data/gpfs01/wlin/.nix"; nixos = false; }; nixpkgs = { march = "haswell"; nixRoot = "/data/gpfs01/wlin/.nix"; nixos = false; };
}); });
in pkgs.symlinkJoin wlin = pkgs.symlinkJoin
{ {
name = "wlin"; name = "wlin";
paths = with pkgs; [ gnuplot localPackages.vaspkit pv ]; paths = with pkgs; [ gnuplot localPackages.vaspkit pv ];
postBuild = "echo ${inputs.self.rev or "dirty"} > $out/.version"; postBuild = "echo ${inputs.self.rev or "dirty"} > $out/.version";
passthru = { inherit pkgs; }; passthru = { inherit pkgs; archive = pkgs.closureInfo { rootPaths = [ wlin.drvPath ]; }; };
} };
in wlin

17
devices/xmuhk/default.nix
View File

@@ -59,11 +59,12 @@ let
trap cleanup SIGINT SIGTERM SIGHUP EXIT trap cleanup SIGINT SIGTERM SIGHUP EXIT
tail -f /dev/null tail -f /dev/null
''; '';
in pkgs.symlinkJoin xmuhk = pkgs.symlinkJoin
{ {
name = "xmuhk"; name = "xmuhk";
paths = (with pkgs; [ hello btop htop iotop pv localPackages.lumerical.lumerical.cmd ]) paths = (with pkgs; [ hello btop htop iotop pv localPackages.lumerical.lumerical.cmd ])
++ [ lumericalLicenseManager ]; ++ [ lumericalLicenseManager ];
postBuild = "echo ${inputs.self.rev or "dirty"} > $out/.version"; postBuild = "echo ${inputs.self.rev or "dirty"} > $out/.version";
passthru = { inherit pkgs; }; passthru = { inherit pkgs; archive = pkgs.closureInfo { rootPaths = [ xmuhk.drvPath ]; }; };
} };
in xmuhk

218
flake.lock generated
View File

@@ -9,11 +9,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1765245742, "lastModified": 1766066658,
"narHash": "sha256-Jh+mDlCWAktYVKUUOJCPoPHfSDwhqw+UEJNt9/Mr/Zk=", "narHash": "sha256-RcoPJNhVguYUTqZTry3/Za+5crZHEbgENeSCUf3H1Nc=",
"owner": "ezKEa", "owner": "ezKEa",
"repo": "aagl-gtk-on-nix", "repo": "aagl-gtk-on-nix",
"rev": "20a2f9146483dd52234059e16d02159b96874a2c", "rev": "c0a4bcf6e95de105aaf11c0d7d8c164c86ae5989",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -100,11 +100,11 @@
"cachyos-kernel": { "cachyos-kernel": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765803132, "lastModified": 1766083376,
"narHash": "sha256-HQRBJcnUvoSh5ZvYWB3/vhvozuXAiOr36BUghEoGK+E=", "narHash": "sha256-eh914fO4gYD8aCuUrMlPBRsxwwa2+qc9HCuAhrG6G9c=",
"owner": "CachyOS", "owner": "CachyOS",
"repo": "linux-cachyos", "repo": "linux-cachyos",
"rev": "3c3ffceb2ab21e7a67a0565ae636d1471893e35b", "rev": "9d369789361623b8a3b842a71adccb19b24ba16f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -116,11 +116,11 @@
"cachyos-kernel-patches": { "cachyos-kernel-patches": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765893414, "lastModified": 1766080842,
"narHash": "sha256-gocqXiDzubfOpmbiLSmDtpE1CbKJe5N1f6bE9aocmlw=", "narHash": "sha256-LezfhAfTdfhvjiHSWe258SMUIs+cP8SHT8BiPou0A4w=",
"owner": "CachyOS", "owner": "CachyOS",
"repo": "kernel-patches", "repo": "kernel-patches",
"rev": "c89149f55d044df5734d7b1018bc015a56900868", "rev": "e266fbc7f36273ebbc62a9bffda02e3882eb8f6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -132,11 +132,11 @@
"cachyos-kernel-patches_2": { "cachyos-kernel-patches_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765622390, "lastModified": 1766080842,
"narHash": "sha256-e9yoAfVY6URHUbUa6zehrvv1eIMdA9YAOql/ICAly38=", "narHash": "sha256-LezfhAfTdfhvjiHSWe258SMUIs+cP8SHT8BiPou0A4w=",
"owner": "CachyOS", "owner": "CachyOS",
"repo": "kernel-patches", "repo": "kernel-patches",
"rev": "8a5e89d346af4221d7426b45da65a677a1ff5582", "rev": "e266fbc7f36273ebbc62a9bffda02e3882eb8f6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -148,11 +148,11 @@
"cachyos-kernel_2": { "cachyos-kernel_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765622878, "lastModified": 1766083376,
"narHash": "sha256-gUC76q6nNDNF7PM4UWGW58eOGF0BalwgnPMTj8tKXiY=", "narHash": "sha256-eh914fO4gYD8aCuUrMlPBRsxwwa2+qc9HCuAhrG6G9c=",
"owner": "CachyOS", "owner": "CachyOS",
"repo": "linux-cachyos", "repo": "linux-cachyos",
"rev": "278762fc5eb743b8bf9f819fdf6506306685b101", "rev": "9d369789361623b8a3b842a71adccb19b24ba16f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -168,11 +168,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765485905, "lastModified": 1765990358,
"narHash": "sha256-fk6zFzzcwz6su99K7UTxS2497+z/Cdk3FzNsacsmZKA=", "narHash": "sha256-l8x0gU8mnYaGMl+gWrsSHKBJlZWD8KXJfHTkRlFiPI0=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "b49c675acd80931fc8b54290920a90189b461dcf", "rev": "de1b60ca45a578f59f7d84c8d338b346017b2161",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -215,11 +215,11 @@
}, },
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1765145449, "lastModified": 1765739568,
"narHash": "sha256-aBVHGWWRzSpfL++LubA0CwOOQ64WNLegrYHwsVuVN7A=", "narHash": "sha256-gQYx35Of4UDKUjAYvmxjUEh/DdszYeTtT6MDin4loGE=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "69f538cdce5955fcd47abfed4395dc6d5194c1c5", "rev": "67d2baff0f9f677af35db61b32b5df6863bcc075",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -237,11 +237,11 @@
"quickshell": "quickshell" "quickshell": "quickshell"
}, },
"locked": { "locked": {
"lastModified": 1765677334, "lastModified": 1766242681,
"narHash": "sha256-4W1BtjXTtRlx3aJ0fCmyCfnotgcg45WswuGNukmJONQ=", "narHash": "sha256-yiZxxOu9Way4MqjoFoFu9RW242do7c7/KXfVbYkibuA=",
"owner": "AvengeMedia", "owner": "AvengeMedia",
"repo": "DankMaterialShell", "repo": "DankMaterialShell",
"rev": "3c9886ad1b3356c2f5fc2a917f4da3a3474f2771", "rev": "dca07a70f8269e3cb598095cf0b22e65e1c72082",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -486,11 +486,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765495779, "lastModified": 1765835352,
"narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=", "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "5635c32d666a59ec9a55cab87e898889869f7b71", "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -504,11 +504,11 @@
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib_2"
}, },
"locked": { "locked": {
"lastModified": 1765495779, "lastModified": 1765835352,
"narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=", "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "5635c32d666a59ec9a55cab87e898889869f7b71", "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -584,11 +584,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1765419202, "lastModified": 1766023871,
"narHash": "sha256-It4CmiKEY4Z2AzTvoCJBLbZZ9UqrQC0tVAb5rbX/l+U=", "narHash": "sha256-s8cTJXGSbIxK4kL3+JDPWkM+sHBaMVFiLaOjiuvoffs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "harmonia", "repo": "harmonia",
"rev": "0829b842208546adab08963b96fe08be5a20cb5a", "rev": "93b2dcbf16b39bbb563287a88d451ceeba41b871",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -620,11 +620,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765605144, "lastModified": 1766292113,
"narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=", "narHash": "sha256-sWTtmkQujRpjWYCnZc8LWdDiCzrRlSBPrGovkZpLkBI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "90b62096f099b73043a747348c11dbfcfbdea949", "rev": "fdec8815a86db36f42fc9c8cb2931cd8485f5aed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -767,11 +767,11 @@
"nc4nix": { "nc4nix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765649042, "lastModified": 1766253837,
"narHash": "sha256-Y+969izs3r5d8h2M6Rmv/ddZ5cSpmEdNpW3PUGy7eiQ=", "narHash": "sha256-EmjgR/1QG6kMyloyO++V71LKFjcV+yZ6cTSqhlm/jlI=",
"owner": "helsinki-systems", "owner": "helsinki-systems",
"repo": "nc4nix", "repo": "nc4nix",
"rev": "42a9cdce832c5f00ec31455613f1b745f9ace8fb", "rev": "6879a4a2c4ba4aae0eb202ccdd604aaaff51d890",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -792,11 +792,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1765629179, "lastModified": 1766291414,
"narHash": "sha256-yYQR3ZYXWEh8mAQOhj6ZOZ4VxZrpzhRz14bOXAMPtcQ=", "narHash": "sha256-0bPXNNAJOffm+iSorLOJvfTqEQa4isWRS9Cl4E+BXn4=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "46e723aa46565b67910187b4b7ad48b615d7f576", "rev": "a9ce6453f35f795f9e1203ff0f49c284ce588cf5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -825,11 +825,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765625997, "lastModified": 1766229062,
"narHash": "sha256-d0/ugnBSrCJwwySMc5skOMbAfEdjWapc+EMFbcsnd5Q=", "narHash": "sha256-8iBPfiM3w0m7Qrs3PyFyiN+I96ba4owEaSZ9ahgPdqM=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "d1fc1ab731f7cc59923a16acce9a387782bfeb10", "rev": "19e55a2df095d14f9490b79e38193ad4b4e87bb9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -841,11 +841,11 @@
"nix": { "nix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1764972171, "lastModified": 1766017819,
"narHash": "sha256-rZf5zbxu0eCz3Lb4IrelWNuegoQHUjCguuJzcyPFvt0=", "narHash": "sha256-xcAPlRHF9OuHBsU9tAcZ1eByzNTifPcglVboBnw+PGk=",
"owner": "nixos", "owner": "nixos",
"repo": "nix", "repo": "nix",
"rev": "0db70b8184c1037a606d9cbd6c277c78f7adf647", "rev": "188cb798ad486e7c5f8a3b2859e74d7fa642bd12",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -865,11 +865,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765941329, "lastModified": 1766317927,
"narHash": "sha256-Jr1C0lsLIWwIkaS+8TUvKBzLmtqQTNyh/d+0yLzezos=", "narHash": "sha256-8bpmKA1+G8r8uB8YesjmvSS8w+0dhB+SYdmpGWYlXAE=",
"owner": "CHN-beta", "owner": "CHN-beta",
"repo": "nix-cachyos-kernel", "repo": "nix-cachyos-kernel",
"rev": "c3a2d7fc9c94b13f1d68f3152c126f9799f42b68", "rev": "ae6243bbaac9c0eff212bfb45eff5620dfe383a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -893,11 +893,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765647886, "lastModified": 1766254058,
"narHash": "sha256-+oOmiXaFmhatMwBXZtvoxk7s5FUQpyFB6ukI6cNGwKU=", "narHash": "sha256-0MBS9uy9qRYvNhPmKM+ROKzS3rhaw0+fYvcWdjHnPgc=",
"owner": "xddxdd", "owner": "xddxdd",
"repo": "nix-cachyos-kernel", "repo": "nix-cachyos-kernel",
"rev": "621af4b63effc390d9c37d4f93fd027bd5e964a8", "rev": "164ca033aca3d563655a1aff3fdf682fc1ffa5a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -980,6 +980,7 @@
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"repo": "nix4vscode", "repo": "nix4vscode",
"rev": "6c603c201b11dafda616940bac1f295144ac1c41",
"type": "github" "type": "github"
} }
}, },
@@ -999,24 +1000,6 @@
"type": "github" "type": "github"
} }
}, },
"nixos-wallpaper": {
"flake": false,
"locked": {
"lastModified": 1763778971,
"lfs": true,
"narHash": "sha256-adf/LAk6xlJInqCLvn7jPlgycvSXz/mni7bzWAhz+S8=",
"ref": "refs/heads/main",
"rev": "454cc19becbd3ce494b8d5df666e05a3fa9ceba3",
"revCount": 14,
"type": "git",
"url": "https://git.chn.moe/chn/nixos-wallpaper.git"
},
"original": {
"lfs": true,
"type": "git",
"url": "https://git.chn.moe/chn/nixos-wallpaper.git"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1744536153, "lastModified": 1744536153,
@@ -1114,11 +1097,11 @@
}, },
"nixpkgs-lib_2": { "nixpkgs-lib_2": {
"locked": { "locked": {
"lastModified": 1761765539, "lastModified": 1765674936,
"narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1129,11 +1112,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1765311797, "lastModified": 1766201043,
"narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", "rev": "b3aad468604d3e488d627c0b43984eb60e75e782",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1161,11 +1144,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1766120825, "lastModified": 1766317807,
"narHash": "sha256-p9cCGl3hOkHt37/UKJvuQr+ToO8pyrgHzMtQYkjECvs=", "narHash": "sha256-HQeHsIrRFllgpmUlhMH+F8cxp/zeODTziEHai2Ryebw=",
"owner": "CHN-beta", "owner": "CHN-beta",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "90acc805cec579c1fa48f249822ebcdb06c8b907", "rev": "201f7c1ac0c7c455ad0a6660c037f49821160c3b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1198,11 +1181,11 @@
"nu-scripts": { "nu-scripts": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765474577, "lastModified": 1766007177,
"narHash": "sha256-ZUBuAL+T28k3t9ssV0GBYo5iKtf4DJxTubcwd0BZL6I=", "narHash": "sha256-KsS3Brtt9tXKpogXdGQJK6QfJq3tbGnyU/ydVaYggE4=",
"owner": "nushell", "owner": "nushell",
"repo": "nu_scripts", "repo": "nu_scripts",
"rev": "24766292d56fa1b645d37e1dd69db4a4af0f1836", "rev": "4af008a317185b4e247bdb13002dbc074e98b60c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1225,11 +1208,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1765607984, "lastModified": 1766176929,
"narHash": "sha256-eIfGXL4S93giDf+vklDOMTqsQLY96SNRyGtNb+kqYc8=", "narHash": "sha256-/g73VBHnGTgmgWmvzmS9IiMXJ5uV2VJma6ZPFvBeC5k=",
"owner": "linyinfeng", "owner": "linyinfeng",
"repo": "nur-packages", "repo": "nur-packages",
"rev": "fd7583767cab5d87538e2ac671c05ec7e70e2b5e", "rev": "7286e49f58d4effc7a0f7f45aaaaa439540c7e96",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1251,11 +1234,11 @@
"treefmt-nix": "treefmt-nix_3" "treefmt-nix": "treefmt-nix_3"
}, },
"locked": { "locked": {
"lastModified": 1765715197, "lastModified": 1766317860,
"narHash": "sha256-MImc+zz1TKBGNya3gX70K8Dm+gW5vhGMP+eAfAbv87c=", "narHash": "sha256-HoNTjaOkn7nG4ijDBvx/cnyZJm7zbsF0aV7ETJEDsyk=",
"owner": "CHN-beta", "owner": "CHN-beta",
"repo": "nur-xddxdd", "repo": "nur-xddxdd",
"rev": "462c3fe2834a9b1997c920770e7dad498191b125", "rev": "dd08d793fc3d2318daeac878037317089319719d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1280,11 +1263,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760948256, "lastModified": 1765698311,
"narHash": "sha256-nIsrxp6n1nQ63n1JTDaO/18RjvYbW9GVkanTP4G6Y18=", "narHash": "sha256-78sPqekEDJiol2YD3Hx2zHu5E4AtrbNrUKi0032HMHo=",
"owner": "berberman", "owner": "berberman",
"repo": "nvfetcher", "repo": "nvfetcher",
"rev": "cb958b35b647c8a79fbd9d79764accc5e5a9a430", "rev": "dbae9626c46b93d9fd6b85c8b292939ae569c4fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1353,11 +1336,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765464257, "lastModified": 1765911976,
"narHash": "sha256-dixPWKiHzh80PtD0aLuxYNQ0xP+843dfXG/yM3OzaYQ=", "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "09e45f2598e1a8499c3594fe11ec2943f34fe509", "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1453,7 +1436,6 @@
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nix4vscode": "nix4vscode", "nix4vscode": "nix4vscode",
"nixos-wallpaper": "nixos-wallpaper",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgs-2305": "nixpkgs-2305", "nixpkgs-2305": "nixpkgs-2305",
"nixpkgs-2311": "nixpkgs-2311", "nixpkgs-2311": "nixpkgs-2311",
@@ -1486,11 +1468,11 @@
"rsshub": { "rsshub": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765604264, "lastModified": 1766246081,
"narHash": "sha256-rfLG0W8URtksZlYEa5XFkIn1bkCPVkRG7C75kcaUpFg=", "narHash": "sha256-0T/irp921k49XvKsXmH+fegbISNohaVW8YAB3TildBY=",
"owner": "DIYgod", "owner": "DIYgod",
"repo": "RSSHub", "repo": "RSSHub",
"rev": "9f09c37c30a47207f1b74a29f39b6ef713d5f3b7", "rev": "14757b8d5e22d9af85d259d9f1188f286874f14c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1520,11 +1502,11 @@
"rycee": { "rycee": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765598666, "lastModified": 1766289817,
"narHash": "sha256-faLDozLZAi4HjTKG1C13JUx57YJNH89pR0WmIg4whMA=", "narHash": "sha256-Y2GlcwoB72HeWGB40y2V3rSw7b7o1mTlb7pLgod2WSA=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "bd9bf55fbe132fe5e50bb4a33d26f2b17f620bf7", "rev": "6509da5789e9ee79a30983950b44a0f5ceaefb2a",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@@ -1540,11 +1522,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1765553226, "lastModified": 1766289575,
"narHash": "sha256-Ii16Nq5jL2wURXpV3D3tOM3vPpbKh18roHLkyZCHK4Q=", "narHash": "sha256-BOKCwOQQIP4p9z8DasT5r+qjri3x7sPCOq+FTjY8Z+o=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "496a6f625f63b780ce849891868f2fad22fd49c6", "rev": "9836912e37aef546029e48c8749834735a6b9dad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1556,11 +1538,11 @@
"speedtest": { "speedtest": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765145618, "lastModified": 1766004313,
"narHash": "sha256-Ijo/wKTD85yEmRJSlNvKWaSA09o00hUWnl7bQxaEywI=", "narHash": "sha256-adkIZBuWalT/G1jclKFDjqFgaIHikxI4vRXVdWT6P2o=",
"owner": "librespeed", "owner": "librespeed",
"repo": "speedtest", "repo": "speedtest",
"rev": "a3ed06699fca657ce045dffa3a8ade5ff99012b0", "rev": "750f043872f0315c00e9baed43307aa57ca6d0b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1710,11 +1692,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762938485, "lastModified": 1766000401,
"narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1731,11 +1713,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1762938485, "lastModified": 1766000401,
"narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1838,11 +1820,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1765343581, "lastModified": 1765935116,
"narHash": "sha256-HtTPbV6z6AJPg2d0bHaJKFrnNha+SEbHvbJafKAQ614=", "narHash": "sha256-lNyckAdrhNKXsi9pNOBYajntNFlWs+BITVoIZuNuwX0=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "f0ad674b7009a6afd80cea59d4fbf975dd68ee95", "rev": "979eab242e60cf481a31d9de508a1bdaf2dcf7d4",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
flake.nix
View File

@@ -22,7 +22,11 @@
nixvirt = { url = "github:CHN-beta/NixVirt"; inputs.nixpkgs.follows = "nixpkgs"; }; nixvirt = { url = "github:CHN-beta/NixVirt"; inputs.nixpkgs.follows = "nixpkgs"; };
buildproxy = { url = "github:polygon/nix-buildproxy"; inputs.nixpkgs.follows = "nixpkgs"; }; buildproxy = { url = "github:polygon/nix-buildproxy"; inputs.nixpkgs.follows = "nixpkgs"; };
niri = { url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; niri = { url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; };
nix4vscode = { url = "github:nix-community/nix4vscode"; inputs.nixpkgs.follows = "nixpkgs"; }; nix4vscode =
{
url = "github:nix-community/nix4vscode?rev=6c603c201b11dafda616940bac1f295144ac1c41";
inputs.nixpkgs.follows = "nixpkgs";
};
dankmaterialshell = { url = "github:AvengeMedia/DankMaterialShell"; inputs.nixpkgs.follows = "nixpkgs"; }; dankmaterialshell = { url = "github:AvengeMedia/DankMaterialShell"; inputs.nixpkgs.follows = "nixpkgs"; };
harmonia.url = "github:nix-community/harmonia"; harmonia.url = "github:nix-community/harmonia";
nix-cachyos-kernel = { url = "github:CHN-beta/nix-cachyos-kernel"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-cachyos-kernel = { url = "github:CHN-beta/nix-cachyos-kernel"; inputs.nixpkgs.follows = "nixpkgs"; };
@@ -48,7 +52,6 @@
py4vasp = { url = "github:vasp-dev/py4vasp?ref=v0.10.2"; flake = false; }; py4vasp = { url = "github:vasp-dev/py4vasp?ref=v0.10.2"; flake = false; };
pocketfft = { url = "github:mreineck/pocketfft"; flake = false; }; pocketfft = { url = "github:mreineck/pocketfft"; flake = false; };
blog = { url = "git+https://git.chn.moe/chn/blog-public.git?lfs=1"; flake = false; }; blog = { url = "git+https://git.chn.moe/chn/blog-public.git?lfs=1"; flake = false; };
nixos-wallpaper = { url = "git+https://git.chn.moe/chn/nixos-wallpaper.git?lfs=1"; flake = false; };
vaspberry = { url = "github:Infant83/VASPBERRY"; flake = false; }; vaspberry = { url = "github:Infant83/VASPBERRY"; flake = false; };
ufo = { url = "git+https://git.chn.moe/chn/ufo.git?lfs=1"; flake = false; }; ufo = { url = "git+https://git.chn.moe/chn/ufo.git?lfs=1"; flake = false; };
stickerpicker = { url = "github:maunium/stickerpicker"; flake = false; }; stickerpicker = { url = "github:maunium/stickerpicker"; flake = false; };

4
flake/lib/buildNixpkgsConfig/default.nix
View File

@@ -72,10 +72,6 @@ in platformConfig //
google-chrome = prev.google-chrome.override (prev: google-chrome = prev.google-chrome.override (prev:
{ commandLineArgs = prev.commandLineArgs or "" + " --disable-features=GlobalShortcutsPortal"; }); { commandLineArgs = prev.commandLineArgs or "" + " --disable-features=GlobalShortcutsPortal"; });
xray = prev.xray.overrideAttrs (prev: { patches = prev.patches or [] ++ [ ./xray.patch ]; }); xray = prev.xray.overrideAttrs (prev: { patches = prev.patches or [] ++ [ ./xray.patch ]; });
linux-firmware = prev.linux-firmware.overrideAttrs (prev: { patchPhase = prev.patchPhase or "" +
''
cp ${./gc_11_5_1_mes_2.bin} amdgpu/gc_11_5_1_mes_2.bin
''; });
} }
// ( // (
let let

BIN
flake/lib/buildNixpkgsConfig/gc_11_5_1_mes_2.bin
View File

Binary file not shown.

4
modules/default.nix
View File

@@ -16,8 +16,8 @@ inputs: let inherit (inputs) topInputs; in
{ config.home-manager.sharedModules = { config.home-manager.sharedModules =
[ [
topInputs.catppuccin.homeModules.catppuccin topInputs.catppuccin.homeModules.catppuccin
topInputs.dankmaterialshell.homeModules.dankMaterialShell.default topInputs.dankmaterialshell.homeModules.dank-material-shell
topInputs.dankmaterialshell.homeModules.dankMaterialShell.niri topInputs.dankmaterialshell.homeModules.niri
];} ];}
] ++ (inputs.localLib.findModules ./.); ] ++ (inputs.localLib.findModules ./.);
} }

2
modules/services/slurm.nix
View File

@@ -196,7 +196,7 @@ inputs:
{ {
services.slurm = services.slurm =
{ {
server = { enable = true; extraFlags = [ "-i" ]; }; server = { enable = true; flag.i = true; };
dbdserver = dbdserver =
{ {
enable = true; enable = true;

2
modules/system/gui.nix
View File

@@ -51,7 +51,7 @@ inputs:
{ {
config.programs = config.programs =
{ {
dankMaterialShell = dank-material-shell =
{ {
enable = true; enable = true;
niri.enableKeybinds = true; niri.enableKeybinds = true;