From b048f43152032e7c43c0fc73573b38e630d55716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Sat, 11 Feb 2023 15:40:26 +0100
Subject: [PATCH] improve hyperland module

output waybar on all monitors and make comments prettier
---
 modules/programs/hyprland/config.nix  |  4 ++--
 modules/programs/hyprland/default.nix | 23 ++++++-----------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/modules/programs/hyprland/config.nix b/modules/programs/hyprland/config.nix
index 2135f17..38ef853 100644
--- a/modules/programs/hyprland/config.nix
+++ b/modules/programs/hyprland/config.nix
@@ -145,8 +145,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 -x11 -show combi
-  bind = $mainMod, C, exec, rofi -x11 -show calc -modi calc -no-show-match -no-sort | wl-copy
+  bind = $mainMod, R, exec, rofi -show combi
+  bind = $mainMod, C, exec, rofi -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 b8758d0..26b1538 100644
--- a/modules/programs/hyprland/default.nix
+++ b/modules/programs/hyprland/default.nix
@@ -66,11 +66,6 @@ in
           layer = "top";
           position = "top";
           height = 30;
-          output = [
-            "eDP-1"
-            "HDMI-A-1"
-            "HDMI-A-2"
-          ];
           modules-left = [ "wlr/workspaces" ];
           modules-center = [ "hyprland/window" ];
           modules-right = [ "network" "memory" "cpu" "battery" "clock" ];
@@ -151,18 +146,12 @@ in
 
     # add user packages for wayland and hyprland in particular
     users.users.moritz.packages = with pkgs; [
-      # pulse audio cli
-      pamixer
-      # control media playback
-      playerctl
-      # control brightness
-      brightnessctl
-      # screenshot tool for hyprland
-      grimblast
-      # region select for wayland (for screensharing)
-      slurp
-      # clipboard tool for wayland
-      wl-clipboard
+      pamixer # pulse audio cli
+      playerctl # control media playback
+      brightnessctl # control brightness
+      grimblast # screenshot tool for hyprland
+      slurp # region select for wayland (for screensharing)
+      wl-clipboard # clipboard tool for wayland
     ];