diff --git a/flake.lock b/flake.lock index 909a4384..e6557e73 100644 --- a/flake.lock +++ b/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": { @@ -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, @@ -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": 1694049614, + "narHash": "sha256-z76x1ZkLEfFK9Xav37rrDB6C/9qpuK8BzVzfH/p0Ks8=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "f878309889d6d91867f4455d223df0f521e2a6d1", + "rev": "1774f268935f7edde5429963e2341953b15b1f40", "type": "github" }, "original": { @@ -782,11 +792,11 @@ ] }, "locked": { - "lastModified": 1692283173, - "narHash": "sha256-6bt+X2PpoyUAtEDWJM0XT0Z54JA2YHw62VoZRTRkz7s=", + "lastModified": 1694054794, + "narHash": "sha256-hbQTuZ81n5daWxp8Hfb+3x4JkkrJ+erT0DXOqmDnBGk=", "owner": "nixpak", "repo": "nixpak", - "rev": "eef08f1a7e871e3017edbc54d0374292a9b6f67a", + "rev": "119af38d3d56a86d6f20dbf54f59352decc773f0", "type": "github" }, "original": { @@ -879,29 +889,29 @@ "type": "github" } }, - "nixpkgs-stable_2": { + "nixpkgs-unstable": { "locked": { - "lastModified": 1691421349, - "narHash": "sha256-RRJyX0CUrs4uW4gMhd/X4rcDG8PTgaaCQM5rXEJOx6g=", + "lastModified": 1693844670, + "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "011567f35433879aae5024fc6ec53f2a0568a6c4", + "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "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": { @@ -945,27 +955,27 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1693843185, - "narHash": "sha256-/huFNnA50JSUyEg68v9uiC4xl8shVsS5LgtNRlzZvHo=", + "lastModified": 1694057802, + "narHash": "sha256-jtz6aN3reqoJonznLI58PbKDB+PzbRb0ZlKeWKbmyFo=", "owner": "CHN-beta", "repo": "nixpkgs", - "rev": "e7e8dca748d5fa1a29b5bb231bf8aa727c29b89c", + "rev": "7e52e7f169cd4cfbdceace95958ae2c0508bf3e4", "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": 1694057549, + "narHash": "sha256-AmaygB/0+phSNBl/vwgjrCILpRxlDG4Ko3+Ob9M2qoI=", "owner": "nix-community", "repo": "NUR", - "rev": "c987eac4f579d9e989d5a0cde93d688592bda990", + "rev": "b15c1a0af8eea7373b22531311f0bed6ccb18538", "type": "github" }, "original": { @@ -980,14 +990,15 @@ "flake-utils-plus": "flake-utils-plus", "nixpkgs": [ "nixpkgs" - ] + ], + "nvfetcher": "nvfetcher" }, "locked": { - "lastModified": 1691561203, - "narHash": "sha256-GmujZtR1vlTkBMahLXLp3BXYYfC0vIczxkcd9XVt6/E=", + "lastModified": 1693898560, + "narHash": "sha256-yrBfvKFR76bGMjJ30LVtiWgx2NSjcRU3LnUNTmR01mw=", "owner": "xddxdd", "repo": "nur-packages", - "rev": "52a85ab474601e3661f30796aa0d7fe995fc0122", + "rev": "211a6952cd91575293afcbe9c418d5850c1a7a73", "type": "github" }, "original": { @@ -1014,6 +1025,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 +1079,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": { @@ -1071,7 +1108,7 @@ "nixos-cn": "nixos-cn", "nixpak": "nixpak", "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "nur-xddxdd": "nur-xddxdd", "pnpm2nix-nzbr": "pnpm2nix-nzbr", @@ -1086,15 +1123,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 +1172,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 +1262,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 +1283,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 +1299,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1689068808, diff --git a/flake.nix b/flake.nix index 0fb83907..ca817a74 100644 --- a/flake.nix +++ b/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:NixOS/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"; }; @@ -65,7 +65,7 @@ (inputs: { config.nixpkgs.overlays = [(final: prev: { localPackages = (import ./local/pkgs { inherit (inputs) lib; pkgs = final; }); - stablePackages = import inputs.topInputs.nixpkgs-stable + unstablePackages = import inputs.topInputs.nixpkgs-unstable { system = "x86_64-linux"; config.allowUnfree = true; }; })]; }) ./modules diff --git a/modules/packages/default.nix b/modules/packages/default.nix index ae003f44..6cc7c697 100644 --- a/modules/packages/default.nix +++ b/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 @@ -226,7 +226,7 @@ inputs: nix-template appimage-run nil nixd nix-alien nix-serve node2nix nix-prefetch-github prefetch-npm-deps nix-prefetch-docker pnpm-lock-export bundix # instant messager - zoom-us signal-desktop qq nur-xddxdd.wechat-uos stablePackages.slack # jail + zoom-us signal-desktop qq nur-xddxdd.wechat-uos slack # jail # office libreoffice-qt texlive.combined.scheme-full texstudio poppler_utils pdftk gnuplot pdfchain # development