Merge branch 'main' of 192.168.0.184:andrzej/dotfiles

bgs

@@ -1 +1 @@
-Subproject commit cd1971abc93ce4f3c6fe42da7fccbbbe6b44d6d2
+Subproject commit 6f26892e699d04f1a072af50300543fae28d3e77

fuzzel/.config/fuzzel/fuzzel.ini

@@ -4,7 +4,7 @@ font=GoMono Nerd Font
 use-bold=yes
 # prompt="> "
 # placeholder=
-# icon-theme=hicolor
+icon-theme=oomox-rose-pine
 # icons-enabled=yes
 # hide-before-typing=no
 # fields=filename,name,generic
@@ -58,7 +58,7 @@ counter=9ccfd8ff
 border=9ccfd8cc
 
 [border]
-# width=1
+ width=2
 # radius=10
 
 [dmenu]

gtk/.config/gtk-3.0/settings.ini

@@ -0,0 +1,17 @@
+[Settings]
+gtk-theme-name=rose-pine-gtk
+gtk-icon-theme-name=rose-pine-icons
+gtk-font-name=Sans 9
+gtk-cursor-theme-name=Adwaita
+gtk-cursor-theme-size=24
+gtk-toolbar-style=GTK_TOOLBAR_ICONS
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-button-images=0
+gtk-menu-images=0
+gtk-enable-event-sounds=0
+gtk-enable-input-feedback-sounds=0
+gtk-xft-antialias=1
+gtk-xft-hinting=1
+gtk-xft-hintstyle=hintslight
+gtk-xft-rgba=rgb
+gtk-application-prefer-dark-theme=0

hyprland/.config/hypr/bg-scripts/bg_slideshow.pid

@@ -1 +1 @@
-2854
+2189

hyprland/.config/hypr/hyprland.conf

@@ -30,7 +30,7 @@ $menu = fuzzel
 
  exec-once = $terminal
 # exec-once = nm-applet &
- exec-once = waybar & hyprpaper & hyprnotify
+ exec-once = hyprnotify & waybar & nextcloud
 
 
 #############################
@@ -124,8 +124,8 @@ master {
 
 # https://wiki.hyprland.org/Configuring/Variables/#misc
 misc { 
-    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
+    force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers
-    disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :(
+    disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :(
 }
 
 
@@ -179,6 +179,7 @@ bind = $mainMod, V, togglefloating,
 bind = $mainMod, R, exec, $menu
 bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod SHIFT, J, togglesplit, # dwindle
+#bind = $mainmod SHIFT, P, exec, hyprshot -m output
 
 # Move focus with mainMod + arrow keys
 bind = $mainMod, h, movefocus, l
@@ -187,8 +188,8 @@ bind = $mainMod, k, movefocus, u
 bind = $mainMod, j, movefocus, d
 
 #background bg switcheroo
-bind = $mainMod SHIFT, W, exec, $HOME/.config/hypr/bg-scripts/hyprland-switch-bg.sh chsck
+bind = $mainMod SHIFT, W, exec, /home/andrzej/go/bin/gopaperctl chsck
-bind = $mainMod , W, exec, $HOME/.config/hypr/bg-scripts/hyprland-switch-bg.sh
+bind = $mainMod, W, exec, /home/andrzej/go/bin/gopaperctl leics
 
 # Switch workspaces with mainMod + [0-9]
 bind = $mainMod, 1, workspace, 1
@@ -214,6 +215,12 @@ bind = $mainMod SHIFT, 8, movetoworkspace, 8
 bind = $mainMod SHIFT, 9, movetoworkspace, 9
 bind = $mainMod SHIFT, 0, movetoworkspace, 10
 
+# Move active window left or right
+bind = $mainMod SHIFT, LEFT, movetoworkspace, e-1
+bind = $mainMod SHIFT, RIGHT, movetoworkspace, e+1
+bind = $mainMod SHIFT, UP, movetoworkspace, empty
+
+
 # Example special workspace (scratchpad)
 # bind = $mainMod, S, togglespecialworkspace, magic
 # bind = $mainMod SHIFT, S, movetoworkspace, special:magic
@@ -252,6 +259,8 @@ bindel = , XF86KbdBrightnessDown, exec, brightnessctl -d smc::kbd_backlight s 10
 
 # Example windowrule v1
  windowrule = noblur, ^(kitty)$
+ windowrulev2 = workspace emptyn, initialClass:(Supersonic)
+
 
  layerrule = blur, ^(launcher)$
 
@@ -259,3 +268,7 @@ bindel = , XF86KbdBrightnessDown, exec, brightnessctl -d smc::kbd_backlight s 10
 # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
 
 windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
+
+
+exec = sleep 2 && /home/andrzej/go/bin/gopaper -dir leics
+

nohup.out

@@ -0,0 +1,6 @@
+path: chsck, duration: 10m
+length: 41
+random index: 30
+/home/andrzej/bgs/chsck/Kelly-kelly-brook-36819309-1920-1440.png
+ok
+ok

nvim/.config/nvim/lua/plugins/lualine.lua

@@ -33,10 +33,8 @@ return {
 					},
 					lualine_y = { "vim.b.word_count", "filetype" },
 					lualine_z = {
-						--"vim.g.cwdShortened"
+						{ prose.word_count, cond = prose.is_available },
-						--						"datetime",
+						{ prose.reading_time, cond = prose.is_available },
-						-- options: default, us, uk, iso, or your own format string ("%H:%M", etc..)
-						--style = "uk",
 					},
 				},
 				inactive_sections = {

nvim/.config/nvim/lua/plugins/wrd.lua

@@ -0,0 +1,22 @@
+return {
+	"manning390/wrd.nvim",
+	dependencies = {
+		"nvim-lua/plenary.nvim",
+		{ "nvim-telescope/telescope.nvim", tag = "0.1.6" },
+	},
+	config = function()
+		require("wrd").setup({
+			client_key = "datamuse", -- Set to target internal client API
+			default_method = "synonym", -- Default method if one is not provided, must be available in client API
+			commands = true, -- Register the :Wrd command
+			client = nil, -- Can be set to provide custom client API, if unset, w
+		}) -- Registers :Wrd
+		vim.keymap.set("n", "<leader>t", require("wrd").run, { desc = "Wrd: Run default wrd query" })
+		vim.keymap.set(
+			"n",
+			"<leader>T",
+			require("wrd").run_methods,
+			{ desc = "Wrd: List available methods from client" }
+		)
+	end,
+}

nvim/.config/nvim/lua/prose_mode.lua

@@ -8,6 +8,7 @@ vim.api.nvim_create_autocmd({ "Bufenter" }, {
 			vim.cmd("PencilSoft")
 			require("section-wordcount").wordcounter({})
 			setProseModeVars(true)
+			vim.cmd("LspStop")
 		else
 			vim.cmd("PencilOff")
 			setProseModeVars(false)

nvim/.config/nvim/snippets/bash/snippets.lua

@@ -0,0 +1,23 @@
+local ls = require("luasnip")
+local s = ls.snippet
+local sn = ls.snippet_node
+local t = ls.text_node
+local i = ls.insert_node
+local f = ls.function_node
+local c = ls.choice_node
+local d = ls.dynamic_node
+local r = ls.restore_node
+
+return {
+	sn("working directory", {
+		t('cd "$(dirname "$0")"'),
+	}),
+	sn("pidfile", {
+		t("PIDFILE="),
+		i(1, "pidfile.pid"),
+		t({ "", "remove_pidfile()" }),
+		t({ "", "{", 'rm -f "$PIDFILE"', "}" }),
+		t('if [ -f "$PIDFILE"]; then', 'kill -9 "$(cat $PIDFILE)"', "fi"),
+		t('echo $$ > "PIDFILE"'),
+	}),
+}

scripts/scripts/bg_slideshow.pid

@@ -1 +1 @@
-11599
+15130

waybar/.config/waybar/bg_menu.xml

@@ -0,0 +1,26 @@
+
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkMenu" id="menu">
+    <child>
+		<object class="GtkMenuItem" id="default">
+			<property name="label">Default</property>
+        </object>
+	</child>
+	<child>
+        <object class="GtkMenuItem" id="leics">
+			<property name="label">Leics</property>
+        </object>
+	</child>
+    <child>
+        <object class="GtkMenuItem" id="art">
+			<property name="label">Art</property>
+        </object>
+    </child>
+    <child>
+        <object class="GtkMenuItem" id="chsck">
+			<property name="label">Chsck</property>
+        </object>
+    </child>
+  </object>
+</interface>

waybar/.config/waybar/config.jsonc

@@ -7,27 +7,23 @@
     "spacing": 4, // Gaps between modules (4px)
     // Choose the order of the modules
     "modules-left": [
-        "hyprland/workspaces",
+        "hyprland/window"
     ],
     "modules-center": [
-        "sway/window"
+        "hyprland/workspaces",
     ],
     "modules-right": [
-        "mpd",
+        "privacy",
-        "idle_inhibitor",
+        "wireplumber",
-        "pulseaudio",
         "network",
-        "power-profiles-daemon",
         "cpu",
         "memory",
         "temperature",
         "backlight",
         "keyboard-state",
-        "sway/language",
-        "battery",
-        "battery#bat2",
-        "clock",
         "tray",
+        "battery",
+        "clock",
         "custom/power"
     ],
     // Modules configuration
@@ -40,6 +36,29 @@
 	},
 },
 
+"privacy": {
+	"icon-spacing": 4,
+	"icon-size": 18,
+	"transition-duration": 250,
+	"modules": [
+		{
+			"type": "screenshare",
+			"tooltip": true,
+			"tooltip-icon-size": 24
+		},
+		{
+			"type": "audio-out",
+			"tooltip": true,
+			"tooltip-icon-size": 24
+		},
+		{
+			"type": "audio-in",
+			"tooltip": true,
+			"tooltip-icon-size": 24
+		}
+	]
+},
+
     "keyboard-state": {
         "numlock": true,
         "capslock": true,
@@ -104,7 +123,7 @@
         "critical-threshold": 80,
         // "format-critical": "{temperatureC}°C {icon}",
         "format": "{temperatureC}°C {icon}",
-        "format-icons": ["", "", ""]
+        "format-icons": ["󰜗", "", "󰈸"]
     },
     "backlight": {
         // "device": "acpi_video1",
@@ -119,69 +138,28 @@
         },
         "format": "{capacity}% {icon}",
         "format-full": "{capacity}% {icon}",
-        "format-charging": "{capacity}% ",
+        "format-charging": "{capacity}% 󱐋",
         "format-plugged": "{capacity}% ",
         "format-alt": "{time} {icon}",
         // "format-good": "", // An empty format will hide the module
         // "format-full": "",
-        "format-icons": ["", "", "", "", ""]
+        "format-icons": ["󰚌", "", "", "", ""]
-    },
-    "battery#bat2": {
-        "bat": "BAT2"
-    },
-    "power-profiles-daemon": {
-      "format": "{icon}",
-      "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
-      "tooltip": true,
-      "format-icons": {
-        "default": "",
-        "performance": "",
-        "balanced": "",
-        "power-saver": ""
-      }
     },
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
         "format-wifi": "{essid} ({signalStrength}%) ",
-        "format-ethernet": "{ipaddr}/{cidr} ",
+        "format-ethernet": "{ipaddr}/{cidr} 󰛳",
-        "tooltip-format": "{ifname} via {gwaddr} ",
+        "tooltip-format": "{ifname} via {gwaddr}",
-        "format-linked": "{ifname} (No IP) ",
+        "format-linked": "{ifname} (No IP) 󰌘",
         "format-disconnected": "Disconnected ⚠",
         "format-alt": "{ifname}: {ipaddr}/{cidr}"
     },
-    "pulseaudio": {
+    "wireplumber":{
-        // "scroll-step": 1, // %, can be a float
+"format-muted":"  ",
-        "format": "{volume}% {icon} {format_source}",
+    "on-click":"helvum"
-        "format-bluetooth": "{volume}% {icon} {format_source}",
-        "format-bluetooth-muted": " {icon} {format_source}",
-        "format-muted": " {format_source}",
-        "format-source": "{volume}% ",
-        "format-source-muted": "",
-        "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
-        },
-        "on-click": "pavucontrol"
-    },
-    "custom/media": {
-        "format": "{icon} {text}",
-        "return-type": "json",
-        "max-length": 40,
-        "format-icons": {
-            "spotify": "",
-            "default": "🎜"
-        },
-        "escape": true,
-        "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
-        // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
     },
     "custom/power": {
-        "format" : "⏻ ",
+        "format" : "⏻",
 		"tooltip": false,
 		"menu": "on-click",
 		"menu-file": "$HOME/.config/waybar/power_menu.xml", // Menu file in resources folder
@@ -191,5 +169,18 @@
 			"suspend": "systemctl suspend",
 			"hibernate": "systemctl hibernate"
 		}
-    }
+    },
+ //    "custom/bg":{
+ //        "format":"",
+ //        "tooltip":false,
+ //        "menu":"on-click",
+	// "menu-file": "$HOME/.config/waybar/bg_menu.xml", 
+ //        "menu-actions": {
+ //        "default":"nohup $HOME/.config/hypr/bg-scripts/hyprland-switch-bg.sh 20m &",
+ //        "leics":"nohup $HOME/.config/hypr/bg-scripts/hyprland-slideshow.sh leics 20m &",
+ //        "art":"nohup $HOME/.config/hypr/bg-scripts/hyprland-slideshow.sh art 20m &",
+ //        "chsck":"nohup $HOME/.config/hypr/bg-scripts/hyprland-slideshow.sh chsck 20m &",
+ //        }
+	//
+ //    }
 }

waybar/.config/waybar/nohup.out

@@ -0,0 +1,56 @@
+[2024-10-17 00:04:06.175] [info] Using configuration file /home/andrzej/.config/waybar/config.jsonc
+[2024-10-17 00:04:06.180] [info] Unable to receive desktop appearance: GDBus.Error:org.freedesktop.DBus.Error.UnknownMethod: No such interface “org.freedesktop.portal.Settings” on object at path /org/freedesktop/portal/desktop
+[2024-10-17 00:04:06.180] [info] Using CSS file /home/andrzej/.config/waybar/style.css
+[2024-10-17 00:04:06.197] [info] Hyprland IPC starting
+[2024-10-17 00:04:06.200] [info] Loading persistent workspaces from Hyprland workspace rules
+[2024-10-17 00:04:06.205] [warning] Can't open /dev/input/event0 (are you in the input group?): EACCES Permission denied
+[2024-10-17 00:04:06.205] [warning] Can't open /dev/input/event1 (are you in the input group?): EACCES Permission denied
+[2024-10-17 00:04:06.205] [warning] Can't open /dev/input/event2 (are you in the input group?): EACCES Permission denied
+[2024-10-17 00:04:06.205] [warning] Can't open /dev/input/event3 (are you in the input group?): EACCES Permission denied
+[2024-10-17 00:04:06.205] [warning] Can't open /dev/input/event4 (are you in the input group?): EACCES Permission denied
+[2024-10-17 00:04:06.205] [warning] Can't open /dev/input/event5 (are you in the input group?): EACCES Permission denied
+[2024-10-17 00:04:06.205] [warning] Can't open /dev/input/event7 (are you in the input group?): EACCES Permission denied
+[2024-10-17 00:04:06.205] [warning] Can't open /dev/input/event8 (are you in the input group?): EACCES Permission denied
+[2024-10-17 00:04:06.205] [warning] Can't open /dev/input/mice (are you in the input group?): EACCES Permission denied
+[2024-10-17 00:04:06.205] [warning] Can't open /dev/input/mouse1 (are you in the input group?): EACCES Permission denied
+[2024-10-17 00:04:06.205] [warning] Can't open /dev/input/event9 (are you in the input group?): EACCES Permission denied
+[2024-10-17 00:04:06.205] [warning] Can't open /dev/input/mouse2 (are you in the input group?): EACCES Permission denied
+[2024-10-17 00:04:06.205] [warning] Can't open /dev/input/event10 (are you in the input group?): EACCES Permission denied
+[2024-10-17 00:04:06.205] [warning] Can't open /dev/input/event6 (are you in the input group?): EACCES Permission denied
+[2024-10-17 00:04:06.207] [warning] Can't create libevdev device: EINVAL Invalid argument
+[2024-10-17 00:04:06.207] [warning] Can't open /dev/input/event12 (are you in the input group?): EACCES Permission denied
+[2024-10-17 00:04:06.207] [warning] Can't open /dev/input/event13 (are you in the input group?): EACCES Permission denied
+[2024-10-17 00:04:06.207] [warning] Can't open /dev/input/event14 (are you in the input group?): EACCES Permission denied
+[2024-10-17 00:04:06.207] [warning] Can't open /dev/input/event15 (are you in the input group?): EACCES Permission denied
+[2024-10-17 00:04:06.207] [warning] Can't open /dev/input/event16 (are you in the input group?): EACCES Permission denied
+[2024-10-17 00:04:06.207] [warning] module keyboard-state: Disabling module "keyboard-state", Failed to find keyboard device: EACCES Permission denied
+[2024-10-17 00:04:06.208] [warning] No battery named BAT2
+[2024-10-17 00:04:06.208] [warning] Error while creating the menu : Failed to expand file: $HOME/.config/waybar/power_menu.xml. Menu popup not activated.
+[2024-10-17 00:04:06.372] [warning] Requested height: 30 is less than the minimum height: 34 required by the modules
+[2024-10-17 00:04:06.372] [info] Bar configured (width: 1280, height: 34) for output: LVDS-1
+Gdk-Message: 00:04:08.477: Unable to load hand2 from the cursor theme
+Gdk-Message: 00:04:08.863: Unable to load arrow from the cursor theme
+Gdk-Message: 00:04:08.863: Unable to load hand2 from the cursor theme
+Gdk-Message: 00:04:08.879: Unable to load arrow from the cursor theme
+Gdk-Message: 00:04:13.865: Unable to load hand2 from the cursor theme
+Gdk-Message: 00:04:13.873: Unable to load arrow from the cursor theme
+Gdk-Message: 00:04:13.889: Unable to load hand2 from the cursor theme
+Gdk-Message: 00:04:14.024: Unable to load arrow from the cursor theme
+Gdk-Message: 00:04:14.039: Unable to load hand2 from the cursor theme
+Gdk-Message: 00:04:14.048: Unable to load arrow from the cursor theme
+Gdk-Message: 00:04:55.270: Unable to load hand2 from the cursor theme
+Gdk-Message: 00:04:55.362: Unable to load arrow from the cursor theme
+Gdk-Message: 00:04:55.362: Unable to load hand2 from the cursor theme
+Gdk-Message: 00:04:55.470: Unable to load arrow from the cursor theme
+Gdk-Message: 00:04:55.470: Unable to load hand2 from the cursor theme
+Gdk-Message: 00:04:55.499: Unable to load arrow from the cursor theme
+Gdk-Message: 00:04:57.052: Unable to load hand2 from the cursor theme
+Gdk-Message: 00:04:57.070: Unable to load arrow from the cursor theme
+[2024-10-17 00:07:12.280] [info] Using configuration file /home/andrzej/.config/waybar/config.jsonc
+[2024-10-17 00:07:12.285] [info] Unable to receive desktop appearance: GDBus.Error:org.freedesktop.DBus.Error.UnknownMethod: No such interface “org.freedesktop.portal.Settings” on object at path /org/freedesktop/portal/desktop
+[2024-10-17 00:07:12.285] [info] Using CSS file /home/andrzej/.config/waybar/style.css
+[2024-10-17 00:07:12.292] [error] style.css:70:4Expected semicolon
+[2024-10-17 00:07:21.603] [info] Using configuration file /home/andrzej/.config/waybar/config.jsonc
+[2024-10-17 00:07:21.608] [info] Unable to receive desktop appearance: GDBus.Error:org.freedesktop.DBus.Error.UnknownMethod: No such interface “org.freedesktop.portal.Settings” on object at path /org/freedesktop/portal/desktop
+[2024-10-17 00:07:21.608] [info] Using CSS file /home/andrzej/.config/waybar/style.css
+[2024-10-17 00:07:21.609] [error] style.css:70:4Expected semicolon

waybar/.config/waybar/power_menu.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkMenu" id="menu">
+    <child>
+		<object class="GtkMenuItem" id="suspend">
+			<property name="label">Suspend</property>
+        </object>
+	</child>
+	<child>
+        <object class="GtkMenuItem" id="hibernate">
+			<property name="label">Hibernate</property>
+        </object>
+	</child>
+    <child>
+        <object class="GtkMenuItem" id="shutdown">
+			<property name="label">Shutdown</property>
+        </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="delimiter1"/>
+    </child>
+    <child>
+		<object class="GtkMenuItem" id="reboot">
+			<property name="label">Reboot</property>
+		</object>
+    </child>
+  </object>
+</interface>

waybar/.config/waybar/rose-pine.css

@@ -3,21 +3,21 @@
 * Maintainer: DankChoir
 */
 
-@define-color base            #191724;
+@define-color base #191724;
-@define-color surface         #1f1d2e;
+@define-color surface #1f1d2e;
-@define-color overlay         #26233a;
+@define-color overlay #26233a;
 
-@define-color muted           #6e6a86;
+@define-color muted #6e6a86;
-@define-color subtle          #908caa;
+@define-color subtle #908caa;
-@define-color text            #e0def4;
+@define-color text #e0def4;
 
-@define-color love            #eb6f92;
+@define-color love #eb6f92;
-@define-color gold            #f6c177;
+@define-color gold #f6c177;
-@define-color rose            #ebbcba;
+@define-color rose #ebbcba;
-@define-color pine            #31748f;
+@define-color pine #31748f;
-@define-color foam            #9ccfd8;
+@define-color foam #9ccfd8;
-@define-color iris            #c4a7e7;
+@define-color iris #c4a7e7;
 
-@define-color highlightLow    #21202e;
+@define-color highlightLow #21202e;
-@define-color highlightMed    #403d52;
+@define-color highlightMed #403d52;
-@define-color highlightHigh   #524f67;
+@define-color highlightHigh #524f67;

waybar/.config/waybar/style.css

@@ -2,13 +2,6 @@
 /* @import "./rose-pine-moon.css"; */
 /* @import "./rose-pine-dawn.css"; */
 
-* {
-    /* reference the color by using @color-name */
-    background: @base;
-    border: 1px solid @overlay;
-}
-
-
 * {
     /* `otf-font-awesome` is required to be installed for icons */
     font-family: GoMono Nerd Font, Roboto, Helvetica, Arial, sans-serif;
@@ -16,15 +9,16 @@
 }
 
 window#waybar {
-    border-bottom: 3px solid @pine;
+    /*     border-bottom: 3px solid @pine; */
-    color: @surface;
+    /*     color: @surface; */
-    transition-property: background-color;
+    /*     transition-property: background-color; */
-    transition-duration: .5s;
+    /*     transition-duration: .5s; */
+    background-color: @base;
 }
 
-window#waybar.hidden {
+/* window#waybar.hidden { */
-    opacity: 0.2;
+/*     opacity: 0.2; */
-}
+/* } */
 
 /*
 window#waybar.empty {
@@ -35,13 +29,17 @@ window#waybar.solo {
 }
 */
 
-window#waybar.termite {
+/* window#waybar.termite { */
-    background-color: #3F3F3F;
+/*     background-color: #3F3F3F; */
-}
+/* } */
+/**/
+/* window#waybar.chromium { */
+/*     background-color: #000000; */
+/*     border: none; */
+/* } */
+#workspaces:hover {
+    color: #e0def4;
 
-window#waybar.chromium {
-    background-color: #000000;
-    border: none;
 }
 
 button {
@@ -49,44 +47,69 @@ button {
     box-shadow: inset 0 -3px transparent;
     /* Avoid rounded borders under each button name */
     border: none;
-    border-radius: 0;
+    border-radius: 1rem;
 }
 
 /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
 button:hover {
-    background: inherit;
+    /* background: inherit; */
-    box-shadow: inset 0 -3px #ffffff;
+    box-shadow: 0 0 2px 2px @pine;
-}
-
-/* you can set a style on hover for any module like this */
-#pulseaudio:hover {
-    background-color: #a37800;
-}
-
-#workspaces button {
-    padding: 0 5px;
-    background-color: transparent;
     color: #ffffff;
 }
 
+
+#wireplumber {
+    background-color: @pine;
+    border-radius: 1rem;
+
+}
+
+#wireplumber.muted {
+    background-color: @love;
+}
+
+
+#workspaces button {
+    margin: 0.2rem;
+    padding: 0.5rem;
+    color: @subtle;
+    background-color: @overlay;
+}
+
+#workspaces button.active,
+#workspaces button.active:hover {
+    background-color: @iris;
+    color: @text;
+}
+
+
 #workspaces button:hover {
-    background: rgba(0, 0, 0, 0.2);
+    background-color: @highlightMed;
 }
 
 #workspaces button.focused {
-    background-color: #64727D;
+    background-color: @pine;
     box-shadow: inset 0 -3px #ffffff;
 }
 
 #workspaces button.urgent {
-    background-color: #eb4d4b;
+    /* background-color: #eb4d4b; */
 }
 
 #mode {
-    background-color: #64727D;
+    /* background-color: #64727D; */
     box-shadow: inset 0 -3px #ffffff;
 }
 
+#window {
+    color: @gold;
+}
+
+#window,
+#workspaces {
+    margin: 0.1rem 0.5rem;
+}
+
 #clock,
 #battery,
 #cpu,
@@ -108,10 +131,6 @@ button:hover {
     color: #ffffff;
 }
 
-#window,
-#workspaces {
-    margin: 0 4px;
-}
 
 /* If workspaces is the leftmost module, omit left margin */
 .modules-left>widget:first-child>#workspaces {
@@ -124,7 +143,7 @@ button:hover {
 }
 
 #clock {
-    color: @gold;
+    color: @rose;
 }
 
 #battery {
@@ -138,7 +157,7 @@ button:hover {
 
 @keyframes blink {
     to {
-        background-color: #ffffff;
+        background-color: @subtle;
         color: #000000;
     }
 }
@@ -180,7 +199,7 @@ label:focus {
 }
 
 #memory {
-    color: @pine;
+    color: @rose;
 }
 
 #disk {
@@ -192,54 +211,28 @@ label:focus {
 }
 
 #network {
-    color: @rose;
+    color: @iris;
 }
 
 #network.disconnected {
     background-color: @love;
 }
 
-#pulseaudio {
-    color: @foam;
-}
 
-#pulseaudio.muted {
-    color: @pine;
-}
 
-#wireplumber {
-    background-color: #fff0f5;
-    color: #000000;
-}
-
-#wireplumber.muted {
-    background-color: #f53c3c;
-}
-
-#custom-media {
-    background-color: #66cc99;
-    color: #2a5c45;
-    min-width: 100px;
-}
-
-#custom-media.custom-spotify {
-    background-color: #66cc99;
-}
-
-#custom-media.custom-vlc {
-    background-color: #ffa000;
-}
 
 #temperature {
-    color: @rose;
+    color: @foam;
 }
 
 #temperature.critical {
     background-color: @love;
+    color: @rose;
 }
 
 #tray {
-    background-color: #2980b9;
+    border-radius: 1rem;
+    background-color: @overlay;
 }
 
 #tray>.passive {
@@ -248,9 +241,20 @@ label:focus {
 
 #tray>.needs-attention {
     -gtk-icon-effect: highlight;
-    background-color: #eb4d4b;
+    background-color: @love;
 }
 
+#custom-power {
+    padding: 1.5rem;
+    color: @subtle;
+}
+
+#custom-power:hover {
+    color: @text;
+}
+
+
+
 #idle_inhibitor {
     background-color: #2d3436;
 }
@@ -309,23 +313,27 @@ label:focus {
     background-color: transparent;
 }
 
-#privacy {
+#privacy {}
-    padding: 0;
-}
 
 #privacy-item {
-    padding: 0 5px;
+    border-radius: 1rem;
-    color: white;
+    padding: 1rem;
+    color: @subtle;
+}
+
+#privacy-item:hover {
+    color: @text;
 }
 
 #privacy-item.screenshare {
-    background-color: #cf5700;
+    background-color: @foam;
+    color: @text;
 }
 
 #privacy-item.audio-in {
-    background-color: #1ca000;
+    background-color: @love;
 }
 
 #privacy-item.audio-out {
-    background-color: #0069d4;
+    background-color: @overlay;
 }

zsh/.zshrc

@@ -31,7 +31,7 @@ eval "$(luarocks path --bin)"
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 
 #fzf
-# source <(fzf --zsh)
+source <(fzf --zsh)
 
 #starship
 eval "$(starship init zsh)"