diff --git a/modules/home/hyprland/conf/hypr/hyprland.conf b/modules/home/hyprland/conf/hypr/hyprland.conf
index 7e4be7c..adc84ab 100644
--- a/modules/home/hyprland/conf/hypr/hyprland.conf
+++ b/modules/home/hyprland/conf/hypr/hyprland.conf
@@ -26,40 +26,22 @@ monitor = ,preferred,auto,auto
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
# Execute your favorite apps at launch
-exec-once = ~/.config/hypr/scripts/resetxdgportal.sh # reset XDPH for screenshare
exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # for XDPH
exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # for XDPH
exec-once = /usr/lib/polkit-kde-authentication-agent-1 # authentication dialogue for GUI apps
-exec-once = waybar && ~/.config/waybar/wbarconfgen.sh n # launch the system panel
+exec-once = waybar # launch the system panel
exec-once = blueman-applet # systray app for BT
exec-once = nm-applet --indicator # systray app for Network/Wifi
exec-once = dunst # start notification demon
exec-once = wl-paste --type text --watch cliphist store # clipboard store text data
exec-once = wl-paste --type image --watch cliphist store # clipboard store image data
-exec-once = ~/.config/swww/swwwallpaper.sh # start wallpaper daemon
exec-once = fcitx5
+exec-once = ~/.config/swww/swwwallpaper.sh # start wallpaper daemon
+exec-once = ~/.config/hypr/scripts/resetxdgportal.sh # reset XDPH for screenshare
#exec-once = swayidle -w timeout 900 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' # turn off monitor after 15 mins
-# █▀▀ █▄░█ █░█
-# ██▄ █░▀█ ▀▄▀
-
-# Some default env vars.
-
-# env = XDG_CURRENT_DESKTOP,Hyprland
-# env = XDG_SESSION_TYPE,wayland
-# env = XDG_SESSION_DESKTOP,Hyprland
-# env = GDK_BACKEND,wayland
-# env = QT_QPA_PLATFORM,wayland
-# #env = QT_STYLE_OVERRIDE,kvantum
-# env = QT_QPA_PLATFORMTHEME,qt5ct
-# env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-# env = QT_AUTO_SCREEN_SCALE_FACTOR,1
-# env = XDG_PICTURES_DIR,$HOME/Pictures
-
-
-
# █ █▄░█ █▀█ █░█ ▀█▀
# █ █░▀█ █▀▀ █▄█ ░█░
@@ -116,16 +98,6 @@ master {
-# █▀▄▀█ █ █▀ █▀▀
-# █░▀░█ █ ▄█ █▄▄
-
-# See https://wiki.hyprland.org/Configuring/Variables/ for more
-
-misc {
- vrr = 0
-}
-
-
# █▀ █▀█ █░█ █▀█ █▀▀ █▀▀
# ▄█ █▄█ █▄█ █▀▄ █▄▄ ██▄
@@ -136,7 +108,7 @@ misc {
source = ~/.config/hypr/animations.conf
source = ~/.config/hypr/keybindings.conf
source = ~/.config/hypr/windowrules.conf
-source = ~/.config/hypr/themes/theme.conf
+source = ~/.config/hypr/theme.conf
source = ~/.config/hypr/monitors.conf # initially empty, to be configured by user and remains static
source = ~/.config/hypr/userprefs.conf # initially empty, to be configured by user and remains static
diff --git a/modules/home/hyprland/conf/hypr/keybindings.conf b/modules/home/hyprland/conf/hypr/keybindings.conf
index d0f2933..eaa337e 100644
--- a/modules/home/hyprland/conf/hypr/keybindings.conf
+++ b/modules/home/hyprland/conf/hypr/keybindings.conf
@@ -5,32 +5,37 @@
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-# main modifier
+################################################
+# Main modifier
+################################################
$mainMod = SUPER # windows key
-# window/session actions
+################################################
+# Main actions
+################################################
bind = $mainMod, Q, exec, ~/.config/hypr/scripts/dontkillsteam.sh # killactive, # kill the window on focus
bind = $mainMod, delete, exit, # kill hyperland session
bind = $mainMod, esc, exit, # kill hyperland session
bind = $mainMod, F, togglefloating, # toggle the window on focus to float
-bind = ALT, return, fullscreen, # toggle the window on focus to fullscreen
-bind = $mainMod, G, exec, ~/.config/hypr/scripts/gamemode.sh # disable hypr effects for gamemode
bind = $mainMod, L, exec, swaylock # lock screen
-bind = $mainMod, backspace, exec, ~/.config/hypr/scripts/logoutlaunch.sh 1 # logout menu
bind = $mainMod, P, pseudo, # dwindle
-bind = $mainMod, S, togglesplit, # dwindle
+bind = $mainMod, S, togglesplit, # split screen
+bind = ALT, return, fullscreen, # toggle the window on focus to fullscreen
-# application shortcuts
+# Application shortcuts
bind = $mainMod, grave, exec, kitty # ~ open terminal
bind = $mainMod, E, exec, dolphin # open file manager
bind = $mainMod, V, exec, code # open vscode
-# rofi is toggled on/off if you repeat the key presses
+################################################
+# Control actions
+################################################
+# Rofi is toggled on/off if you repeat the key presses
bind = $mainMod, SPACE, exec, pkill rofi || ~/.config/hypr/scripts/rofilaunch.sh d # launch desktop applications
bind = $mainMod, tab, exec, pkill rofi || ~/.config/hypr/scripts/rofilaunch.sh w # switch between desktop applications
bind = $mainMod, R, exec, pkill rofi || ~/.config/hypr/scripts/rofilaunch.sh f # browse system files
-# audio control
+# Audio control
# bind = , F10, exec, ~/.config/hypr/scripts/volumecontrol.sh -o m # toggle audio mute
# binde = , F11, exec, ~/.config/hypr/scripts/volumecontrol.sh -o d # decrease volume
# binde = , F12, exec, ~/.config/hypr/scripts/volumecontrol.sh -o i # increase volume
@@ -43,23 +48,27 @@ bind = , XF86AudioPause, exec, playerctl play-pause
bind = , XF86AudioNext, exec, playerctl next
bind = , XF86AudioPrev, exec, playerctl previous
-# brightness control
+# Brightness control
binde = , XF86MonBrightnessUp, exec, ~/.config/hypr/scripts/brightnesscontrol.sh i # increase brightness
binde = , XF86MonBrightnessDown, exec, ~/.config/hypr/scripts/brightnesscontrol.sh d # decrease brightness
-# screenshot/screencapture
+# Screenshot/screencapture
bind = $mainMod, P, exec, ~/.config/hypr/scripts/screenshot.sh s # screenshot snip
bind = $mainMod ALT, P, exec, ~/.config/hypr/scripts/screenshot.sh p # print current screen
bind = $CONTROL SHIFT, P, pass, ^(com\.obsproject\.Studio)$ # start/stop obs screen recording
-# exec custom scripts
-bind = $mainMod ALT, right, exec, ~/.config/swww/swwwallpaper.sh -n # next wallpaper
-bind = $mainMod ALT, left, exec, ~/.config/swww/swwwallpaper.sh -p # previous wallpaper
-bind = $mainMod ALT, up, exec, ~/.config/waybar/wbarconfgen.sh n # next waybar mode
-bind = $mainMod ALT, down, exec, ~/.config/waybar/wbarconfgen.sh p # previous waybar mode
-bind = $mainMod SHIFT, T, exec, ~/.config/hypr/scripts/themeselect.sh # theme select menu
-bind = $mainMod SHIFT, A, exec, ~/.config/hypr/scripts/rofiselect.sh # rofi style select menu
+################################################
+# Exec custom scripts
+################################################
+bind = $mainMod, backspace, exec, ~/.config/hypr/scripts/logoutlaunch.sh 1 # logout menu
+bind = $mainMod, G, exec, ~/.config/hypr/scripts/gamemode.sh # disable hypr effects for gamemode
+
+
+
+################################################
+# Window actions
+################################################
# Move focus with mainMod + arrow keys
bind = $mainMod, left, movefocus, l
bind = $mainMod, right, movefocus, r
@@ -67,18 +76,6 @@ bind = $mainMod, up, movefocus, u
bind = $mainMod, down, movefocus, d
bind = ALT, Tab, movefocus, d
-# Switch workspaces with mainMod + [0-9]
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
-bind = $mainMod, 0, workspace, 10
-
# Resize windows
binde = $mainMod CONTROL, right, resizeactive, 10 0
binde = $mainMod CONTROL, left, resizeactive, -10 0
@@ -91,6 +88,26 @@ bind = $mainMod SHIFT, right, movewindow, r
bind = $mainMod SHIFT, up, movewindow, u
bind = $mainMod SHIFT, down, movewindow, d
+# Move/resize windows with mainMod + LMB/RMB and dragging
+bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod, mouse:273, resizewindow
+
+
+################################################
+# Workspace actions
+################################################
+# Switch workspaces with mainMod + [0-9]
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+bind = $mainMod, 0, workspace, 10
+
# Move active window to a workspace with mainMod + SHIFT + [0-9]
bind = $mainMod SHIFT, 1, movetoworkspace, 1
bind = $mainMod SHIFT, 2, movetoworkspace, 2
@@ -103,18 +120,6 @@ bind = $mainMod SHIFT, 8, movetoworkspace, 8
bind = $mainMod SHIFT, 9, movetoworkspace, 9
bind = $mainMod SHIFT, 0, movetoworkspace, 10
-# Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1
-
-# Move/resize windows with mainMod + LMB/RMB and dragging
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
-
-# Special workspaces (scratchpad)
-bind = $mainMod ALT, S, movetoworkspacesilent, special
-bind = $mainMod CONTROL, S, togglespecialworkspace,
-
# Move window to workspace Super + Alt + [0-9]
bind = $mainMod ALT, 1, movetoworkspacesilent, 1
bind = $mainMod ALT, 2, movetoworkspacesilent, 2
@@ -126,3 +131,11 @@ bind = $mainMod ALT, 7, movetoworkspacesilent, 7
bind = $mainMod ALT, 8, movetoworkspacesilent, 8
bind = $mainMod ALT, 9, movetoworkspacesilent, 9
bind = $mainMod ALT, 0, movetoworkspacesilent, 10
+
+# Special workspaces (scratchpad)
+bind = $mainMod ALT, S, movetoworkspacesilent, special
+bind = $mainMod CONTROL, S, togglespecialworkspace,
+
+# Scroll through existing workspaces with mainMod + scroll
+bind = $mainMod, mouse_down, workspace, e+1
+bind = $mainMod, mouse_up, workspace, e-1
\ No newline at end of file
diff --git a/modules/home/hyprland/conf/hypr/themes/Catppuccin-Latte.conf b/modules/home/hyprland/conf/hypr/theme.conf
similarity index 100%
rename from modules/home/hyprland/conf/hypr/themes/Catppuccin-Latte.conf
rename to modules/home/hyprland/conf/hypr/theme.conf
diff --git a/modules/home/hyprland/conf/hypr/themes/Catppuccin-Mocha.conf b/modules/home/hyprland/conf/hypr/themes/Catppuccin-Mocha.conf
deleted file mode 100644
index 6f85756..0000000
--- a/modules/home/hyprland/conf/hypr/themes/Catppuccin-Mocha.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-exec = hyprctl setcursor Bibata-Modern-Ice 20
-exec = gsettings set org.gnome.desktop.interface cursor-theme 'Bibata-Modern-Ice'
-exec = gsettings set org.gnome.desktop.interface cursor-size 20
-
-exec = kvantummanager --set Catppuccin-Mocha
-exec = gsettings set org.gnome.desktop.interface icon-theme 'Tela-circle-dracula'
-exec = gsettings set org.gnome.desktop.interface gtk-theme 'Catppuccin-Mocha'
-exec = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
-
-exec = gsettings set org.gnome.desktop.interface font-name 'Cantarell 10'
-exec = gsettings set org.gnome.desktop.interface document-font-name 'Cantarell 10'
-exec = gsettings set org.gnome.desktop.interface monospace-font-name 'CaskaydiaCove Nerd Font Mono 9'
-exec = gsettings set org.gnome.desktop.interface font-antialiasing 'rgba'
-exec = gsettings set org.gnome.desktop.interface font-hinting 'full'
-
-env = XCURSOR_THEME,Bibata-Modern-Ice
-env = XCURSOR_SIZE,20
-
-general {
- gaps_in = 3
- gaps_out = 8
- border_size = 2
- col.active_border = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg
- col.inactive_border = rgba(b4befecc) rgba(6c7086cc) 45deg
- layout = dwindle
- resize_on_border = true
-}
-
-decoration {
- rounding = 10
- multisample_edges = true
- drop_shadow = false
-
- blur {
- enabled = yes
- size = 6
- passes = 3
- new_optimizations = on
- ignore_opacity = on
- xray = false
- }
-}
-
-blurls = waybar
diff --git a/modules/home/hyprland/conf/hypr/themes/Cyberpunk-Edge.conf b/modules/home/hyprland/conf/hypr/themes/Cyberpunk-Edge.conf
deleted file mode 100644
index aebf3aa..0000000
--- a/modules/home/hyprland/conf/hypr/themes/Cyberpunk-Edge.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-exec = hyprctl setcursor Bibata-Modern-Ice 20
-exec = gsettings set org.gnome.desktop.interface cursor-theme 'Bibata-Modern-Ice'
-exec = gsettings set org.gnome.desktop.interface cursor-size 20
-
-exec = kvantummanager --set Cyberpunk-Edge
-exec = gsettings set org.gnome.desktop.interface icon-theme 'Tela-circle-yellow'
-exec = gsettings set org.gnome.desktop.interface gtk-theme 'Cyberpunk-Edge'
-exec = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
-
-exec = gsettings set org.gnome.desktop.interface font-name 'Cantarell 10'
-exec = gsettings set org.gnome.desktop.interface document-font-name 'Cantarell 10'
-exec = gsettings set org.gnome.desktop.interface monospace-font-name 'CaskaydiaCove Nerd Font Mono 9'
-exec = gsettings set org.gnome.desktop.interface font-antialiasing 'rgba'
-exec = gsettings set org.gnome.desktop.interface font-hinting 'full'
-
-env = XCURSOR_THEME,Bibata-Modern-Ice
-env = XCURSOR_SIZE,20
-
-general {
- gaps_in = 8
- gaps_out = 15
- border_size = 4
- col.active_border = rgba(FADA16ff) rgba(4DBD4Fff) 45deg
- col.inactive_border = rgba(5032ACff) rgba(1F5322ff) 45deg
- layout = dwindle
- resize_on_border = true
-}
-
-decoration {
- rounding = 0
- multisample_edges = true
- drop_shadow = true
- shadow_ignore_window = true
- shadow_offset = 12 12
- shadow_range = 0
- shadow_render_power = 4
- col.shadow = 0xffFFA6C2
-
- blur {
- enabled = yes
- size = 6
- passes = 3
- new_optimizations = on
- ignore_opacity = on
- xray = false
- }
-}
-
-#blurls = waybar
diff --git a/modules/home/hyprland/conf/hypr/themes/Decay-Green.conf b/modules/home/hyprland/conf/hypr/themes/Decay-Green.conf
deleted file mode 100644
index 093faf4..0000000
--- a/modules/home/hyprland/conf/hypr/themes/Decay-Green.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-exec = hyprctl setcursor Bibata-Modern-Ice 20
-exec = gsettings set org.gnome.desktop.interface cursor-theme 'Bibata-Modern-Ice'
-exec = gsettings set org.gnome.desktop.interface cursor-size 20
-
-exec = kvantummanager --set Decay-Green
-exec = gsettings set org.gnome.desktop.interface icon-theme 'Tela-circle-green'
-exec = gsettings set org.gnome.desktop.interface gtk-theme 'Decay-Green'
-exec = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
-
-exec = gsettings set org.gnome.desktop.interface font-name 'Cantarell 10'
-exec = gsettings set org.gnome.desktop.interface document-font-name 'Cantarell 10'
-exec = gsettings set org.gnome.desktop.interface monospace-font-name 'CaskaydiaCove Nerd Font Mono 9'
-exec = gsettings set org.gnome.desktop.interface font-antialiasing 'rgba'
-exec = gsettings set org.gnome.desktop.interface font-hinting 'full'
-
-env = XCURSOR_THEME,Bibata-Modern-Ice
-env = XCURSOR_SIZE,20
-
-general {
- gaps_in = 3
- gaps_out = 8
- border_size = 2
- col.active_border = rgba(90ceaaff) rgba(ecd3a0ff) 45deg
- col.inactive_border = rgba(86aaeccc) rgba(93cee9cc) 45deg
- layout = dwindle
- resize_on_border = true
-}
-
-decoration {
- rounding = 10
- multisample_edges = true
- drop_shadow = false
-
- blur {
- enabled = yes
- size = 5
- passes = 4
- new_optimizations = on
- ignore_opacity = on
- xray = true
- }
-}
-
-#blurls = waybar
diff --git a/modules/home/hyprland/conf/hypr/themes/Graphite-Mono.conf b/modules/home/hyprland/conf/hypr/themes/Graphite-Mono.conf
deleted file mode 100644
index b0cef16..0000000
--- a/modules/home/hyprland/conf/hypr/themes/Graphite-Mono.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-exec = hyprctl setcursor Bibata-Modern-Ice 20
-exec = gsettings set org.gnome.desktop.interface cursor-theme 'Bibata-Modern-Ice'
-exec = gsettings set org.gnome.desktop.interface cursor-size 20
-
-exec = kvantummanager --set Graphite-Mono
-exec = gsettings set org.gnome.desktop.interface icon-theme 'Tela-circle-grey'
-exec = gsettings set org.gnome.desktop.interface gtk-theme 'Graphite-Mono'
-exec = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
-
-exec = gsettings set org.gnome.desktop.interface font-name 'Cantarell 10'
-exec = gsettings set org.gnome.desktop.interface document-font-name 'Cantarell 10'
-exec = gsettings set org.gnome.desktop.interface monospace-font-name 'CaskaydiaCove Nerd Font Mono 9'
-exec = gsettings set org.gnome.desktop.interface font-antialiasing 'rgba'
-exec = gsettings set org.gnome.desktop.interface font-hinting 'full'
-
-env = XCURSOR_THEME,Bibata-Modern-Ice
-env = XCURSOR_SIZE,20
-
-general {
- gaps_in = 8
- gaps_out = 14
- border_size = 3
- col.active_border = rgba(d9d9d9ff) rgba(a6a6a6ff) 45deg
- col.inactive_border = rgba(404040cc) rgba(262626cc) 45deg
- layout = dwindle
- resize_on_border = true
-}
-
-decoration {
- rounding = 0
- multisample_edges = true
- drop_shadow = true
- shadow_ignore_window = true
- shadow_offset = 7 7
- shadow_range = 0
- shadow_render_power = 4
- col.shadow = 0xffFFFFFF
-
- blur {
- enabled = yes
- size = 6
- passes = 3
- new_optimizations = on
- ignore_opacity = on
- xray = true
- }
-}
-
-#blurls = waybar
diff --git a/modules/home/hyprland/conf/hypr/themes/Material-Sakura.conf b/modules/home/hyprland/conf/hypr/themes/Material-Sakura.conf
deleted file mode 100644
index 19b78a0..0000000
--- a/modules/home/hyprland/conf/hypr/themes/Material-Sakura.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-exec = hyprctl setcursor Bibata-Modern-Ice 20
-exec = gsettings set org.gnome.desktop.interface cursor-theme 'Bibata-Modern-Ice'
-exec = gsettings set org.gnome.desktop.interface cursor-size 20
-
-exec = kvantummanager --set Material-Sakura
-exec = gsettings set org.gnome.desktop.interface icon-theme 'Tela-circle-black'
-exec = gsettings set org.gnome.desktop.interface gtk-theme 'Material-Sakura'
-exec = gsettings set org.gnome.desktop.interface color-scheme 'prefer-light'
-
-exec = gsettings set org.gnome.desktop.interface font-name 'Cantarell 10'
-exec = gsettings set org.gnome.desktop.interface document-font-name 'Cantarell 10'
-exec = gsettings set org.gnome.desktop.interface monospace-font-name 'CaskaydiaCove Nerd Font Mono 9'
-exec = gsettings set org.gnome.desktop.interface font-antialiasing 'rgba'
-exec = gsettings set org.gnome.desktop.interface font-hinting 'full'
-
-env = XCURSOR_THEME,Bibata-Modern-Ice
-env = XCURSOR_SIZE,20
-
-general {
- gaps_in = 8
- gaps_out = 14
- border_size = 4
- col.active_border = rgba(b4637aff) rgba(d7827eff) 45deg
- col.inactive_border = rgba(286983cc) rgba(56949fcc) 45deg
- layout = dwindle
- resize_on_border = true
-}
-
-decoration {
- rounding = 12
- multisample_edges = true
- drop_shadow = true
- shadow_ignore_window = true
- shadow_offset = 9 10
- shadow_range = 5
- shadow_render_power = 4
- col.shadow = 0xff26233a
-
- blur {
- enabled = yes
- size = 6
- passes = 3
- new_optimizations = on
- ignore_opacity = on
- xray = false
- }
-}
-
-#blurls = waybar
diff --git a/modules/home/hyprland/conf/hypr/themes/Rose-Pine.conf b/modules/home/hyprland/conf/hypr/themes/Rose-Pine.conf
deleted file mode 100644
index 2fa8a15..0000000
--- a/modules/home/hyprland/conf/hypr/themes/Rose-Pine.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-exec = hyprctl setcursor Bibata-Modern-Ice 20
-exec = gsettings set org.gnome.desktop.interface cursor-theme 'Bibata-Modern-Ice'
-exec = gsettings set org.gnome.desktop.interface cursor-size 20
-
-exec = kvantummanager --set Rose-Pine
-exec = gsettings set org.gnome.desktop.interface icon-theme 'Tela-circle-pink'
-exec = gsettings set org.gnome.desktop.interface gtk-theme 'Rose-Pine'
-exec = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
-
-exec = gsettings set org.gnome.desktop.interface font-name 'Cantarell 10'
-exec = gsettings set org.gnome.desktop.interface document-font-name 'Cantarell 10'
-exec = gsettings set org.gnome.desktop.interface monospace-font-name 'CaskaydiaCove Nerd Font Mono 9'
-exec = gsettings set org.gnome.desktop.interface font-antialiasing 'rgba'
-exec = gsettings set org.gnome.desktop.interface font-hinting 'full'
-
-env = XCURSOR_THEME,Bibata-Modern-Ice
-env = XCURSOR_SIZE,20
-
-general {
- gaps_in = 3
- gaps_out = 8
- border_size = 2
- col.active_border = rgba(eb6f92ff) rgba(c4a7e7ff) 45deg
- col.inactive_border = rgba(31748fcc) rgba(9ccfd8cc) 45deg
- layout = dwindle
- resize_on_border = true
-}
-
-decoration {
- rounding = 10
- multisample_edges = true
- drop_shadow = false
-
- blur {
- enabled = yes
- size = 6
- passes = 3
- new_optimizations = on
- ignore_opacity = on
- xray = false
- }
-}
-
-blurls = waybar
diff --git a/modules/home/hyprland/conf/hypr/themes/Tokyo-Night.conf b/modules/home/hyprland/conf/hypr/themes/Tokyo-Night.conf
deleted file mode 100644
index ed133a3..0000000
--- a/modules/home/hyprland/conf/hypr/themes/Tokyo-Night.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-exec = hyprctl setcursor Bibata-Modern-Ice 20
-exec = gsettings set org.gnome.desktop.interface cursor-theme 'Bibata-Modern-Ice'
-exec = gsettings set org.gnome.desktop.interface cursor-size 20
-
-exec = kvantummanager --set Tokyo-Night
-exec = gsettings set org.gnome.desktop.interface icon-theme 'Tela-circle-purple'
-exec = gsettings set org.gnome.desktop.interface gtk-theme 'Tokyo-Night'
-exec = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
-
-exec = gsettings set org.gnome.desktop.interface font-name 'Cantarell 10'
-exec = gsettings set org.gnome.desktop.interface document-font-name 'Cantarell 10'
-exec = gsettings set org.gnome.desktop.interface monospace-font-name 'CaskaydiaCove Nerd Font Mono 9'
-exec = gsettings set org.gnome.desktop.interface font-antialiasing 'rgba'
-exec = gsettings set org.gnome.desktop.interface font-hinting 'full'
-
-env = XCURSOR_THEME,Bibata-Modern-Ice
-env = XCURSOR_SIZE,20
-
-general {
- gaps_in = 3
- gaps_out = 8
- border_size = 2
- col.active_border = rgba(bb9af7ff) rgba(b4f9f8ff) 45deg
- col.inactive_border = rgba(565f89cc) rgba(9aa5cecc) 45deg
- layout = dwindle
- resize_on_border = true
-}
-
-decoration {
- rounding = 10
- multisample_edges = true
- drop_shadow = false
-
- blur {
- enabled = yes
- size = 6
- passes = 3
- new_optimizations = on
- ignore_opacity = on
- xray = true
- }
-}
-
-blurls = waybar
diff --git a/modules/home/hyprland/conf/kitty/kitty.conf b/modules/home/hyprland/conf/kitty/kitty.conf
index c7d104b..3ebaa2d 100644
--- a/modules/home/hyprland/conf/kitty/kitty.conf
+++ b/modules/home/hyprland/conf/kitty/kitty.conf
@@ -1,11 +1,80 @@
-font_family CaskaydiaCove Nerd Font Mono
-bold_font auto
-italic_font auto
-bold_italic_font auto
+# vim:ft=kitty
-font_size 12.0
-window_padding_width 18
-include themes/theme.conf
-#background_opacity 0.60
-#hide_window_decorations yes
-#confirm_os_window_close 0
+## name: Catppuccin Latte 🐑
+## author: Pocco81 (https://github.com/Pocco81)
+## license: MIT
+## upstream: https://github.com/catppuccin/kitty/blob/main/latte.conf
+## blurb: Soothing pastel theme for the high-spirited!
+
+
+
+# The basic colors
+foreground #4C4F69
+background #EFF1F5
+selection_foreground #EFF1F5
+selection_background #DC8A78
+
+# Cursor colors
+cursor #DC8A78
+cursor_text_color #EFF1F5
+
+# URL underline color when hovering with mouse
+url_color #7287FD
+
+# Kitty window border colors
+active_border_color #8839EF
+inactive_border_color #7C7F93
+bell_border_color #E64553
+
+# OS Window titlebar colors
+wayland_titlebar_color system
+macos_titlebar_color system
+
+# Tab bar colors
+active_tab_foreground #EFF1F5
+active_tab_background #8839EF
+inactive_tab_foreground #4C4F69
+inactive_tab_background #9CA0B0
+tab_bar_background #BCC0CC
+
+# Colors for marks (marked text in the terminal)
+mark1_foreground #EFF1F5
+mark1_background #1E66F5
+mark2_foreground #EFF1F5
+mark2_background #8839EF
+mark3_foreground #EFF1F5
+mark3_background #209FB5
+
+# The 16 terminal colors
+
+# black
+color0 #4C4F69
+color8 #6C6F85
+
+# red
+color1 #D20F39
+color9 #D20F39
+
+# green
+color2 #40A02B
+color10 #40A02B
+
+# yellow
+color3 #DF8E1D
+color11 #DF8E1D
+
+# blue
+color4 #1E66F5
+color12 #1E66F5
+
+# magenta
+color5 #EA76CB
+color13 #EA76CB
+
+# cyan
+color6 #179299
+color14 #179299
+
+# white
+color7 #ACB0BE
+color15 #ACB0BE
diff --git a/modules/home/hyprland/conf/kitty/themes/Catppuccin-Latte.conf b/modules/home/hyprland/conf/kitty/themes/Catppuccin-Latte.conf
deleted file mode 100644
index 3ebaa2d..0000000
--- a/modules/home/hyprland/conf/kitty/themes/Catppuccin-Latte.conf
+++ /dev/null
@@ -1,80 +0,0 @@
-# vim:ft=kitty
-
-## name: Catppuccin Latte 🐑
-## author: Pocco81 (https://github.com/Pocco81)
-## license: MIT
-## upstream: https://github.com/catppuccin/kitty/blob/main/latte.conf
-## blurb: Soothing pastel theme for the high-spirited!
-
-
-
-# The basic colors
-foreground #4C4F69
-background #EFF1F5
-selection_foreground #EFF1F5
-selection_background #DC8A78
-
-# Cursor colors
-cursor #DC8A78
-cursor_text_color #EFF1F5
-
-# URL underline color when hovering with mouse
-url_color #7287FD
-
-# Kitty window border colors
-active_border_color #8839EF
-inactive_border_color #7C7F93
-bell_border_color #E64553
-
-# OS Window titlebar colors
-wayland_titlebar_color system
-macos_titlebar_color system
-
-# Tab bar colors
-active_tab_foreground #EFF1F5
-active_tab_background #8839EF
-inactive_tab_foreground #4C4F69
-inactive_tab_background #9CA0B0
-tab_bar_background #BCC0CC
-
-# Colors for marks (marked text in the terminal)
-mark1_foreground #EFF1F5
-mark1_background #1E66F5
-mark2_foreground #EFF1F5
-mark2_background #8839EF
-mark3_foreground #EFF1F5
-mark3_background #209FB5
-
-# The 16 terminal colors
-
-# black
-color0 #4C4F69
-color8 #6C6F85
-
-# red
-color1 #D20F39
-color9 #D20F39
-
-# green
-color2 #40A02B
-color10 #40A02B
-
-# yellow
-color3 #DF8E1D
-color11 #DF8E1D
-
-# blue
-color4 #1E66F5
-color12 #1E66F5
-
-# magenta
-color5 #EA76CB
-color13 #EA76CB
-
-# cyan
-color6 #179299
-color14 #179299
-
-# white
-color7 #ACB0BE
-color15 #ACB0BE
diff --git a/modules/home/hyprland/conf/kitty/themes/Catppuccin-Mocha.conf b/modules/home/hyprland/conf/kitty/themes/Catppuccin-Mocha.conf
deleted file mode 100644
index e52f9e1..0000000
--- a/modules/home/hyprland/conf/kitty/themes/Catppuccin-Mocha.conf
+++ /dev/null
@@ -1,80 +0,0 @@
-# vim:ft=kitty
-
-## name: Catppuccin Mocha 🌿
-## author: Pocco81 (https://github.com/Pocco81)
-## license: MIT
-## upstream: https://github.com/catppuccin/kitty/blob/main/mocha.conf
-## blurb: Soothing pastel theme for the high-spirited!
-
-
-
-# The basic colors
-foreground #CDD6F4
-background #1E1E2E
-selection_foreground #1E1E2E
-selection_background #F5E0DC
-
-# Cursor colors
-cursor #F5E0DC
-cursor_text_color #1E1E2E
-
-# URL underline color when hovering with mouse
-url_color #B4BEFE
-
-# Kitty window border colors
-active_border_color #CBA6F7
-inactive_border_color #8E95B3
-bell_border_color #EBA0AC
-
-# OS Window titlebar colors
-wayland_titlebar_color system
-macos_titlebar_color system
-
-# Tab bar colors
-active_tab_foreground #11111B
-active_tab_background #CBA6F7
-inactive_tab_foreground #CDD6F4
-inactive_tab_background #181825
-tab_bar_background #11111B
-
-# Colors for marks (marked text in the terminal)
-mark1_foreground #1E1E2E
-mark1_background #87B0F9
-mark2_foreground #1E1E2E
-mark2_background #CBA6F7
-mark3_foreground #1E1E2E
-mark3_background #74C7EC
-
-# The 16 terminal colors
-
-# black
-color0 #43465A
-color8 #43465A
-
-# red
-color1 #F38BA8
-color9 #F38BA8
-
-# green
-color2 #A6E3A1
-color10 #A6E3A1
-
-# yellow
-color3 #F9E2AF
-color11 #F9E2AF
-
-# blue
-color4 #87B0F9
-color12 #87B0F9
-
-# magenta
-color5 #F5C2E7
-color13 #F5C2E7
-
-# cyan
-color6 #94E2D5
-color14 #94E2D5
-
-# white
-color7 #CDD6F4
-color15 #A1A8C9
diff --git a/modules/home/hyprland/conf/kitty/themes/Cyberpunk-Edge.conf b/modules/home/hyprland/conf/kitty/themes/Cyberpunk-Edge.conf
deleted file mode 100644
index 26e94b1..0000000
--- a/modules/home/hyprland/conf/kitty/themes/Cyberpunk-Edge.conf
+++ /dev/null
@@ -1,72 +0,0 @@
-# vim:ft=kitty
-
-# The basic colors
-foreground #FDF500
-background #000000
-selection_foreground #000000
-selection_background #FADA16
-
-# Cursor colors
-cursor #FADA16
-cursor_text_color #FADA16
-
-# URL underline color when hovering with mouse
-url_color #FADA16
-
-# Kitty window border colors
-active_border_color #000000
-inactive_border_color #000000
-bell_border_color #000000
-
-# OS Window titlebar colors
-wayland_titlebar_color system
-macos_titlebar_color system
-
-# Tab bar colors
-active_tab_foreground #FADA16
-active_tab_background #000000
-inactive_tab_foreground #000000
-inactive_tab_background #FADA16
-tab_bar_background #000000
-
-# Colors for marks (marked text in the terminal)
-mark1_foreground #FADA16
-mark1_background #000000
-mark2_foreground #FADA16
-mark2_background #000000
-mark3_foreground #FADA16
-mark3_background #000000
-
-# The 16 terminal colors
-
-# black
-color0 #1F2229
-color8 #1B1C22
-
-# red
-color1 #D62246
-color9 #EC0101
-
-# green
-color2 #4DBD4F
-color10 #1F5322
-
-# yellow
-color3 #FDF500
-color11 #F2CB07
-
-# blue
-color4 #F29C6B
-color12 #FFA6C2
-
-# magenta
-color5 #A56DF2
-color13 #564873
-
-# cyan
-color6 #2CF6B3
-color14 #37EBF3
-
-# white
-color7 #E6E6E6
-color15 #FFFFFF
diff --git a/modules/home/hyprland/conf/kitty/themes/Decay-Green.conf b/modules/home/hyprland/conf/kitty/themes/Decay-Green.conf
deleted file mode 100644
index 21776a9..0000000
--- a/modules/home/hyprland/conf/kitty/themes/Decay-Green.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-# Eye Friendly Colors
-# Created by https://github.com/decaycs
-
-# Special
-background #0d0f18
-foreground #a5b6cf
-
-# Black
-color0 #151720
-color8 #1c1e27
-
-# Red
-color1 #dd6777
-color9 #e26c7c
-
-# Green
-color4 #90ceaa
-color12 #95d3af
-
-# Yellow
-color3 #ecd3a0
-color11 #f1d8a5
-
-# Blue
-color2 #86aaec
-color10 #8baff1
-
-# Magenta
-color5 #c296eb
-color13 #c79bf0
-
-# Cyan
-color6 #93cee9
-color14 #98d3ee
-
-# White
-color7 #cbced3
-color15 #d0d3d8
-
-# Cursor
-cursor #cbced3
-cursor_text_color #a5b6cf
-
-# Selection highlight
-selection_foreground #a5b6cf
-selection_background #1c1e27
-
diff --git a/modules/home/hyprland/conf/kitty/themes/Graphite-Mono.conf b/modules/home/hyprland/conf/kitty/themes/Graphite-Mono.conf
deleted file mode 100644
index da42b92..0000000
--- a/modules/home/hyprland/conf/kitty/themes/Graphite-Mono.conf
+++ /dev/null
@@ -1,72 +0,0 @@
-# vim:ft=kitty
-
-# The basic colors
-foreground #D9D9D9
-background #262626
-selection_foreground #262626
-selection_background #A6A6A6
-
-# Cursor colors
-cursor #A6A6A6
-cursor_text_color #D9D9D9
-
-# URL underline color when hovering with mouse
-url_color #D9D9D9
-
-# Kitty window border colors
-active_border_color #595959
-inactive_border_color #595959
-bell_border_color #595959
-
-# OS Window titlebar colors
-wayland_titlebar_color system
-macos_titlebar_color system
-
-# Tab bar colors
-active_tab_foreground #D9D9D9
-active_tab_background #262626
-inactive_tab_foreground #D9D9D9
-inactive_tab_background #262626
-tab_bar_background #D9D9D9
-
-# Colors for marks (marked text in the terminal)
-mark1_foreground #262626
-mark1_background #404040
-mark2_foreground #262626
-mark2_background #262626
-mark3_foreground #262626
-mark3_background #A6A6A6
-
-# The 16 terminal colors
-
-# black
-color0 #404040
-color8 #404040
-
-# red
-color1 #D9D9D9
-color9 #D9D9D9
-
-# green
-color2 #D9D9D9
-color10 #D9D9D9
-
-# yellow
-color3 #595959
-color11 #595959
-
-# blue
-color4 #A6A6A6
-color12 #A6A6A6
-
-# magenta
-color5 #A6A6A6
-color13 #A6A6A6
-
-# cyan
-color6 #A6A6A6
-color14 #A6A6A6
-
-# white
-color7 #D9D9D9
-color15 #D9D9D9
diff --git a/modules/home/hyprland/conf/kitty/themes/Material-Sakura.conf b/modules/home/hyprland/conf/kitty/themes/Material-Sakura.conf
deleted file mode 100644
index 9ebde85..0000000
--- a/modules/home/hyprland/conf/kitty/themes/Material-Sakura.conf
+++ /dev/null
@@ -1,55 +0,0 @@
-## name: Rosé Pine Dawn
-## author: mvllow
-## license: MIT
-## upstream: https://github.com/rose-pine/kitty/blob/main/dist/rose-pine-dawn.conf
-## blurb: All natural pine, faux fur and a bit of soho vibes for the classy minimalist
-
-foreground #575279
-background #faf4ed
-selection_foreground #575279
-selection_background #dfdad9
-
-cursor #cecacd
-cursor_text_color #575279
-
-url_color #907aa9
-
-active_tab_foreground #575279
-active_tab_background #f2e9e1
-inactive_tab_foreground #9893a5
-inactive_tab_background #faf4ed
-
-active_border_color #286983
-inactive_border_color #dfdad9
-
-# black
-color0 #f2e9e1
-color8 #9893a5
-
-# red
-color1 #b4637a
-color9 #b4637a
-
-# green
-color2 #286983
-color10 #286983
-
-# yellow
-color3 #ea9d34
-color11 #ea9d34
-
-# blue
-color4 #56949f
-color12 #56949f
-
-# magenta
-color5 #907aa9
-color13 #907aa9
-
-# cyan
-color6 #d7827e
-color14 #d7827e
-
-# white
-color7 #575279
-color15 #575279
diff --git a/modules/home/hyprland/conf/kitty/themes/Rose-Pine.conf b/modules/home/hyprland/conf/kitty/themes/Rose-Pine.conf
deleted file mode 100644
index 575c06b..0000000
--- a/modules/home/hyprland/conf/kitty/themes/Rose-Pine.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-## name: Rosé Pine
-## author: mvllow
-## license: MIT
-## upstream: https://github.com/rose-pine/kitty/blob/main/dist/rose-pine.conf
-## blurb: All natural pine, faux fur and a bit of soho vibes for the classy minimalist
-
-foreground #e0def4
-background #191724
-selection_foreground #e0def4
-selection_background #403d52
-
-cursor #524f67
-cursor_text_color #e0def4
-
-url_color #c4a7e7
-
-active_tab_foreground #e0def4
-active_tab_background #26233a
-inactive_tab_foreground #6e6a86
-inactive_tab_background #191724
-
-active_border_color #31748f
-inactive_border_color #403d52
-
-# black
-color0 #26233a
-color8 #6e6a86
-
-# red
-color1 #eb6f92
-color9 #eb6f92
-
-# green
-color2 #31748f
-color10 #31748f
-
-# yellow
-color3 #f6c177
-color11 #f6c177
-
-# blue
-color4 #9ccfd8
-color12 #9ccfd8
-
-# magenta
-color5 #c4a7e7
-color13 #c4a7e7
-
-# cyan
-color6 #ebbcba
-color14 #ebbcba
-
-# white
-color7 #e0def4
-color15 #e0def4
-
diff --git a/modules/home/hyprland/conf/kitty/themes/Tokyo-Night.conf b/modules/home/hyprland/conf/kitty/themes/Tokyo-Night.conf
deleted file mode 100644
index 9ee37a4..0000000
--- a/modules/home/hyprland/conf/kitty/themes/Tokyo-Night.conf
+++ /dev/null
@@ -1,77 +0,0 @@
-# Tokyo Night color scheme for kitty terminal emulator
-# https://github.com/davidmathers/tokyo-night-kitty-theme
-#
-# Based on Tokyo Night color theme for Visual Studio Code
-# https://github.com/enkia/tokyo-night-vscode-theme
-
-foreground #a9b1d6
-background #24283b
-
-# Black
-color0 #414868
-color8 #414868
-
-# Red
-color1 #f7768e
-color9 #f7768e
-
-# Green
-color2 #73daca
-color10 #73daca
-
-# Yellow
-color3 #e0af68
-color11 #e0af68
-
-# Blue
-color4 #7aa2f7
-color12 #7aa2f7
-
-# Magenta
-color5 #bb9af7
-color13 #bb9af7
-
-# Cyan
-color6 #7dcfff
-color14 #7dcfff
-
-# White
-color7 #c0caf5
-color15 #c0caf5
-
-# Cursor
-cursor #c0caf5
-cursor_text_color #1a1b26
-
-# Selection highlight
-selection_foreground none
-selection_background #28344a
-
-# The color for highlighting URLs on mouse-over
-url_color #9ece6a
-
-# Window borders
-active_border_color #3d59a1
-inactive_border_color #101014
-bell_border_color #e0af68
-
-# Tab bar
-tab_bar_style fade
-tab_fade 1
-active_tab_foreground #3d59a1
-active_tab_background #16161e
-active_tab_font_style bold
-inactive_tab_foreground #787c99
-inactive_tab_background #16161e
-inactive_tab_font_style bold
-tab_bar_background #101014
-
-# Title bar
-macos_titlebar_color #16161e
-
-# Storm
-# background #24283b
-# cursor_text_color #24283b
-# active_tab_background #1f2335
-# inactive_tab_background #1f2335
-# macos_titlebar_color #1f2335
diff --git a/modules/home/hyprland/conf/rofi/clipboard.rasi b/modules/home/hyprland/conf/rofi/clipboard.rasi
deleted file mode 100644
index 92b3652..0000000
--- a/modules/home/hyprland/conf/rofi/clipboard.rasi
+++ /dev/null
@@ -1,124 +0,0 @@
-// Config //
-configuration {
- modi: "drun";
- show-icons: false;
- font: "JetBrainsMono Nerd Font 9";
-}
-
-@theme "~/.config/rofi/themes/theme.rasi"
-
-
-// Main //
-window {
- location: south east;
- anchor: south east;
- x-offset: -20px;
- y-offset: -20px;
- height: 55%;
- width: 20%;
- transparency: "real";
- fullscreen: false;
- enabled: true;
- cursor: "default";
- spacing: 0px;
- padding: 0px;
- border: 2px;
- border-radius: 15px;
- border-color: @alternate-normal-background;
- background-color: transparent;
-}
-
-mainbox {
- enabled: true;
- spacing: 0px;
- orientation: vertical;
- children: [ "inputbar" , "listbox" ];
- background-color: transparent;
- background-image: url("~/.config/swww/wall.blur", height);
-}
-
-
-// Inputs //
-inputbar {
- enabled: true;
- padding: 7px;
- children: [ "entry" ];
- background-color: @background;
-}
-entry {
- border: 3px;
- border-radius: 10px;
- border-color: @background;
- enabled: true;
- padding: 70px;
- text-color: @foreground;
- background-color: @background;
- background-image: url("~/.config/swww/wall.blur", width);
-}
-
-
-// Lists //
-listbox {
- spacing: 0px;
- padding: 10px;
- children: [ "listview" ];
- background-color: @background;
-}
-listview {
- enabled: true;
- columns: 1;
- cycle: true;
- dynamic: true;
- scrollbar: false;
- layout: vertical;
- reverse: false;
- fixed-height: false;
- fixed-columns: true;
- cursor: "default";
- background-color: transparent;
- text-color: @foreground;
-}
-
-
-// Elements //
-element {
- enabled: true;
- spacing: 0px;
- padding: 12px;
- border-radius: 10px;
- cursor: pointer;
- background-color: transparent;
- text-color: @foreground;
-}
-element normal.normal {
- background-color: transparent;
- text-color: @normal-foreground;
-}
-element normal.urgent {
- background-color: @urgent-background;
- text-color: @urgent-foreground;
-}
-element normal.active {
- background-color: @active-background;
- text-color: @active-foreground;
-}
-element selected.normal {
- background-color: @selected-normal-background;
- text-color: @selected-normal-foreground;
-}
-element selected.urgent {
- background-color: @selected-urgent-background;
- text-color: @selected-urgent-foreground;
-}
-element selected.active {
- background-color: @selected-active-background;
- text-color: @selected-active-foreground;
-}
-element-text {
- vertical-align: 0.0;
- horizontal-align: 0.0;
- cursor: inherit;
- background-color: transparent;
- text-color: inherit;
-}
-
diff --git a/modules/home/hyprland/conf/rofi/config.rasi b/modules/home/hyprland/conf/rofi/config.rasi
index b40aea4..7144378 100644
--- a/modules/home/hyprland/conf/rofi/config.rasi
+++ b/modules/home/hyprland/conf/rofi/config.rasi
@@ -1,147 +1,125 @@
-// Config //
+/* MACOS SPOTLIGHT LIKE THEME FOR ROFI */
+
+/* 基本配置项 */
configuration {
- modi: "drun,filebrowser,window,run";
- show-icons: true;
- display-drun: "";
- display-run: "";
- display-filebrowser: "";
- display-window: "";
- drun-display-format: "{name}";
- window-format: "{w}{t}";
- font: "JetBrainsMono Nerd Font 10";
- icon-theme: "Tela-circle-dracula";
+ show-icons: true;
+ icon-theme: "Papirus";
+ drun-display-format: "{icon} {name}";
+ display-drun: "";
}
-@theme "~/.config/rofi/themes/theme.rasi"
+/* 全局变量和样式设置 */
+* {
+ font: "Montserrat 12";
+ bg0: #ffffff;
+ bg1: #e0e0e0;
+ bg2: #0860f2e6;
+ bg3: rgba(0, 0, 0, 0.015);
-// Main //
+ fg0: #242424;
+ fg1: #ffffff;
+ fg2: #24242480;
+
+ background-color: @bg0;
+ text-color: @fg0;
+
+ margin: 0;
+ padding: 0;
+ spacing: 0;
+}
+
+/* 主窗口样式 */
window {
- transparency: "real";
- fullscreen: false;
- enabled: true;
- cursor: "default";
- spacing: 0px;
- padding: 0px;
- border: 2px;
- border-radius: 40px;
- border-color: @alternate-normal-background;
- background-color: transparent;
-}
-mainbox {
- enabled: true;
- spacing: 0px;
- orientation: horizontal;
- children: [ "inputbar" , "listbox" ];
- background-color: transparent;
- background-image: url("~/.config/swww/wall.blur", height);
+ background-color: @bg0;
+ location: center;
+ width: 640;
+ border-radius: 8;
+ border: 1px;
+ border-color: @bg1;
}
-
-// Inputs //
+/* 搜索输入栏样式 */
inputbar {
- enabled: true;
- width: 25%;
- children: [ "mode-switcher" , "entry" ];
- background-color: transparent;
- background-image: url("~/.config/swww/wall.set", height);
-}
-entry {
- enabled: false;
+ font: "Montserrat 20";
+ padding: 12px 12px 12px 12px;
+ spacing: 12px;
+ children: [ icon-search, entry];
}
-
-// Modes //
-mode-switcher{
- orientation: vertical;
- enabled: true;
- spacing: 0px;
- width: 2.5%;
- padding: 160px 10px 160px 10px;
- spacing: 25px;
- background-color: transparent;
- background-image: url("~/.config/swww/wall.blur", height);
-}
-button {
- cursor: pointer;
- border-radius: 50px;
- background-color: @background;
- text-color: @foreground;
-}
-button selected {
- background-color: @foreground;
- text-color: @background;
+/* 搜索图标样式 */
+icon-search {
+ expand: false;
+ filename: "search";
+ size: 28px;
}
-
-// Lists //
-listbox {
- spacing: 10px;
- padding: 30px;
- children: [ "listview" ];
- background-color: @background;
-}
-listview {
- enabled: true;
- columns: 1;
- cycle: true;
- dynamic: true;
- scrollbar: false;
- layout: vertical;
- reverse: false;
- fixed-height: true;
- fixed-columns: true;
- cursor: "default";
- background-color: transparent;
- text-color: @foreground;
-}
-
-
-// Elements //
-element {
- enabled: true;
- spacing: 30px;
- padding: 7px;
- border-radius: 20px;
- cursor: pointer;
- background-color: transparent;
- text-color: @foreground;
-}
-element normal.normal {
- background-color: transparent;
- text-color: @normal-foreground;
-}
-element normal.urgent {
- background-color: @urgent-background;
- text-color: @urgent-foreground;
-}
-element normal.active {
- background-color: @active-background;
- text-color: @active-foreground;
-}
-element selected.normal {
- background-color: @selected-normal-background;
- text-color: @selected-normal-foreground;
-}
-element selected.urgent {
- background-color: @selected-urgent-background;
- text-color: @selected-urgent-foreground;
-}
-element selected.active {
- background-color: @selected-active-background;
- text-color: @selected-active-foreground;
-}
-element-icon {
- size: 48px;
- cursor: inherit;
- background-color: transparent;
- text-color: inherit;
-}
+/* 元素垂直对齐设置 */
+icon-search,
+element-icon,
element-text {
- vertical-align: 0.5;
- horizontal-align: 0.0;
- cursor: inherit;
- background-color: transparent;
- text-color: inherit;
+ vertical-align: 0.5;
}
+/* 搜索输入框样式 */
+entry {
+ font: inherit;
+ vertical-align: 0.5;
+ text-align: center;
+ padding: 5px;
+ spacing: 10px;
+ placeholder: "Search";
+ placeholder-color: @fg2;
+}
+
+/* 消息区域样式 */
+message {
+ border: 2px 0 0;
+ border-color: @bg1;
+ background-color: @bg1;
+}
+
+/* 文本框样式 */
+textbox {
+ padding: 8px 24px;
+}
+
+/* 列表视图样式 */
+listview {
+ lines: 10;
+ columns: 1;
+ fixed-height: false;
+ border: 1px 0 0;
+ border-color: @bg1;
+}
+
+/* 列表项基本样式 */
+element {
+ padding: 8px 16px;
+ spacing: 16px;
+ border: 0;
+ border-radius: 4;
+ background-color: transparent;
+ children: [ element-icon, element-text];
+}
+
+
+element normal.normal {
+ background-color: @bg3;
+}
+
+element alternate.normal {
+ background-color: @bg3;
+}
+
+/* 选中状态的列表项样式 */
+element selected.active,
+element selected.normal {
+ text-color: @fg1;
+ background-color: @bg2;
+}
+
+/* 列表项图标样式 */
+element-icon {
+ size: 1.5em;
+}
diff --git a/modules/home/hyprland/conf/rofi/styles/style_1.png b/modules/home/hyprland/conf/rofi/styles/style_1.png
deleted file mode 100644
index 400b82b..0000000
Binary files a/modules/home/hyprland/conf/rofi/styles/style_1.png and /dev/null differ
diff --git a/modules/home/hyprland/conf/rofi/styles/style_1.rasi b/modules/home/hyprland/conf/rofi/styles/style_1.rasi
deleted file mode 100644
index b40aea4..0000000
--- a/modules/home/hyprland/conf/rofi/styles/style_1.rasi
+++ /dev/null
@@ -1,147 +0,0 @@
-// Config //
-configuration {
- modi: "drun,filebrowser,window,run";
- show-icons: true;
- display-drun: "";
- display-run: "";
- display-filebrowser: "";
- display-window: "";
- drun-display-format: "{name}";
- window-format: "{w}{t}";
- font: "JetBrainsMono Nerd Font 10";
- icon-theme: "Tela-circle-dracula";
-}
-
-@theme "~/.config/rofi/themes/theme.rasi"
-
-
-// Main //
-window {
- transparency: "real";
- fullscreen: false;
- enabled: true;
- cursor: "default";
- spacing: 0px;
- padding: 0px;
- border: 2px;
- border-radius: 40px;
- border-color: @alternate-normal-background;
- background-color: transparent;
-}
-mainbox {
- enabled: true;
- spacing: 0px;
- orientation: horizontal;
- children: [ "inputbar" , "listbox" ];
- background-color: transparent;
- background-image: url("~/.config/swww/wall.blur", height);
-}
-
-
-// Inputs //
-inputbar {
- enabled: true;
- width: 25%;
- children: [ "mode-switcher" , "entry" ];
- background-color: transparent;
- background-image: url("~/.config/swww/wall.set", height);
-}
-entry {
- enabled: false;
-}
-
-
-// Modes //
-mode-switcher{
- orientation: vertical;
- enabled: true;
- spacing: 0px;
- width: 2.5%;
- padding: 160px 10px 160px 10px;
- spacing: 25px;
- background-color: transparent;
- background-image: url("~/.config/swww/wall.blur", height);
-}
-button {
- cursor: pointer;
- border-radius: 50px;
- background-color: @background;
- text-color: @foreground;
-}
-button selected {
- background-color: @foreground;
- text-color: @background;
-}
-
-
-// Lists //
-listbox {
- spacing: 10px;
- padding: 30px;
- children: [ "listview" ];
- background-color: @background;
-}
-listview {
- enabled: true;
- columns: 1;
- cycle: true;
- dynamic: true;
- scrollbar: false;
- layout: vertical;
- reverse: false;
- fixed-height: true;
- fixed-columns: true;
- cursor: "default";
- background-color: transparent;
- text-color: @foreground;
-}
-
-
-// Elements //
-element {
- enabled: true;
- spacing: 30px;
- padding: 7px;
- border-radius: 20px;
- cursor: pointer;
- background-color: transparent;
- text-color: @foreground;
-}
-element normal.normal {
- background-color: transparent;
- text-color: @normal-foreground;
-}
-element normal.urgent {
- background-color: @urgent-background;
- text-color: @urgent-foreground;
-}
-element normal.active {
- background-color: @active-background;
- text-color: @active-foreground;
-}
-element selected.normal {
- background-color: @selected-normal-background;
- text-color: @selected-normal-foreground;
-}
-element selected.urgent {
- background-color: @selected-urgent-background;
- text-color: @selected-urgent-foreground;
-}
-element selected.active {
- background-color: @selected-active-background;
- text-color: @selected-active-foreground;
-}
-element-icon {
- size: 48px;
- cursor: inherit;
- background-color: transparent;
- text-color: inherit;
-}
-element-text {
- vertical-align: 0.5;
- horizontal-align: 0.0;
- cursor: inherit;
- background-color: transparent;
- text-color: inherit;
-}
-
diff --git a/modules/home/hyprland/conf/rofi/styles/style_2.png b/modules/home/hyprland/conf/rofi/styles/style_2.png
deleted file mode 100644
index 0686312..0000000
Binary files a/modules/home/hyprland/conf/rofi/styles/style_2.png and /dev/null differ
diff --git a/modules/home/hyprland/conf/rofi/styles/style_2.rasi b/modules/home/hyprland/conf/rofi/styles/style_2.rasi
deleted file mode 100644
index 065ea2f..0000000
--- a/modules/home/hyprland/conf/rofi/styles/style_2.rasi
+++ /dev/null
@@ -1,154 +0,0 @@
-// Config //
-configuration {
- modi: "drun,filebrowser,window,run";
- show-icons: true;
- display-drun: "";
- display-run: "";
- display-filebrowser: "";
- display-window: "";
- drun-display-format: "{name}";
- window-format: "{w}{t}";
- font: "JetBrainsMono Nerd Font 10";
- icon-theme: "Tela-circle-dracula";
-}
-
-@theme "~/.config/rofi/themes/theme.rasi"
-
-
-// Main //
-window {
- height: 600px;
- width: 900px;
- transparency: "real";
- fullscreen: false;
- enabled: true;
- cursor: "default";
- spacing: 0px;
- padding: 0px;
- border: 2px;
- border-radius: 40px;
- border-color: @alternate-normal-background;
- background-color: transparent;
-}
-mainbox {
- enabled: true;
- spacing: 0px;
- padding: 0px;
- orientation: vertical;
- children: [ "inputbar" , "listbox" ];
- background-color: transparent;
- background-image: url("~/.config/swww/wall.blur", height);
-}
-
-
-// Inputs //
-inputbar {
- enabled: true;
- spacing: 0px;
- padding: 80px;
- children: [ "entry" ];
- background-color: @background;
- background-image: url("~/.config/swww/wall.set", width);
-}
-entry {
- border-radius: 30px;
- enabled: true;
- spacing: 0px;
- padding: 20px;
- text-color: @foreground;
- background-color: @background;
-}
-
-
-// Lists //
-listbox {
- padding: 30px;
- spacing: 0px;
- orientation: horizontal;
- children: [ "listview" , "mode-switcher" ];
- background-color: @background;
-}
-listview {
- padding: 10px;
- spacing: 10px;
- enabled: true;
- columns: 2;
- cycle: true;
- dynamic: true;
- scrollbar: false;
- layout: vertical;
- reverse: false;
- fixed-height: true;
- fixed-columns: true;
- cursor: "default";
- background-color: transparent;
- text-color: @foreground;
-}
-mode-switcher {
- orientation: vertical;
- width: 95px;
- enabled: true;
- padding: 15px;
- spacing: 10px;
- background-color: transparent;
-}
-button {
- cursor: pointer;
- border-radius: 50px;
- background-color: @background;
- text-color: @foreground;
-}
-button selected {
- background-color: @foreground;
- text-color: @background;
-}
-
-
-// Elements //
-element {
- enabled: true;
- spacing: 20px;
- padding: 9px;
- border-radius: 25px;
- cursor: pointer;
- background-color: transparent;
- text-color: @foreground;
-}
-element normal.normal {
- background-color: transparent;
- text-color: @normal-foreground;
-}
-element normal.urgent {
- background-color: @urgent-background;
- text-color: @urgent-foreground;
-}
-element normal.active {
- background-color: @active-background;
- text-color: @active-foreground;
-}
-element selected.normal {
- background-color: @selected-normal-background;
- text-color: @selected-normal-foreground;
-}
-element selected.urgent {
- background-color: @selected-urgent-background;
- text-color: @selected-urgent-foreground;
-}
-element selected.active {
- background-color: @selected-active-background;
- text-color: @selected-active-foreground;
-}
-element-icon {
- size: 47px;
- cursor: inherit;
- background-color: transparent;
- text-color: inherit;
-}
-element-text {
- vertical-align: 0.5;
- horizontal-align: 0.0;
- cursor: inherit;
- background-color: transparent;
- text-color: inherit;
-}
-
diff --git a/modules/home/hyprland/conf/rofi/styles/style_3.png b/modules/home/hyprland/conf/rofi/styles/style_3.png
deleted file mode 100644
index 61fedd6..0000000
Binary files a/modules/home/hyprland/conf/rofi/styles/style_3.png and /dev/null differ
diff --git a/modules/home/hyprland/conf/rofi/styles/style_3.rasi b/modules/home/hyprland/conf/rofi/styles/style_3.rasi
deleted file mode 100644
index 752425d..0000000
--- a/modules/home/hyprland/conf/rofi/styles/style_3.rasi
+++ /dev/null
@@ -1,141 +0,0 @@
-// Config //
-configuration {
- modi: "drun,filebrowser,window,run";
- show-icons: true;
- display-drun: "";
- display-run: "";
- display-filebrowser: "";
- display-window: "";
- drun-display-format: "{name}";
- window-format: "{w}{t}";
- font: "JetBrainsMono Nerd Font 10";
- icon-theme: "Tela-circle-dracula";
-}
-
-@theme "~/.config/rofi/themes/theme.rasi"
-
-
-// Main //
-window {
- height: 500px;
- width: 600px;
- transparency: "real";
- fullscreen: false;
- enabled: true;
- cursor: "default";
- spacing: 0px;
- padding: 0px;
- border: 2px;
- border-radius: 25px;
- border-color: @alternate-normal-background;
- background-color: transparent;
-}
-mainbox {
- enabled: true;
- spacing: 0px;
- padding: 0px;
- orientation: vertical;
- children: [ "listbox" , "inputbar"];
- background-color: transparent;
-}
-
-
-// Inputs //
-inputbar {
- enabled: false;
-}
-
-
-// Lists //
-listbox {
- padding: 5px;
- spacing: 5px;
- orientation: horizontal;
- children: [ "mode-switcher" , "listview" ];
- background-image: url("~/.config/swww/wall.blur", height);
-}
-listview {
- padding: 20px;
- spacing: 5px;
- enabled: true;
- columns: 1;
- cycle: true;
- dynamic: true;
- scrollbar: false;
- layout: vertical;
- reverse: false;
- fixed-height: true;
- fixed-columns: true;
- cursor: "default";
- background-color: @background;
- text-color: @foreground;
- border-radius: 25px;
-}
-mode-switcher {
- orientation: vertical;
- width: 100px;
- enabled: true;
- padding: 60px 10px 60px 10px;
- spacing: 15px;
- background-color: transparent;
-}
-button {
- cursor: pointer;
- border-radius: 50px;
- background-color: @background;
- text-color: @foreground;
-}
-button selected {
- background-color: @foreground;
- text-color: @background;
-}
-
-
-// Elements //
-element {
- enabled: true;
- spacing: 30px;
- padding: 10px;
- border-radius: 20px;
- cursor: pointer;
- background-color: transparent;
- text-color: @foreground;
-}
-element normal.normal {
- background-color: transparent;
- text-color: @normal-foreground;
-}
-element normal.urgent {
- background-color: @urgent-background;
- text-color: @urgent-foreground;
-}
-element normal.active {
- background-color: @active-background;
- text-color: @active-foreground;
-}
-element selected.normal {
- background-color: @selected-normal-background;
- text-color: @selected-normal-foreground;
-}
-element selected.urgent {
- background-color: @selected-urgent-background;
- text-color: @selected-urgent-foreground;
-}
-element selected.active {
- background-color: @selected-active-background;
- text-color: @selected-active-foreground;
-}
-element-icon {
- size: 50px;
- cursor: inherit;
- background-color: transparent;
- text-color: inherit;
-}
-element-text {
- vertical-align: 0.5;
- horizontal-align: 0.0;
- cursor: inherit;
- background-color: transparent;
- text-color: inherit;
-}
-
diff --git a/modules/home/hyprland/conf/rofi/styles/style_4.png b/modules/home/hyprland/conf/rofi/styles/style_4.png
deleted file mode 100644
index 25d2a45..0000000
Binary files a/modules/home/hyprland/conf/rofi/styles/style_4.png and /dev/null differ
diff --git a/modules/home/hyprland/conf/rofi/styles/style_4.rasi b/modules/home/hyprland/conf/rofi/styles/style_4.rasi
deleted file mode 100644
index 09b6dfd..0000000
--- a/modules/home/hyprland/conf/rofi/styles/style_4.rasi
+++ /dev/null
@@ -1,149 +0,0 @@
-// Config //
-configuration {
- modi: "drun,filebrowser,window,run";
- show-icons: true;
- display-drun: "";
- display-run: "";
- display-filebrowser: "";
- display-window: "";
- drun-display-format: "{name}";
- window-format: "{w}{t}";
- font: "JetBrainsMono Nerd Font 10";
- icon-theme: "Tela-circle-dracula";
-}
-
-@theme "~/.config/rofi/themes/theme.rasi"
-
-
-// Main //
-window {
- height: 500px;
- width: 750px;
- transparency: "real";
- fullscreen: false;
- enabled: true;
- cursor: "default";
- spacing: 0px;
- padding: 0px;
- border: 2px;
- border-radius: 40px;
- border-color: @alternate-normal-background;
- background-color: transparent;
-}
-mainbox {
- enabled: true;
- spacing: 0px;
- orientation: horizontal;
- children: [ "inputbar" , "mode-switcher" , "listbox" ];
- background-color: transparent;
- background-image: url("~/.config/swww/wall.blur", height);
-}
-
-
-// Inputs //
-inputbar {
- enabled: true;
- width: 180px;
- children: [ "entry" ];
- background-image: url("~/.config/swww/wall.set", height);
-}
-entry {
- enabled: false;
-}
-
-
-// Modes //
-mode-switcher{
- orientation: vertical;
- enabled: true;
- spacing: 0px;
- width: 100px;
- padding: 70px 10px 70px 20px;
- spacing: 25px;
- background-color: transparent;
-}
-button {
- cursor: pointer;
- border-radius: 50px;
- background-color: @background;
- text-color: @foreground;
-}
-button selected {
- background-color: @foreground;
- text-color: @background;
-}
-
-
-// Lists //
-listbox {
- spacing: 5px;
- padding: 10px;
- children: [ "listview" ];
- background-color: transparent;
-}
-listview {
- padding: 20px;
- enabled: true;
- columns: 1;
- cycle: true;
- dynamic: true;
- scrollbar: false;
- layout: vertical;
- reverse: false;
- fixed-height: true;
- fixed-columns: true;
- cursor: "default";
- background-color: @background;
- text-color: @foreground;
- border-radius: 30px;
-}
-
-
-// Elements //
-element {
- enabled: true;
- spacing: 30px;
- padding: 6px;
- border-radius: 20px;
- cursor: pointer;
- background-color: transparent;
- text-color: @foreground;
-}
-element normal.normal {
- background-color: transparent;
- text-color: @normal-foreground;
-}
-element normal.urgent {
- background-color: @urgent-background;
- text-color: @urgent-foreground;
-}
-element normal.active {
- background-color: @active-background;
- text-color: @active-foreground;
-}
-element selected.normal {
- background-color: @selected-normal-background;
- text-color: @selected-normal-foreground;
-}
-element selected.urgent {
- background-color: @selected-urgent-background;
- text-color: @selected-urgent-foreground;
-}
-element selected.active {
- background-color: @selected-active-background;
- text-color: @selected-active-foreground;
-}
-element-icon {
- size: 48px;
- cursor: inherit;
- background-color: transparent;
- text-color: inherit;
-}
-element-text {
- vertical-align: 0.5;
- horizontal-align: 0.0;
- cursor: inherit;
- background-color: transparent;
- text-color: inherit;
-}
-
diff --git a/modules/home/hyprland/conf/rofi/styles/style_5.png b/modules/home/hyprland/conf/rofi/styles/style_5.png
deleted file mode 100644
index 77fd487..0000000
Binary files a/modules/home/hyprland/conf/rofi/styles/style_5.png and /dev/null differ
diff --git a/modules/home/hyprland/conf/rofi/styles/style_5.rasi b/modules/home/hyprland/conf/rofi/styles/style_5.rasi
deleted file mode 100644
index 1d7f05f..0000000
--- a/modules/home/hyprland/conf/rofi/styles/style_5.rasi
+++ /dev/null
@@ -1,149 +0,0 @@
-// Config //
-configuration {
- modi: "drun,filebrowser,window,run";
- show-icons: true;
- display-drun: "";
- display-run: "";
- display-filebrowser: "";
- display-window: "";
- drun-display-format: "{name}";
- window-format: "{w}{t}";
- font: "JetBrainsMono Nerd Font 10";
- icon-theme: "Tela-circle-dracula";
-}
-
-@theme "~/.config/rofi/themes/theme.rasi"
-
-
-// Main //
-window {
- height: 500px;
- width: 800px;
- transparency: "real";
- fullscreen: false;
- enabled: true;
- cursor: "default";
- spacing: 0px;
- padding: 0px;
- border: 2px;
- border-radius: 40px;
- border-color: @alternate-normal-background;
- background-color: transparent;
-}
-mainbox {
- enabled: true;
- spacing: 0px;
- padding: 0px;
- orientation: vertical;
- children: [ "inputbar" , "listbox" , "mode-switcher" ];
- background-color: transparent;
- background-image: url("~/.config/swww/wall.blur", height);
-}
-
-
-// Inputs //
-inputbar {
- enabled: true;
- children: [ "entry" ];
-}
-entry {
- enabled: false;
-}
-
-
-// Lists //
-listbox {
- padding: 0px;
- spacing: 0px;
- orientation: horizontal;
- children: [ "listview" ];
- background-color: transparent;
-}
-listview {
- padding: 30px;
- spacing: 10px;
- enabled: true;
- columns: 5;
- cycle: true;
- dynamic: true;
- scrollbar: false;
- layout: vertical;
- reverse: false;
- fixed-height: true;
- fixed-columns: true;
- cursor: "default";
- background-color: @background;
- text-color: @foreground;
-}
-
-
-// Modes //
-mode-switcher {
- orientation: horizontal;
- enabled: true;
- padding: 30px 160px 30px 160px;
- spacing: 50px;
- background-color: transparent;
-}
-button {
- cursor: pointer;
- padding: 30px;
- border-radius: 50px;
- background-color: @background;
- text-color: @foreground;
-}
-button selected {
- background-color: @foreground;
- text-color: @background;
-}
-
-
-// Elements //
-element {
- orientation: vertical;
- enabled: true;
- spacing: 10px;
- padding: 10px;
- border-radius: 25px;
- cursor: pointer;
- background-color: transparent;
- text-color: @foreground;
-}
-element normal.normal {
- background-color: transparent;
- text-color: @normal-foreground;
-}
-element normal.urgent {
- background-color: @urgent-background;
- text-color: @urgent-foreground;
-}
-element normal.active {
- background-color: @active-background;
- text-color: @active-foreground;
-}
-element selected.normal {
- background-color: @selected-normal-background;
- text-color: @selected-normal-foreground;
-}
-element selected.urgent {
- background-color: @selected-urgent-background;
- text-color: @selected-urgent-foreground;
-}
-element selected.active {
- background-color: @selected-active-background;
- text-color: @selected-active-foreground;
-}
-element-icon {
- size: 90px;
- cursor: inherit;
- background-color: transparent;
- text-color: inherit;
-}
-element-text {
- vertical-align: 0.5;
- horizontal-align: 0.5;
- cursor: inherit;
- background-color: transparent;
- text-color: inherit;
-}
-
diff --git a/modules/home/hyprland/conf/rofi/styles/style_6.png b/modules/home/hyprland/conf/rofi/styles/style_6.png
deleted file mode 100644
index a120367..0000000
Binary files a/modules/home/hyprland/conf/rofi/styles/style_6.png and /dev/null differ
diff --git a/modules/home/hyprland/conf/rofi/styles/style_6.rasi b/modules/home/hyprland/conf/rofi/styles/style_6.rasi
deleted file mode 100644
index 600903c..0000000
--- a/modules/home/hyprland/conf/rofi/styles/style_6.rasi
+++ /dev/null
@@ -1,150 +0,0 @@
-// Config //
-configuration {
- modi: "drun,filebrowser,window,run";
- show-icons: true;
- display-drun: "";
- display-run: "";
- display-filebrowser: "";
- display-window: "";
- drun-display-format: "{name}";
- window-format: "{w}{t}";
- font: "JetBrainsMono Nerd Font 10";
- icon-theme: "Tela-circle-dracula";
-}
-
-@theme "~/.config/rofi/themes/theme.rasi"
-
-
-// Main //
-window {
- height: 500px;
- width: 600px;
- transparency: "real";
- fullscreen: false;
- enabled: true;
- cursor: "default";
- spacing: 0px;
- padding: 0px;
- border: 2px;
- border-radius: 40px;
- border-color: @alternate-normal-background;
- background-color: transparent;
-}
-mainbox {
- enabled: true;
- spacing: 0px;
- padding: 0px;
- orientation: horizontal;
- children: [ "inputbar" , "mode-switcher" , "listbox" ];
- background-color: @background;
-}
-
-
-// Inputs //
-inputbar {
- width: 0px;
- enabled: true;
- children: [ "entry" ];
-}
-entry {
- enabled: false;
-}
-
-
-// Modes //
-mode-switcher {
- width: 150px;
- orientation: vertical;
- enabled: true;
- padding: 80px 40px 80px 40px;
- spacing: 20px;
- background-color: @background;
-}
-button {
- cursor: pointer;
- background-color: transparent;
- text-color: @foreground;
-}
-button selected {
- padding: 5px;
- border-radius: 50px;
- background-color: @foreground;
- text-color: @background;
-}
-
-
-// Lists //
-listbox {
- padding: 0px;
- spacing: 0px;
- orientation: horizontal;
- children: [ "listview" ];
- background-color: transparent;
-}
-listview {
- padding: 30px;
- spacing: 0px;
- enabled: true;
- columns: 1;
- cycle: true;
- dynamic: true;
- scrollbar: false;
- layout: vertical;
- reverse: false;
- fixed-height: true;
- fixed-columns: true;
- cursor: "default";
- background-color: transparent;
- text-color: @foreground;
-}
-
-
-// Elements //
-element {
- orientation: horizontal;
- enabled: true;
- spacing: 20px;
- padding: 10px;
- border-radius: 20px;
- cursor: pointer;
- background-color: transparent;
- text-color: @foreground;
-}
-element normal.normal {
- background-color: transparent;
- text-color: @normal-foreground;
-}
-element normal.urgent {
- background-color: @urgent-background;
- text-color: @urgent-foreground;
-}
-element normal.active {
- background-color: @active-background;
- text-color: @active-foreground;
-}
-element selected.normal {
- background-color: @selected-normal-background;
- text-color: @selected-normal-foreground;
-}
-element selected.urgent {
- background-color: @selected-urgent-background;
- text-color: @selected-urgent-foreground;
-}
-element selected.active {
- background-color: @selected-active-background;
- text-color: @selected-active-foreground;
-}
-element-icon {
- size: 50px;
- cursor: inherit;
- background-color: transparent;
- text-color: inherit;
-}
-element-text {
- vertical-align: 0.5;
- horizontal-align: 0;
- cursor: inherit;
- background-color: transparent;
- text-color: inherit;
-}
-
diff --git a/modules/home/hyprland/conf/rofi/themes/Catppuccin-Latte.rasi b/modules/home/hyprland/conf/rofi/themes/Catppuccin-Latte.rasi
deleted file mode 100644
index 8dc8996..0000000
--- a/modules/home/hyprland/conf/rofi/themes/Catppuccin-Latte.rasi
+++ /dev/null
@@ -1,37 +0,0 @@
-// Global //
-* {
- foreground: #4c4f69ff; //Text
- normal-foreground: @foreground;
- urgent-foreground: #11111bff; //Crust
- active-foreground: #11111bff; //Crust
-
- alternate-normal-foreground: @normal-foreground;
- alternate-urgent-foreground: @urgent-foreground;
- alternate-active-foreground: @active-foreground;
-
- selected-normal-foreground: #11111bff; //Crust
- selected-urgent-foreground: #11111bff; //Crust
- selected-active-foreground: #11111bff; //Crust
-
- background: #dce0e8e6;
- normal-background: @background;
- urgent-background: #eba0accc; //Maroon
- active-background: #94e2d5cc; //Teal
-
- alternate-normal-background: #f5c2e7ff;
- alternate-urgent-background: @urgent-background;
- alternate-active-background: @active-background;
-
- selected-normal-background: #b4befeff; //Lavender
- selected-urgent-background: #94e2d5cc; //Teal
- selected-active-background: #eba0accc; //Maroon
-
- separatorcolor: transparent;
- border-color: transparent;
- border-radius: 0px;
- border: 0px;
- spacing: 0px;
- padding: 0px;
- height: 55%;
- width: 45%;
-}
diff --git a/modules/home/hyprland/conf/rofi/themes/Catppuccin-Mocha.rasi b/modules/home/hyprland/conf/rofi/themes/Catppuccin-Mocha.rasi
deleted file mode 100644
index b4e426b..0000000
--- a/modules/home/hyprland/conf/rofi/themes/Catppuccin-Mocha.rasi
+++ /dev/null
@@ -1,37 +0,0 @@
-// Global //
-* {
- foreground: #cdd6f4ff; //Text
- normal-foreground: @foreground;
- urgent-foreground: #11111bff; //Crust
- active-foreground: #11111bff; //Crust
-
- alternate-normal-foreground: @normal-foreground;
- alternate-urgent-foreground: @urgent-foreground;
- alternate-active-foreground: @active-foreground;
-
- selected-normal-foreground: #11111bff; //Crust
- selected-urgent-foreground: #11111bff; //Crust
- selected-active-foreground: #11111bff; //Crust
-
- background: #11111be6;
- normal-background: @background;
- urgent-background: #eba0accc; //Maroon
- active-background: #94e2d5cc; //Teal
-
- alternate-normal-background: #f5c2e7ff;
- alternate-urgent-background: @urgent-background;
- alternate-active-background: @active-background;
-
- selected-normal-background: #b4befeff; //Lavender
- selected-urgent-background: #94e2d5cc; //Teal
- selected-active-background: #eba0accc; //Maroon
-
- separatorcolor: transparent;
- border-color: transparent;
- border-radius: 0px;
- border: 0px;
- spacing: 0px;
- padding: 0px;
- height: 55%;
- width: 45%;
-}
diff --git a/modules/home/hyprland/conf/rofi/themes/Cyberpunk-Edge.rasi b/modules/home/hyprland/conf/rofi/themes/Cyberpunk-Edge.rasi
deleted file mode 100644
index 28ab232..0000000
--- a/modules/home/hyprland/conf/rofi/themes/Cyberpunk-Edge.rasi
+++ /dev/null
@@ -1,37 +0,0 @@
-// Global //
-* {
- foreground: #ffffffff; //Text
- normal-foreground: @foreground;
- urgent-foreground: #000000ff; //Crust
- active-foreground: #000000ff; //Crust
-
- alternate-normal-foreground: @normal-foreground;
- alternate-urgent-foreground: @urgent-foreground;
- alternate-active-foreground: @active-foreground;
-
- selected-normal-foreground: #000000ff; //Crust
- selected-urgent-foreground: #000000ff; //Crust
- selected-active-foreground: #000000ff; //Crust
-
- background: #000000e6;
- normal-background: @background;
- urgent-background: #5032ACcc; //Maroon
- active-background: #1F5322cc; //Teal
-
- alternate-normal-background: #FFA6C2ff;
- alternate-urgent-background: @urgent-background;
- alternate-active-background: @active-background;
-
- selected-normal-background: #FADA16ff; //Lavender
- selected-urgent-background: #1F5322cc; //Teal
- selected-active-background: #5032ACcc; //Maroon
-
- separatorcolor: transparent;
- border-color: transparent;
- border-radius: 0px;
- border: 0px;
- spacing: 0px;
- padding: 0px;
- height: 55%;
- width: 45%;
-}
diff --git a/modules/home/hyprland/conf/rofi/themes/Decay-Green.rasi b/modules/home/hyprland/conf/rofi/themes/Decay-Green.rasi
deleted file mode 100644
index a5ddf6f..0000000
--- a/modules/home/hyprland/conf/rofi/themes/Decay-Green.rasi
+++ /dev/null
@@ -1,37 +0,0 @@
-// Global //
-* {
- foreground: #cbced3ff; //White
- normal-foreground: @foreground;
- urgent-foreground: #151720ff; //Black
- active-foreground: #151720ff; //Black
-
- alternate-normal-foreground: @normal-foreground;
- alternate-urgent-foreground: @urgent-foreground;
- alternate-active-foreground: @active-foreground;
-
- selected-normal-foreground: #151720ff; //Black
- selected-urgent-foreground: #151720ff; //Black
- selected-active-foreground: #151720ff; //Black
-
- background: #151720e6; //Black
- normal-background: @background;
- urgent-background: #95d3afcc; //BrightGreen
- active-background: #c79bf0cc; //BrightMagenta
-
- alternate-normal-background: #90ceaaff; //Green
- alternate-urgent-background: @urgent-background;
- alternate-active-background: @active-background;
-
- selected-normal-background: #95d3afff; //BrightGreen
- selected-urgent-background: #c79bf0cc; //BrightMagenta
- selected-active-background: #98d3eecc; //BrightCyan
-
- separatorcolor: transparent;
- border-color: transparent;
- border-radius: 0px;
- border: 0px;
- spacing: 0px;
- padding: 0px;
- height: 55%;
- width: 45%;
-}
diff --git a/modules/home/hyprland/conf/rofi/themes/Graphite-Mono.rasi b/modules/home/hyprland/conf/rofi/themes/Graphite-Mono.rasi
deleted file mode 100644
index 7f7a934..0000000
--- a/modules/home/hyprland/conf/rofi/themes/Graphite-Mono.rasi
+++ /dev/null
@@ -1,37 +0,0 @@
-// Global //
-* {
- foreground: #d9d9d9ff; //Text
- normal-foreground: @foreground;
- urgent-foreground: #262626ff; //Crust
- active-foreground: #262626ff; //Crust
-
- alternate-normal-foreground: @normal-foreground;
- alternate-urgent-foreground: @urgent-foreground;
- alternate-active-foreground: @active-foreground;
-
- selected-normal-foreground: #262626ff; //Crust
- selected-urgent-foreground: #262626ff; //Crust
- selected-active-foreground: #262626ff; //Crust
-
- background: #262626e6;
- normal-background: @background;
- urgent-background: #a6a6a6cc; //Maroon
- active-background: #595959cc; //Teal
-
- alternate-normal-background: #d9d9d9ff;
- alternate-urgent-background: @urgent-background;
- alternate-active-background: @active-background;
-
- selected-normal-background: #d9d9d9ff; //Lavender
- selected-urgent-background: #595959cc; //Teal
- selected-active-background: #a6a6a6cc; //Maroon
-
- separatorcolor: transparent;
- border-color: transparent;
- border-radius: 0px;
- border: 0px;
- spacing: 0px;
- padding: 0px;
- height: 55%;
- width: 45%;
-}
diff --git a/modules/home/hyprland/conf/rofi/themes/Material-Sakura.rasi b/modules/home/hyprland/conf/rofi/themes/Material-Sakura.rasi
deleted file mode 100644
index d0ba56b..0000000
--- a/modules/home/hyprland/conf/rofi/themes/Material-Sakura.rasi
+++ /dev/null
@@ -1,29 +0,0 @@
-// Global //
-* {
- foreground: #b4637aff; // main text
- normal-foreground: @foreground;
-
- selected-normal-foreground: #fffaf3ff; // selected text
- selected-normal-background: #d7827eff; // selected bg
-
- selected-active-foreground: #f4ede8ff; // selected text overlap
- selected-active-background: #907aa9cc; // selected overlap bg
-
- active-foreground: #f4ede8cc; // aselected text alt
- active-background: #56949fcc; // selected alt bg
-
- background: #faf4ede6; // main background tint
- normal-background: @background;
- urgent-background: #ea9d34cc; // button text
-
- alternate-normal-background: #9893a5ff; // border color
-
- separatorcolor: transparent;
- border-color: transparent;
- border-radius: 0px;
- border: 0px;
- spacing: 0px;
- padding: 0px;
- height: 55%;
- width: 45%;
-}
diff --git a/modules/home/hyprland/conf/rofi/themes/Rose-Pine.rasi b/modules/home/hyprland/conf/rofi/themes/Rose-Pine.rasi
deleted file mode 100644
index 9d734f5..0000000
--- a/modules/home/hyprland/conf/rofi/themes/Rose-Pine.rasi
+++ /dev/null
@@ -1,29 +0,0 @@
-// Global //
-* {
- foreground: #e0def4ff; // main text
- normal-foreground: @foreground;
-
- selected-normal-foreground: #191724ff; // selected text
- selected-normal-background: #c4a7e7ff; // selected bg
-
- selected-active-foreground: #f6c177ff; // selected text overlap
- selected-active-background: #eb6f92cc; // selected overlap bg
-
- active-foreground: #9ccfd8cc; // aselected text alt
- active-background: #31748fcc; // selected alt bg
-
- background: #26233ae6; // main background tint
- normal-background: @background;
- urgent-background: #c4a7e7cc; // button text
-
- alternate-normal-background: #31748fff; // border color
-
- separatorcolor: transparent;
- border-color: transparent;
- border-radius: 0px;
- border: 0px;
- spacing: 0px;
- padding: 0px;
- height: 55%;
- width: 45%;
-}
diff --git a/modules/home/hyprland/conf/rofi/themes/Tokyo-Night.rasi b/modules/home/hyprland/conf/rofi/themes/Tokyo-Night.rasi
deleted file mode 100644
index 69d026f..0000000
--- a/modules/home/hyprland/conf/rofi/themes/Tokyo-Night.rasi
+++ /dev/null
@@ -1,29 +0,0 @@
-// Global //
-* {
- foreground: #c0caf5ff; // main text
- normal-foreground: @foreground;
-
- selected-normal-foreground: #414868ff; // selected text
- selected-normal-background: #7aa2f7ff; // selected bg
-
- selected-active-foreground: #565f89ff; // selected text overlap
- selected-active-background: #bb9af7cc; // selected overlap bg
-
- active-foreground: #b4f9f8cc; // aselected text alt
- active-background: #73dacacc; // selected alt bg
-
- background: #24283be6; // main background tint
- normal-background: @background;
- urgent-background: #7dcfffcc; // button text
-
- alternate-normal-background: #bb9af7ff; // border color
-
- separatorcolor: transparent;
- border-color: transparent;
- border-radius: 0px;
- border: 0px;
- spacing: 0px;
- padding: 0px;
- height: 55%;
- width: 45%;
-}
diff --git a/modules/home/hyprland/conf/rofi/themeselect.rasi b/modules/home/hyprland/conf/rofi/themeselect.rasi
deleted file mode 100644
index b651c6f..0000000
--- a/modules/home/hyprland/conf/rofi/themeselect.rasi
+++ /dev/null
@@ -1,101 +0,0 @@
-// Config //
-configuration {
- modi: "drun";
- show-icons: true;
- drun-display-format: "{name}";
- font: "JetBrainsMono Nerd Font 10";
-}
-
-@theme "~/.config/rofi/themes/theme.rasi"
-
-
-// Main //
-window {
- enabled: true;
- fullscreen: false;
- width: 100%;
- transparency: "real";
- cursor: "default";
- spacing: 0px;
- padding: 0px;
- border: 0px;
- border-radius: 0px;
- border-color: transparent;
- background-color: transparent;
-}
-mainbox {
- enabled: true;
- children: [ "listview" ];
- background-color: @background;
-}
-
-
-// Lists //
-listview {
- enabled: true;
- columns: 3;
- lines: 1;
- spacing: 50px;
- padding: 50px;
- cycle: true;
- dynamic: false;
- scrollbar: false;
- layout: vertical;
- reverse: true;
- fixed-height: true;
- fixed-columns: true;
- cursor: "default";
- background-color: transparent;
- text-color: @foreground;
-}
-
-
-// Elements //
-element {
- enabled: true;
- orientation: horizontal;
- spacing: 0px;
- padding: 10px;
- border-radius: 40px;
- cursor: pointer;
- background-color: transparent;
- text-color: @foreground;
-}
-element normal.normal {
- background-color: transparent;
- text-color: @normal-foreground;
-}
-element normal.urgent {
- background-color: @urgent-background;
- text-color: @urgent-foreground;
-}
-element normal.active {
- background-color: @active-background;
- text-color: @active-foreground;
-}
-element selected.normal {
- background-color: @selected-normal-background;
- text-color: @selected-normal-foreground;
-}
-element selected.urgent {
- background-color: @selected-urgent-background;
- text-color: @selected-urgent-foreground;
-}
-element selected.active {
- background-color: @selected-active-background;
- text-color: @selected-active-foreground;
-}
-element-icon {
- size: 450px;
- cursor: inherit;
- border-radius: 35px;
- background-color: transparent;
- text-color: inherit;
-}
-element-text {
- vertical-align: 0.5;
- horizontal-align: 0.5;
- cursor: inherit;
- background-color: transparent;
- text-color: inherit;
-}
diff --git a/modules/home/hyprland/conf/waybar/config.ctl b/modules/home/hyprland/conf/waybar/config.ctl
deleted file mode 100644
index 0b0669a..0000000
--- a/modules/home/hyprland/conf/waybar/config.ctl
+++ /dev/null
@@ -1,6 +0,0 @@
-0|28|bottom|( cpu memory ) ( clock )|( wlr/workspaces hyprland/window )|( network bluetooth pulseaudio pulseaudio#microphone custom/updates ) ( tray ) ( custom/wallchange custom/mode custom/wbar custom/cliphist custom/power )
-0||top|( wlr/workspaces hyprland/window )|( clock )|( cpu memory ) ( network bluetooth pulseaudio pulseaudio#microphone custom/updates ) ( tray ) ( custom/wallchange custom/mode custom/wbar custom/cliphist custom/power )
-1|31|top|( custom/power custom/cliphist custom/wbar custom/mode custom/wallchange ) ( wlr/taskbar ) ( wlr/workspaces hyprland/window )|( clock )|( tray ) ( cpu memory ) ( network bluetooth pulseaudio pulseaudio#microphone )
-0|32|top||( custom/power ) ( tray ) ( wlr/taskbar clock ) ( custom/wbar ) ( custom/wallchange ) ( custom/mode )|
-0|31|bottom|( cpu memory ) ( clock ) ( wlr/workspaces )|( wlr/taskbar )|( network bluetooth pulseaudio pulseaudio#microphone custom/updates ) ( tray ) ( custom/wallchange custom/mode custom/wbar custom/cliphist custom/power )
-0|29|top|( wlr/taskbar mpris )|( clock )|( network bluetooth pulseaudio pulseaudio#microphone custom/updates ) ( tray ) ( custom/wallchange custom/mode custom/wbar custom/cliphist custom/power )
diff --git a/modules/home/hyprland/conf/waybar/config.jsonc b/modules/home/hyprland/conf/waybar/config.jsonc
index 13eba81..92625a5 100644
--- a/modules/home/hyprland/conf/waybar/config.jsonc
+++ b/modules/home/hyprland/conf/waybar/config.jsonc
@@ -1,245 +1,244 @@
// --// waybar config generated by wbarconfgen.sh //-- //
{
-// sourced from header module //
+ // sourced from header module //
- "layer": "top",
- "position": "top",
- "mod": "dock",
- "height": 31,
- "exclusive": true,
- "passthrough": false,
- "gtk-layer-shell": true,
+ "layer": "top",
+ "position": "top",
+ "mod": "dock",
+ "height": 31,
+ "exclusive": true,
+ "passthrough": false,
+ "gtk-layer-shell": true,
+
+ // positions generated based on config.ctl //
+
+ "modules-left": [
+ "custom/padd",
+ "custom/l_end",
+ "custom/power",
+ "custom/cliphist",
+ "custom/wbar",
+ "custom/mode",
+ "custom/r_end",
+ "custom/l_end",
+ "wlr/taskbar",
+ "custom/r_end",
+ "custom/l_end",
+ "wlr/workspaces",
+ "hyprland/window",
+ "custom/r_end",
+ "custom/padd"
+ ],
+ "modules-center": [
+ "custom/padd",
+ "custom/l_end",
+ "clock",
+ "custom/r_end",
+ "custom/padd"
+ ],
+ "modules-right": [
+ "custom/padd",
+ "custom/l_end",
+ "tray",
+ "custom/r_end",
+ "custom/l_end",
+ "cpu",
+ "memory",
+ "custom/r_end",
+ "custom/l_end",
+ "network",
+ "bluetooth",
+ "pulseaudio",
+ "pulseaudio#microphone",
+ "custom/r_end",
+ "custom/padd"
+ ],
+
+ // sourced from modules based on config.ctl //
+
+ "custom/power": {
+ "format": "{}",
+ "exec": "echo ; echo logout",
+ "on-click": "~/.config/hypr/scripts/logoutlaunch.sh 2",
+ "interval": 86400, // once every day
+ "tooltip": true
+ },
+
+ "custom/cliphist": {
+ "format": "{}",
+ "exec": "echo ; echo clipboard history",
+ "on-click": "sleep 0.1 && ~/.config/hypr/scripts/cliphist.sh c 1",
+ //"on-click-right": "sleep 0.1 && ~/.config/hypr/scripts/cliphist.sh d",
+ "on-click-middle": "sleep 0.1 && ~/.config/hypr/scripts/cliphist.sh w 1",
+ "interval": 86400, // once every day
+ "tooltip": true
+ },
+
+ "custom/mode": {
+ "format": "{}",
+ "exec": "echo ; echo switch mode",
+ "on-click": "~/.config/hypr/scripts/themeswitch.sh -n",
+ "on-click-right": "~/.config/hypr/scripts/themeswitch.sh -p",
+ "on-click-middle": "sleep 0.1 && ~/.config/hypr/scripts/themeselect.sh",
+ "interval": 86400, // once every day
+ "tooltip": true
+ },
-// positions generated based on config.ctl //
-
- "modules-left": ["custom/padd","custom/l_end","custom/power","custom/cliphist","custom/wbar","custom/mode","custom/wallchange","custom/r_end","custom/l_end","wlr/taskbar","custom/r_end","custom/l_end","wlr/workspaces","hyprland/window","custom/r_end","custom/padd"],
- "modules-center": ["custom/padd","custom/l_end","clock","custom/r_end","custom/padd"],
- "modules-right": ["custom/padd","custom/l_end","tray","custom/r_end","custom/l_end","cpu","memory","custom/r_end","custom/l_end","network","bluetooth","pulseaudio","pulseaudio#microphone","custom/r_end","custom/padd"],
-
-
-// sourced from modules based on config.ctl //
-
- "custom/power": {
- "format": "{}",
- "exec": "echo ; echo logout",
- "on-click": "~/.config/hypr/scripts/logoutlaunch.sh 2",
- "interval" : 86400, // once every day
- "tooltip": true
- },
-
- "custom/cliphist": {
- "format": "{}",
- "exec": "echo ; echo clipboard history",
- "on-click": "sleep 0.1 && ~/.config/hypr/scripts/cliphist.sh c 1",
- //"on-click-right": "sleep 0.1 && ~/.config/hypr/scripts/cliphist.sh d",
- "on-click-middle": "sleep 0.1 && ~/.config/hypr/scripts/cliphist.sh w 1",
- "interval" : 86400, // once every day
- "tooltip": true
- },
-
- "custom/wbar": {
- "format": "{}", // //
- "exec": "echo ; echo switch menubar",
- "on-click": "~/.config/waybar/wbarconfgen.sh n",
- "on-click-right": "~/.config/waybar/wbarconfgen.sh p",
- "on-click-middle": "~/.config/waybar/wbarconfgen.sh",
- "interval" : 86400,
- "tooltip": true
- },
-
- "custom/mode": {
- "format": "{}",
- "exec": "echo ; echo switch mode",
- "on-click": "~/.config/hypr/scripts/themeswitch.sh -n",
- "on-click-right": "~/.config/hypr/scripts/themeswitch.sh -p",
- "on-click-middle": "sleep 0.1 && ~/.config/hypr/scripts/themeselect.sh",
- "interval" : 86400, // once every day
- "tooltip": true
- },
-
- "custom/wallchange": {
- "format": "{}",
- "exec": "echo ; echo switch wallpaper",
- "on-click": "~/.config/swww/swwwallpaper.sh -n 1",
- "on-click-right": "~/.config/swww/swwwallpaper.sh -p 1",
- "interval" : 86400, // once every day
- "tooltip": true
- },
-
- "wlr/taskbar": {
- "format": "{icon}",
- "icon-size": 18,
- "icon-theme": "papirus-icon-theme",
- "spacing": 0,
- "tooltip-format": "{title}",
- "on-click": "activate",
- "on-click-middle": "close",
- "ignore-list": [
- "Alacritty"
- ],
- "app_ids-mapping": {
- "firefoxdeveloperedition": "firefox-developer-edition"
- }
- },
-
- "wlr/workspaces": {
- "disable-scroll": true,
- "all-outputs": true,
- "on-click": "activate",
- "persistent_workspaces": {
- "1": [],
- "2": [],
- "3": [],
- "4": [],
- "5": [],
- "6": [],
- "7": [],
- "8": [],
- "9": [],
- "10": []
- }
- },
-
- "hyprland/window": {
- "format": " {}",
- "separate-outputs": true,
- "rewrite": {
- "alex@gaea:(.*)": " ",
- "(.*) — Mozilla Firefox": " ",
- "(.*)Mozilla Firefox": "Firefox ",
- "(.*) - Visual Studio Code": " ",
- "(.*)Visual Studio Code": "Code ",
- "(.*) — Dolphin": " ",
- "(.*)Spotify": "Spotify ",
- "(.*)Steam": "Steam "
- }
- },
-
- "clock": {
- "format": "{: %I:%M %p %a %d}",
- "format-alt": "{: %H:%M %b %Y}",
- "tooltip-format": "{calendar}"
- },
-
- "tray": {
- "icon-size": 18,
- "spacing": 5
- },
-
- "cpu": {
- "interval": 10,
- "format": " {usage}%",
- "format-alt": "{icon0}{icon1}{icon2}{icon3}",
- "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"]
- },
-
- "memory": {
- "interval": 30,
- "format": " {percentage}%",
- "format-alt": " {used}GB",
- "max-length": 10,
- "tooltip": true,
- "tooltip-format": " {used:0.1f}GB/{total:0.1f}GB"
- },
-
- "network": {
- // "interface": "wlp2*", // (Optional) To force the use of this interface
- "format-wifi": " {essid}",
- "format-ethernet": " Wired",
- "tooltip-format": " {ipaddr} {bandwidthUpBytes} {bandwidthDownBytes}",
- "format-linked": " {ifname} (No IP)",
- "format-disconnected": " Disconnected",
- "format-alt": " {signalStrength}%",
- "interval": 5
- },
-
- "bluetooth": {
- "format": "",
- "format-disabled": "", // an empty format will hide the module
- "format-connected": " {num_connections}",
- "tooltip-format": " {device_alias}",
- "tooltip-format-connected": "{device_enumerate}",
- "tooltip-format-enumerate-connected": " {device_alias}"
- },
-
- "pulseaudio": {
- "format": "{icon} {volume}",
- "format-muted": "婢",
- "on-click": "pavucontrol -t 3",
- "on-click-middle": "~/.config/hypr/scripts/volumecontrol.sh -o m",
- "on-scroll-up": "~/.config/hypr/scripts/volumecontrol.sh -o i",
- "on-scroll-down": "~/.config/hypr/scripts/volumecontrol.sh -o d",
- "tooltip-format": "{icon} {desc} // {volume}%",
- "scroll-step": 5,
- "format-icons": {
- "headphone": "",
- "hands-free": "",
- "headset": "",
- "phone": "",
- "portable": "",
- "car": "",
- "default": ["", "", ""]
- }
- },
-
- "pulseaudio#microphone": {
- "format": "{format_source}",
- "format-source": "",
- "format-source-muted": "",
- "on-click": "pavucontrol -t 4",
- "on-click-middle": "~/.config/hypr/scripts/volumecontrol.sh -i m",
- "on-scroll-up": "~/.config/hypr/scripts/volumecontrol.sh -i i",
- "on-scroll-down": "~/.config/hypr/scripts/volumecontrol.sh -i d",
- "tooltip-format": "{format_source} {source_desc} // {source_volume}%",
- "scroll-step": 5
- },
-
-
-// modules for padding //
-
- "custom/l_end": {
- "format": " ",
- "interval" : "once",
- "tooltip": false
- },
-
- "custom/r_end": {
- "format": " ",
- "interval" : "once",
- "tooltip": false
- },
-
- "custom/sl_end": {
- "format": " ",
- "interval" : "once",
- "tooltip": false
- },
-
- "custom/sr_end": {
- "format": " ",
- "interval" : "once",
- "tooltip": false
- },
-
- "custom/rl_end": {
- "format": " ",
- "interval" : "once",
- "tooltip": false
- },
-
- "custom/rr_end": {
- "format": " ",
- "interval" : "once",
- "tooltip": false
- },
-
- "custom/padd": {
- "format": " ",
- "interval" : "once",
- "tooltip": false
+ "wlr/taskbar": {
+ "format": "{icon}",
+ "icon-size": 18,
+ "icon-theme": "papirus-icon-theme",
+ "spacing": 0,
+ "tooltip-format": "{title}",
+ "on-click": "activate",
+ "on-click-middle": "close",
+ "ignore-list": ["Alacritty"],
+ "app_ids-mapping": {
+ "firefoxdeveloperedition": "firefox-developer-edition"
}
+ },
+ "wlr/workspaces": {
+ "disable-scroll": true,
+ "all-outputs": true,
+ "on-click": "activate",
+ "persistent_workspaces": {
+ "1": [],
+ "2": [],
+ "3": [],
+ "4": [],
+ "5": [],
+ "6": [],
+ "7": [],
+ "8": [],
+ "9": [],
+ "10": []
+ }
+ },
+
+ "clock": {
+ "format": "{:%Y/%m/%d %H:%M}",
+ "format-alt": "{:%I:%M%p 周%u}",
+ "tooltip-format": "{calendar}",
+ "locale": "zh_CN.UTF-8"
+ },
+
+ "tray": {
+ "icon-size": 18,
+ "spacing": 5
+ },
+
+ "cpu": {
+ "interval": 10,
+ "format": " {usage}%",
+ "format-alt": "{icon0}{icon1}{icon2}{icon3}",
+ "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"]
+ },
+
+ "memory": {
+ "interval": 30,
+ "format": " {percentage}%",
+ "format-alt": " {used}GB",
+ "max-length": 10,
+ "tooltip": true,
+ "tooltip-format": " {used:0.1f}GB/{total:0.1f}GB"
+ },
+
+ "network": {
+ // "interface": "wlp2*", // (Optional) To force the use of this interface
+ "format-wifi": " {essid}",
+ "format-ethernet": " Wired",
+ "tooltip-format": " {ipaddr} {bandwidthUpBytes} {bandwidthDownBytes}",
+ "format-linked": " {ifname} (No IP)",
+ "format-disconnected": " Disconnected",
+ "format-alt": " {signalStrength}%",
+ "interval": 5
+ },
+
+ "bluetooth": {
+ "format": "",
+ "format-disabled": "", // an empty format will hide the module
+ "format-connected": " {num_connections}",
+ "tooltip-format": " {device_alias}",
+ "tooltip-format-connected": "{device_enumerate}",
+ "tooltip-format-enumerate-connected": " {device_alias}"
+ },
+
+ "pulseaudio": {
+ "format": "{icon} {volume}",
+ "format-muted": "婢",
+ "on-click": "pavucontrol -t 3",
+ "on-click-middle": "~/.config/hypr/scripts/volumecontrol.sh -o m",
+ "on-scroll-up": "~/.config/hypr/scripts/volumecontrol.sh -o i",
+ "on-scroll-down": "~/.config/hypr/scripts/volumecontrol.sh -o d",
+ "tooltip-format": "{icon} {desc} // {volume}%",
+ "scroll-step": 5,
+ "format-icons": {
+ "headphone": "",
+ "hands-free": "",
+ "headset": "",
+ "phone": "",
+ "portable": "",
+ "car": "",
+ "default": ["", "", ""]
+ }
+ },
+
+ "pulseaudio#microphone": {
+ "format": "{format_source}",
+ "format-source": "",
+ "format-source-muted": "",
+ "on-click": "pavucontrol -t 4",
+ "on-click-middle": "~/.config/hypr/scripts/volumecontrol.sh -i m",
+ "on-scroll-up": "~/.config/hypr/scripts/volumecontrol.sh -i i",
+ "on-scroll-down": "~/.config/hypr/scripts/volumecontrol.sh -i d",
+ "tooltip-format": "{format_source} {source_desc} // {source_volume}%",
+ "scroll-step": 5
+ },
+
+ // modules for padding //
+
+ "custom/l_end": {
+ "format": " ",
+ "interval": "once",
+ "tooltip": false
+ },
+
+ "custom/r_end": {
+ "format": " ",
+ "interval": "once",
+ "tooltip": false
+ },
+
+ "custom/sl_end": {
+ "format": " ",
+ "interval": "once",
+ "tooltip": false
+ },
+
+ "custom/sr_end": {
+ "format": " ",
+ "interval": "once",
+ "tooltip": false
+ },
+
+ "custom/rl_end": {
+ "format": " ",
+ "interval": "once",
+ "tooltip": false
+ },
+
+ "custom/rr_end": {
+ "format": " ",
+ "interval": "once",
+ "tooltip": false
+ },
+
+ "custom/padd": {
+ "format": " ",
+ "interval": "once",
+ "tooltip": false
+ }
}
-
diff --git a/modules/home/hyprland/conf/waybar/modes/wb_bottom_01.jsonc b/modules/home/hyprland/conf/waybar/modes/wb_bottom_01.jsonc
deleted file mode 100644
index 7fa999b..0000000
--- a/modules/home/hyprland/conf/waybar/modes/wb_bottom_01.jsonc
+++ /dev/null
@@ -1,201 +0,0 @@
-{
- "layer": "top",
- "position": "bottom",
- "mod": "dock",
- // "height": 28,
- "exclusive": true,
- "passthrough": false,
- "gtk-layer-shell": true,
- "modules-left": ["custom/l_end","cpu","memory","battery","custom/r_end","custom/l_end","clock","custom/r_end"],
- "modules-center": ["custom/l_end","wlr/workspaces","hyprland/window","custom/r_end"],
- "modules-right": ["custom/l_end","network","bluetooth","pulseaudio","pulseaudio#microphone","custom/updates","custom/r_end",
- "custom/l_end","tray","custom/r_end",
- "custom/l_end","custom/wallchange","custom/mode","custom/wbar", "custom/cliphist","custom/power","custom/r_end"],
-
-
-// center modules //
-
- "wlr/workspaces": {
- "disable-scroll": true,
- "all-outputs": true,
- "on-click": "activate",
- "persistent_workspaces": {
- "1": [],
- "2": [],
- "3": [],
- "4": [],
- "5": [],
- "6": [],
- "7": [],
- "8": [],
- "9": [],
- "10": []
- }
- },
-
- "hyprland/window": {
- "format": " {}",
- "separate-outputs": true,
- "rewrite": {
- "tittu@kryptonite:(.*)": "$1 ",
- "(.*) — Mozilla Firefox": "$1 ",
- "(.*)Mozilla Firefox": "Firefox ",
- "(.*) - Visual Studio Code": "$1 ",
- "(.*)Visual Studio Code": "Code ",
- "(.*) — Dolphin": "$1 ",
- "(.*)Spotify": "Spotify ",
- "(.*)Steam": "Steam "
- }
- },
-
-
-// left modules //
-
- "cpu": {
- "interval": 10,
- "format": " {usage}%",
- "format-alt": "{icon0}{icon1}{icon2}{icon3}",
- "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"]
- },
-
- "memory": {
- "interval": 30,
- "format": " {percentage}%",
- "format-alt": " {used}GB",
- "max-length": 10,
- "tooltip": true,
- "tooltip-format": " {used:0.1f}GB/{total:0.1f}GB"
- },
-
- "clock": {
- "format": "{: %I:%M %p %a %d}",
- "format-alt": "{: %H:%M %b %Y}",
- "tooltip-format": "{calendar}"
- },
-
-
-// right modules //
-
- "network": {
- // "interface": "wlp2*", // (Optional) To force the use of this interface
- "format-wifi": " {essid}",
- "format-ethernet": " Wired",
- "tooltip-format": " {ipaddr} {bandwidthUpBytes} {bandwidthDownBytes}",
- "format-linked": " {ifname} (No IP)",
- "format-disconnected": " Disconnected",
- "format-alt": " {signalStrength}%",
- "interval": 5
- },
-
- "bluetooth": {
- "format": "",
- "format-disabled": "", // an empty format will hide the module
- "format-connected": " {num_connections}",
- "tooltip-format": " {device_alias}",
- "tooltip-format-connected": "{device_enumerate}",
- "tooltip-format-enumerate-connected": " {device_alias}"
- },
-
- "pulseaudio": {
- "format": "{icon}",
- "format-muted": "婢",
- "on-click": "pavucontrol -t 3",
- "on-click-middle": "~/.config/hypr/scripts/volumecontrol.sh m",
- "on-scroll-up": "~/.config/hypr/scripts/volumecontrol.sh i",
- "on-scroll-down": "~/.config/hypr/scripts/volumecontrol.sh d",
- "tooltip-format": "{icon} {desc} // {volume}%",
- "scroll-step": 5,
- "format-icons": {
- "headphone": "",
- "hands-free": "",
- "headset": "",
- "phone": "",
- "portable": "",
- "car": "",
- "default": ["", "", ""]
- }
- },
-
- "pulseaudio#microphone": {
- "format": "{format_source}",
- "format-source": "",
- "format-source-muted": "",
- "on-click": "pavucontrol -t 4",
- "on-click-middle": "pamixer --default-source -t",
- "on-scroll-up": "pamixer --default-source -i 5",
- "on-scroll-down": "pamixer --default-source -d 5",
- "tooltip-format": "{format_source} {source_desc} // {source_volume}%",
- "scroll-step": 5
- },
-
- "custom/updates": {
- "format": " {}",
- "exec": "~/.config/hypr/scripts/systemupdate.sh",
- "on-click": "~/.config/hypr/scripts/systemupdate.sh up",
- "interval": 86400, // once every day
- "tooltip": true
- },
-
- "tray": {
- "icon-size": 15,
- "spacing": 5
- },
-
- "custom/wallchange": {
- "format": "{}",
- "exec": "~/.config/swww/swwwallpaper.sh -t",
- "on-click": "~/.config/swww/swwwallpaper.sh -n",
- "on-click-right": "~/.config/swww/swwwallpaper.sh -p",
- "interval" : 86400, // once every day
- "tooltip": true
- },
-
- "custom/mode": {
- "format": "{}",
- "exec": "echo ; echo switch mode",
- "on-click": "~/.config/hypr/scripts/themeswitch.sh -n",
- "on-click-right": "~/.config/hypr/scripts/themeswitch.sh -p",
- "on-click-middle": "sleep 0.1 && ~/.config/hypr/scripts/themeselect.sh",
- "interval" : 86400, // once every day
- "tooltip": true
- },
-
- "custom/cliphist": {
- "format": "{}",
- "exec": "~/.config/hypr/scripts/cliphist.sh t",
- "on-click": "sleep 0.1 && ~/.config/hypr/scripts/cliphist.sh c",
- //"on-click-right": "sleep 0.1 && ~/.config/hypr/scripts/cliphist.sh d",
- "on-click-middle": "sleep 0.1 && ~/.config/hypr/scripts/cliphist.sh w",
- "interval" : 86400, // once every day
- "tooltip": true
- },
-
- "custom/power": {
- "format": "{}",
- "exec": "echo ; echo logout",
- "on-click": "wlogout -b 2 -c 0 -r 0 -L 930 -R 930 -T 300 -B 300 --protocol layer-shell",
- "interval" : 86400, // once every day
- "tooltip": true
- },
-
- "custom/wbar": {
- "format": "{}",
- "exec": "echo ; echo switch menubar",
- "on-click": "~/.config/waybar/wbarswitch.sh -n",
- "on-click-right": "~/.config/waybar/wbarswitch.sh -p",
- "interval" : 86400,
- "tooltip": true
- },
-
- "custom/l_end": {
- "format": " ",
- "interval" : "once",
- "tooltip": false
- },
-
- "custom/r_end": {
- "format": " ",
- "interval" : "once",
- "tooltip": false
- }
-}
diff --git a/modules/home/hyprland/conf/waybar/modes/wb_top_01.jsonc b/modules/home/hyprland/conf/waybar/modes/wb_top_01.jsonc
deleted file mode 100644
index 4510474..0000000
--- a/modules/home/hyprland/conf/waybar/modes/wb_top_01.jsonc
+++ /dev/null
@@ -1,202 +0,0 @@
-{
- "layer": "top",
- "position": "top",
- "mod": "dock",
- // "height": 28,
- "exclusive": true,
- "passthrough": false,
- "gtk-layer-shell": true,
- "modules-left": ["custom/l_end","wlr/workspaces","hyprland/window","custom/r_end"],
- "modules-center": ["custom/l_end","clock","custom/r_end"],
- "modules-right": ["custom/l_end","cpu","memory","battery","custom/r_end",
- "custom/l_end","network","bluetooth","pulseaudio","pulseaudio#microphone","custom/updates","custom/r_end",
- "custom/l_end","tray","custom/r_end",
- "custom/l_end","custom/wallchange","custom/mode","custom/wbar", "custom/cliphist","custom/power","custom/r_end"],
-
-
-// center modules //
-
- "wlr/workspaces": {
- "disable-scroll": true,
- "all-outputs": true,
- "on-click": "activate",
- "persistent_workspaces": {
- "1": [],
- "2": [],
- "3": [],
- "4": [],
- "5": [],
- "6": [],
- "7": [],
- "8": [],
- "9": [],
- "10": []
- }
- },
-
- "hyprland/window": {
- "format": " {}",
- "separate-outputs": true,
- "rewrite": {
- "tittu@kryptonite:(.*)": "$1 ",
- "(.*) — Mozilla Firefox": "$1 ",
- "(.*)Mozilla Firefox": "Firefox ",
- "(.*) - Visual Studio Code": "$1 ",
- "(.*)Visual Studio Code": "Code ",
- "(.*) — Dolphin": "$1 ",
- "(.*)Spotify": "Spotify ",
- "(.*)Steam": "Steam "
- }
- },
-
-
-// left modules //
-
- "cpu": {
- "interval": 10,
- "format": " {usage}%",
- "format-alt": "{icon0}{icon1}{icon2}{icon3}",
- "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"]
- },
-
- "memory": {
- "interval": 30,
- "format": " {percentage}%",
- "format-alt": " {used}GB",
- "max-length": 10,
- "tooltip": true,
- "tooltip-format": " {used:0.1f}GB/{total:0.1f}GB"
- },
-
- "clock": {
- "format": "{: %I:%M %p %a %d}",
- "format-alt": "{: %H:%M %b %Y}",
- "tooltip-format": "{calendar}"
- },
-
-
-// right modules //
-
- "network": {
- // "interface": "wlp2*", // (Optional) To force the use of this interface
- "format-wifi": " {essid}",
- "format-ethernet": " Wired",
- "tooltip-format": " {ipaddr} {bandwidthUpBytes} {bandwidthDownBytes}",
- "format-linked": " {ifname} (No IP)",
- "format-disconnected": " Disconnected",
- "format-alt": " {signalStrength}%",
- "interval": 5
- },
-
- "bluetooth": {
- "format": "",
- "format-disabled": "", // an empty format will hide the module
- "format-connected": " {num_connections}",
- "tooltip-format": " {device_alias}",
- "tooltip-format-connected": "{device_enumerate}",
- "tooltip-format-enumerate-connected": " {device_alias}"
- },
-
- "pulseaudio": {
- "format": "{icon}",
- "format-muted": "婢",
- "on-click": "pavucontrol -t 3",
- "on-click-middle": "~/.config/hypr/scripts/volumecontrol.sh m",
- "on-scroll-up": "~/.config/hypr/scripts/volumecontrol.sh i",
- "on-scroll-down": "~/.config/hypr/scripts/volumecontrol.sh d",
- "tooltip-format": "{icon} {desc} // {volume}%",
- "scroll-step": 5,
- "format-icons": {
- "headphone": "",
- "hands-free": "",
- "headset": "",
- "phone": "",
- "portable": "",
- "car": "",
- "default": ["", "", ""]
- }
- },
-
- "pulseaudio#microphone": {
- "format": "{format_source}",
- "format-source": "",
- "format-source-muted": "",
- "on-click": "pavucontrol -t 4",
- "on-click-middle": "pamixer --default-source -t",
- "on-scroll-up": "pamixer --default-source -i 5",
- "on-scroll-down": "pamixer --default-source -d 5",
- "tooltip-format": "{format_source} {source_desc} // {source_volume}%",
- "scroll-step": 5
- },
-
- "custom/updates": {
- "format": " {}",
- "exec": "~/.config/hypr/scripts/systemupdate.sh",
- "on-click": "~/.config/hypr/scripts/systemupdate.sh up",
- "interval": 86400, // once every day
- "tooltip": true
- },
-
- "tray": {
- "icon-size": 15,
- "spacing": 5
- },
-
- "custom/wallchange": {
- "format": "{}",
- "exec": "~/.config/swww/swwwallpaper.sh -t",
- "on-click": "~/.config/swww/swwwallpaper.sh -n",
- "on-click-right": "~/.config/swww/swwwallpaper.sh -p",
- "interval" : 86400, // once every day
- "tooltip": true
- },
-
- "custom/mode": {
- "format": "{}",
- "exec": "echo ; echo switch mode",
- "on-click": "~/.config/hypr/scripts/themeswitch.sh -n",
- "on-click-right": "~/.config/hypr/scripts/themeswitch.sh -p",
- "on-click-middle": "sleep 0.1 && ~/.config/hypr/scripts/themeselect.sh",
- "interval" : 86400, // once every day
- "tooltip": true
- },
-
- "custom/cliphist": {
- "format": "{}",
- "exec": "~/.config/hypr/scripts/cliphist.sh t",
- "on-click": "sleep 0.1 && ~/.config/hypr/scripts/cliphist.sh c",
- //"on-click-right": "sleep 0.1 && ~/.config/hypr/scripts/cliphist.sh d",
- "on-click-middle": "sleep 0.1 && ~/.config/hypr/scripts/cliphist.sh w",
- "interval" : 86400, // once every day
- "tooltip": true
- },
-
- "custom/power": {
- "format": "{}",
- "exec": "echo ; echo logout",
- "on-click": "wlogout -b 2 -c 0 -r 0 -L 930 -R 930 -T 300 -B 300 --protocol layer-shell",
- "interval" : 86400, // once every day
- "tooltip": true
- },
-
- "custom/wbar": {
- "format": "{}",
- "exec": "echo ; echo switch menubar",
- "on-click": "~/.config/waybar/wbarswitch.sh -n",
- "on-click-right": "~/.config/waybar/wbarswitch.sh -p",
- "interval" : 86400,
- "tooltip": true
- },
-
- "custom/l_end": {
- "format": " ",
- "interval" : "once",
- "tooltip": false
- },
-
- "custom/r_end": {
- "format": " ",
- "interval" : "once",
- "tooltip": false
- }
-}
diff --git a/modules/home/hyprland/conf/waybar/modules/battery.jsonc b/modules/home/hyprland/conf/waybar/modules/battery.jsonc
deleted file mode 100644
index bdad61c..0000000
--- a/modules/home/hyprland/conf/waybar/modules/battery.jsonc
+++ /dev/null
@@ -1,13 +0,0 @@
- "battery": {
- "states": {
- "good": 95,
- "warning": 30,
- "critical": 20
- },
- "format": "{icon} {capacity}%",
- "format-charging": " {capacity}%",
- "format-plugged": " {capacity}%",
- "format-alt": "{time} {icon}",
- "format-icons": ["", "", "", "", "", "", "", "", "", "", ""]
- },
-
diff --git a/modules/home/hyprland/conf/waybar/modules/bluetooth.jsonc b/modules/home/hyprland/conf/waybar/modules/bluetooth.jsonc
deleted file mode 100644
index 2cfd8a1..0000000
--- a/modules/home/hyprland/conf/waybar/modules/bluetooth.jsonc
+++ /dev/null
@@ -1,9 +0,0 @@
- "bluetooth": {
- "format": "",
- "format-disabled": "", // an empty format will hide the module
- "format-connected": " {num_connections}",
- "tooltip-format": " {device_alias}",
- "tooltip-format-connected": "{device_enumerate}",
- "tooltip-format-enumerate-connected": " {device_alias}"
- },
-
diff --git a/modules/home/hyprland/conf/waybar/modules/cliphist.jsonc b/modules/home/hyprland/conf/waybar/modules/cliphist.jsonc
deleted file mode 100644
index d397ec5..0000000
--- a/modules/home/hyprland/conf/waybar/modules/cliphist.jsonc
+++ /dev/null
@@ -1,10 +0,0 @@
- "custom/cliphist": {
- "format": "{}",
- "exec": "echo ; echo clipboard history",
- "on-click": "sleep 0.1 && ~/.config/hypr/scripts/cliphist.sh c ${mod_pos}",
- //"on-click-right": "sleep 0.1 && ~/.config/hypr/scripts/cliphist.sh d",
- "on-click-middle": "sleep 0.1 && ~/.config/hypr/scripts/cliphist.sh w ${mod_pos}",
- "interval" : 86400, // once every day
- "tooltip": true
- },
-
diff --git a/modules/home/hyprland/conf/waybar/modules/clock.jsonc b/modules/home/hyprland/conf/waybar/modules/clock.jsonc
deleted file mode 100644
index 3d79fc1..0000000
--- a/modules/home/hyprland/conf/waybar/modules/clock.jsonc
+++ /dev/null
@@ -1,6 +0,0 @@
- "clock": {
- "format": "{: %I:%M %p %a %d}",
- "format-alt": "{: %H:%M %b %Y}",
- "tooltip-format": "{calendar}"
- },
-
diff --git a/modules/home/hyprland/conf/waybar/modules/cpu.jsonc b/modules/home/hyprland/conf/waybar/modules/cpu.jsonc
deleted file mode 100644
index d2d0646..0000000
--- a/modules/home/hyprland/conf/waybar/modules/cpu.jsonc
+++ /dev/null
@@ -1,7 +0,0 @@
- "cpu": {
- "interval": 10,
- "format": " {usage}%",
- "format-alt": "{icon0}{icon1}{icon2}{icon3}",
- "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"]
- },
-
diff --git a/modules/home/hyprland/conf/waybar/modules/footer.jsonc b/modules/home/hyprland/conf/waybar/modules/footer.jsonc
deleted file mode 100644
index 1387f74..0000000
--- a/modules/home/hyprland/conf/waybar/modules/footer.jsonc
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// modules for padding //
-
- "custom/l_end": {
- "format": " ",
- "interval" : "once",
- "tooltip": false
- },
-
- "custom/r_end": {
- "format": " ",
- "interval" : "once",
- "tooltip": false
- },
-
- "custom/sl_end": {
- "format": " ",
- "interval" : "once",
- "tooltip": false
- },
-
- "custom/sr_end": {
- "format": " ",
- "interval" : "once",
- "tooltip": false
- },
-
- "custom/rl_end": {
- "format": " ",
- "interval" : "once",
- "tooltip": false
- },
-
- "custom/rr_end": {
- "format": " ",
- "interval" : "once",
- "tooltip": false
- },
-
- "custom/padd": {
- "format": " ",
- "interval" : "once",
- "tooltip": false
- }
-
-}
-
diff --git a/modules/home/hyprland/conf/waybar/modules/header.jsonc b/modules/home/hyprland/conf/waybar/modules/header.jsonc
deleted file mode 100644
index 703277b..0000000
--- a/modules/home/hyprland/conf/waybar/modules/header.jsonc
+++ /dev/null
@@ -1,12 +0,0 @@
-// --// waybar config generated by wbarconfgen.sh //-- //
-
-{
-// sourced from header module //
-
- "layer": "top",
- "position": "${w_position}",
- "mod": "dock",
- "height": ${w_height},
- "exclusive": true,
- "passthrough": false,
- "gtk-layer-shell": true,
diff --git a/modules/home/hyprland/conf/waybar/modules/memory.jsonc b/modules/home/hyprland/conf/waybar/modules/memory.jsonc
deleted file mode 100644
index 3c5058d..0000000
--- a/modules/home/hyprland/conf/waybar/modules/memory.jsonc
+++ /dev/null
@@ -1,9 +0,0 @@
- "memory": {
- "interval": 30,
- "format": " {percentage}%",
- "format-alt": " {used}GB",
- "max-length": 10,
- "tooltip": true,
- "tooltip-format": " {used:0.1f}GB/{total:0.1f}GB"
- },
-
diff --git a/modules/home/hyprland/conf/waybar/modules/mode.jsonc b/modules/home/hyprland/conf/waybar/modules/mode.jsonc
deleted file mode 100644
index 5a025a3..0000000
--- a/modules/home/hyprland/conf/waybar/modules/mode.jsonc
+++ /dev/null
@@ -1,10 +0,0 @@
- "custom/mode": {
- "format": "{}",
- "exec": "echo ; echo switch mode",
- "on-click": "~/.config/hypr/scripts/themeswitch.sh -n",
- "on-click-right": "~/.config/hypr/scripts/themeswitch.sh -p",
- "on-click-middle": "sleep 0.1 && ~/.config/hypr/scripts/themeselect.sh",
- "interval" : 86400, // once every day
- "tooltip": true
- },
-
diff --git a/modules/home/hyprland/conf/waybar/modules/mpris.jsonc b/modules/home/hyprland/conf/waybar/modules/mpris.jsonc
deleted file mode 100644
index 6122c84..0000000
--- a/modules/home/hyprland/conf/waybar/modules/mpris.jsonc
+++ /dev/null
@@ -1,13 +0,0 @@
- "mpris": {
- "format": "{player_icon} {dynamic}",
- "format-paused": "{status_icon} {dynamic}",
- "player-icons": {
- "default": "▶",
- "mpv": "🎵"
- },
- "status-icons": {
- "paused": "⏸"
- },
- // "ignored-players": ["firefox"]
- },
-
diff --git a/modules/home/hyprland/conf/waybar/modules/network.jsonc b/modules/home/hyprland/conf/waybar/modules/network.jsonc
deleted file mode 100644
index bafb437..0000000
--- a/modules/home/hyprland/conf/waybar/modules/network.jsonc
+++ /dev/null
@@ -1,11 +0,0 @@
- "network": {
- // "interface": "wlp2*", // (Optional) To force the use of this interface
- "format-wifi": " {essid}",
- "format-ethernet": " Wired",
- "tooltip-format": " {ipaddr} {bandwidthUpBytes} {bandwidthDownBytes}",
- "format-linked": " {ifname} (No IP)",
- "format-disconnected": " Disconnected",
- "format-alt": " {signalStrength}%",
- "interval": 5
- },
-
diff --git a/modules/home/hyprland/conf/waybar/modules/power.jsonc b/modules/home/hyprland/conf/waybar/modules/power.jsonc
deleted file mode 100644
index b69ed6f..0000000
--- a/modules/home/hyprland/conf/waybar/modules/power.jsonc
+++ /dev/null
@@ -1,8 +0,0 @@
- "custom/power": {
- "format": "{}",
- "exec": "echo ; echo logout",
- "on-click": "~/.config/hypr/scripts/logoutlaunch.sh 2",
- "interval" : 86400, // once every day
- "tooltip": true
- },
-
diff --git a/modules/home/hyprland/conf/waybar/modules/pulseaudio.jsonc b/modules/home/hyprland/conf/waybar/modules/pulseaudio.jsonc
deleted file mode 100644
index 06f8314..0000000
--- a/modules/home/hyprland/conf/waybar/modules/pulseaudio.jsonc
+++ /dev/null
@@ -1,32 +0,0 @@
- "pulseaudio": {
- "format": "{icon} {volume}",
- "format-muted": "婢",
- "on-click": "pavucontrol -t 3",
- "on-click-middle": "~/.config/hypr/scripts/volumecontrol.sh -o m",
- "on-scroll-up": "~/.config/hypr/scripts/volumecontrol.sh -o i",
- "on-scroll-down": "~/.config/hypr/scripts/volumecontrol.sh -o d",
- "tooltip-format": "{icon} {desc} // {volume}%",
- "scroll-step": 5,
- "format-icons": {
- "headphone": "",
- "hands-free": "",
- "headset": "",
- "phone": "",
- "portable": "",
- "car": "",
- "default": ["", "", ""]
- }
- },
-
- "pulseaudio#microphone": {
- "format": "{format_source}",
- "format-source": "",
- "format-source-muted": "",
- "on-click": "pavucontrol -t 4",
- "on-click-middle": "~/.config/hypr/scripts/volumecontrol.sh -i m",
- "on-scroll-up": "~/.config/hypr/scripts/volumecontrol.sh -i i",
- "on-scroll-down": "~/.config/hypr/scripts/volumecontrol.sh -i d",
- "tooltip-format": "{format_source} {source_desc} // {source_volume}%",
- "scroll-step": 5
- },
-
diff --git a/modules/home/hyprland/conf/waybar/modules/style.css b/modules/home/hyprland/conf/waybar/modules/style.css
deleted file mode 100644
index c0092b7..0000000
--- a/modules/home/hyprland/conf/waybar/modules/style.css
+++ /dev/null
@@ -1,164 +0,0 @@
-* {
- border: none;
- border-radius: 0px;
- font-family: "JetBrainsMono Nerd Font";
- font-weight: bold;
- font-size: ${s_fontpx}px;
- min-height: 10px;
-}
-
-@import "themes/${cur_theme}.css";
-
-window#waybar {
- background: @bar-bg;
-}
-
-tooltip {
- background: @tool-bg;
- color: @tool-color;
- border-radius: ${b_radius}px;
- border-width: 1px;
- border-style: solid;
- border-color: @tool-border;
-}
-
-#workspaces button {
- box-shadow: none;
- text-shadow: none;
- padding: 0px;
- border-radius: ${w_radius}px;
- margin-top: ${w_margin}px;
- margin-bottom: ${w_margin}px;
- padding-left: ${w_paddin}px;
- padding-right: ${w_paddin}px;
- color: @wb-color;
- animation: gradient_f 20s ease-in infinite;
- transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#workspaces button.active {
- background: @wb-act-bg;
- color: @wb-act-color;
- margin-left: ${w_margin}px;
- padding-left: ${w_padact}px;
- padding-right: ${w_padact}px;
- margin-right: ${w_margin}px;
- animation: gradient_f 20s ease-in infinite;
- transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#workspaces button:hover {
- background: @wb-hvr-bg;
- color: @wb-hvr-color;
- padding-left: ${w_paddin}px;
- padding-right: ${w_paddin}px;
- animation: gradient_f 20s ease-in infinite;
- transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#taskbar button {
- box-shadow: none;
- text-shadow: none;
- padding: 0px;
- border-radius: ${w_radius}px;
- margin-top: ${w_margin}px;
- margin-bottom: ${w_margin}px;
- padding-left: ${w_paddin}px;
- padding-right: ${w_paddin}px;
- color: @wb-color;
- animation: gradient_f 20s ease-in infinite;
- transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#taskbar button.active {
- background: @wb-act-bg;
- color: @wb-act-color;
- margin-left: ${w_margin}px;
- padding-left: ${w_padact}px;
- padding-right: ${w_padact}px;
- margin-right: ${w_margin}px;
- animation: gradient_f 20s ease-in infinite;
- transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#taskbar button:hover {
- background: @wb-hvr-bg;
- color: @wb-hvr-color;
- padding-left: ${w_paddin}px;
- padding-right: ${w_paddin}px;
- animation: gradient_f 20s ease-in infinite;
- transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-}
-
-#cpu,
-#memory,
-#battery,
-#clock,
-#workspaces,
-#window,
-#taskbar,
-#network,
-#bluetooth,
-#pulseaudio,
-#mpris,
-#custom-updates,
-#custom-wallchange,
-#custom-mode,
-#custom-cliphist,
-#custom-power,
-#custom-wbar,
-#custom-l_end,
-#custom-r_end,
-#custom-sl_end,
-#custom-sr_end,
-#custom-rl_end,
-#custom-rr_end,
-#tray {
- color: @main-color;
- background: @main-bg;
- opacity: 1;
- margin: ${g_margin}px 0px ${g_margin}px 0px;
- padding-left: ${g_paddin}px;
- padding-right: ${g_paddin}px;
-}
-
-#workspaces,
-#taskbar {
- padding: 0px;
-}
-
-#custom-r_end {
- border-radius: 0px ${b_radius}px ${b_radius}px 0px;
- margin-right: ${e_margin}px;
- padding-right: ${e_paddin}px;
-}
-
-#custom-l_end {
- border-radius: ${b_radius}px 0px 0px ${b_radius}px;
- margin-left: ${e_margin}px;
- padding-left: ${e_paddin}px;
-}
-
-#custom-sr_end {
- border-radius: 0px;
- margin-right: ${e_margin}px;
- padding-right: ${e_paddin}px;
-}
-
-#custom-sl_end {
- border-radius: 0px;
- margin-left: ${e_margin}px;
- padding-left: ${e_paddin}px;
-}
-
-#custom-rr_end {
- border-radius: 0px ${c_radius}px ${c_radius}px 0px;
- margin-right: ${e_margin}px;
- padding-right: ${e_paddin}px;
-}
-
-#custom-rl_end {
- border-radius: ${c_radius}px 0px 0px ${c_radius}px;
- margin-left: ${e_margin}px;
- padding-left: ${e_paddin}px;
-}
diff --git a/modules/home/hyprland/conf/waybar/modules/taskbar.jsonc b/modules/home/hyprland/conf/waybar/modules/taskbar.jsonc
deleted file mode 100644
index eb72ecf..0000000
--- a/modules/home/hyprland/conf/waybar/modules/taskbar.jsonc
+++ /dev/null
@@ -1,16 +0,0 @@
- "wlr/taskbar": {
- "format": "{icon}",
- "icon-size": ${i_task},
- "icon-theme": "${i_theme}",
- "spacing": 0,
- "tooltip-format": "{title}",
- "on-click": "activate",
- "on-click-middle": "close",
- "ignore-list": [
- "Alacritty"
- ],
- "app_ids-mapping": {
- "firefoxdeveloperedition": "firefox-developer-edition"
- }
- },
-
diff --git a/modules/home/hyprland/conf/waybar/modules/tray.jsonc b/modules/home/hyprland/conf/waybar/modules/tray.jsonc
deleted file mode 100644
index f5fb1b0..0000000
--- a/modules/home/hyprland/conf/waybar/modules/tray.jsonc
+++ /dev/null
@@ -1,5 +0,0 @@
- "tray": {
- "icon-size": ${i_size},
- "spacing": 5
- },
-
diff --git a/modules/home/hyprland/conf/waybar/modules/updates.jsonc b/modules/home/hyprland/conf/waybar/modules/updates.jsonc
deleted file mode 100644
index 138d37b..0000000
--- a/modules/home/hyprland/conf/waybar/modules/updates.jsonc
+++ /dev/null
@@ -1,8 +0,0 @@
- "custom/updates": {
- "format": " {}",
- "exec": "~/.config/hypr/scripts/systemupdate.sh",
- "on-click": "~/.config/hypr/scripts/systemupdate.sh up",
- "interval": 86400, // once every day
- "tooltip": true
- },
-
diff --git a/modules/home/hyprland/conf/waybar/modules/wallchange.jsonc b/modules/home/hyprland/conf/waybar/modules/wallchange.jsonc
deleted file mode 100644
index be446e5..0000000
--- a/modules/home/hyprland/conf/waybar/modules/wallchange.jsonc
+++ /dev/null
@@ -1,9 +0,0 @@
- "custom/wallchange": {
- "format": "{}",
- "exec": "echo ; echo switch wallpaper",
- "on-click": "~/.config/swww/swwwallpaper.sh -n ${mod_pos}",
- "on-click-right": "~/.config/swww/swwwallpaper.sh -p ${mod_pos}",
- "interval" : 86400, // once every day
- "tooltip": true
- },
-
diff --git a/modules/home/hyprland/conf/waybar/modules/wbar.jsonc b/modules/home/hyprland/conf/waybar/modules/wbar.jsonc
deleted file mode 100644
index eb9f1b7..0000000
--- a/modules/home/hyprland/conf/waybar/modules/wbar.jsonc
+++ /dev/null
@@ -1,10 +0,0 @@
- "custom/wbar": {
- "format": "{}", // //
- "exec": "echo ; echo switch menubar",
- "on-click": "~/.config/waybar/wbarconfgen.sh n",
- "on-click-right": "~/.config/waybar/wbarconfgen.sh p",
- "on-click-middle": "~/.config/waybar/wbarconfgen.sh",
- "interval" : 86400,
- "tooltip": true
- },
-
diff --git a/modules/home/hyprland/conf/waybar/modules/window.jsonc b/modules/home/hyprland/conf/waybar/modules/window.jsonc
deleted file mode 100644
index f9d4eb8..0000000
--- a/modules/home/hyprland/conf/waybar/modules/window.jsonc
+++ /dev/null
@@ -1,15 +0,0 @@
- "hyprland/window": {
- "format": " {}",
- "separate-outputs": true,
- "rewrite": {
- "${USER}@${set_sysname}:(.*)": "$1 ",
- "(.*) — Mozilla Firefox": "$1 ",
- "(.*)Mozilla Firefox": "Firefox ",
- "(.*) - Visual Studio Code": "$1 ",
- "(.*)Visual Studio Code": "Code ",
- "(.*) — Dolphin": "$1 ",
- "(.*)Spotify": "Spotify ",
- "(.*)Steam": "Steam "
- }
- },
-
diff --git a/modules/home/hyprland/conf/waybar/modules/workspaces.jsonc b/modules/home/hyprland/conf/waybar/modules/workspaces.jsonc
deleted file mode 100644
index 7c8ffd2..0000000
--- a/modules/home/hyprland/conf/waybar/modules/workspaces.jsonc
+++ /dev/null
@@ -1,18 +0,0 @@
- "wlr/workspaces": {
- "disable-scroll": true,
- "all-outputs": true,
- "on-click": "activate",
- "persistent_workspaces": {
- "1": [],
- "2": [],
- "3": [],
- "4": [],
- "5": [],
- "6": [],
- "7": [],
- "8": [],
- "9": [],
- "10": []
- }
- },
-
diff --git a/modules/home/hyprland/conf/waybar/style.css b/modules/home/hyprland/conf/waybar/style.css
index 16ad120..4392c3c 100644
--- a/modules/home/hyprland/conf/waybar/style.css
+++ b/modules/home/hyprland/conf/waybar/style.css
@@ -1,3 +1,15 @@
+@define-color bar-bg rgba(0, 0, 0, 0);
+@define-color main-color #cdd6f4;
+@define-color main-bg #11111b;
+@define-color tool-bg #1e1e2e;
+@define-color tool-color #cdd6f4;
+@define-color tool-border #11111b;
+@define-color wb-color #cdd6f4;
+@define-color wb-act-bg #a6adc8;
+@define-color wb-act-color #313244;
+@define-color wb-hvr-bg #f5c2e7;
+@define-color wb-hvr-color #313244;
+
* {
border: none;
border-radius: 0px;
@@ -7,8 +19,6 @@
min-height: 10px;
}
-@import "themes/theme.css";
-
window#waybar {
background: @bar-bg;
}
diff --git a/modules/home/hyprland/conf/waybar/themes/Catppuccin-Latte.css b/modules/home/hyprland/conf/waybar/themes/Catppuccin-Latte.css
deleted file mode 100644
index d8e6376..0000000
--- a/modules/home/hyprland/conf/waybar/themes/Catppuccin-Latte.css
+++ /dev/null
@@ -1,16 +0,0 @@
-@define-color bar-bg rgba(0, 0, 0, 0);
-
-@define-color main-color #4c4f69;
-@define-color main-bg #9ca0b0;
-
-@define-color tool-bg #9ca0b0;
-@define-color tool-color #4c4f69;
-@define-color tool-border #ccd0da;
-
-@define-color wb-color #4c4f69;
-
-@define-color wb-act-bg #5c5f77;
-@define-color wb-act-color #dce0e8;
-
-@define-color wb-hvr-bg #dc8a78;
-@define-color wb-hvr-color #dce0e8;
diff --git a/modules/home/hyprland/conf/waybar/themes/Catppuccin-Mocha.css b/modules/home/hyprland/conf/waybar/themes/Catppuccin-Mocha.css
deleted file mode 100644
index 2b6da2f..0000000
--- a/modules/home/hyprland/conf/waybar/themes/Catppuccin-Mocha.css
+++ /dev/null
@@ -1,16 +0,0 @@
-@define-color bar-bg rgba(0, 0, 0, 0);
-
-@define-color main-color #cdd6f4;
-@define-color main-bg #11111b;
-
-@define-color tool-bg #1e1e2e;
-@define-color tool-color #cdd6f4;
-@define-color tool-border #11111b;
-
-@define-color wb-color #cdd6f4;
-
-@define-color wb-act-bg #a6adc8;
-@define-color wb-act-color #313244;
-
-@define-color wb-hvr-bg #f5c2e7;
-@define-color wb-hvr-color #313244;
diff --git a/modules/home/hyprland/conf/waybar/themes/Cyberpunk-Edge.css b/modules/home/hyprland/conf/waybar/themes/Cyberpunk-Edge.css
deleted file mode 100644
index debe8ea..0000000
--- a/modules/home/hyprland/conf/waybar/themes/Cyberpunk-Edge.css
+++ /dev/null
@@ -1,16 +0,0 @@
-@define-color bar-bg rgba(0,0,0,1);
-
-@define-color main-color #FFA6C2;
-@define-color main-bg #000000;
-
-@define-color tool-bg #000000;
-@define-color tool-color #ffffff;
-@define-color tool-border #FFA6C2;
-
-@define-color wb-color #FFA6C2;
-
-@define-color wb-act-bg #FFA6C2;
-@define-color wb-act-color #000000;
-
-@define-color wb-hvr-bg #FADA16;
-@define-color wb-hvr-color #000000;
diff --git a/modules/home/hyprland/conf/waybar/themes/Decay-Green.css b/modules/home/hyprland/conf/waybar/themes/Decay-Green.css
deleted file mode 100644
index 97d7864..0000000
--- a/modules/home/hyprland/conf/waybar/themes/Decay-Green.css
+++ /dev/null
@@ -1,16 +0,0 @@
-@define-color bar-bg rgba(31, 35, 40, 0.95);
-
-@define-color main-color #93cee9;
-@define-color main-bg #101419;
-
-@define-color tool-bg #cbced3;
-@define-color tool-color #1f2328;
-@define-color tool-border #90ceaa;
-
-@define-color wb-color #93cee9;
-
-@define-color wb-act-bg #93cee9;
-@define-color wb-act-color #1f2328;
-
-@define-color wb-hvr-bg #93cee9;
-@define-color wb-hvr-color #1f2328;
diff --git a/modules/home/hyprland/conf/waybar/themes/Graphite-Mono.css b/modules/home/hyprland/conf/waybar/themes/Graphite-Mono.css
deleted file mode 100644
index 98ee654..0000000
--- a/modules/home/hyprland/conf/waybar/themes/Graphite-Mono.css
+++ /dev/null
@@ -1,16 +0,0 @@
-@define-color bar-bg rgba(38,38,38,1);
-
-@define-color main-color #d9d9d9;
-@define-color main-bg #262626;
-
-@define-color tool-bg #595959;
-@define-color tool-color #a6a6a6;
-@define-color tool-border #d9d9d9;
-
-@define-color wb-color #d9d9d9;
-
-@define-color wb-act-bg #d9d9d9;
-@define-color wb-act-color #262626;
-
-@define-color wb-hvr-bg #a6a6a6;
-@define-color wb-hvr-color #262626;
diff --git a/modules/home/hyprland/conf/waybar/themes/Material-Sakura.css b/modules/home/hyprland/conf/waybar/themes/Material-Sakura.css
deleted file mode 100644
index 5d94dc3..0000000
--- a/modules/home/hyprland/conf/waybar/themes/Material-Sakura.css
+++ /dev/null
@@ -1,16 +0,0 @@
-@define-color bar-bg rgba(0, 0, 0, 0);
-
-@define-color main-color #907aa9;
-@define-color main-bg #faf4ed;
-
-@define-color tool-bg #f2e9e1;
-@define-color tool-color #9893a5;
-@define-color tool-border #d7827e;
-
-@define-color wb-color #907aa9;
-
-@define-color wb-act-bg #b4637a;
-@define-color wb-act-color #fffaf3;
-
-@define-color wb-hvr-bg #56949f;
-@define-color wb-hvr-color #fffaf3;
diff --git a/modules/home/hyprland/conf/waybar/themes/Rose-Pine.css b/modules/home/hyprland/conf/waybar/themes/Rose-Pine.css
deleted file mode 100644
index 41907ef..0000000
--- a/modules/home/hyprland/conf/waybar/themes/Rose-Pine.css
+++ /dev/null
@@ -1,16 +0,0 @@
-@define-color bar-bg rgba(0, 0, 0, 0);
-
-@define-color main-color #ebbcba;
-@define-color main-bg #26233a;
-
-@define-color tool-bg #21202e;
-@define-color tool-color #908caa;
-@define-color tool-border #524f67;
-
-@define-color wb-color #31748f;
-
-@define-color wb-act-bg #31748f;
-@define-color wb-act-color #9ccfd8;
-
-@define-color wb-hvr-bg #eb6f92;
-@define-color wb-hvr-color #f6c177;
diff --git a/modules/home/hyprland/conf/waybar/themes/Tokyo-Night.css b/modules/home/hyprland/conf/waybar/themes/Tokyo-Night.css
deleted file mode 100644
index 6b22f25..0000000
--- a/modules/home/hyprland/conf/waybar/themes/Tokyo-Night.css
+++ /dev/null
@@ -1,16 +0,0 @@
-@define-color bar-bg rgba(0, 0, 0, 0);
-
-@define-color main-color #7aa2f7;
-@define-color main-bg #24283b;
-
-@define-color tool-bg #414868;
-@define-color tool-color #b4f9f8;
-@define-color tool-border #565f89;
-
-@define-color wb-color #7dcfff;
-
-@define-color wb-act-bg #bb9af7;
-@define-color wb-act-color #b4f9f8;
-
-@define-color wb-hvr-bg #7aa2f7;
-@define-color wb-hvr-color #cfc9c2;
diff --git a/modules/home/hyprland/conf/waybar/themes/theme.css b/modules/home/hyprland/conf/waybar/themes/theme.css
deleted file mode 120000
index ada2182..0000000
--- a/modules/home/hyprland/conf/waybar/themes/theme.css
+++ /dev/null
@@ -1 +0,0 @@
-Catppuccin-Mocha.css
\ No newline at end of file
diff --git a/modules/home/hyprland/conf/waybar/wbarconfgen.sh b/modules/home/hyprland/conf/waybar/wbarconfgen.sh
deleted file mode 100755
index ce1079e..0000000
--- a/modules/home/hyprland/conf/waybar/wbarconfgen.sh
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/env sh
-
-
-# read control file and initialize variables
-
-waybar_dir=`pwd`
-modules_dir="$waybar_dir/modules"
-conf_file="$waybar_dir/config.jsonc"
-conf_ctl="$waybar_dir/config.ctl"
-
-readarray -t read_ctl < $conf_ctl
-num_files="${#read_ctl[@]}"
-switch=0
-
-
-# update control file to set next/prev mode
-
-for (( i=0 ; i<$num_files ; i++ ))
-do
- flag=`echo "${read_ctl[i]}" | cut -d '|' -f 1`
-
- if [ $flag -eq 1 ] && [ "$1" == "n" ] ; then
- nextIndex=$(( (i + 1) % $num_files ))
- switch=1
- break;
-
- elif [ $flag -eq 1 ] && [ "$1" == "p" ] ; then
- nextIndex=$(( i - 1 ))
- switch=1
- break;
- fi
-done
-
-if [ $switch -eq 1 ] ; then
- update_ctl="${read_ctl[nextIndex]}"
- sed -i "s/^1/0/g" $conf_ctl
- awk -F '|' -v cmp="$update_ctl" '{OFS=FS} {if($0==cmp) $1=1; print$0}' $conf_ctl > $waybar_dir/tmp && mv $waybar_dir/tmp $conf_ctl
-fi
-
-
-# overwrite config from header module
-
-export set_sysname=`hostnamectl hostname`
-export w_position=`grep '^1|' $conf_ctl | cut -d '|' -f 3`
-
-export w_height=`grep '^1|' $conf_ctl | cut -d '|' -f 2`
-if [ -z $w_height ] ; then
- y_monres=`cat /sys/class/drm/*/modes | head -1 | cut -d 'x' -f 2`
- export w_height=$(( y_monres*2/100 ))
-fi
-
-export i_size=$(( w_height*6/10 ))
-if [ $i_size -lt 12 ] ; then
- export i_size="12"
-fi
-
-export i_theme=`gsettings get org.gnome.desktop.interface icon-theme | sed "s/'//g"`
-export i_task=$(( w_height*6/10 ))
-if [ $i_task -lt 16 ] ; then
- export i_task="16"
-fi
-
-envsubst < $modules_dir/header.jsonc > $conf_file
-
-
-# module generator function
-
-gen_mod()
-{
- local pos=$1
- local col=$2
- local mod=""
-
- mod=`grep '^1|' $conf_ctl | cut -d '|' -f ${col}`
- mod="${mod//(/"custom/l_end"}"
- mod="${mod//)/"custom/r_end"}"
- mod="${mod//[/"custom/sl_end"}"
- mod="${mod//]/"custom/sr_end"}"
- mod="${mod//\{/"custom/rl_end"}"
- mod="${mod//\}/"custom/rr_end"}"
- mod="${mod// /"\",\""}"
-
- echo -e "\t\"modules-${pos}\": [\"custom/padd\",\"${mod}\",\"custom/padd\"]," >> $conf_file
- write_mod=`echo $write_mod $mod`
-}
-
-
-# write positions for modules
-
-echo -e "\n\n// positions generated based on config.ctl //\n" >> $conf_file
-gen_mod left 4
-gen_mod center 5
-gen_mod right 6
-
-
-# copy modules/*.jsonc to the config
-
-echo -e "\n\n// sourced from modules based on config.ctl //\n" >> $conf_file
-echo "$write_mod" | sed 's/","/\n/g ; s/ /\n/g' | awk '!x[$0]++' | while read mod_list
-do
- mod_cpy=`echo $mod_list | awk -F '/' '{print $NF}'`
-
- case ${w_position}-$(grep -E '"modules-left":|"modules-center":|"modules-right":' $conf_file | grep "$mod_cpy" | tail -1 | cut -d '"' -f 2 | cut -d '-' -f 2) in
- top-left) export mod_pos=1;;
- top-right) export mod_pos=2;;
- bottom-right) export mod_pos=3;;
- bottom-left) export mod_pos=4;;
- esac
-
- if [ -f $modules_dir/$mod_cpy.jsonc ] ; then
- envsubst < $modules_dir/$mod_cpy.jsonc >> $conf_file
- fi
-done
-
-cat $modules_dir/footer.jsonc >> $conf_file
-
-
-# generate style and restart waybar
-
-$waybar_dir/wbarstylegen.sh
-
-
diff --git a/modules/home/hyprland/conf/waybar/wbarstylegen.sh b/modules/home/hyprland/conf/waybar/wbarstylegen.sh
deleted file mode 100755
index dfdd023..0000000
--- a/modules/home/hyprland/conf/waybar/wbarstylegen.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env sh
-
-
-# detect hypr theme and initialize variables
-
-waybar_dir=`pwd`
-in_file="$waybar_dir/modules/style.css"
-out_file="$waybar_dir/style.css"
-src_file="$HOME/.config/hypr/themes/theme.conf"
-export cur_theme=`echo $(readlink "$src_file") | awk -F "/" '{print $NF}' | cut -d '.' -f 1`
-
-
-# calculate height from control file or monitor res
-
-b_height=`grep '^1|' $waybar_dir/config.ctl | cut -d '|' -f 2`
-
-if [ -z $b_height ] || [ "$b_height" == "0" ]; then
- y_monres=`cat /sys/class/drm/*/modes | head -1 | cut -d 'x' -f 2`
- b_height=$(( y_monres*3/100 ))
-fi
-
-
-# calculate values based on height and generate theme style
-
-export b_radius=$(( b_height*70/100 )) # block rad 90% of height (type1)
-export c_radius=$(( b_height*25/100 )) # block rad 25% of height {type2}
-export e_margin=$(( b_height*30/100 )) # block margin 30% of height
-export e_paddin=$(( b_height*10/100 )) # block padding 10% of height
-export g_margin=$(( b_height*14/100 )) # module margin 14% of height
-export g_paddin=$(( b_height*15/100 )) # module padding 15% of height
-export w_radius=$(( b_height*30/100 )) # workspace rad 30% of height
-export w_margin=$(( b_height*10/100 )) # workspace margin 10% of height
-export w_paddin=$(( b_height*10/100 )) # workspace padding 10% of height
-export w_padact=$(( b_height*40/100 )) # workspace active padding 40% of height
-export s_fontpx=$(( b_height*38/100 )) # font size 38% of height
-
-if [ $b_height -lt 30 ] ; then
- export e_paddin=0
-fi
-if [ $s_fontpx -lt 10 ] ; then
- export s_fontpx=10
-fi
-
-envsubst < $in_file > $out_file
-
-
-# override rounded couners
-
-hypr_border=`awk -F '=' '{if($1~" rounding ") print $2}' $src_file | sed 's/ //g'`
-if [ "$hypr_border" == "0" ] ; then
- sed -i "/border-radius: /c\ border-radius: 0px;" $out_file
-fi
-
-
-# restart waybar
-
-killall waybar
-waybar > /dev/null 2>&1 &
-# killall -SIGUSR2 waybar
-
-
diff --git a/modules/home/hyprland/conf/waybar/wbarswitch.sh b/modules/home/hyprland/conf/waybar/wbarswitch.sh
deleted file mode 100755
index d063ecc..0000000
--- a/modules/home/hyprland/conf/waybar/wbarswitch.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env sh
-
-# Set the directory paths
-waybar_dir=`dirname $(realpath $0)`
-modes_dir="$waybar_dir/modes"
-
-# Get the current symlink target
-current_target=$(readlink "$waybar_dir/config.jsonc")
-
-# Get the list of available files in modes directory
-file_list=("$modes_dir"/*.jsonc)
-num_files=${#file_list[@]}
-
-# Check if there are no files or only one file
-if [[ $num_files -eq 0 ]]; then
- echo "Error: No files found in modes directory."
- exit 1
-elif [[ $num_files -eq 1 ]]; then
- echo "Only one file found. No changes made."
- exit 0
-fi
-
-# Find the index of the current target in the file list
-current_index=-1
-for ((i=0; i /dev/null 2>&1 &
diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix
index fec62dd..b382563 100644
--- a/modules/home/hyprland/default.nix
+++ b/modules/home/hyprland/default.nix
@@ -45,19 +45,16 @@
# copy the scripts directory recursively
recursive = true;
};
- home.file.".config/hypr/themes/theme.conf".source = ./conf/hypr/themes/Catppuccin-Latte.conf;
home.file.".config/rofi" = {
source = ./conf/rofi;
recursive = true;
};
- home.file.".config/rofi/themes/theme.rasi".source = ./conf/rofi/themes/Catppuccin-Latte.rasi;
home.file.".config/kitty" = {
source = ./conf/kitty;
recursive = true;
};
- home.file.".config/kitty/themes/theme.conf".source = ./conf/kitty/themes/Catppuccin-Latte.conf;
home.file.".config/swww" = {
source = ./conf/swww;