From 8134c4bcc3eb96b40126c029c70a676e5d275e3b Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Sat, 15 Jun 2024 14:16:56 +0200
Subject: [PATCH] Wofi: also show run

---
 homes/x86_64-linux/julian@aspi/fonts.nix    |  3 +-
 homes/x86_64-linux/julian@aspi/packages.nix |  1 -
 modules/home/hyprland/default.nix           |  2 +-
 modules/home/hyprland/waybar-config.json    | 57 ---------------------
 modules/home/hyprland/waybar/config.json    |  2 +-
 modules/home/hyprland/wofi/config           |  2 +-
 packages/pulseaudio-popup/default.nix       |  2 +-
 7 files changed, 6 insertions(+), 63 deletions(-)
 delete mode 100644 modules/home/hyprland/waybar-config.json

diff --git a/homes/x86_64-linux/julian@aspi/fonts.nix b/homes/x86_64-linux/julian@aspi/fonts.nix
index e95d6d9..72eee37 100644
--- a/homes/x86_64-linux/julian@aspi/fonts.nix
+++ b/homes/x86_64-linux/julian@aspi/fonts.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }:
 
-with pkgs; [
+with pkgs;
+[
   (nerdfonts.override { fonts = [ "FiraCode" ]; })
   font-awesome
   dejavu_fonts
diff --git a/homes/x86_64-linux/julian@aspi/packages.nix b/homes/x86_64-linux/julian@aspi/packages.nix
index 044388c..ac4355a 100644
--- a/homes/x86_64-linux/julian@aspi/packages.nix
+++ b/homes/x86_64-linux/julian@aspi/packages.nix
@@ -38,7 +38,6 @@ with pkgs;
   libnfc
 
   xournalpp
-  path-of-building
 
   xfce.thunar-archive-plugin
   zip
diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix
index 9a3d9fa..63dedf1 100644
--- a/modules/home/hyprland/default.nix
+++ b/modules/home/hyprland/default.nix
@@ -231,7 +231,7 @@ in
           "$mod, P, pseudo," # dwindle
 
           # opening applications
-          "$mod, D, exec, wofi --show run"
+          "$mod, D, exec, wofi --show drun,run"
           "$mod, E, exec, thunar"
           "$mod, Return, exec, alacritty"
           "$mod, B, exec, firefox"
diff --git a/modules/home/hyprland/waybar-config.json b/modules/home/hyprland/waybar-config.json
deleted file mode 100644
index 1582088..0000000
--- a/modules/home/hyprland/waybar-config.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-	"position": "bottom",
-    "height": 10,
-
-    "modules-left": ["hyprland/workspaces"],
-    "modules-right": ["idle_inhibitor", "disk", "cpu", "memory", "pulseaudio", "battery", "clock", "tray"],
-    "idle_inhibitor": {
-        "format": "{icon}",
-        "format-icons": {
-            "activated": " ",
-            "deactivated": " "
-        }
-    },
-    "disk": {
-        "interval": 30,
-        "format": "free: {percentage_free}% ({free})",
-        "path": "/",
-        "unit": "GB"
-    },
-    "tray": {
-        "spacing": 10
-    },
-    "clock": {
-        "tooltip-format": "{calendar}",
-        "format": "{:%a %d.%m %H:%M:%S}",
-		"interval": 1
-    },
-    "cpu": {
-        "format": "  {usage}%"
-    },
-    "memory": {
-        "format": "  {}%"
-    },
-    "battery": {
-        "states": {
-            "good": 95,
-            "warning": 30,
-            "critical": 15
-        },
-        "format": "{icon}  {capacity}% ({time})",
-        "format-charging": "  {capacity}% ({time})",
-        "format-plugged": "  {capacity}% ({time})",
-        "format-full": "{icon} ",
-        "format-icons": ["", "", "", "", ""]
-    },
-    "pulseaudio": {
-        "format": "{icon}   {volume}%",
-        "format-muted": "   {format_source}",
-        "format-icons": {
-           "headphone": "",
-            "default": ["", "", ""]
-        },
-		"scroll-step": 5.0,
-        "max-volume": 200,
-        "on-click": "pulseaudio-popup"
-    }
-}
diff --git a/modules/home/hyprland/waybar/config.json b/modules/home/hyprland/waybar/config.json
index 853f5c2..0bf73cf 100644
--- a/modules/home/hyprland/waybar/config.json
+++ b/modules/home/hyprland/waybar/config.json
@@ -3,7 +3,7 @@
     "position": "bottom",
     "mode": "dock",
     "exclusive": true,
-    "passtrough": false,
+    "passtrough": true,
     "height": 32,
 
     "modules-left": [
diff --git a/modules/home/hyprland/wofi/config b/modules/home/hyprland/wofi/config
index 7d7484c..0b4864b 100644
--- a/modules/home/hyprland/wofi/config
+++ b/modules/home/hyprland/wofi/config
@@ -1,7 +1,7 @@
 width=900
 height=600
 location=center
-show=drun
+show=drun,run
 prompt=Search...
 filter_rate=100
 allow_markup=true
diff --git a/packages/pulseaudio-popup/default.nix b/packages/pulseaudio-popup/default.nix
index 896ccf0..a2b916e 100644
--- a/packages/pulseaudio-popup/default.nix
+++ b/packages/pulseaudio-popup/default.nix
@@ -42,6 +42,6 @@ pkgs.writeShellApplication {
     Laptop - $LAPTOP_VOLUME,pactl set-default-sink $LAPTOP_SINK,$LAPTOP_ICON
     EOF
 
-    echo "$CONF" | jgmenu --simple
+    echo "$CONF" | jgmenu --simple --at-pointer
   '';
 }