From 5902de4177cf3605d7bbd6652374494e7306726d Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Sun, 7 Jul 2024 19:41:07 -0400 Subject: [PATCH] move hyprland overlays to nixosModules/desktop/hyprland --- baseModules/nixpkgs.nix | 3 --- nixosModules/desktop/hyprland/default.nix | 8 ++++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/baseModules/nixpkgs.nix b/baseModules/nixpkgs.nix index 3578cadb..4c9ace66 100644 --- a/baseModules/nixpkgs.nix +++ b/baseModules/nixpkgs.nix @@ -20,7 +20,6 @@ alyraffauf-wallpapers = inputs.wallpapers.packages.${pkgs.system}.default; brave = prev.brave.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";}; google-chrome = prev.google-chrome.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";}; - hyprland = inputs.hyprland.packages.${pkgs.system}.hyprland; nerdfonts = prev.nerdfonts.override {fonts = ["Noto"];}; obsidian = prev.obsidian.overrideAttrs (old: { @@ -38,8 +37,6 @@ ["--ozone-platform-hint=auto --enable-wayland-ime"] old.installPhase; }); - - xdg-desktop-portal-hyprland = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; }) ]; }; diff --git a/nixosModules/desktop/hyprland/default.nix b/nixosModules/desktop/hyprland/default.nix index dd21f367..4b74ea10 100644 --- a/nixosModules/desktop/hyprland/default.nix +++ b/nixosModules/desktop/hyprland/default.nix @@ -1,5 +1,6 @@ { config, + inputs, lib, pkgs, ... @@ -18,6 +19,13 @@ ]; }; + nixpkgs.overlays = [ + (final: prev: { + hyprland = inputs.hyprland.packages.${pkgs.system}.hyprland; + xdg-desktop-portal-hyprland = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; + }) + ]; + programs = { hyprland = { enable = true;