From b9a3eff10becc0298ce3f534d8ad516d7b012fe2 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 14:12:55 +1000 Subject: [PATCH] come ooon home-manager, pls worky ? :pleading_crying: :pissing: :laughing: 4 --- flake.nix | 48 ++++++++++++++++++++++++++++--------------- modules/core/home.nix | 4 ---- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/flake.nix b/flake.nix index 9a9e06b..767a6af 100644 --- a/flake.nix +++ b/flake.nix @@ -38,30 +38,46 @@ home-manager, hyprland, ... - }: { + }: + + let + + system = "x86_64-linux"; + + home-manager-config = toplevel: [ + home-manager.nixosModules.home-manager + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = { inherit inputs; }; + users.serenity = toplevel; + users.serenity = { + imports = [ + (import ./modules/core/home.nix) + ]; + }; + }; + } + ]; + + in + + { nixosConfigurations = { proserpina = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { inherit hyprland; }; + inherit system; + # specialArgs = { inherit hyprland; }; modules = [ - # nixos-hardware.nixosModules.$MODEL ./hosts/proserpina/configuration.nix disko.nixosModules.disko - home-manager.nixosModules.home-manager - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - users = { - serenity = import ./modules/core/home.nix; - }; - }; - } - - ]; + ] ++ home-manager-config; }; }; }; + + system.stateVersion = "23.11"; + } diff --git a/modules/core/home.nix b/modules/core/home.nix index 317c93b..24b3143 100755 --- a/modules/core/home.nix +++ b/modules/core/home.nix @@ -3,7 +3,6 @@ { imports = [ - inputs.home-manager.nixosModules.home-manager ]; @@ -24,10 +23,7 @@ }; home-manager = { - # extraSpecialArgs = { inherit inputs; }; - users.serenity = { - imports = [ (import ./../home) ]; home = { username = "serenity"; homeDirectory = "/home/serenity/";