From 42f97ad0bcd9997fbebd64fb999ea6b469e7650b Mon Sep 17 00:00:00 2001
From: Madeline Hashcube <hashcube.dev@proton.me>
Date: Wed, 12 Aug 2026 05:36:02 +0000
Subject: [PATCH] do the things idk

---
 users/hashcube/pkgs/default.nix | 2 ++
 users/hashcube/theming/gtk.nix | 4 ++++
 users/hashcube/programs/wayland/waybar.nix | 4 +++-
 users/hashcube/programs/wayland/wleave.nix | 45 ++++++++++++++++++++++++++++++---------------
 4 file(s) changed, 39 insertion(s)(+), 16 deletion(s)(-)

diff --git a/users/hashcube/pkgs/default.nix b/users/hashcube/pkgs/default.nix
--- a/users/hashcube/pkgs/default.nix
+++ b/users/hashcube/pkgs/default.nix
@@ -36,6 +36,8 @@
     packet
     w3m
     woomer
+    freecad-wayland
+    mcpelauncher-ui-qt
     inputs.ytpm.packages.x86_64-linux.default
   ];
 }
diff --git a/users/hashcube/theming/gtk.nix b/users/hashcube/theming/gtk.nix
--- a/users/hashcube/theming/gtk.nix
+++ b/users/hashcube/theming/gtk.nix
@@ -10,6 +10,10 @@
     };
 		iconTheme = {
 			name = "Papirus-Dark";
+      package = pkgs.catppuccin-papirus-folders.override {
+				flavor = "mocha";
+				accent = "pink";
+      };
 		};
     cursorTheme = {
       name = "catppuccin-mocha-pink-cursors";
diff --git a/users/hashcube/programs/wayland/waybar.nix b/users/hashcube/programs/wayland/waybar.nix
--- a/users/hashcube/programs/wayland/waybar.nix
+++ b/users/hashcube/programs/wayland/waybar.nix
@@ -1,6 +1,7 @@
-{ config, pkgs, inputs, ... }:
+{ pkgs, ... }:
 
 {
+  home.packages = [ pkgs.lxqt.pavucontrol-qt ];
   programs.waybar = {
     enable = true;
     settings = {
@@ -56,6 +57,7 @@
           format = "{volume}%";
           format-muted = "{volume}X";
           scroll-step = 1;
+          on-click = "pavucontrol-qt";
         };
         "niri/workspaces" = {
           format = "{name}";
diff --git a/users/hashcube/programs/wayland/wleave.nix b/users/hashcube/programs/wayland/wleave.nix
--- a/users/hashcube/programs/wayland/wleave.nix
+++ b/users/hashcube/programs/wayland/wleave.nix
@@ -1,41 +1,56 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   programs.wleave = {
     enable = true;
     settings = {
-      buttons-per-row = "1/2";
+      buttons-per-row = "1/3";
       close-on-lost-focus = true;
       show-keybinds = true;
       no-version-info = true;
       buttons = [
-        {
+        # insane nix magic to get things to be the right way
+        ( let name = ["log" "out"]; in rec {
+          label = lib.strings.concatStringsSep "" name;
+          action = "pkill niri";
+          keybind = "o";
+          text = lib.strings.concatMapStringsSep " " (x: lib.strings.toSentenceCase x) name;
+          icon = "${pkgs.wleave}/share/wleave/icons/${label}.svg";
+        })
+        rec {
           label = "lock";
           action = "swaylock";
-          text = "Lock";
           keybind = "l";
-          icon = "${pkgs.wleave}/share/wleave/icons/lock.svg";
+          text = lib.strings.toSentenceCase label;
+          icon = "${pkgs.wleave}/share/wleave/icons/${label}.svg";
         }
-        {
+        rec {
           label = "reboot";
           action = "systemctl reboot";
-          text = "Reboot";
           keybind = "r";
-          icon = "${pkgs.wleave}/share/wleave/icons/reboot.svg";
+          text = lib.strings.toSentenceCase label;
+          icon = "${pkgs.wleave}/share/wleave/icons/${label}.svg";
         }
-        {
+        rec {
           label = "shutdown";
           action = "systemctl poweroff";
-          text = "Shutdown";
           keybind = "s";
-          icon = "${pkgs.wleave}/share/wleave/icons/shutdown.svg";
+          text = lib.strings.toSentenceCase label;
+          icon = "${pkgs.wleave}/share/wleave/icons/${label}.svg";
         }
-        {
+        rec {
           label = "suspend";
-          action = "systemctl suspend";
-          text = "Suspend";
+          action = "swaylock & systemctl suspend";
           keybind = "u";
-          icon = "${pkgs.wleave}/share/wleave/icons/suspend.svg";
+          text = lib.strings.toSentenceCase label;
+          icon = "${pkgs.wleave}/share/wleave/icons/${label}.svg";
+        }
+        rec {
+          label = "hibernate";
+          action = "swaylock & systemctl hibernate";
+          keybind = "h";
+          text = lib.strings.toSentenceCase label;
+          icon = "${pkgs.wleave}/share/wleave/icons/${label}.svg";
         }
       ];
     };

--
tangled.sh