Changes for uwsm, theme and env

Move env to uwsm
GNOME keyring fixes
Theme refactoring
Walker theme tweaks
Add notifications to waybar

config/hypr/hyprland.conf

@@ -6,18 +6,10 @@ source = ~/.config/hypr/bindings.conf
 source = ~/.config/hypr/monitors.conf
 source = ~/.config/hypr/rules.conf
 
-#env = XDG_CURRENT_DESKTOP,GNOME
-
 exec-once = hyprpaper
 exec-once = waybar
 exec-once = hypridle
 exec-once = systemctl --user start hyprpolkitagent
-exec-once = eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
-#exec-once = gnome-keyring-daemon --unlock --components=pkcs11,secrets,ssh && dbus-update-activation-environment --all
-#exec-once = gnome-keyring-daemon --start --components=pkcs11
-#exec-once = gnome-keyring-daemon --start --components=secrets
-#exec-once = gnome-keyring-daemon --start --components=ssh
-
 exec-once = swayosd-server
 exec-once = elephant & walker --gapplication-service
 
@@ -161,8 +153,8 @@ master {
 
 # https://wiki.hypr.land/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. :(
 }
 
 

config/kitty/current-theme.conf

@@ -0,0 +1,50 @@
+# vim:ft=kitty
+
+## name: Tokyo Night
+## license: MIT
+## author: Folke Lemaitre
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_night.conf
+
+
+background #1a1b26
+foreground #c0caf5
+selection_background #283457
+selection_foreground #c0caf5
+url_color #73daca
+cursor #c0caf5
+cursor_text_color #1a1b26
+
+# Tabs
+active_tab_background #7aa2f7
+active_tab_foreground #16161e
+inactive_tab_background #292e42
+inactive_tab_foreground #545c7e
+#tab_bar_background #15161e
+
+# Windows
+active_border_color #7aa2f7
+inactive_border_color #292e42
+
+# normal
+color0 #15161e
+color1 #f7768e
+color2 #9ece6a
+color3 #e0af68
+color4 #7aa2f7
+color5 #bb9af7
+color6 #7dcfff
+color7 #a9b1d6
+
+# bright
+color8 #414868
+color9 #f7768e
+color10 #9ece6a
+color11 #e0af68
+color12 #7aa2f7
+color13 #bb9af7
+color14 #7dcfff
+color15 #c0caf5
+
+# extended colors
+color16 #ff9e64
+color17 #db4b4b

config/swaync/style.css

@@ -325,7 +325,8 @@ notificationwindow, blankwindow, blankwindow {
   background: var(--cc-bg);
 
   color: var(--text-color);
-  border-radius: var(--border-radius-center);
+  border: var(--border);
+  border-radius: var(--border-radius);
 }
 
 .control-center .control-center-list-placeholder {

config/uwsm/env

@@ -0,0 +1,2 @@
+export XDG_CURRENT_DESKTOP=GNOME
+export TERMINAL=kitty

config/walker/themes/hyprtron/style.css

@@ -7,10 +7,11 @@
 
 * {
   all: unset;
+  color: @foreground;
 }
 
 .normal-icons {
-  -gtk-icon-size: 16px;
+  -gtk-icon-size: 24px;
 }
 
 .large-icons {
@@ -25,24 +26,23 @@ scrollbar {
   box-shadow:
     0 19px 38px rgba(0, 0, 0, 0.3),
     0 15px 12px rgba(0, 0, 0, 0.22);
-  /*background: @window_bg_color;*/
   background: @background-t0;
-  padding: 20px;
+  padding: 12px;
+  border: var(--border);
   border-radius: var(--border-radius);
-  border: 1px solid @border;
 }
 
 .preview-box,
 .elephant-hint,
 .placeholder {
-  color: @theme_fg_color;
 }
 
 .box {
 }
 
 .search-container {
-  border-radius: 10px;
+  border: var(--border);
+  border-radius: var(--border-radius);
 }
 
 .input placeholder {
@@ -50,10 +50,9 @@ scrollbar {
 }
 
 .input {
-  caret-color: @theme_fg_color;
+  caret-color: @foreground;
-  background: lighter(@window_bg_color);
+  background: lighter(@background);
-  padding: 10px;
+  padding: 12px;
-  color: @theme_fg_color;
 }
 
 .input:focus,
@@ -70,22 +69,22 @@ scrollbar {
 }
 
 .list {
-  color: @theme_fg_color;
 }
 
 child {
 }
 
 .item-box {
-  border-radius: 10px;
+  border-radius: var(--border-radius);
-  padding: 10px;
+  padding: 8px;
 }
 
 .item-quick-activation {
-  margin-left: 10px;
+  margin-left: 8px;
-  background: alpha(@accent_bg_color, 0.25);
+  background: alpha(@background, 0.7);
-  border-radius: 5px;
+  border-radius: var(--border-radius);
-  padding: 10px;
+  padding: 8px;
+  color: @border;
 }
 
 child:hover .item-box,
@@ -106,7 +105,7 @@ child:selected .item-box {
 
 .item-image,
 .item-image-text {
-  margin-right: 10px;
+  margin-right: 8px;
 }
 
 .item-image-text {
@@ -114,10 +113,8 @@ child:selected .item-box {
 }
 
 .preview {
-  border: 1px solid alpha(@accent_bg_color, 0.25);
+  border: var(--border);
-  padding: 10px;
+  border-radius: var(--border-radius);
-  border-radius: 10px;
-  color: @theme_fg_color;
 }
 
 .calc .item-text {
@@ -152,10 +149,9 @@ child:selected .item-box {
 }
 
 .keybinds-wrapper {
-  border-top: 1px solid lighter(@window_bg_color);
+  border-top: var(--border);
   font-size: 12px;
-  opacity: 0.5;
+  opacity: 0.7;
-  color: @theme_fg_color;
 }
 
 .keybinds {
@@ -165,7 +161,6 @@ child:selected .item-box {
 }
 
 .keybind-bind {
-  /* color: lighter(@window_bg_color); */
   font-weight: bold;
   text-transform: lowercase;
 }
@@ -174,7 +169,7 @@ child:selected .item-box {
 }
 
 .error {
-  padding: 10px;
+  padding: 12px;
   background: @error_bg_color;
   color: @error_fg_color;
 }

config/waybar/config.jsonc

@@ -1,4 +1,5 @@
 {
+  "output": "!DP-6",
   "reload_style_on_change": true,
   "layer": "top",
   "position": "top",
@@ -10,6 +11,7 @@
   "modules-center": ["clock", "custom/update", "custom/screenrecording-indicator"],
   "modules-right": [
     "tray",
+    "custom/notification",
     "bluetooth",
     "network",
     "pulseaudio",
@@ -53,7 +55,26 @@
     "signal": 7,
     "interval": 3600
   },
-
+    "custom/notification": {
+    "tooltip": true,
+    "format": "{icon}",
+    "format-icons": {
+      "notification": "󱅫",
+      "none": "󰂜",
+      "dnd-notification": "󰂠",
+      "dnd-none": "󰪓",
+      "inhibited-notification": "󰂛",
+      "inhibited-none": "󰪑",
+      "dnd-inhibited-notification": "󰂛",
+      "dnd-inhibited-none": "󰪑"
+    },
+    "return-type": "json",
+    "exec-if": "which swaync-client",
+    "exec": "swaync-client -swb",
+    "on-click": "swaync-client -t -sw",
+    "on-click-right": "swaync-client -d -sw",
+    "escape": true
+  },
   "cpu": {
     "interval": 5,
     "format": "󰍛",
@@ -106,8 +127,7 @@
   },
   "pulseaudio": {
     "format": "{icon}",
-    "on-click": "$TERMINAL --class=Wiremix -e wiremix",
+    "on-click": "pavucontrol",
-    "on-click-right": "pamixer -t",
     "tooltip-format": "Playing at {volume}%",
     "scroll-step": 5,
     "format-muted": "",

config/waybar/style.css

@@ -42,13 +42,18 @@ window#waybar {
 #pulseaudio,
 #custom-omarchy,
 #custom-screenrecording-indicator,
+#custom-notification,
 #custom-update {
   min-width: 12px;
   margin: 0 10px;
 }
 
 #bluetooth {
-  margin: 0 4px;
+  margin: 0 4px 0 6px;
+}
+
+#custom-notification {
+  margin-left: 4px;
 }
 
 #tray {

local/share/hyprtron/theme/style.css

@@ -3,7 +3,9 @@
 @define-color background-t1 alpha(@background, 0.7);
 @define-color background-t2 alpha(@background, 0.6);
 @define-color border #33ccff;
+@define-color foreground #ffffff;
 
 :root {
+    --border: 1px solid @border;
     --border-radius: 8px;
 }