From afbfe9f576ecde189ece40b7f23086cb979f23e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Sun, 1 Jan 2023 15:27:31 +0100
Subject: [PATCH] hyprland improvements

---
 flake.nix                             |  7 +++++--
 modules/programs/hyprland/config.nix  | 11 ++---------
 modules/programs/hyprland/default.nix |  4 ++--
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index 1c93a22..e95fcb4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -51,9 +51,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    hyprland.url = "github:hyprwm/Hyprland";
 
+    # Hyprland
+    hyprland.url = "github:hyprwm/Hyprland";
     hyprpaper.url = "github:hyprwm/hyprpaper";
+    hypr-contrib.url = "github:hyprwm/contrib";
   };
 
   outputs =
@@ -72,13 +74,14 @@
       overlay = import ./overlays { inherit inputs; };
 
       channels.nixpkgs.overlaysBuilder = channels: [
-        self.overlay
         inputs.agenix.overlay
         inputs.emacs-overlay.overlay
         inputs.howdy.overlays.default
+        inputs.hypr-contrib.overlays.default
         inputs.hyprland.overlays.default
         inputs.hyprpaper.overlays.default
         inputs.utils.overlay
+        self.overlay
       ];
 
       # overlays = utils.lib.exportOverlays {
diff --git a/modules/programs/hyprland/config.nix b/modules/programs/hyprland/config.nix
index 0fcaa86..038f962 100644
--- a/modules/programs/hyprland/config.nix
+++ b/modules/programs/hyprland/config.nix
@@ -18,15 +18,8 @@ in
   # See https://wiki.hyprland.org/Configuring/Monitors/
   monitor=,preferred,auto,1
 
-
   # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 
-  # Execute your favorite apps at launch
-  # exec-once = waybar & hyprpaper & firefox
-
-  # Source a file (multi-file configs)
-  # source = ~/.config/hypr/myColors.conf
-
   # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
   input {
       kb_layout = de,us
@@ -140,8 +133,8 @@ in
   bind = $mainMod, M, exec, hyprctl keyword general:layout master
   bind = $mainMod, P, pseudo, # dwindle
   bind = $mainMod, Q, killactive,
-  bind = $mainMod, R, exec, rofi -show combi -normal-window
-  bind = $mainMod, C, exec, rofi -show calc -modi calc -no-show-match -no-sort | xclip -selection clipboard
+  bind = $mainMod, R, exec, rofi -x11 -show combi
+  bind = $mainMod, C, exec, rofi -x11 -show calc -modi calc -no-show-match -no-sort | wl-copy
   bind = $mainMod, B, exec, rofi-bluetooth
   bind = $mainMod, RETURN, exec, kitty
   bind = $mainMod, T, togglesplit, # dwindle
diff --git a/modules/programs/hyprland/default.nix b/modules/programs/hyprland/default.nix
index b46c677..4f7b32a 100644
--- a/modules/programs/hyprland/default.nix
+++ b/modules/programs/hyprland/default.nix
@@ -109,8 +109,8 @@ in
       pamixer
       playerctl
       brightnessctl
-      slurp
-      grim
+      grimblast
+      wl-clipboard
     ];
 
     security.pam.services.swaylock = { };