hyprland: use hyprsplit

7 files changed, 159 insertions, 133 deletions

diff --git a/common/home/default.nix b/common/home/default.nix
index 3590195..0f870e5 100644
--- a/common/home/default.nix
+++ b/common/home/default.nix
@@ -52,6 +52,7 @@ packages = [
 	pkgs.ascii
 	pkgs.qpwgraph
 	pkgs.ffmpeg
+	pkgs.nbsdgames
 	];
 	in
 {
@@ -75,7 +76,7 @@ packages = [
 
 		accounts = import ./accounts { };
 
-		wayland.windowManager.hyprland = import ./hyprland;
+		wayland.windowManager.hyprland = import ./hyprland { inherit pkgs; };
 
 		home.packages = packages ++ scripts;
 
diff --git a/common/home/hyprland/default.nix b/common/home/hyprland/default.nix
index d33e8af..2ef1b0a 100644
--- a/common/home/hyprland/default.nix
+++ b/common/home/hyprland/default.nix
@@ -1,11 +1,18 @@
-{
+{ pkgs, ... }: {
 	enable = true;
 	systemd = {
 		enable = true;
 		variables = [ "--all" ];
 	};
 	xwayland.enable = true;
+	plugins = [ pkgs.hyprlandPlugins.hyprsplit ];
 	settings = {
+		plugin = {
+			hyprsplit = {
+				num_workspaces = 10;
+				persistent_workspaces = false;
+			};
+		};
 		"$mod" = "SUPER";
 		bind = [
 			"$mod+Shift, Q, exit"
@@ -41,31 +48,27 @@
 			"$mod+Shift, k, movewindow, u"
 			"$mod+Shift, j, movewindow, d"
 
-			"$mod, 1, workspace, 1"
-			"$mod, 2, workspace, 2"
-			"$mod, 3, workspace, 3"
-			"$mod, 4, workspace, 4"
-			"$mod, 5, workspace, 5"
-			"$mod, 6, workspace, 6"
-			"$mod, 7, workspace, 7"
-			"$mod, 8, workspace, 8"
-			"$mod, 9, workspace, 9"
-			"$mod, 0, workspace, 10"
-
-			"$mod, F1, movecurrentworkspacetomonitor, 0"
-			"$mod, F2, movecurrentworkspacetomonitor, 1"
-			"$mod, F3, movecurrentworkspacetomonitor, 2"
+			"$mod, 1, split:workspace, 1"
+			"$mod, 2, split:workspace, 2"
+			"$mod, 3, split:workspace, 3"
+			"$mod, 4, split:workspace, 4"
+			"$mod, 5, split:workspace, 5"
+			"$mod, 6, split:workspace, 6"
+			"$mod, 7, split:workspace, 7"
+			"$mod, 8, split:workspace, 8"
+			"$mod, 9, split:workspace, 9"
+			"$mod, 0, split:workspace, 10"
 
-			"$mod+Shift, 1, movetoworkspace, 1"
-			"$mod+Shift, 2, movetoworkspace, 2"
-			"$mod+Shift, 3, movetoworkspace, 3"
-			"$mod+Shift, 4, movetoworkspace, 4"
-			"$mod+Shift, 5, movetoworkspace, 5"
-			"$mod+Shift, 6, movetoworkspace, 6"
-			"$mod+Shift, 7, movetoworkspace, 7"
-			"$mod+Shift, 8, movetoworkspace, 8"
-			"$mod+Shift, 9, movetoworkspace, 9"
-			"$mod+Shift, 0, movetoworkspace, 10"
+			"$mod+Shift, 1, split:movetoworkspacesilent, 1"
+			"$mod+Shift, 2, split:movetoworkspacesilent, 2"
+			"$mod+Shift, 3, split:movetoworkspacesilent, 3"
+			"$mod+Shift, 4, split:movetoworkspacesilent, 4"
+			"$mod+Shift, 5, split:movetoworkspacesilent, 5"
+			"$mod+Shift, 6, split:movetoworkspacesilent, 6"
+			"$mod+Shift, 7, split:movetoworkspacesilent, 7"
+			"$mod+Shift, 8, split:movetoworkspacesilent, 8"
+			"$mod+Shift, 9, split:movetoworkspacesilent, 9"
+			"$mod+Shift, 0, split:movetoworkspacesilent, 10"
 		];
 
 		binde = [
@@ -88,8 +91,8 @@
 		];
 
 		general = {
-			gaps_in = 10;
-			gaps_out = 10;
+			gaps_in = 0;
+			gaps_out = 0;
 			layout = "master";
 			border_size = 3;
 			"col.active_border" = "rgba(b16286ff)";
@@ -97,7 +100,7 @@
 		};
 
 		decoration = {
-			rounding = 5;
+			rounding = 0;
 			shadow = {
 				enabled = true;
 				range = true;
@@ -106,7 +109,7 @@
 		};
 
 		animations = {
-			enabled = true;
+			enabled = false;
 			bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
 			animation = [
 				"windows, 1, 3, myBezier"
diff --git a/common/home/programs/waybar/default.nix b/common/home/programs/waybar/default.nix
index d02decb..523277b 100644
--- a/common/home/programs/waybar/default.nix
+++ b/common/home/programs/waybar/default.nix
@@ -1,53 +1,91 @@
 { ... }:
 {
-  enable = true;
-  systemd.enable = true;
-  settings = {
-    mainBar = {
-      layer = "top";
-      position = "left";
-      width = 50;
-      outputs = "*";
-      spacing = 10;
-      modules-left = [ "hyprland/workspaces" ];
-      modules-center = [ ];
-      modules-right = [
-        "bluetooth"
-        "pulseaudio"
-        "battery"
-        "tray"
-      ];
+	enable = true;
+	systemd.enable = true;
+	settings = {
+		mainBar = {
+			layer = "top";
+			position = "top";
+			height = 10;
+			outputs = "*";
+			spacing = 0;
+			modules-left = [ "hyprland/workspaces" ];
+			modules-center = [ ];
+			modules-right = [
+				"pulseaudio"
+				"bluetooth"
+				"battery"
+				"tray"
+			];
 
-      "hyprland/workspaces" = {
-        format = "{icon}";
-        all-outputs = true;
-      };
+			"hyprland/workspaces" = {
+				format = "{icon}";
+				format-icons = {
+					"1" =  "α";
+					"2" =  "β";
+					"3" =  "γ";
+					"4" =  "δ";
+					"5" =  "ε";
+					"6" =  "ζ";
+					"7" =  "η";
+					"8" =  "θ";
+					"9" =  "ι";
+					"10" = "κ";
+					"11" = "α";
+					"12" = "β";
+					"13" = "γ";
+					"14" = "δ";
+					"15" = "ε";
+					"16" = "ζ";
+					"17" = "η";
+					"18" = "θ";
+					"19" = "ι";
+					"20" = "κ";
+					"21" = "α";
+					"22" = "β";
+					"23" = "γ";
+					"24" = "δ";
+					"25" = "ε";
+					"26" = "ζ";
+					"27" = "η";
+					"28" = "θ";
+					"29" = "ι";
+					"30" = "κ";
+				};
+				all-outputs = false;
+			};
 
-      "hyprland/window" = {
-        separate-outputs = true;
-      };
+			"hyprland/window" = {
+				separate-outputs = true;
+			};
 
-      bluetooth = {
-        format = "";
-        format-disabled = "󰂲";
-        format-off = "󰂲";
-        format-on = "";
-        format-connected = "󰂱";
-        on-click = "blueberry";
-      };
+			bluetooth = {
+				format = "";
+				format-disabled = "󰂲";
+				format-off = "󰂲";
+				format-on = "";
+				format-connected = "󰂱";
+				on-click = "blueberry";
+			};
 
-      battery = {
-        states = {
-          warning = 15;
-          critical = 5;
-        };
-      };
+			battery = {
+				states = {
+					warning = 15;
+					critical = 5;
+				};
+			};
 
-      tray = {
-        icon-size = 15;
-        spacing = 10;
-      };
-    };
-  };
-  style = ./style.css;
+			tray = {
+				icon-size = 12;
+				spacing = 10;
+			};
+
+			"pulseaudio/slider" = {
+				min = 0;
+				max = 100;
+				orientation = "horizontal";
+			};
+		};
+	};
+	style = ./style.css;
 }
diff --git a/common/home/programs/waybar/style.css b/common/home/programs/waybar/style.css
index 99dc06b..6527a9f 100644
--- a/common/home/programs/waybar/style.css
+++ b/common/home/programs/waybar/style.css
@@ -3,61 +3,50 @@
 }
 
 window {
-	background: transparent;
+	background: #282828;
+}
+
+#pulseaudio {
+	font-size: 12px;
+}
+
+#bluetooth {
+	padding-left: 10px;
+	padding-right: 10px;
+	font-size: 12px;
 }
 
 #workspaces  {
-	background: #282828;
-	border-radius: 5px;
-	margin-left: 10px;
-	padding: 5px;
+	padding: 0px;
 }
 
 #workspaces button {
-	border: 5px solid #282828;
 	padding: 0px;
+	border-radius: 0px;
+	min-width: 20px;
+	min-height: 20px;
+	border: none;
 }
 
 #workspaces button.active {
-	border-right: 5px solid #b16286;
-	border-radius: 0px;
+	background: #b16286;
+	color: #1d2021;
 }
 
 #workspaces button:hover {
-	border-radius: 20px;
-	border: 5px solid #1d2021;
-	background: #1d2021;
+	background: #3c3836;
 	padding: 0px;
+	border: none;
 }
 
 #workspaces button.active:hover {
-	border: 5px solid #1d2021;
-	border-right: 5px solid #b16286;
-	border-radius: 20px;
-	background: #1d2021;
+	background: #b16286;
 	padding: 0px;
 }
 
-#tray,
-#bluetooth,
-#pulseaudio
-{
-	background: #282828;
-	border-radius: 5px;
-	margin-left: 10px;
-	padding: 10px 5px;
-}
-
-#tray window {
-	border-radius: 5px;
-}
-
 #battery {
 	background: #458588;
 	color: #282828;
-	border-radius: 5px;
-	margin-left: 10px;
-	padding: 10px 5px;
 }
 
 #battery.charging {
@@ -73,23 +62,9 @@ window {
 }
 
 .modules-left {
-	margin-top: 10px;
+	margin-top: 0px;
 }
 
 .modules-right {
-	margin-bottom: 10px;
-}
-
-.popup menu {
-	border: 3px solid #3c3836;
-	border-radius: 10px;
-	padding: 10px;
-}
-
-.popup menu menuitem {
-	border-radius: 5px;
-}
-
-.popup decoration {
-	background: transparent;
+	margin-right: 10px;
 }
diff --git a/common/home/programs/wofi/default.nix b/common/home/programs/wofi/default.nix
index d8cf5a9..07821e1 100644
--- a/common/home/programs/wofi/default.nix
+++ b/common/home/programs/wofi/default.nix
@@ -1,5 +1,13 @@
 { ... }:
 {
-  enable = true;
-  style = builtins.readFile ./style.css;
+	enable = true;
+	style = builtins.readFile ./style.css;
+	settings = {
+		key_forward = "Alt-j";
+		key_backward = "Alt-k";
+		location = "top_right";
+		gtk_dark = true;
+		layer = "overlay";
+		width = "100%";
+	};
 }
diff --git a/common/home/programs/wofi/style.css b/common/home/programs/wofi/style.css
index 7e38346..d4ab36d 100644
--- a/common/home/programs/wofi/style.css
+++ b/common/home/programs/wofi/style.css
@@ -8,20 +8,21 @@ window {
 }
 
 #outer-box {
-	border-radius: 10px;
+	border-radius: 0px;
 	background: transparent;
 }
 
 entry#input {
 	background: #1d2021;
-	border: 2px solid #b16286;
-	margin-bottom: 10px;
+	border: 3px solid #b16286;
+	margin-bottom: 0px;
 	padding: 10px;
-	border-radius: 10px;
+	border-radius: 0px;
 }
 #scroll {
-	border-radius: 10px;
-	border: 2px solid #3c3836;
+	border-radius: 0px;
+	border: 3px solid #b16286;
+	border-top: none;
 	background: #1d2021;
 }
 
@@ -31,7 +32,7 @@ entry#input {
 }
 
 .entry {
-	border-radius: 5px;
+	border-radius: 0px;
 	border: none;
 	padding: 8px;
 	margin: 2px;
diff --git a/common/home/scripts/openproject b/common/home/scripts/openproject
index 1c9ca48..768f9eb 100644
--- a/common/home/scripts/openproject
+++ b/common/home/scripts/openproject
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-path=$(find ~ -name '.git' -type d -maxdepth 6 | sed 's/\.git$//' | wofi -d -p 'Open Project')
+path=$(find . -name '.git' -type d -maxdepth 6 | sed 's/\.git$//' | wofi -d -p 'Open Project')
 
 [ -z "$path" ] && exit