From ec39218bbefdd65cef15bbfd90a461e2fc30edf6 Mon Sep 17 00:00:00 2001 From: Aloys23 Date: Fri, 29 May 2026 21:51:08 +0800 Subject: [PATCH] cleanup: remove duplicate vbox-guest, obsolete flatpak options, nix-flatpak and claude-code --- configuration.nix | 8 ----- flake.lock | 87 +---------------------------------------------- flake.nix | 9 +---- home.nix | 1 + 4 files changed, 3 insertions(+), 102 deletions(-) diff --git a/configuration.nix b/configuration.nix index 773e558..292fa46 100644 --- a/configuration.nix +++ b/configuration.nix @@ -21,13 +21,6 @@ programs.nix-ld.enable = true; services.flatpak.enable = true; - services.flatpak.remotes = [{ - name = "flathub"; - location = "https://dl.flathub.org/repo/flathub.flatpakrepo"; - }]; - services.flatpak.packages = [ - # "com.obsproject.Studio" - ]; # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # Configure network proxy if necessary @@ -154,7 +147,6 @@ # Install firefox. programs.firefox.enable = true; - virtualisation.virtualbox.guest.enable = true; # Allow unfree packages nixpkgs.config.allowUnfree = true; diff --git a/flake.lock b/flake.lock index d582244..f1b8529 100644 --- a/flake.lock +++ b/flake.lock @@ -1,42 +1,5 @@ { "nodes": { - "claude-code": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1780023606, - "narHash": "sha256-kLRVx7T+9ETF26prUsMA9Nm0LidSFN08oPLkXK5V2CA=", - "owner": "sadjow", - "repo": "claude-code-nix", - "rev": "879750a6fc504c9eafbab781798cb85e1b39242f", - "type": "github" - }, - "original": { - "owner": "sadjow", - "repo": "claude-code-nix", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -57,38 +20,7 @@ "type": "github" } }, - "nix-flatpak": { - "locked": { - "lastModified": 1779998907, - "narHash": "sha256-8CSkdFNkAF49pmhFneEFNAO4UX9/0FnoMwXMY3yyvi0=", - "owner": "gmodena", - "repo": "nix-flatpak", - "rev": "744221c2aef17f1f2a13278abfeabd9bd5e40180", - "type": "github" - }, - "original": { - "owner": "gmodena", - "repo": "nix-flatpak", - "type": "github" - } - }, "nixpkgs": { - "locked": { - "lastModified": 1779877693, - "narHash": "sha256-NOF9NAREhxr50bbBfVcVOq+ArCMSoe8dP79Pk2uyARk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4100e830e085863741bc69b156ec4ccd53ab5be0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1779560665, "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", @@ -106,25 +38,8 @@ }, "root": { "inputs": { - "claude-code": "claude-code", "home-manager": "home-manager", - "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_2" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index f637731..48a0987 100644 --- a/flake.nix +++ b/flake.nix @@ -12,12 +12,10 @@ inputs.nixpkgs.follows = "nixpkgs"; # 保证 Home Manager 用的软件版本和系统一致 }; - claude-code.url = "github:sadjow/claude-code-nix"; - nix-flatpak.url = "github:gmodena/nix-flatpak"; }; # 输出(最终建成的系统) - outputs = { self, nixpkgs, home-manager, claude-code, nix-flatpak, ... }@inputs: { + outputs = { self, nixpkgs, home-manager, ... }@inputs: { nixosConfigurations = { # 这里的 "nixos" 是你的系统主机名 (hostname)。 # 如果你在安装系统时改过主机名,请把这里的 "nixos" 换成你的实际主机名。 @@ -27,10 +25,6 @@ # 1. 引入系统底层的硬件和全局配置 ./configuration.nix - ({ ... }: { - nixpkgs.overlays = [ claude-code.overlays.default ]; - }) - # 2. 把 Home Manager 作为系统模块请进来 home-manager.nixosModules.home-manager { @@ -41,7 +35,6 @@ home-manager.users.test = import ./home.nix; } - nix-flatpak.nixosModules.nix-flatpak ]; }; }; diff --git a/home.nix b/home.nix index d6a94e8..16de753 100644 --- a/home.nix +++ b/home.nix @@ -10,6 +10,7 @@ qq fastfetch jetbrains-toolbox + google-chrome ]; # 用 Home Manager 固定 Fcitx5 输入法配置,仅保留拼音