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

cleanup

Browse Source
This commit is contained in:
陈浩南
2024-10-23 08:13:26 +08:00
parent 24d2ac9b88
commit 4d2f8bb807
12 changed files with 14 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

231
flake.lock generated
View File

@@ -1,26 +1,5 @@
{
"nodes": {
"aagl": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1728524457,
"narHash": "sha256-R+GJ3H1PvRUHLm45muY1KEezhfgIl8l7HJ36DySZMu0=",
"owner": "ezKEa",
"repo": "aagl-gtk-on-nix",
"rev": "5611dd61df02e0bc5d62bb3f5388821d8854faff",
"type": "github"
},
"original": {
"owner": "ezKEa",
"repo": "aagl-gtk-on-nix",
"type": "github"
}
},
"blog": {
"flake": false,
"locked": {
@@ -114,22 +93,6 @@
"type": "github"
}
},
"cjktty": {
"flake": false,
"locked": {
"lastModified": 1716434550,
"narHash": "sha256-jrkx2ipqmZxp6WKemJR2UZjbaJv2xGkHLWbEffRnuw4=",
"owner": "CHN-beta",
"repo": "cjktty-patches",
"rev": "ab6df4de5666f229a10fff53b348677ba668fa78",
"type": "github"
},
"original": {
"owner": "CHN-beta",
"repo": "cjktty-patches",
"type": "github"
}
},
"concurrencpp": {
"flake": false,
"locked": {
@@ -323,22 +286,6 @@
"type": "github"
}
},
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
@@ -361,27 +308,6 @@
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"nix-fast-build",
"nixpkgs"
]
},
"locked": {
"lastModified": 1722555600,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"nur-linyinfeng",
@@ -402,7 +328,7 @@
"type": "github"
}
},
"flake-parts_4": {
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
@@ -651,22 +577,6 @@
"type": "github"
}
},
"kylin-virtual-keyboard": {
"flake": false,
"locked": {
"lastModified": 1728870819,
"narHash": "sha256-ECg3z9fXtOgnRJ4zTVhm+zEuHx0kQMRiSbnCZNDzEXo=",
"ref": "refs/heads/upstream",
"rev": "aa24264254d92040c991001e248c927e9c30f4f2",
"revCount": 173,
"type": "git",
"url": "https://gitee.com/openkylin/kylin-virtual-keyboard.git"
},
"original": {
"type": "git",
"url": "https://gitee.com/openkylin/kylin-virtual-keyboard.git"
}
},
"lepton": {
"flake": false,
"locked": {
@@ -797,28 +707,6 @@
"type": "github"
}
},
"nix-fast-build": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": [
"nixpkgs"
],
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1728306776,
"narHash": "sha256-57QXMMEELaEbE+ZVg0ngSC7UGZoyYP2QmDGcQSJ8BnE=",
"owner": "Mic92",
"repo": "nix-fast-build",
"rev": "1775c732071d0ee37c1950ce4ecbf2729487ee71",
"type": "github"
},
"original": {
"owner": "Mic92",
"repo": "nix-fast-build",
"type": "github"
}
},
"nix-flatpak": {
"locked": {
"lastModified": 1728416205,
@@ -921,7 +809,7 @@
},
"nix-vscode-extensions": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
@@ -1004,38 +892,6 @@
"type": "github"
}
},
"nixpkgs-22.05": {
"locked": {
"lastModified": 1685573264,
"narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "380be19fbd2d9079f677978361792cb25e8a3635",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-22.11": {
"locked": {
"lastModified": 1688392541,
"narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-23.05": {
"locked": {
"lastModified": 1701326464,
@@ -1112,22 +968,6 @@
"type": "github"
}
},
"nodesoup": {
"flake": false,
"locked": {
"lastModified": 1599307935,
"narHash": "sha256-tFLq6QC3U3uvcuWsdRy2wnwcmAfH2MkI2oMcAiUBHSo=",
"owner": "olvb",
"repo": "nodesoup",
"rev": "3158ad082bb0cd1abee75418b12b35522dbca74f",
"type": "github"
},
"original": {
"owner": "olvb",
"repo": "nodesoup",
"type": "github"
}
},
"nu-scripts": {
"flake": false,
"locked": {
@@ -1147,15 +987,15 @@
"nur-linyinfeng": {
"inputs": {
"devshell": "devshell",
"flake-compat": "flake-compat_3",
"flake-parts": "flake-parts_3",
"flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_2",
"flake-utils": "flake-utils_2",
"nixos-stable": "nixos-stable",
"nixpkgs": [
"nixpkgs"
],
"nvfetcher": "nvfetcher",
"treefmt-nix": "treefmt-nix_3"
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1728844221,
@@ -1173,7 +1013,7 @@
},
"nur-xddxdd": {
"inputs": {
"flake-parts": "flake-parts_4",
"flake-parts": "flake-parts_3",
"nix-index-database": "nix-index-database_2",
"nixpkgs": [
"nixpkgs"
@@ -1181,7 +1021,7 @@
"nixpkgs-24_05": "nixpkgs-24_05",
"nvfetcher": "nvfetcher_2",
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
"treefmt-nix": "treefmt-nix_4"
"treefmt-nix": "treefmt-nix_3"
},
"locked": {
"lastModified": 1728813954,
@@ -1228,7 +1068,7 @@
},
"nvfetcher_2": {
"inputs": {
"flake-compat": "flake-compat_4",
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nur-xddxdd",
@@ -1313,7 +1153,7 @@
"nixpkgs"
],
"systems": "systems_5",
"treefmt-nix": "treefmt-nix_5"
"treefmt-nix": "treefmt-nix_4"
},
"locked": {
"lastModified": 1728564116,
@@ -1331,7 +1171,7 @@
},
"pre-commit-hooks-nix": {
"inputs": {
"flake-compat": "flake-compat_5",
"flake-compat": "flake-compat_4",
"gitignore": "gitignore",
"nixpkgs": [
"nur-xddxdd",
@@ -1392,13 +1232,11 @@
},
"root": {
"inputs": {
"aagl": "aagl",
"blog": "blog",
"blurred-wallpaper": "blurred-wallpaper",
"bscpkgs": "bscpkgs",
"catppuccin": "catppuccin",
"chaotic": "chaotic",
"cjktty": "cjktty",
"concurrencpp": "concurrencpp",
"cppcoro": "cppcoro",
"date": "date",
@@ -1409,7 +1247,6 @@
"hextra": "hextra",
"home-manager": "home-manager",
"impermanence": "impermanence",
"kylin-virtual-keyboard": "kylin-virtual-keyboard",
"lepton": "lepton",
"linux-surface": "linux-surface",
"lmod": "lmod",
@@ -1418,18 +1255,14 @@
"mumax": "mumax",
"nameof": "nameof",
"nc4nix": "nc4nix",
"nix-fast-build": "nix-fast-build",
"nix-flatpak": "nix-flatpak",
"nix-index-database": "nix-index-database",
"nix-vscode-extensions": "nix-vscode-extensions",
"nixos-hardware": "nixos-hardware",
"nixos-wallpaper": "nixos-wallpaper",
"nixpkgs": "nixpkgs",
"nixpkgs-22.05": "nixpkgs-22.05",
"nixpkgs-22.11": "nixpkgs-22.11",
"nixpkgs-23.05": "nixpkgs-23.05",
"nixpkgs-23.11": "nixpkgs-23.11",
"nodesoup": "nodesoup",
"nu-scripts": "nu-scripts",
"nur-linyinfeng": "nur-linyinfeng",
"nur-xddxdd": "nur-xddxdd",
@@ -1449,8 +1282,7 @@
"tgbot-cpp": "tgbot-cpp",
"v-sim": "v-sim",
"winapps": "winapps",
"zpp-bits": "zpp-bits",
"zxorm": "zxorm"
"zpp-bits": "zpp-bits"
}
},
"rsshub": {
@@ -1716,27 +1548,6 @@
}
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"nix-fast-build",
"nixpkgs"
]
},
"locked": {
"lastModified": 1723808491,
"narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_3": {
"inputs": {
"nixpkgs": [
"nur-linyinfeng",
@@ -1757,7 +1568,7 @@
"type": "github"
}
},
"treefmt-nix_4": {
"treefmt-nix_3": {
"inputs": {
"nixpkgs": [
"nur-xddxdd",
@@ -1778,7 +1589,7 @@
"type": "github"
}
},
"treefmt-nix_5": {
"treefmt-nix_4": {
"inputs": {
"nixpkgs": [
"poetry2nix",
@@ -1852,22 +1663,6 @@
"repo": "zpp_bits",
"type": "github"
}
},
"zxorm": {
"flake": false,
"locked": {
"lastModified": 1714876963,
"narHash": "sha256-PYUs76SpsbCUHSV8n1+u10U4aEpA0u3L+IEXkRKzMXM=",
"owner": "CHN-beta",
"repo": "zxorm",
"rev": "c72543439eac41dae7aa44065fee657cad336bab",
"type": "github"
},
"original": {
"owner": "CHN-beta",
"repo": "zxorm",
"type": "github"
}
}
},
"root": "root",

8
flake.nix
View File

@@ -6,15 +6,12 @@
nixpkgs.url = "github:CHN-beta/nixpkgs/nixos-unstable";
"nixpkgs-23.11".url = "github:CHN-beta/nixpkgs/nixos-23.11";
"nixpkgs-23.05".url = "github:CHN-beta/nixpkgs/nixos-23.05";
"nixpkgs-22.11".url = "github:NixOS/nixpkgs/nixos-22.11";
"nixpkgs-22.05".url = "github:NixOS/nixpkgs/nixos-22.05";
home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; };
sops-nix =
{
url = "github:Mic92/sops-nix";
inputs = { nixpkgs.follows = "nixpkgs"; nixpkgs-stable.follows = "nixpkgs"; };
};
aagl = { url = "github:ezKEa/aagl-gtk-on-nix"; inputs.nixpkgs.follows = "nixpkgs"; };
nix-index-database = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; };
nur-xddxdd = { url = "github:xddxdd/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; };
nix-vscode-extensions = { url = "github:nix-community/nix-vscode-extensions"; inputs.nixpkgs.follows = "nixpkgs"; };
@@ -28,7 +25,6 @@
nur-linyinfeng = { url = "github:linyinfeng/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; };
nixos-hardware.url = "github:CHN-beta/nixos-hardware";
envfs = { url = "github:Mic92/envfs"; inputs.nixpkgs.follows = "nixpkgs"; };
nix-fast-build = { url = "github:/Mic92/nix-fast-build"; inputs.nixpkgs.follows = "nixpkgs"; };
nix-flatpak.url = "github:gmodena/nix-flatpak";
chaotic =
{
@@ -50,7 +46,6 @@
eigen = { url = "gitlab:libeigen/eigen"; flake = false; };
matplotplusplus = { url = "github:alandefreitas/matplotplusplus"; flake = false; };
nameof = { url = "github:Neargye/nameof"; flake = false; };
nodesoup = { url = "github:olvb/nodesoup"; flake = false; };
tgbot-cpp = { url = "github:reo7sp/tgbot-cpp"; flake = false; };
v-sim = { url = "gitlab:l_sim/v_sim"; flake = false; };
rycee = { url = "gitlab:rycee/nur-expressions"; flake = false; };
@@ -60,9 +55,6 @@
lepton = { url = "github:black7375/Firefox-UI-Fix"; flake = false; };
lmod = { url = "github:TACC/Lmod"; flake = false; };
mumax = { url = "github:CHN-beta/mumax"; flake = false; };
kylin-virtual-keyboard = { url = "git+https://gitee.com/openkylin/kylin-virtual-keyboard.git"; flake = false; };
cjktty = { url = "github:CHN-beta/cjktty-patches"; flake = false; };
zxorm = { url = "github:CHN-beta/zxorm"; flake = false; };
openxlsx = { url = "github:troldal/OpenXLSX?rev=f85f7f1bd632094b5d78d4d1f575955fc3801886"; flake = false; };
sqlite-orm = { url = "github:fnc12/sqlite_orm"; flake = false; };
sockpp = { url = "github:fpagliughi/sockpp"; flake = false; };

2
modules/default.nix
View File

@@ -8,7 +8,6 @@ inputs:
[
topInputs.home-manager.nixosModules.home-manager
topInputs.sops-nix.nixosModules.sops
topInputs.aagl.nixosModules.default
topInputs.nix-index-database.nixosModules.nix-index
topInputs.nur-xddxdd.nixosModules.setupOverlay
topInputs.impermanence.nixosModules.impermanence
@@ -23,7 +22,6 @@ inputs:
nixpkgs.overlays =
[
topInputs.qchem.overlays.default
topInputs.aagl.overlays.default
topInputs.bscpkgs.overlays.default
topInputs.poetry2nix.overlays.default
(final: prev:

3
modules/packages/desktop/default.nix
View File

@@ -136,9 +136,6 @@ inputs:
wireshark = { enable = true; package = inputs.pkgs.wireshark; };
yubikey-touch-detector.enable = true;
kdeconnect.enable = true;
anime-game-launcher = { enable = true; package = inputs.pkgs.anime-game-launcher; };
honkers-railway-launcher = { enable = true; package = inputs.pkgs.honkers-railway-launcher; };
sleepy-launcher = { enable = true; package = inputs.pkgs.sleepy-launcher; };
};
nixpkgs.overlays = [(final: prev:
{

2
modules/packages/server.nix
View File

@@ -32,7 +32,7 @@ inputs:
# networking
ipset iptables iproute2 dig nettools traceroute tcping-go whois tcpdump nmap inetutils wireguard-tools
# nix tools
nix-output-monitor nix-tree ssh-to-age nix-inspect # (callPackage "${inputs.topInputs.nix-fast-build}" {})
nix-output-monitor nix-tree ssh-to-age nix-inspect
# development
gdb try inputs.topInputs.plasma-manager.packages.${inputs.pkgs.system}.rc2nix rr hexo-cli gh nix-init hugo
# stupid things

9
modules/system/kernel/default.nix
View File

@@ -59,15 +59,6 @@ inputs:
let
patches =
{
cjktty =
[{
name = "cjktty";
patch =
let version = inputs.lib.versions.majorMinor inputs.config.boot.kernelPackages.kernel.version;
in "${inputs.topInputs.cjktty}/v6.x/cjktty-${version}.patch";
extraStructuredConfig =
{ FONT_CJK_16x16 = inputs.lib.kernel.yes; FONT_CJK_32x32 = inputs.lib.kernel.yes; };
}];
lantian =
[{
name = "lantian";

2
modules/system/nixpkgs.nix
View File

@@ -77,8 +77,6 @@ inputs:
{
"pkgs-23.11" = "nixpkgs-23.11";
"pkgs-23.05" = "nixpkgs-23.05";
"pkgs-22.11" = "nixpkgs-22.11";
"pkgs-22.05" = "nixpkgs-22.05";
};
permittedInsecurePackages."pkgs-23.11" = [ "electron_19" ];
packages = name: import inputs.topInputs.${source.${name}}

5
packages/default.nix
View File

@@ -7,8 +7,6 @@ inputs: rec
vaspkit = inputs.pkgs.callPackage ./vaspkit.nix { inherit (inputs.localLib) attrsToList; };
v-sim = inputs.pkgs.callPackage ./v-sim.nix { src = inputs.topInputs.v-sim; };
concurrencpp = inputs.pkgs.callPackage ./concurrencpp.nix { src = inputs.topInputs.concurrencpp; };
eigengdb = inputs.pkgs.python3Packages.callPackage ./eigengdb.nix {};
nodesoup = inputs.pkgs.callPackage ./nodesoup.nix { src = inputs.topInputs.nodesoup; };
matplotplusplus = inputs.pkgs.callPackage ./matplotplusplus.nix
{
src = inputs.topInputs.matplotplusplus;
@@ -73,8 +71,6 @@ inputs: rec
vtstscripts = inputs.pkgs.callPackage ./vasp/vtstscripts.nix {};
};
mumax = inputs.pkgs.callPackage ./mumax.nix { src = inputs.topInputs.mumax; };
kylin-virtual-keyboard = inputs.pkgs.libsForQt5.callPackage ./kylin-virtual-keyboard.nix
{ src = inputs.topInputs.kylin-virtual-keyboard; };
biu = inputs.pkgs.callPackage ./biu
{
inherit nameof zpp-bits tgbot-cpp concurrencpp pocketfft;
@@ -82,7 +78,6 @@ inputs: rec
boost = inputs.pkgs.boost186;
fmt = inputs.pkgs.fmt_11.overrideAttrs (prev: { patches = prev.patches or [] ++ [ ./biu/fmt.patch ]; });
};
zxorm = inputs.pkgs.callPackage ./zxorm.nix { src = inputs.topInputs.zxorm; };
hpcstat = inputs.pkgs.callPackage ./hpcstat
{ inherit sqlite-orm date biu openxlsx; stdenv = inputs.pkgs.clang18Stdenv; };
openxlsx = inputs.pkgs.callPackage ./openxlsx.nix { src = inputs.topInputs.openxlsx; };

15
packages/eigengdb.nix
View File

@@ -1,15 +0,0 @@
{ lib, fetchFromGitHub, buildPythonPackage, numpy, gdb }: buildPythonPackage
{
name = "eigengdb";
src = fetchFromGitHub
{
owner = "dmillard";
repo = "eigengdb";
rev = "c741edef3f07f33429056eff48d79a62733ed494";
sha256 = "MTqOaWsKhWaPs3G5F/6bYZmQI5qS2hEGKGa3mwbgFaY=";
};
doCheck = false;
buildInputs = [ gdb ];
nativeBuildInputs = [ gdb ];
propagatedBuildInputs = [ numpy ];
}

17
packages/kylin-virtual-keyboard.nix
View File

@@ -1,17 +0,0 @@
{
stdenv, src, wrapQtAppsHook,
qtbase, gsettings-qt, pkg-config, kwindowsystem, fcitx5-qt, qmake, wrapGAppsHook, glib
}: stdenv.mkDerivation
{
name = "kylin-virtual-keyboard";
inherit src;
buildInputs = [ qtbase gsettings-qt kwindowsystem fcitx5-qt ];
nativeBuildInputs = [ wrapQtAppsHook pkg-config qmake wrapGAppsHook glib ];
qmakeFlags = [ "PREFIX=/" ];
installFlags = [ "INSTALL_ROOT=$(out)" ];
postInstall =
''
mv $out/usr/* $out
rm -rf $out/usr
'';
}

7
packages/nodesoup.nix
View File

@@ -1,7 +0,0 @@
{ stdenv, src, cmake, pkg-config, cairo, pcre2, xorg }: stdenv.mkDerivation
{
name = "nodesoup";
inherit src;
buildInputs = [ cairo pcre2.dev xorg.libXdmcp.dev ];
nativeBuildInputs = [ cmake pkg-config ];
}

10
packages/zxorm.nix
View File

@@ -1,10 +0,0 @@
{
lib, stdenv, cmake, src,
pkg-config, sqlite
}: stdenv.mkDerivation
{
name = "zxorm";
inherit src;
buildInputs = [ sqlite ];
nativeBuildInputs = [ cmake pkg-config ];
}