diff options
| -rw-r--r-- | flake.lock | 56 | ||||
| -rw-r--r-- | flake.nix | 11 | ||||
| -rw-r--r-- | machines/zenbook/configuration.nix | 5 | ||||
| -rw-r--r-- | modules/nixos/hyprland.nix | 5 |
4 files changed, 57 insertions, 20 deletions
@@ -176,11 +176,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1713735508, - "narHash": "sha256-rJ0nQmJvTvA55P2lYnkQNf4Agt0Be+86KZnfLHnfokk=", + "lastModified": 1713778289, + "narHash": "sha256-h3ufswObZ8qUxQewTc5L173ILfV6JBQ+IaN1aN9RPjY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "a4f38a07d7578f0b06c09de7d04682e0aaddb12a", + "rev": "e1644e91ead7cdef5d08bfe6a579c4478a816a8e", "type": "github" }, "original": { @@ -189,6 +189,31 @@ "type": "github" } }, + "hyprland-plugins": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1713607544, + "narHash": "sha256-nbqQmhvYbDVC/5YiZLSGj5r14cOk2k6TGPpP2TtCfhI=", + "owner": "hyprwm", + "repo": "hyprland-plugins", + "rev": "9971fec974a9d94a2a1b1d68d5ada5fc59fec053", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-plugins", + "type": "github" + } + }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -251,11 +276,11 @@ ] }, "locked": { - "lastModified": 1713619586, - "narHash": "sha256-fIhNlYhPhG5AJ8DxX3LaitnccnQ+X2MCL39W2Abp7mM=", + "lastModified": 1713730424, + "narHash": "sha256-MqYjTvQCxwuDIuAaqIEuyqserm5PYr0auiHHPuYFN/k=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "9e13e0915273959bfd98a10662f678c15ac71c77", + "rev": "7c9c8adfe7e424faa0c5ce6e8be90157fda53c06", "type": "github" }, "original": { @@ -306,11 +331,11 @@ ] }, "locked": { - "lastModified": 1712537332, - "narHash": "sha256-yYlxv1sg/TNl6hghjAe0ct+/p5PwXiT1mpuaExjhR88=", + "lastModified": 1713783234, + "narHash": "sha256-3yh0nqI1avYUmmtqqTW3EVfwaLE+9ytRWxsA5aWtmyI=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d942db8df8ee860556a38754f15b8d03bf7e6933", + "rev": "722b512eb7e6915882f39fff0e4c9dd44f42b77e", "type": "github" }, "original": { @@ -352,11 +377,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1713537308, - "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "type": "github" }, "original": { @@ -392,6 +417,7 @@ "catppuccin-starship": "catppuccin-starship", "home-manager": "home-manager", "hyprland": "hyprland", + "hyprland-plugins": "hyprland-plugins", "nix-colors": "nix-colors", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs", @@ -468,11 +494,11 @@ ] }, "locked": { - "lastModified": 1713214484, - "narHash": "sha256-h1bSIsDuPk1FGgvTuSHJyiU2Glu7oAyoPMJutKZmLQ8=", + "lastModified": 1713724432, + "narHash": "sha256-dtU1y4oj/0Y42oauzm93ucFg1AoqETnQ21bmXTIUng0=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "bb44921534a9cee9635304fdb876c1b3ec3a8f61", + "rev": "9ace6f969ce495185df34cc6254fb9d297765478", "type": "github" }, "original": { @@ -19,6 +19,10 @@ url = "github:hyprwm/Hyprland"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + hyprland-plugins = { + url = "github:hyprwm/hyprland-plugins"; + inputs.hyprland.follows = "hyprland"; + }; nix-colors.url = "github:misterio77/nix-colors"; @@ -209,6 +213,7 @@ zenbook = nixpkgs.lib.nixosSystem { # inherit system; + specialArgs = { inherit inputs; }; modules = [ ./machines/zenbook/configuration.nix @@ -216,6 +221,9 @@ ./modules/users/defin.nix ./modules/users/root.nix + # hyprland.homeManagerModules.default {wayland.windowManager.hyprland.enable = true;} + ./modules/nixos/hyprland.nix + home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; @@ -225,9 +233,6 @@ home-manager.extraSpecialArgs = { inherit inputs; }; } - # hyprland.homeManagerModules.default {wayland.windowManager.hyprland.enable = true;} - ./modules/nixos/hyprland.nix - ./modules/nixos/bluetooth.nix ./modules/nixos/environment.nix ./modules/nixos/kde-connect.nix diff --git a/machines/zenbook/configuration.nix b/machines/zenbook/configuration.nix index a0e5bd6..9363722 100644 --- a/machines/zenbook/configuration.nix +++ b/machines/zenbook/configuration.nix @@ -18,6 +18,11 @@ kernelPackages = pkgs.linuxPackages_latest; # use latest kernel }; + nix.settings = { + substituters = ["https://hyprland.cachix.org"]; + trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; + }; + nixpkgs = { # texlive.combined.scheme-medium; system = "x84_64-linux"; diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix index 3167314..935d5e4 100644 --- a/modules/nixos/hyprland.nix +++ b/modules/nixos/hyprland.nix @@ -1,10 +1,10 @@ -{ pkgs, hyprland, ...}: { +{ pkgs, inputs, ...}: { xdg.portal = { enable = true; wlr.enable = true; extraPortals = with pkgs; [ # xdg-desktop-portal-wlr - xdg-desktop-portal-hyprland + # xdg-desktop-portal-hyprland ]; }; @@ -32,6 +32,7 @@ programs = { hyprland = { enable = true; + package = inputs.hyprland.packages.${pkgs.system}.hyprland; # nvidiaPatches = true; }; |