diff --git a/flake.lock b/flake.lock index 3386095..0ff80d5 100755 --- a/flake.lock +++ b/flake.lock @@ -433,6 +433,22 @@ "type": "github" } }, + "hyprland-stable": { + "locked": { + "lastModified": 1723474844, + "narHash": "sha256-9dyLWfx/PruwHjCZhIvY3jBdNfhID1AbsSU6Wkn284k=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6404fe89d602c9511c08f4978bcb214032cd3cfc", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6404fe89d602c9511c08f4978bcb214032cd3cfc", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane", @@ -721,6 +737,7 @@ "home-manager": "home-manager", "homebrew-cask": "homebrew-cask", "homebrew-core": "homebrew-core", + "hyprland-stable": "hyprland-stable", "lanzaboote": "lanzaboote", "lix-module": "lix-module", "nix-darwin": "nix-darwin", diff --git a/flake.nix b/flake.nix index a39d976..82fe25d 100755 --- a/flake.nix +++ b/flake.nix @@ -53,6 +53,8 @@ url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; + + hyprland-stable.url = "github:nixos/nixpkgs/6404fe89d602c9511c08f4978bcb214032cd3cfc"; }; outputs = { @@ -77,8 +79,11 @@ nixosConfigurations = { demeter = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs;}; system = "x86_64-linux"; + specialArgs = { + inherit inputs; + system = "x86_64-linux"; + }; modules = [ ./hosts/demeter ]; diff --git a/hosts/demeter/default.nix b/hosts/demeter/default.nix index 109f20b..dddff51 100644 --- a/hosts/demeter/default.nix +++ b/hosts/demeter/default.nix @@ -1,4 +1,8 @@ -{inputs, ...}: { +{ + inputs, + system, + ... +}: { imports = with inputs; [ ./configuration.nix ../../modules/nixos/gaming @@ -17,6 +21,10 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.backupFileExtension = "backup"; + home-manager.extraSpecialArgs = { + inherit inputs; + inherit system; + }; home-manager.users.youwen = { imports = [ ../../users/youwen/linux/desktop @@ -25,8 +33,8 @@ ../../users/youwen/common/neofetch ../../users/youwen/common/neovim ../../users/youwen/common - inputs.catppuccin.homeManagerModules.catppuccin - inputs.nixvim.homeManagerModules.nixvim + catppuccin.homeManagerModules.catppuccin + nixvim.homeManagerModules.nixvim ]; }; } diff --git a/users/youwen/linux/hyprland/common.nix b/users/youwen/linux/hyprland/common.nix index c0facf2..8cbd1f2 100644 --- a/users/youwen/linux/hyprland/common.nix +++ b/users/youwen/linux/hyprland/common.nix @@ -1,6 +1,12 @@ -{pkgs, ...}: { +{ + pkgs, + inputs, + system, + ... +}: { wayland.windowManager.hyprland = { enable = true; + package = inputs.hyprland-stable.legacyPackages.${system}.hyprland; settings = { exec-once = ["waypaper --restore"]; "$mod" = "SUPER";