From cbe7f893bf2b3472140053da8a6c54e39be222a9 Mon Sep 17 00:00:00 2001 From: Fern Garden Date: Sun, 29 Jun 2025 09:25:10 +0800 Subject: [PATCH] Remove home manager --- flake.nix | 20 +++++--------------- home.nix | 53 ----------------------------------------------------- 2 files changed, 5 insertions(+), 68 deletions(-) delete mode 100644 home.nix diff --git a/flake.nix b/flake.nix index 4b1e6fe..967e3b5 100755 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,6 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; # Stable nixpkgs. lanzaboote.url = "github:nix-community/lanzaboote"; # Secure boot. nixos-hardware.url = "github:NixOS/nixos-hardware"; # Hardware specific config. - home-manager.url = "github:nix-community/home-manager/release-25.05"; # Manage user home directories. # Updated packages. fluffychat2.url = "github:NixOS/nixpkgs?ref=pull/419632/head"; # FluffyChat 2.0.0 @@ -18,7 +17,6 @@ nixpkgs, lanzaboote, nixos-hardware, - home-manager, fluffychat2, feishin0_16_0, ... @@ -27,22 +25,14 @@ nixosConfigurations.muskduck = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; + specialArgs = { + fluffychat2 = import fluffychat2 { inherit system; }; + feishin0_16_0 = import feishin0_16_0 { inherit system; }; + }; + modules = [ lanzaboote.nixosModules.lanzaboote nixos-hardware.nixosModules.lenovo-thinkpad-t480 - - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.backupFileExtension = "backup"; - home-manager.users.fern = ./home.nix; - - home-manager.extraSpecialArgs = { - fluffychat2 = import fluffychat2 { inherit system; }; - feishin0_16_0 = import feishin0_16_0 { inherit system; }; - }; - } ./configuration.nix ./hardware-configuration/muskduck.nix # Include the results of the hardware scan. diff --git a/home.nix b/home.nix deleted file mode 100644 index a6f0d3b..0000000 --- a/home.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ config, pkgs, fluffychat2, feishin0_16_0, ... }: - -{ - # Home manager options. - home.username = "fern"; - home.homeDirectory = "/home/fern"; - home.stateVersion = "25.05"; - - # Let Home Manager install and manage itself. - programs.home-manager.enable = true; - - # Install some packages. - programs.git.enable = true; - programs.firefox.enable = true; - - programs.ghostty = { - enable = true; - settings.theme = "GruvboxDarkHard"; - }; - - programs.vscode = { - enable = true; - package = pkgs.vscodium; - }; - - home.packages = with pkgs; [ - adwsteamgtk - ansible - celluloid - discord - feishin0_16_0.feishin - filezilla - fluffychat2.fluffychat - gimp3 - glabels-qt - jellyfin-media-player - libreoffice - nixd # nix language server - nixfmt-rfc-style # nix language formatter - obsidian - (prismlauncher.override { - # Change Java runtimes available to Prism Launcher - jdks = [ - temurin-jre-bin - ]; - }) - signal-desktop - smile - yubioath-flutter - gnomeExtensions.rounded-window-corners-reborn - gnomeExtensions.smile-complementary-extension - ]; -} \ No newline at end of file