diff --git a/flake.lock b/flake.lock index 2c33bf5..ebb06c0 100644 --- a/flake.lock +++ b/flake.lock @@ -132,7 +132,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -169,6 +169,135 @@ "type": "github" } }, + "hypridle": { + "inputs": { + "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_2" + }, + "locked": { + "lastModified": 1742397293, + "narHash": "sha256-WVREToubLhIlogCoNJzo+HdatLKkEushwStDU1uyRnc=", + "owner": "hyprwm", + "repo": "Hypridle", + "rev": "71e875e49e583c7b8b1364b55dfe494375c4e3ea", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "Hypridle", + "type": "github" + } + }, + "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hypridle", + "nixpkgs" + ], + "systems": [ + "hypridle", + "systems" + ] + }, + "locked": { + "lastModified": 1737556638, + "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprlang": { + "inputs": { + "hyprutils": [ + "hypridle", + "hyprutils" + ], + "nixpkgs": [ + "hypridle", + "nixpkgs" + ], + "systems": [ + "hypridle", + "systems" + ] + }, + "locked": { + "lastModified": 1737634606, + "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hypridle", + "nixpkgs" + ], + "systems": [ + "hypridle", + "systems" + ] + }, + "locked": { + "lastModified": 1737632363, + "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "006620eb29d54ea9086538891404c78563d1bae1", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hypridle", + "nixpkgs" + ], + "systems": [ + "hypridle", + "systems" + ] + }, + "locked": { + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "nextcloud-side-menu": { "flake": false, "locked": { @@ -287,6 +416,7 @@ "firefox-addons": "firefox-addons", "flake-parts": "flake-parts", "home-manager": "home-manager", + "hypridle": "hypridle", "nextcloud-side-menu": "nextcloud-side-menu", "nextcloud-twofactor-totp": "nextcloud-twofactor-totp", "nix-vscode-extensions": "nix-vscode-extensions", @@ -333,6 +463,21 @@ } }, "systems_2": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/flake.nix b/flake.nix index 2d57a92..8b1722e 100644 --- a/flake.nix +++ b/flake.nix @@ -56,6 +56,11 @@ url = "https://gitnet.fr/deblan/side_menu/releases/download/v4.0.1/side_menu_v4.0.1.tar.gz"; flake = false; }; + + hypridle = { + url = "github:hyprwm/Hypridle"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = diff --git a/modules/home/de-utils/hypridle.nix b/modules/home/de-utils/hypridle.nix index c275344..c3d4ce3 100644 --- a/modules/home/de-utils/hypridle.nix +++ b/modules/home/de-utils/hypridle.nix @@ -1,5 +1,6 @@ { config, + inputs, pkgs, lib, ... @@ -12,6 +13,7 @@ services.hypridle = { enable = true; + package = inputs.hypridle.packages.${pkgs.system}.default; settings = { general = { diff --git a/modules/home/de/hyprland/default.nix b/modules/home/de/hyprland/default.nix index 0dbdebb..adbe08f 100644 --- a/modules/home/de/hyprland/default.nix +++ b/modules/home/de/hyprland/default.nix @@ -1,6 +1,7 @@ { config, pkgs, + pkgs-unstable, lib, ... }@moduleArgs: @@ -10,7 +11,10 @@ }; config = lib.mkIf config.myConfig.de.hyprland.enable { - wayland.windowManager.hyprland.enable = true; + wayland.windowManager.hyprland = { + enable = true; + package = pkgs-unstable.hyprland; + }; home.packages = [ pkgs.wl-clipboard diff --git a/modules/system/de/hyprland.nix b/modules/system/de/hyprland.nix index 342ea07..d737493 100644 --- a/modules/system/de/hyprland.nix +++ b/modules/system/de/hyprland.nix @@ -1,6 +1,6 @@ { config, - pkgs, + pkgs-unstable, lib, ... }: @@ -8,15 +8,19 @@ options.myConfig.de.hyprland.enable = lib.mkEnableOption ""; config = lib.mkIf config.myConfig.de.hyprland.enable { - programs.hyprland.enable = true; + programs.hyprland = { + enable = true; + package = pkgs-unstable.hyprland; + portalPackage = pkgs-unstable.xdg-desktop-portal-hyprland; + }; + + hardware.graphics = { + package = pkgs-unstable.mesa; + package32 = pkgs-unstable.pkgsi686Linux.mesa; + }; environment.sessionVariables.NIXOS_OZONE_WL = "1"; - xdg.portal = { - enable = true; - extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - }; - services.gvfs.enable = true; }; }