From 5e49253974d72f31549a615aa3c25c78345a13dc Mon Sep 17 00:00:00 2001 From: sunziping2016 <8998546+sunziping2016@users.noreply.github.com> Date: Mon, 2 Jun 2025 18:02:40 +0800 Subject: [PATCH 1/2] chore(deps): update flake.lock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/df522e787fdffc4f32ed3e1fca9ed0968a384d62?narHash=sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4%3D' (2025-05-20) → 'github:nix-community/disko/58d6e5a83fff9982d57e0a0a994d4e5c0af441e4?narHash=sha256-/CtyLVfNaFP7PrOPrTEuGOJBIhcBKVQ91KiEbtXJi0A%3D' (2025-06-02) • Updated input 'dream2nix': 'github:nix-community/dream2nix/6fd6d9188f32efd1e1656b3c3e63a67f9df7b636?narHash=sha256-qZWuEdxmPx818qR61t3mMozJOvZSmTRUDPU4L3JeGgE%3D' (2025-05-19) → 'github:nix-community/dream2nix/e92dacdc57acaa6b2ae79592c1a62c2340931410?narHash=sha256-wORL3vLIJdBF8hz73yuD7DVsrbOvFgtH96hQIetXhfg%3D' (2025-06-02) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/c621e8422220273271f52058f618c94e405bb0f5?narHash=sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY%3D' (2025-04-01) → 'github:hercules-ci/flake-parts/49f0870db23e8c1ca0b5259734a02cd9e1e371a1?narHash=sha256-F82%2BgS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE%3D' (2025-06-01) • Updated input 'home-manager': 'github:nix-community/home-manager/c1e671036224089937e111e32ea899f59181c383?narHash=sha256-5PBK1nV8X39K3qUj8B477Aa2RdbLq3m7wRxUKRtggX4%3D' (2025-05-25) → 'github:nix-community/home-manager/c7fdb7e90bff1a51b79c1eed458fb39e6649a82a?narHash=sha256-EB%2BLzYHK0D5aqxZiYoPeoZoOzSAs8eqBDxm3R%2B6wMKU%3D' (2025-06-02) • Updated input 'nix-minecraft': 'github:Infinidoge/nix-minecraft/3aede7ec07e25d1abdf55e4b9921872d08e4d0a9?narHash=sha256-20rk3nzu5uFpg3ZGrSoB88VdCr%2BeJENGnuncKHorXTE%3D' (2025-05-25) → 'github:Infinidoge/nix-minecraft/6c961ee42ff2301ee61c75aa42cbe8c8adecf3c8?narHash=sha256-oDnEc/rxyDf%2BuUXO56Z2TJtrrQoBe0Z4MCIRaY6lVZ0%3D' (2025-05-30) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/063f43f2dbdef86376cc29ad646c45c46e93234c?narHash=sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o%3D' (2025-05-23) → 'github:NixOS/nixpkgs/910796cabe436259a29a72e8d3f5e180fc6dfacc?narHash=sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8%3D' (2025-05-31) • Updated input 'nv2nix': 'github:adisbladis/uv2nix/ec0502250b48116fd3aa8e1347a2d0254bacd05e?narHash=sha256-1v8SFHOwUCvHDXFmQRjHZYawY19nxmtZ7zH/kwAGgj0%3D' (2025-05-22) → 'github:adisbladis/uv2nix/f006d191d4ff5894d2ead6299e2eaf3659bc46b0?narHash=sha256-99mf47Kjl/rj716cSjeA6ubZLlhNudmC4HRg/6UMfvs%3D' (2025-05-28) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/020cb423808365fa3f10ff4cb8c0a25df35065a3?narHash=sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0%3D' (2025-05-22) → 'github:numtide/treefmt-nix/1f3f7b784643d488ba4bf315638b2b0a4c5fb007?narHash=sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8%3D' (2025-05-26) --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 875ed26..07e4fec 100644 --- a/flake.lock +++ b/flake.lock @@ -68,11 +68,11 @@ ] }, "locked": { - "lastModified": 1747742835, - "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", + "lastModified": 1748832438, + "narHash": "sha256-/CtyLVfNaFP7PrOPrTEuGOJBIhcBKVQ91KiEbtXJi0A=", "owner": "nix-community", "repo": "disko", - "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", + "rev": "58d6e5a83fff9982d57e0a0a994d4e5c0af441e4", "type": "github" }, "original": { @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1747658429, - "narHash": "sha256-qZWuEdxmPx818qR61t3mMozJOvZSmTRUDPU4L3JeGgE=", + "lastModified": 1748838242, + "narHash": "sha256-wORL3vLIJdBF8hz73yuD7DVsrbOvFgtH96hQIetXhfg=", "owner": "nix-community", "repo": "dream2nix", - "rev": "6fd6d9188f32efd1e1656b3c3e63a67f9df7b636", + "rev": "e92dacdc57acaa6b2ae79592c1a62c2340931410", "type": "github" }, "original": { @@ -130,11 +130,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1748821116, + "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", "type": "github" }, "original": { @@ -236,11 +236,11 @@ ] }, "locked": { - "lastModified": 1748134483, - "narHash": "sha256-5PBK1nV8X39K3qUj8B477Aa2RdbLq3m7wRxUKRtggX4=", + "lastModified": 1748830238, + "narHash": "sha256-EB+LzYHK0D5aqxZiYoPeoZoOzSAs8eqBDxm3R+6wMKU=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1e671036224089937e111e32ea899f59181c383", + "rev": "c7fdb7e90bff1a51b79c1eed458fb39e6649a82a", "type": "github" }, "original": { @@ -277,11 +277,11 @@ ] }, "locked": { - "lastModified": 1748139117, - "narHash": "sha256-20rk3nzu5uFpg3ZGrSoB88VdCr+eJENGnuncKHorXTE=", + "lastModified": 1748570485, + "narHash": "sha256-oDnEc/rxyDf+uUXO56Z2TJtrrQoBe0Z4MCIRaY6lVZ0=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "3aede7ec07e25d1abdf55e4b9921872d08e4d0a9", + "rev": "6c961ee42ff2301ee61c75aa42cbe8c8adecf3c8", "type": "github" }, "original": { @@ -344,11 +344,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -368,11 +368,11 @@ ] }, "locked": { - "lastModified": 1747949765, - "narHash": "sha256-1v8SFHOwUCvHDXFmQRjHZYawY19nxmtZ7zH/kwAGgj0=", + "lastModified": 1748398512, + "narHash": "sha256-99mf47Kjl/rj716cSjeA6ubZLlhNudmC4HRg/6UMfvs=", "owner": "adisbladis", "repo": "uv2nix", - "rev": "ec0502250b48116fd3aa8e1347a2d0254bacd05e", + "rev": "f006d191d4ff5894d2ead6299e2eaf3659bc46b0", "type": "github" }, "original": { @@ -470,11 +470,11 @@ ] }, "locked": { - "lastModified": 1747912973, - "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=", + "lastModified": 1748243702, + "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3", + "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", "type": "github" }, "original": { From 0640c0bc2b4e8e3b9c57df8942089fdbcc720e46 Mon Sep 17 00:00:00 2001 From: Ziping Sun Date: Mon, 2 Jun 2025 22:10:13 +0800 Subject: [PATCH 2/2] feat(config): remove nixos documentation from server --- flake/hosts.nix | 11 +++++------ home-manager/profiles/programs/nix-dev.nix | 1 + nixos/profiles/config/no-nixos-doc.nix | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 nixos/profiles/config/no-nixos-doc.nix diff --git a/flake/hosts.nix b/flake/hosts.nix index 0b547a1..48e24b3 100644 --- a/flake/hosts.nix +++ b/flake/hosts.nix @@ -13,6 +13,7 @@ let nixosSuites = with nixosProfiles; rec { # base should not require sops base = [ + config.bbr config.bootloader config.home-manager config.persistent-common @@ -116,7 +117,7 @@ let suites.base ++ suites.domestic ++ (with profiles; [ - config.bbr + config.no-nixos-doc services.aria2 services.atticd services.acme-dns @@ -171,7 +172,7 @@ let suites.base ++ suites.domestic ++ (with profiles; [ - config.bbr + config.no-nixos-doc services.node-exporter services.vector system.kernel.qemu-guest @@ -223,7 +224,7 @@ let imports = suites.base ++ (with profiles; [ - config.bbr + config.no-nixos-doc services.headscale-global services.nginx services.node-exporter @@ -257,7 +258,6 @@ let ++ suites.desktop ++ suites.domestic ++ (with profiles; [ - config.bbr system.systemd-boot services.minecraft services.nginx @@ -298,7 +298,6 @@ let ++ suites.desktop ++ suites.domestic ++ (with profiles; [ - config.bbr services.power-profiles-daemon services.vector system.systemd-boot @@ -334,7 +333,7 @@ let ++ suites.base ++ suites.domestic ++ (with profiles; [ - config.bbr + config.no-nixos-doc services.node-exporter services.vector ]); diff --git a/home-manager/profiles/programs/nix-dev.nix b/home-manager/profiles/programs/nix-dev.nix index 302dcec..ac63b9b 100644 --- a/home-manager/profiles/programs/nix-dev.nix +++ b/home-manager/profiles/programs/nix-dev.nix @@ -5,5 +5,6 @@ nixfmt-rfc-style nvd vulnix + nix-tree ]; } diff --git a/nixos/profiles/config/no-nixos-doc.nix b/nixos/profiles/config/no-nixos-doc.nix new file mode 100644 index 0000000..da6141d --- /dev/null +++ b/nixos/profiles/config/no-nixos-doc.nix @@ -0,0 +1,3 @@ +{ + documentation.nixos.enable = false; +}