From 749e2cf67d5c5515cf304a26ac51f7c597712066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sun, 10 Sep 2023 15:05:56 +0200 Subject: [PATCH] refactor: remove hyrpland overlay --- flake.nix | 1 - modules/programs/hyprland/default.nix | 3 ++- overlays/packages.nix | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 91ccddd..4ba9684 100644 --- a/flake.nix +++ b/flake.nix @@ -86,7 +86,6 @@ overlays = [ inputs.hypr-contrib.overlays.default - inputs.hyprland.overlays.default inputs.neovim-nightly-overlay.overlay overlay ]; diff --git a/modules/programs/hyprland/default.nix b/modules/programs/hyprland/default.nix index e208565..7c1cefa 100644 --- a/modules/programs/hyprland/default.nix +++ b/modules/programs/hyprland/default.nix @@ -9,7 +9,8 @@ with lib; let cfg = config.my.programs.hyprland; - hyprland = pkgs.hyprland.override { enableNvidiaPatches = cfg.nvidiaSupport; }; + hyprland-nvidia = pkgs.hyprland.override { enableNvidiaPatches = true; }; + hyprland = if cfg.nvidiaSupport then hyprland-nvidia else pkgs.hyprland; in { options.my.programs.hyprland = { diff --git a/overlays/packages.nix b/overlays/packages.nix index 66b2624..973523e 100644 --- a/overlays/packages.nix +++ b/overlays/packages.nix @@ -11,6 +11,7 @@ final: prev: version = lib.my.mkVersionInput inputs.rofi-wayland; }); timers = inputs.timers.packages.${prev.system}.default; + hyprland = inputs.hyprland.packages.${prev.system}.default; fzf1 = final.writeShellApplication { name = "fzf1";