From ef72e46e77513d1c7a72065cd1957d27a616ca45 Mon Sep 17 00:00:00 2001
From: Veneficium <85629831+veneficium42@users.noreply.github.com>
Date: Fri, 18 Jul 2025 13:03:45 +0200
Subject: [PATCH] update various configs

---
 flake.nix                     |  5 +++++
 modules/home/niri/config.kdl  |  2 ++
 modules/home/niri/niri.nix    | 24 +++++++++++++++++++++++-
 modules/home/niri/waybar.json | 34 ++++++----------------------------
 4 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/flake.nix b/flake.nix
index a8bec3d..5507997 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,6 +24,9 @@
 
     treefmt-nix.url = "github:numtide/treefmt-nix";
     treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
+
+    helix.url = "github:helix-editor/helix";
+    helix.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =
@@ -36,6 +39,7 @@
       niri,
       nix-vscode-extensions,
       treefmt-nix,
+      helix,
       ...
     }:
     {
@@ -47,6 +51,7 @@
             {
               nixpkgs.overlays = [
                 nix-vscode-extensions.overlays.default
+                helix.overlays.default
                 niri.overlays.niri
               ];
             }
diff --git a/modules/home/niri/config.kdl b/modules/home/niri/config.kdl
index 7d34d17..0f7b2e3 100644
--- a/modules/home/niri/config.kdl
+++ b/modules/home/niri/config.kdl
@@ -351,6 +351,8 @@ binds {
     // The quit action will show a confirmation dialog to avoid accidental exits.
     Mod+Shift+E { quit; }
 
+    Mod+V       { toggle-window-floating; }
+
     // Powers off the monitors. To turn them back on, do any input like
     // moving the mouse or pressing any other key.
     Mod+Shift+P { power-off-monitors; }
diff --git a/modules/home/niri/niri.nix b/modules/home/niri/niri.nix
index fd93b62..fb1d271 100644
--- a/modules/home/niri/niri.nix
+++ b/modules/home/niri/niri.nix
@@ -17,7 +17,26 @@
 
   services.mako = {
     enable = true;
-    extraConfig = builtins.readFile ./mako.conf;
+    settings = {
+      sort = "+time";
+      on-button-left = "invoke-default-action";
+      on-button-middle = "dismiss-group";
+      on-button-right = "dismiss";
+      on-touch = "invoke-default-action";
+      height = 99;
+      width = 299;
+      margin = 0;
+      padding = 10;
+      border-size = 1;
+      border-radius = 1;
+      icons = 1;
+      layer = "top";
+      anchor = "bottom-right";
+      markup = 1;
+      actions = 1;
+      text-alignment = "center";
+      default-timeout = 10000;
+    };
   };
   services.swayosd = {
     enable = true;
@@ -30,6 +49,9 @@
     ];
     style = builtins.readFile ./waybar.css;
   };
+
+  programs.fuzzel.enable = true;
+
   services.wpaperd.enable = true;
   programs.niri.config = builtins.readFile ./config.kdl;
 }
diff --git a/modules/home/niri/waybar.json b/modules/home/niri/waybar.json
index 0d9b372..abb9787 100644
--- a/modules/home/niri/waybar.json
+++ b/modules/home/niri/waybar.json
@@ -2,22 +2,9 @@
 	"layer": "top",
 	"position": "top",
 	"spacing": 10,
-	"modules-left": [
-		"niri/workspaces"
-	],
-	"modules-center": [
-		"clock#1",
-		"clock#2",
-		"clock#3"
-	],
-	"modules-right": [
-		"pulseaudio",
-		"memory",
-		"cpu",
-		"battery",
-		"disk",
-		"tray"
-	],
+	"modules-left": ["niri/workspaces"],
+	"modules-center": ["clock#1", "clock#2", "clock#3"],
+	"modules-right": ["pulseaudio", "memory", "cpu", "battery", "disk", "tray"],
 	"sway/workspaces": {
 		"disable-scroll": true,
 		"format": "{name}"
@@ -40,10 +27,7 @@
 		"format-muted": "",
 		"format-icons": {
 			"headphones": "",
-			"default": [
-				"",
-				""
-			]
+			"default": ["", ""]
 		},
 		"scroll-step": 5,
 		"on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
@@ -65,13 +49,7 @@
 			"critical": 15
 		},
 		"format": "{icon}    {capacity}%",
-		"format-icons": [
-			"",
-			"",
-			"",
-			"",
-			""
-		]
+		"format-icons": ["", "", "", "", ""]
 	},
 	"disk": {
 		"interval": 5,
@@ -82,4 +60,4 @@
 		"icon-size": 22,
 		"spacing": 6
 	}
-}
\ No newline at end of file
+}