diff --git a/flake.lock b/flake.lock index 278ed71..e7ce16d 100644 --- a/flake.lock +++ b/flake.lock @@ -71,7 +71,9 @@ "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang_2", - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems_2", "wlroots": "wlroots", "xdph": "xdph" @@ -180,22 +182,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1711523803, - "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1712163089, "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", @@ -216,7 +202,7 @@ "home-manager": "home-manager", "hyprland": "hyprland", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" } }, "systems": { diff --git a/flake.nix b/flake.nix index d0d39d5..73eb58c 100644 --- a/flake.nix +++ b/flake.nix @@ -23,10 +23,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland = { - url = "github:hyprwm/Hyprland"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + hyprland.url = "github:hyprwm/Hyprland"; }; @@ -38,10 +35,18 @@ # nixos-hardware.nixosModules.$MODEL ./hosts/proserpina/configuration.nix disko.nixosModules.disko - home-manager.nixosModules.home-manager ]; }; }; + homeConfigurations."serenity@proserpina" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux; + modules = [ + hyprland.homeManagerModules.default + {wayland.windowManager.hyprland.enable = true;} + # ... + ]; + }; + }; } diff --git a/modules/core/user.nix b/modules/core/user.nix index 5271122..08f7c69 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -3,36 +3,34 @@ { imports = [ - inputs.home-manager.nixosModules.home-manager + # inputs.home-manager.nixosModules.home-manager ]; + users.defaultUserShell = pkgs.fish; + home-manager = { useUserPackages = true; useGlobalPkgs = true; extraSpecialArgs = { inherit inputs; }; users.serenity = { - imports = [ (import ../home) ]; - home.username = "serenity"; - home.homeDirectory = "/home/serenity"; - home.stateVersion = "23.11"; programs.home-manager.enable = true; + # imports = [ (import ../home) ]; + home = { + username = "serenity"; + homeDirectory = "/home/serenity" + stateVersion = "23.11"; + }; }; }; - users = { - - defaultUserShell = pkgs.fish; - - users.serenity = { - description = "Serenity Amalgam"; - isNormalUser = true; - shell = pkgs.fish; - extraGroups = [ - "wheel" - "networkmanager" - ]; - }; - + users.users.serenity = { + description = "Serenity Amalgam"; + isNormalUser = true; + shell = pkgs.fish; + extraGroups = [ + "wheel" + "networkmanager" + ]; }; - + }