loads of tweaks

hypr/hyprland.conf

@@ -64,7 +64,7 @@ general {
     # col.inactive_border = rgba(595959aa)
 		col.active_border = rgb(b8bb26)
 		#col.active_border = rgb(B8BB26)
-		col.inactive_border = rgb(A89984)
+		col.inactive_border = rgb(504945)
     layout = dwindle
 
     # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on

hypr/hyprlock.conf

@@ -28,6 +28,7 @@ input-field {
     position = 0, -20
     halign = center
     valign = center
+		rounding = 0
 }
 label {
     monitor =

nvim/lua/thomas/core/colourscheme.lua

@@ -1,4 +1,4 @@
-local status, _ = pcall(vim.cmd, "colorscheme gruvbox-material")
+local status, _ = pcall(vim.cmd, "colorscheme gruvbox")
 if not status then
 	print("Colorscheme not found!") -- print error if colorscheme not installed
 	return

nvim/lua/thomas/plugins-setup.lua

@@ -42,7 +42,7 @@ return packer.startup(function(use)
 		requires = { "MunifTanjim/nui.nvim", "rcarriga/nvim-notify" },
 	})
 	use({ "epwalsh/obsidian.nvim", requires = { "nvim-lua/plenary.nvim" } })
-	-- use("ellisonleao/gruvbox.nvim")
+	use("ellisonleao/gruvbox.nvim")
 	use("sainnhe/gruvbox-material")
 	use("kdheepak/lazygit.nvim")
 	use("zk-org/zk-nvim")

scripts/waybar/time_warrior_waybar.py

@@ -36,10 +36,10 @@ def main():
     output = {}
     try:
         if timer_active():
-            output["text"] = "󱫐 Timer"
+            output["text"] = "󱫐"
             output["class"] = "active"
         else:
-            output["text"] = "󱫦 Timer"
+            output["text"] = "󱫦"
             output["class"] = "inactive"
     except Exception as e:
         output["text"] = "Error"

swaync/config.json

@@ -1,6 +1,6 @@
 {
   "$schema": "/etc/xdg/swaync/configSchema.json",
-  "positionX": "left",
+  "positionX": "right",
   "positionY": "top",
   "layer": "overlay",
   "control-center-layer": "top",
@@ -11,10 +11,10 @@
   "control-center-margin-right": 0,
   "control-center-margin-left": 0,
   "notification-2fa-action": true,
-  "notification-inline-replies": false,
+  "notification-inline-replies": true,
-  "notification-icon-size": 64,
+  "notification-icon-size": 24,
-  "notification-body-image-height": 100,
+  "notification-body-image-height": 180,
-  "notification-body-image-width": 200,
+  "notification-body-image-width": 180,
   "timeout": 10,
   "timeout-low": 5,
   "timeout-critical": 0,
@@ -47,7 +47,7 @@
       "app-name": "Spotify"
     }
   },
-  "widgets": ["inhibitors", "title", "dnd", "notifications"],
+  "widgets": ["inhibitors", "title", "notifications", "menubar"],
   "widget-config": {
     "inhibitors": {
       "text": "Inhibitors",

swaync/style.css

@@ -1,16 +1,17 @@
-@define-color cc-bg rgba(46, 46, 46, 0.7);
+@define-color cc-bg rgba(40, 40, 40, 0.7);
-@define-color noti-border-color rgba(0, 0, 0, 1);
+@define-color noti-border-color rgba(69, 133, 136, 1);
-@define-color noti-bg rgba(48, 48, 48, 0.8);
+@define-color noti-bg rgba(40, 40, 40, 0.9);
-@define-color noti-bg-opaque rgb(48, 48, 48);
+@define-color noti-bg-opaque rgb(60, 56, 54);
-@define-color noti-bg-darker rgb(38, 38, 38);
+@define-color noti-bg-darker rgb(40, 40, 40);
-@define-color noti-bg-hover rgb(56, 56, 56);
+@define-color noti-bg-hover rgb(40,40,40);
-@define-color noti-bg-hover-opaque rgb(56, 56, 56);
+@define-color noti-bg-hover-opaque rgb(40,40,40);
 @define-color noti-bg-focus rgba(68, 68, 68, 0.6);
-@define-color noti-close-bg rgba(255, 255, 255, 0.1);
+@define-color noti-close-bg rgba(40,40, 40, 1);
 @define-color noti-close-bg-hover rgba(255, 255, 255, 0.15);
-@define-color text-color rgb(255, 255, 255);
+@define-color text-color rgb(189, 174, 147);
 @define-color text-color-disabled rgb(150, 150, 150);
 @define-color bg-selected rgb(0, 128, 255);
+
 .notification-row {
   outline: none;
 }
@@ -26,45 +27,45 @@
 
 .notification-row .notification-background .close-button {
   /* The notification Close Button */
-  background: @noti-close-bg;
+
+  background: #3c3836;
   color: @text-color;
   text-shadow: none;
   padding: 0;
-  border-radius: 100%;
+  border-radius: 0;
-  margin-top: 5px;
+  margin-top: 10px;
-  margin-right: 5px;
+  margin-right: 10px;
   box-shadow: none;
-  border: none;
+  border: 2px solid #504945;
-  min-width: 24px;
+  min-width: 20px;
-  min-height: 24px;
+  min-height: 20px;
 }
 
 .notification-row .notification-background .close-button:hover {
   box-shadow: none;
-  background: @noti-close-bg-hover;
+  background: #3c3836;
   transition: background 0.15s ease-in-out;
-  border: none;
+
+  border: 2px solid #504945;
 }
 
 .notification-row .notification-background .notification {
   /* The actual notification */
-  border-radius: 12px;
+  border-radius: 0px;
-  border: 1px solid @noti-border-color;
+  border: 2px solid #504945;
   padding: 0;
   transition: background 0.15s ease-in-out;
-  background: @noti-bg;
+  background: #282828;
+  font-family: "Sys TT";
 }
 
 .notification-row .notification-background .notification.low {
-  /* Low Priority Notification */
 }
 
 .notification-row .notification-background .notification.normal {
-  /* Normal Priority Notification */
 }
 
 .notification-row .notification-background .notification.critical {
-  /* Critical Priority Notification */
 }
 
 .notification-row .notification-background .notification .notification-action,
@@ -90,7 +91,7 @@
   .notification
   .notification-default-action:hover {
   -gtk-icon-effect: none;
-  background: @noti-bg-hover;
+  background: #282828;
 }
 
 .notification-row
@@ -98,7 +99,7 @@
   .notification
   .notification-default-action {
   /* The large action that also displays the notification summary and body */
-  border-radius: 12px;
+  border-radius: 0px;
 }
 
 .notification-row
@@ -116,8 +117,8 @@
   .notification-default-action
   .notification-content {
   background: transparent;
-  border-radius: 12px;
+  border-radius: 0px;
-  padding: 4px;
+  padding: 12px;
 }
 
 .notification-row
@@ -128,9 +129,10 @@
   .image {
   /* Notification Primary Image */
   -gtk-icon-effect: none;
-  border-radius: 100px;
+  border-radius: 0px;
   /* Size in px */
   margin: 4px;
+  margin-right: 15px;
 }
 
 .notification-row
@@ -158,6 +160,7 @@
   background: transparent;
   color: @text-color;
   text-shadow: none;
+  margin-bottom: 5px;
 }
 
 .notification-row
@@ -168,12 +171,13 @@
   .text-box
   .time {
   /* Notification time-ago */
-  font-size: 16px;
+  font-size: 14px;
   font-weight: bold;
+  font-style: italic;
   background: transparent;
   color: @text-color;
   text-shadow: none;
-  margin-right: 30px;
+  margin-right: 40px;
 }
 
 .notification-row
@@ -189,6 +193,7 @@
   background: transparent;
   color: @text-color;
   text-shadow: none;
+  margin-right: 10px;
 }
 
 .notification-row
@@ -357,14 +362,16 @@
 .notification-group.collapsed:hover
   .notification-row:not(:only-child)
   .notification {
-  background-color: @noti-bg-hover-opaque;
 }
 
 .control-center {
   /* The Control Center which contains the old notifications + widgets */
-  background: @cc-bg;
+  background: rgba(40, 40, 40, 0.7);
   color: @text-color;
-  border-radius: 12px;
+  border-radius: 0px;
+  margin-top: 12px;
+  margin-right: 12px;
+  margin-bottom: 12px;
 }
 
 .control-center .control-center-list-placeholder {
@@ -377,11 +384,13 @@
   background: transparent;
 }
 
-.control-center .control-center-list .notification {
+/* .control-center .control-center-list .notification {
-  box-shadow:
+  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3), 0 1px 3px 1px rgba(0, 0, 0, 0.7),
-    0 0 0 1px rgba(0, 0, 0, 0.3),
-    0 1px 3px 1px rgba(0, 0, 0, 0.7),
     0 2px 6px 2px rgba(0, 0, 0, 0.3);
+} */
+
+.control-center .control-center-list .notification {
+  box-shadow: none;
 }
 
 .control-center .control-center-list .notification .notification-default-action,
@@ -396,7 +405,7 @@
   .notification
   .notification-default-action:hover,
 .control-center .control-center-list .notification .notification-action:hover {
-  background-color: @noti-bg-hover;
+  background-color: #282828;
 }
 
 .blank-window {
@@ -417,21 +426,24 @@
 .widget-title {
   color: @text-color;
   margin: 8px;
+  padding: 10 0px;
   font-size: 1.5rem;
+  font-weight: bold;
 }
 
 .widget-title > button {
   font-size: initial;
   color: @text-color;
   text-shadow: none;
-  background: @noti-bg;
+  background: #3c3836;
-  border: 1px solid @noti-border-color;
+  border: 2px solid #504945;
   box-shadow: none;
-  border-radius: 12px;
+  border-radius: 0px;
+  padding-top: 5px;
 }
 
 .widget-title > button:hover {
-  background: @noti-bg-hover;
+  background: #282828;
 }
 
 /* DND widget */
@@ -443,19 +455,20 @@
 
 .widget-dnd > switch {
   font-size: initial;
-  border-radius: 12px;
+  border-radius: 0px;
-  background: @noti-bg;
+  background: #282828;
-  border: 1px solid @noti-border-color;
+  border: 2px solid #504945;
   box-shadow: none;
+  transition: background ease-in-out 0.3s;
 }
 
 .widget-dnd > switch:checked {
-  background: @bg-selected;
+  background: #98971a;
 }
 
 .widget-dnd > switch slider {
-  background: @noti-bg-hover;
+  background: #3c3836;
-  border-radius: 12px;
+  border-radius: 0px;
 }
 
 /* Label widget */
@@ -522,13 +535,13 @@
 .widget-buttons-grid {
   padding: 8px;
   margin: 8px;
-  border-radius: 12px;
+  border-radius: 0px;
   background-color: @noti-bg;
 }
 
 .widget-buttons-grid > flowbox > flowboxchild > button {
   background: @noti-bg;
-  border-radius: 12px;
+  border-radius: 0px;
 }
 
 .widget-buttons-grid > flowbox > flowboxchild > button.toggle:checked {

tofi/config

@@ -13,11 +13,10 @@
 	# characters not in the chosen font will fail to render.
 	#
 	# Otherwise, fonts are interpreted in Pango format.
-	font = "/usr/local/share/fonts/p/PragmataPro_Mono_R_liga_0829.ttf"
+	font = "/usr/share/fonts/Sys1.1/Sys1.1.ttf"
-
 	# Point size of text.
 	font-size = 14
-
+z
 	# Comma separated list of OpenType font feature settings to apply,
 	# if supported by the chosen font. The format is similar to the CSS
 	# "font-feature-settings" property.
@@ -70,7 +69,7 @@
 	# Prompt text theme
 	# prompt-color = #FFFFFF
 	prompt-background = #00000000
-	prompt-background-padding = 0
+	prompt-background-padding = 15
 	prompt-background-corner-radius = 0
 
 	# Placeholder text theme
@@ -82,7 +81,7 @@
 	# Input text theme
   #input-color = #a9b665
 	# input-background = #3C1f1d
-	input-background-padding = 0
+	input-background-padding = 15
 	input-background-corner-radius = 0
 
 	# Default result text theme
@@ -142,9 +141,12 @@
 ### Text layout
 #
 	# Prompt to display.
-	prompt-text = "run: "
+	prompt-text = ""
-	# Extra horizontal padding between prompt and input.
+  prompt-color = "#458588"
-	prompt-padding = 0
+ # prompt-background = "#504945"
+#
+#Extra horizontal padding between prompt and input.
+	prompt-padding = 5
 
 	# Placeholder input text.
 	placeholder-text = ""
@@ -154,7 +156,7 @@
 	num-results = 0
 
 	# Spacing between results in pixels. Can be negative.
-	result-spacing = 0
+	result-spacing = 5
 
 	# List results horizontally.
 	horizontal = false
@@ -166,32 +168,32 @@
 ### Window theming
 #
 	# Width and height of the window. Can be pixels or a percentage.
-	width = 30%
+	width = 25%
 	height = 20%
 
 	# Window background color
-	background-color = #282828
+	background-color = #282828DB
 
 	# Width of the border outlines in pixels.
 	outline-width = 0
 
 	# Border outline color
-	outline-color = #E78A43
+	outline-color = #282828
 
 	# Width of the border in pixels.
-	border-width = 4
+	border-width = 0
 
 	# Border color
-	border-color = #98971A
+	border-color = #504945
 
 	# Radius of window corners in pixels.
 	corner-radius = 0
 
 	# Padding between borders and text. Can be pixels or a percentage.
-	padding-top = 8
+	padding-top = 10
-	padding-bottom = 8
+	padding-bottom = 10
-	padding-left = 8
+	padding-left = 10
-	padding-right = 8
+	padding-right = 10
 
 	# Whether to clip text drawing to be within the specified padding. This
 	# is mostly important for allowing text to be inset from the border,
@@ -212,7 +214,7 @@
 	#
 	# Supported values: top-left, top, top-right, right, bottom-right,
 	# bottom, bottom-left, left, center.
-	anchor = center
+	anchor = top
 
 	# Set the size of the exclusive zone.
 	#
@@ -226,7 +228,7 @@
 
 	# Window offset from edge of screen. Only has an effect when anchored
 	# to the relevant edge. Can be pixels or a percentage.
-	margin-top = 0
+	margin-top = 60
 	margin-bottom = 0
 	margin-left = 0
 	margin-right = 0
@@ -238,7 +240,7 @@
 	hide-cursor = false
 
 	# Show a text cursor in the input field.
-	text-cursor = false
+	text-cursor = true
 
 	# Sort results by number of usages in run and drun modes.
 	history = true

waybar/config

@@ -21,13 +21,14 @@
     "custom/wakatime",
     "clock",
     "custom/timewarrior",
+    "custom/notification",
     "idle_inhibitor",
     "custom/logout"
   ],
   "wlr/taskbar": {
-    "format": "{icon} {name}",
+    "format": "{icon}",
     "icon-size": 20,
-    "icon-theme": "Numix-Circle",
+    "icon-theme": "Gruvbox Plus Dark",
     "tooltip-format": "{title}",
     "on-click": "activate",
     "on-click-middle": "close",
@@ -78,7 +79,7 @@
     "tooltip-format-disconnected": "MPD (disconnected)"
   },
   "idle_inhibitor": {
-    "format": "󰈈"
+    "format": "󰖨"
   },
   "tray": {
     "spacing": 10
@@ -88,15 +89,15 @@
     "format-alt": "{: %d/%m/%Y}"
   },
   "cpu": {
-    "format": "  {usage}%",
+    "format": "cpu {usage}%",
     "tooltip": false
   },
   "memory": {
-    "format": " {}%"
+    "format": "mem {}%"
   },
   "temperature": {
     "critical-threshold": 80,
-    "format": "{icon} {temperatureC}°C",
+    "format": "temp {temperatureC}°C",
     "format-icons": [
       "󱩅",
       "󱩅",
@@ -113,7 +114,7 @@
       "󰪡 ",
       "󰪢 ",
       "󰪣 ",
-			"󰪥 ",
+      "󰪥 "
     ]
   },
   "battery": {
@@ -136,12 +137,12 @@
     "bat": "BAT2"
   },
   "network": {
-    "format-wifi": "󰖩  {essid} ({signalStrength}%)",
+    "format-wifi": "󰖩 ",
     "format-ethernet": "{ipaddr}/{cidr}",
     "tooltip-format": "{ifname} via {gwaddr}",
     "format-linked": "{ifname} (No IP)",
-    "format-disconnected": "󰖪  Disconnected",
+    "format-disconnected": "󰖪 ",
-    "format-alt": "{ifname}: {ipaddr}/{cidr}"
+    "format-alt": "󰖩  {essid} ({signalStrength}%)"
   },
   "pulseaudio": {
     "format": "{icon} {volume}%",
@@ -166,14 +167,15 @@
   },
   "disk": {
     "interval": 30,
-    "format": " {percentage_used}%",
+    "format": "disk {percentage_used}%",
     "path": "/home"
   },
   "bluetooth": {
     "controller": "bluetoothctl",
-    "format": " {status}",
+    "format": " ",
-    "format-connected": " {device_alias}",
+    "format-connected": " ",
-    "format-connected-battery": " {device_alias} {device_battery_percentage}% ",
+    "format-alt": " {device_alias}",
+    "format-connected-battery": " ",
     "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected",
     "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}",
     "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",
@@ -192,7 +194,6 @@
   },
   "custom/os": {
     "format": "  archbish",
-    "format-alt": " "
   },
   "custom/wakatime": {
     "exec": "source $HOME/dotfiles/.env && python3 $HOME/.config/waybar/resources/custom_modules/wakatime_waybar.py",
@@ -203,14 +204,34 @@
   "custom/timewarrior": {
     "exec": "python3 $HOME/.config/waybar/resources/custom_modules/time_warrior_waybar.py",
     "format": "{}",
-		"on-click": "timew stop && notify-send 'Time Warrior' 'Timer stopped'",
+    "on-click": "sleep 0.15 && timew stop && notify-send 'Time Warrior' 'Timer stopped'",
-		"on-click-right": "timew continue && notify-send 'Time Warrior' 'Timer resumed'",
+    "on-click-right": "sleep 0.1 && timew continue && notify-send 'Time Warrior' 'Timer resumed'",
     "return-type": "json",
     "interval": 5
   },
   "custom/logout": {
-    "format": "󰠜",
+    "format": "󰛂",
-    "on-click": "wlogout",
+    "on-click": "sleep 0.1 && wlogout",
     "tooltip": false
+  },
+  "custom/notification": {
+    "tooltip": false,
+    "format": "{icon}",
+    "format-icons": {
+      "notification": "<span foreground='#b8bb26'>󰂝</span>",
+      "none": "󰂚",
+      "dnd-notification": "<span foreground='#b8bb26'>󰂛</span>",
+      "dnd-none": "󰂛",
+      "inhibited-notification": "<span foreground='#b8bb26'>󰂛</span>",
+      "inhibited-none": "󰂚",
+      "dnd-inhibited-notification": "<span foreground='#b8bb26'>󰂛</span>",
+      "dnd-inhibited-none": "󰂚"
+    },
+    "return-type": "json",
+    "exec-if": "which swaync-client",
+    "exec": "swaync-client -swb",
+    "on-click": "sleep 0.1 && swaync-client -t -sw",
+    "on-click-right": "swaync-client -d -sw",
+    "escape": true
   }
 }

waybar/style.css

@@ -1,17 +1,27 @@
 * {
-  font-family: "PragmataPro Mono Liga", Roboto, Helvetica, Arial, sans-serif;
   font-size: 16px;
 }
 
 window#waybar {
   /* background-color: #282828; */
 
-  background-color: rgba(40, 40, 40, 0.8);
+  font-family: "PragmataPro Mono Liga";
+  border: 2px solid #504945;
+  background-color: rgba(40, 40, 40, 0.9);
 }
 
 tooltip {
+  color: #ebdbb2;
   border-radius: 0;
   font-weight: 400;
+  background-color: #282828;
+  box-shadow: none;
+  font-family: "Sys TT";
+  padding: 20px;
+}
+
+tooltip label {
+  color: #ebdbb2;
 }
 
 button {
@@ -22,18 +32,20 @@ button {
 }
 
 #workspaces button.active {
-  background-color: #98971a;
   color: #282828;
+  background-color: #98971a;
+  border: 2px solid #504945;
 }
 
 #workspaces button {
   padding: 2px 3px;
   /* color: #282828; */
-
+  color: #ebdbb2;
   background-color: #3c3836;
   margin-right: 5px;
   margin-top: 6px;
   margin-bottom: 6px;
+  border: 2px solid #504945;
 }
 
 #workspaces button.urgent {
@@ -41,11 +53,12 @@ button {
 }
 
 #taskbar button {
+  color: #ebdbb2;
   background-color: #3c3836;
   padding: 3px 8px;
   margin-top: 6px;
   margin-bottom: 6px;
-  border-bottom: 2px solid #3c3836;
+  border-bottom: 2px solid #504945;
 }
 
 #taskbar button.active {
@@ -57,7 +70,6 @@ button {
   margin-bottom: 6px; */
 }
 
-#clock,
 #battery,
 #cpu,
 #memory,
@@ -71,14 +83,22 @@ button {
 #tray,
 #custom-spotify,
 #mode,
-#idle_inhibitor,
 #scratchpad,
 #mpd,
 #user,
 #bluetooth,
-#custom-wakatime,
+#custom-wakatime {
+  font-weight: 400;
+  padding: 3px 8px;
+  margin-left: 4px;
+  margin-top: 6px;
+  margin-bottom: 6px;
+}
+
+#custom-logout,
 #custom-timewarrior,
-#custom-logout {
+#custom-notification,
+#idle_inhibitor {
   font-weight: 400;
   padding: 3px 10px;
   margin-left: 4px;
@@ -87,9 +107,10 @@ button {
 }
 
 #custom-logout {
+  color: #ebdbb2;
+  background-color: #3c3836;
   margin-right: 8px;
-  background-color: #ebdbb2;
+  border: 2px solid #504945;
-  color: #282828;
 }
 
 #custom-os {
@@ -107,17 +128,25 @@ button {
 }
 
 #clock {
-  color: #fb4934;
+  color: #98971a;
-
+  font-weight: 400;
-  /* color: #1d2021; */
+  padding-top: 3px;
-  /* margin-right: 8px; */
+  padding-bottom: 3px;
+  padding-left: 10px;
+  padding-right: 5px;
+  margin-left: 4px;
   margin-right: 4px;
+  margin-top: 6px;
+  margin-bottom: 6px;
+
+  border-right: 1px solid #504945;
+  /* color: #1d2021; */
 }
 
 #bluetooth {
+  padding-right: 16px;
   border-right: 1px solid #504945;
-  color: #689d6a;
+  color: #458588;
-
   /* color: #282828; */
 }
 
@@ -166,7 +195,8 @@ button {
 }
 
 #network {
-  color: #689d6a;
+  padding-right: 0;
+  color: #458588;
   /* color: #282828; */
 }
 
@@ -200,8 +230,10 @@ button {
 }
 
 #idle_inhibitor {
+  color: #ebdbb2;
   background-color: #3c3836;
   padding-right: 14px;
+  border: 2px solid #504945;
 }
 
 #idle_inhibitor.activated {
@@ -213,6 +245,7 @@ button {
   font-size: 16px;
   background-color: #458588;
   color: #f2e5bc;
+  border: 2px solid #504945;
 }
 
 #custom-wakatime {
@@ -228,8 +261,17 @@ button {
 #custom-timewarrior.active {
   background-color: #98971a;
   color: #282828;
+  border: 2px solid #504945;
 }
 
 #custom-timewarrior.inactive {
-  background-color: #928374;
+  color: #ebdbb2;
+  background-color: #3c3836;
+  border: 2px solid #504945;
+}
+
+#custom-notification {
+  color: #ebdbb2;
+  background-color: #3c3836;
+  border: 2px solid #504945;
 }