From 495aba3fefefe989142411b8e8738f8f37daf8f9 Mon Sep 17 00:00:00 2001 From: John Ogle Date: Wed, 5 Mar 2025 12:33:32 -0800 Subject: [PATCH] [home] Support standalone home manager --- flake.nix | 17 +++++++++++++++-- home/home-nix-book.nix | 2 +- home/home-z790prors.nix | 7 ------- home/{home-default.nix => home.nix} | 2 ++ 4 files changed, 18 insertions(+), 10 deletions(-) delete mode 100644 home/home-z790prors.nix rename home/{home-default.nix => home.nix} (99%) diff --git a/flake.nix b/flake.nix index 40c1fb9..4d69c7f 100644 --- a/flake.nix +++ b/flake.nix @@ -67,7 +67,7 @@ ./machines/boxy/configuration.nix inputs.home-manager.nixosModules.home-manager { - home-manager.users.johno = import ./home/home-default.nix; + home-manager.users.johno = import ./home/home.nix; home-manager.extraSpecialArgs = { inherit system; }; } ]; @@ -80,10 +80,23 @@ ./machines/wixos/configuration.nix inputs.home-manager.nixosModules.home-manager { - home-manager.users.johno = import ./home/home-default.nix; + home-manager.users.johno = import ./home/home.nix; home-manager.extraSpecialArgs = { inherit system; }; } ]; }; + + homeConfigurations."johno" = inputs.home-manager.lib.homeManagerConfiguration { + pkgs = inputs.nixpkgs.legacyPackages."x86_64-linux"; + modules = [ + inputs.plasma-manager.homeManagerModules.plasma-manager + inputs.nix-doom-emacs-unstraightened.hmModule + ./home/home.nix + ]; + extraSpecialArgs = { + system = "x86_64-linux"; + globalInputs = inputs; + }; + }; }; } diff --git a/home/home-nix-book.nix b/home/home-nix-book.nix index 0956ca9..8b63b82 100644 --- a/home/home-nix-book.nix +++ b/home/home-nix-book.nix @@ -2,7 +2,7 @@ { imports = [ - ./home-default.nix + ./home.nix ]; home.i3_sway.extraSwayConfig = { diff --git a/home/home-z790prors.nix b/home/home-z790prors.nix deleted file mode 100644 index 0c855ae..0000000 --- a/home/home-z790prors.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ./home-default.nix - ]; -} diff --git a/home/home-default.nix b/home/home.nix similarity index 99% rename from home/home-default.nix rename to home/home.nix index 0ba5f1b..644b964 100644 --- a/home/home-default.nix +++ b/home/home.nix @@ -105,6 +105,8 @@ in home.sessionPath = [ ]; + nixpkgs.config.allowUnfree = true; + imports = [ ./modules/emacs ./modules/i3+sway