diff --git a/flake.nix b/flake.nix index 663acf7..107f09a 100644 --- a/flake.nix +++ b/flake.nix @@ -29,11 +29,12 @@ }; outputs = { + self, nixpkgs, nixpkgs-unstable, - home-manager, - hyprland, nixos-hardware, + home-manager, + hyprland,, ... }: let system = "x86_64-linux"; @@ -49,7 +50,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; # ASK AKESI ABOUT EASIER WAY TO LOAD ALL USERS MAYBE? - home-manager.users.serenity = toplevel; + # home-manager.users.serenity = toplevel; # Optionally, use home-manager.extraSpecialArgs to pass # arguments to home.nix } @@ -64,6 +65,7 @@ nixosConfigurations = { proserpina = nixpkgs.lib.nixosSystem { inherit system; + specialArgs = { inherit hyprland; }; modules = [ ./hosts/proserpina/configuration.nix # Load muir main nix config # nixos-hardware.nixosModules.$MODEL diff --git a/home/home.nix b/home/home.nix index a01bc46..da561a0 100755 --- a/home/home.nix +++ b/home/home.nix @@ -1,4 +1,5 @@ { pkgs, lib, osConfig, ... }: + { imports = [ diff --git a/home/users/default.nix b/home/users/default.nix index b1b9351..d1099f0 100644 --- a/home/users/default.nix +++ b/home/users/default.nix @@ -1,6 +1,8 @@ +{ config, lib, pkgs, osConfig, ...} + { - import = [ + imports = [ ./serenity.nix ];