diff --git a/dotfiles/config/hypr/hyprland.conf b/dotfiles/config/hypr/hyprland.conf index ff17a61..071cdab 100644 --- a/dotfiles/config/hypr/hyprland.conf +++ b/dotfiles/config/hypr/hyprland.conf @@ -24,15 +24,15 @@ exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CUR exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # More wayland magic (screen sharing etc.) exec-once = ~/.config/hypr/scripts/bgaction -exec-once = ~/.local/share/hyprload/hyprload.sh +#exec-once = ~/.local/share/hyprload/hyprload.sh exec-once = ~/.config/hypr/scripts/xdg-portal-hyprland exec-once = /usr/lib/polkit-kde-authentication-agent-1 -exec-once = mako & -exec-once = clash & +exec-once = swaync +#exec-once = clash & exec-once = waybar & -exec-once = udiskie & -exec-once = blueman-applet +#exec-once = udiskie & +#exec-once = blueman-applet exec-once = fcitx5 --replace -d exec-once = nm-applet --indicator @@ -182,33 +182,32 @@ xwayland { force_zero_scaling = true } -plugin { - - hyprload { - quiet = true - } - - touch_gestures { - # default sensitivity is probably too low on tablet screens, - # I recommend turning it up to 4.0 - sensitivity = 4.0 - workspace_swipe_fingers = 3 - } - - hyprbars { - # config - buttons { - # button config - } - } -windowrulev2 = tile, title:^(bandu_flutter)$ - - borders-plus-plus { - #add_borders = 1 # 0 - 2 - #col.border_1 = rgb(ffffff) # example col for border 1 - #col.border_2 = rgb(2222ff) # example col for border 2 - } -} +#plugin { +# +# hyprload { +# quiet = true +# } +# +# touch_gestures { +# # default sensitivity is probably too low on tablet screens, +# # I recommend turning it up to 4.0 +# sensitivity = 4.0 +# workspace_swipe_fingers = 3 +# } +# +# hyprbars { +# # config +# buttons { +# # button config +# } +# } +# +# borders-plus-plus { +# #add_borders = 1 # 0 - 2 +# #col.border_1 = rgb(ffffff) # example col for border 1 +# #col.border_2 = rgb(2222ff) # example col for border 2 +# } +#} # Example windowrule v1 # windowrule = float, ^(kitty)$ @@ -251,6 +250,7 @@ bind = $mainMod, J, exec, pkill jupyter-lab; jupyter-lab bind = $mainMod, L, exec, logseq #bind = $mainMod SHIFT, L, exec, swaylock #bind = $mainMod, M, exec, wlogout --protocol layer-shell +bind = $mainMod, N, exec, swaync-client -t -sw #bind = $mainMod CTRL, M, exec, motrix #bind = $mainMod, N, exec, microsoft-edge --profile-directory=Default --app-id=bicgkabnllfcnajoaobgkmpjchldbdco --app-url=https://www.notion.so/000-Inbox-ed0cb9b1899648ea8007e860698d251c bind = $mainMod SHIFT, N, exec, kitty nvim diff --git a/dotfiles/config/hypr/hyprload.toml b/dotfiles/config/hypr/hyprload.toml deleted file mode 100644 index 35e8711..0000000 --- a/dotfiles/config/hypr/hyprload.toml +++ /dev/null @@ -1,10 +0,0 @@ -plugins = [ - "Duckonaut/split-monitor-workspaces", - "zakk4223/hyprNStack", - "zakk4223/hyprRiver", - "VortexCoyote/hyprfocus", - "ItsDrike/hyprland-dwindle-autogroup", - "outfoxxed/hy3", - "horriblename/hyprland-touch-gestures", - "Duckonaut/split-monitor-workspaces", -] diff --git a/dotfiles/config/hypr/wallpaper-dark.jpg b/dotfiles/config/hypr/wallpaper-dark.jpg index bc79709..b360c80 100644 Binary files a/dotfiles/config/hypr/wallpaper-dark.jpg and b/dotfiles/config/hypr/wallpaper-dark.jpg differ diff --git a/dotfiles/config/hypr/wallpaper.jpg b/dotfiles/config/hypr/wallpaper.jpg index cbc929e..57bb6b0 100644 Binary files a/dotfiles/config/hypr/wallpaper.jpg and b/dotfiles/config/hypr/wallpaper.jpg differ diff --git a/dotfiles/config/waybar/config.jsonc b/dotfiles/config/waybar/config.jsonc index d8a3f8e..291af3b 100644 --- a/dotfiles/config/waybar/config.jsonc +++ b/dotfiles/config/waybar/config.jsonc @@ -43,13 +43,18 @@ "tray", //"custom/power", //"custom/lock_screen", + "custom/notification", "custom/light_dark" ], "custom/launcher": { - "format": "  ", + "format": "  ", "on-click": "sh -c '(sleep 0.5s; pkill wofi || wofi -c ~/.config/wofi/config-lmenu)' & disown", "tooltip": false }, + "clock": { + "format": "{:%H:%M}", + "tooltip-format": "{: %A, %e %B %Y}" + }, "wlr/workspaces": { "disable-scroll": true, "all-outputs": true, @@ -79,9 +84,9 @@ "on-scroll-up": "hyprctl dispatch workspace r-1", "on-scroll-down": "hyprctl dispatch workspace r+1", "all-outputs": false, - //"persistent_workspaces": { - // "*": 5 - //} + "persistent_workspaces": { + "*": 3 + } }, "custom/playerctl": { "format": "{icon}", @@ -110,7 +115,7 @@ "format-icons": { "Playing": "󰒮 󰐌 󰒭 ", "Paused": "󰒮 󰏥 󰒭 " - }, + } }, // -------------------- @@ -128,9 +133,9 @@ "ignore-list": [ "wofi" ], - "app_ids-mapping": { - "steam_app_39210": "Final Fantasy 14" - } + "app_ids-mapping": { + "steam_app_39210": "Final Fantasy 14" + } }, @@ -206,7 +211,7 @@ }, "battery": { "states": { - // "good": 95, + "good": 80, "warning": 30, "critical": 15 }, @@ -226,7 +231,7 @@ "scroll-step": 1, // %, can be a float "format": "{icon} {volume}%", "format-bluetooth": " {volume}%", //"{icon}  {volume}%", //{format_source}", - "format-bluetooth-muted": " ", //" {icon}", //{format_source}", + "format-bluetooth-muted": " {icon}", //{format_source}", "format-muted": "", "format-source": " {volume}%", "format-source-muted": "", @@ -241,7 +246,7 @@ }, "on-click": "pavucontrol", "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +1%", - "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -1%", + "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -1%" }, "pulseaudio_pamixer": { "format": "{icon}", @@ -313,8 +318,28 @@ "tooltip": false }, "custom/light_dark": { - "format": "󰐾", + "format": "", "on-click": "~/.config/waybar/scripts/baraction light", "tooltip": false - } + }, + "custom/notification": { + "tooltip": false, + "format": "{icon}", + "format-icons": { + "notification": "", + "none": "", + "dnd-notification": "", + "dnd-none": "", + "inhibited-notification": "", + "inhibited-none": "", + "dnd-inhibited-notification": "", + "dnd-inhibited-none": "" + }, + "return-type": "json", + "exec-if": "which swaync-client", + "exec": "swaync-client -swb", + "on-click": "swaync-client -t -sw", + "on-click-right": "swaync-client -d -sw", + "escape": true + } } diff --git a/dotfiles/config/waybar/config.sway b/dotfiles/config/waybar/config.sway deleted file mode 100644 index 14b6e75..0000000 --- a/dotfiles/config/waybar/config.sway +++ /dev/null @@ -1,218 +0,0 @@ -// Global -{ - "layer": "top", - "position": "top", - - // If height property would be not present, it'd be calculated dynamically - "height": 30, - - "modules-left": [ - "custom/launcher", - "sway/workspaces", - "sway/mode", - ], - - "modules-center": [ - ], - - "modules-right": [ - "network", - "idle_inhibitor", - "memory", - "cpu", - "pulseaudio", - "custom/keyboard-layout", - "battery", - //"custom/PBPbattery", - "backlight#icon", - "backlight#value", - "clock", - "tray", - //"custom/weather", - "custom/power", - ], - - // Modules - - "idle_inhibitor": { - "format": "{icon} ", - "format-icons":{ - "activated": "", - "deactivated": "" - } - }, - - "battery": { - "states": { - // "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% {icon}", - "format-charging": "{capacity}% ", - "format-plugged": "{capacity}% ", - // "format-good": "", // An empty format will hide the module - // "format-full": "", - "format-icons": ["", "", "", "", ""] - }, - - "custom/PBPbattery": { - "exec": "~/.config/waybar/scripts/PBPbattery.sh", - "format": "{}", - }, - - "clock": { - "interval": 10, - "format-alt": " {:%e %b %Y}", // Icon: calendar-alt - "format": "{:%H:%M}", - "tooltip-format": "{:%e %B %Y}" - }, - - "cpu": { - "interval": 5, - "format": " {usage}% ({load})", // Icon: microchip - "states": { - "warning": 70, - "critical": 90, - }, - "on-click": "xfce4-terminal -e 'htop'", - }, - - "custom/keyboard-layout": { - "exec": "swaymsg -t get_inputs | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4", - // Interval set only as a fallback, as the value is updated by signal - "interval": 30, - "format": " {}", // Icon: keyboard - // Signal sent by Sway key binding (~/.config/sway/key-bindings) - "signal": 1, // SIGHUP - "tooltip": false, - "on-click": "~/.config/waybar/scripts/keyhint.sh", - }, - - "memory": { - "interval": 5, - "format": " {}%", // Icon: memory - "on-click": "xfce4-terminal -e 'htop'", - "states": { - "warning": 70, - "critical": 90 - } - }, - - "network": { - "interval": 5, - "format-wifi": " {essid} ({signalStrength}%)", // Icon: wifi - "format-ethernet": " {ifname}: {ipaddr}/{cidr}", // Icon: ethernet - "format-disconnected": "⚠ Disconnected", - "tooltip-format": "{ifname}: {ipaddr}", - "on-click": "xfce4-terminal -e 'nmtui'", - }, - "network#vpn": { - "interface": "tun0", - "format": " {essid} ({signalStrength}%)", - "format-disconnected": "⚠ Disconnected", - "tooltip-format": "{ifname}: {ipaddr}/{cidr}", - }, - - "sway/mode": { - "format": "{}", - "tooltip": false - }, - - "sway/window": { - "format": "{}", - "max-length": 120 - }, - - "sway/workspaces": { - "disable-scroll": true, - "disable-markup" : false, - "all-outputs": true, - "format": " {icon} ", - //"format":"{icon}", - "format-icons": { - "1": "", - "2": "", - "3": "", - "4": "", - } - }, - - "pulseaudio": { - "scroll-step": 1, // %, can be a float - "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% {icon}  {format_source}", - "format-bluetooth-muted": " {icon}  {format_source}", - "format-muted": "婢 {format_source}", - "format-source": "{volume}% ", - "format-source-muted": "", - "format-icons": { - "headphone": "", - "hands-free": "וֹ", - "headset": "  ", - "phone": "", - "portable": "", - "car": "", - "default": [""] - }, - "on-click": "pavucontrol", - "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +2%", - "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -2%", - }, - - // to use the weather module replace with your city or town - // note: do not use spaces: new york would be newyork - "custom/weather": { - "exec": "~/.config/waybar/scripts/weather.sh ", - "return-type": "json", - "interval": 600, - }, - - "tray": { - "icon-size": 18, - "spacing":10, - }, - - "backlight#icon": { - "format": "{icon}", - "format-icons": [""], - "on-scroll-down": "brightnessctl -c backlight set 1%-", - "on-scroll-up": "brightnessctl -c backlight set +1%" - }, - - "backlight#value" :{ - "format": "{percent}%", - "on-scroll-down": "brightnessctl -c backlight set 1%-", - "on-scroll-up": "brightnessctl -c backlight set +1%" - }, - - "custom/firefox": { - "format": " ", - "on-click": "exec firefox", - "tooltip": false - }, - - "custom/terminal": { - "format": " ", - "on-click": "exec xfce4-terminal", - "tooltip": false - }, - - "custom/files": { - "format": " ", - "on-click": "exec thunar", - "tooltip": false - }, - - "custom/launcher": { - "format":" ", - "on-click": "exec wofi -c ~/.config/wofi/config -I", - "tooltip": false, - }, - - "custom/power": { - "format":"⏻", - "on-click": "exec ~/.config/waybar/scripts/power-menu.sh", - "tooltip": false, - }, -}