diff options
Diffstat (limited to 'config/hyprland')
| -rw-r--r-- | config/hyprland/foot/foot.ini | 4 | ||||
| -rw-r--r-- | config/hyprland/hypr/binds.conf | 34 | ||||
| -rw-r--r-- | config/hyprland/hypr/hyprland.conf | 5 | ||||
| -rwxr-xr-x | config/hyprland/hypr/startup.sh | 5 | ||||
| l--------- | config/hyprland/tofi/config | 1 | ||||
| -rw-r--r-- | config/hyprland/tofi/themes/colors | 14 | ||||
| -rw-r--r-- | config/hyprland/waybar/config.jsonc | 24 | ||||
| -rw-r--r-- | config/hyprland/waybar/schemes/base16.css | 46 |
8 files changed, 66 insertions, 67 deletions
diff --git a/config/hyprland/foot/foot.ini b/config/hyprland/foot/foot.ini index 24df032..8caee75 100644 --- a/config/hyprland/foot/foot.ini +++ b/config/hyprland/foot/foot.ini @@ -113,7 +113,7 @@ alpha=0.90 # clipboard-copy=Control+Shift+c XF86Copy # clipboard-paste=Control+Shift+v XF86Paste # primary-paste=Shift+Insert -# search-start=Control+Shift+r +search-start=Control+Shift+r # font-increase=Control+plus Control+equal Control+KP_Add # font-decrease=Control+minus Control+KP_Subtract # font-reset=Control+0 Control+KP_0 @@ -125,7 +125,7 @@ alpha=0.90 # pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none # pipe-selected=[xargs -r firefox] none # show-urls-launch=Control+Shift+u -# show-urls-copy=none +show-urls-copy=Mod1+Shift+l # show-urls-persistent=none # prompt-prev=Control+Shift+z # prompt-next=Control+Shift+x diff --git a/config/hyprland/hypr/binds.conf b/config/hyprland/hypr/binds.conf index 315a9dd..5c2dd99 100644 --- a/config/hyprland/hypr/binds.conf +++ b/config/hyprland/hypr/binds.conf @@ -3,12 +3,14 @@ $mainMod = SUPER $term = foot $menu = $(tofi-run) +$menu_opt = $(tofi-run --auto-accept-single=false) bind = $mainMod, Return, exec, $term bind = $mainMod SHIFT, Return, exec, $menu +bind = $mainMod CTRL, Return, exec, $menu_opt bind = $mainMod, C, killactive, bind = $mainMod SHIFT, C, exec, hyprctl kill -bind = $mainMod, Q, exit, +bind = $mainMod SHIFT, Q, exit, bind = $mainMod, F, togglefloating, bind = $mainMod SHIFT, P, pseudo bind = $mainMod, S, togglesplit @@ -75,34 +77,34 @@ bindm = $mainMod, mouse:273, resizewindow bind = $mainMod, M, submap, menuscripts submap = menuscripts -bind =, A, exec, dmask -bind =, C, exec, dmclip -bind =, D, exec, mdsktp -bind =, E, exec, memoji -bind =, F, exec, dmfm -bind =, G, exec, mpassgen -bind =, H, exec, mhelp -bind =, I, exec, mapimg -bind =, L, exec, dmlang -bind =, M, exec, mpass -bind =, P, exec, mpdf -bind =, O, exec, mpower -bind =, U, exec, mcurs -bind =, V, exec, mvid bind = $mainMod, A, exec, dmask -bind = $mainMod, C, exec, dmclip +bind =, A, exec, dmask +bind = $mainMod, C, exec, copyhist +bind =, C, exec, copyhist bind = $mainMod, D, exec, mdsktp +bind =, D, exec, mdsktp bind = $mainMod, E, exec, memoji +bind =, E, exec, memoji bind = $mainMod, F, exec, dmfm +bind =, F, exec, dmfm bind = $mainMod, G, exec, mpassgen +bind =, G, exec, mpassgen bind = $mainMod, H, exec, mhelp +bind =, H, exec, mhelp bind = $mainMod, I, exec, mapimg +bind =, I, exec, mapimg bind = $mainMod, L, exec, dmlang +bind =, L, exec, dmlang bind = $mainMod, M, exec, mpass +bind =, M, exec, mpass bind = $mainMod, P, exec, mpdf +bind =, P, exec, mpdf bind = $mainMod, O, exec, mpower +bind =, O, exec, mpower bind = $mainMod, U, exec, mcurs +bind =, U, exec, mcurs bind = $mainMod, V, exec, mvid +bind =, V, exec, mvid source = ./reset-submap.conf submap = reset diff --git a/config/hyprland/hypr/hyprland.conf b/config/hyprland/hypr/hyprland.conf index e7048ae..8aa437e 100644 --- a/config/hyprland/hypr/hyprland.conf +++ b/config/hyprland/hypr/hyprland.conf @@ -4,8 +4,7 @@ monitor=,preferred,auto,1 source = ./env.conf -exec-once = gammastep & waybar -exec-once = swaybg -i ~/pics/wallpaper +exec-once = $HOME/.config/hypr/startup.sh input { kb_layout = us @@ -32,7 +31,7 @@ general { layout = dwindle - cursor_inactive_timeout = 2 + cursor_inactive_timeout = 0 } misc { diff --git a/config/hyprland/hypr/startup.sh b/config/hyprland/hypr/startup.sh new file mode 100755 index 0000000..ab0e48b --- /dev/null +++ b/config/hyprland/hypr/startup.sh @@ -0,0 +1,5 @@ +#!/bin/sh +swaybg -i ~/pics/wallpaper & +waybar & +gammastep & +wl-paste --watch cliphist store & diff --git a/config/hyprland/tofi/config b/config/hyprland/tofi/config deleted file mode 120000 index 75daa23..0000000 --- a/config/hyprland/tofi/config +++ /dev/null @@ -1 +0,0 @@ -/home/aluc/.config/tofi/themes/base16
\ No newline at end of file diff --git a/config/hyprland/tofi/themes/colors b/config/hyprland/tofi/themes/colors deleted file mode 100644 index 3c35fc2..0000000 --- a/config/hyprland/tofi/themes/colors +++ /dev/null @@ -1,14 +0,0 @@ -# tofi -text-color = #d1dae6 -prompt-color = #999CA9 -placeholder-color = #999CA9 -input-color = #d1dae6 -default-result-color = #9CB3D4 -selection-color = #9298a1 -selection-match-color = #d1dae6 - -background-color = #0f1114f0 - -outline-color = #999CA9 - -border-color = #9CB3D4 diff --git a/config/hyprland/waybar/config.jsonc b/config/hyprland/waybar/config.jsonc index 006d22b..816a851 100644 --- a/config/hyprland/waybar/config.jsonc +++ b/config/hyprland/waybar/config.jsonc @@ -1,8 +1,8 @@ { "layer": "top", - "modules-left": ["battery", "wlr/workspaces", "mpd"], + "modules-left": ["battery", "clock", "wlr/workspaces", "mpd"], "modules-center": ["hyprland/window"], - "modules-right": ["network", "pulseaudio", "temperature", "cpu", "custom/memory", "clock", "tray"], + "modules-right": ["network", "pulseaudio", "temperature", "cpu", "custom/memory", "tray"], "wlr/workspaces": { "on-click": "activate", }, @@ -10,13 +10,15 @@ "tooltip": false, "format": "{artist} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})", "artist-len": 24, - "format-disconnected": "ﳌ", - "format-stopped": "", + "format-disconnected": "", + "format-stopped": "", "state-icons": { - "playing": "", - "paused": "", + "playing": "", + "paused": "", }, "on-click": "mpc toggle", + "on-scroll-up": "mpc volume +5", + "on-scroll-down": "mpc volume -5", }, "battery": { "format-charging": " {capacity}%", @@ -29,9 +31,9 @@ "pulseaudio": { "tooltip": false, "scroll-step": 5, - "format": "{icon} {volume}%", + "format": "{icon} {volume:3}%", "format-icons": { - "default": ["奄", "奔", "墳"] + "default": ["", "", ""] }, "on-click": "pavucontrol", }, @@ -43,11 +45,11 @@ }, }, "network": { - "format-wifi": "", + "format-wifi": " ", "tooltip-format-wifi": "{ifname} {essid}", "format-ethernet": "", "tooltip-format-ethernet": "{ifname} {ipaddr}", - "format-disconnected": "裏", + "format-disconnected": "", }, "cpu": { "tooltip": false, @@ -61,7 +63,7 @@ }, "clock": { "format": "{:%H:%M}", - "format-alt": " {:%A, %B %d, %Y (%R)}", + "format-alt": "{:(%R) %A %d %B}", "interval": 1, }, "tray": { diff --git a/config/hyprland/waybar/schemes/base16.css b/config/hyprland/waybar/schemes/base16.css index 68c5219..eced638 100644 --- a/config/hyprland/waybar/schemes/base16.css +++ b/config/hyprland/waybar/schemes/base16.css @@ -38,6 +38,7 @@ window#waybar.PCSX2 #window { } #mpd, #battery, +#window, #network, #pulseaudio, #temperature, #cpu, #custom-memory { margin-left: 8px; padding-left: 16px; @@ -45,8 +46,10 @@ window#waybar.PCSX2 #window { border-radius: 26px; } -#workspaces, #mpd, #battery, -#network, #pulseaudio, #temperature, #cpu, #custom-memory, #workspaces, #clock, #tray { +#workspaces, #mpd, #battery, #clock, +#window, +#network, #pulseaudio, #temperature, #cpu, #custom-memory, #tray { + border: solid @background 2px; margin-top: 4px; margin-bottom: 2px; transition: none; @@ -55,28 +58,29 @@ window#waybar.PCSX2 #window { #battery { color: @color6; background: @background; + border-color: @color4; } #workspaces { margin-left: 12px; border-radius: 26px; - background: @background; + background: @color3; } #workspaces button { transition: none; - color: @foreground; background: transparent; font-size: 16px; + color: @background; } #workspaces button.active { - color: @color12; + text-shadow: 1px 0px 1px @background; } #workspaces button:hover { transition: none; - color: @color11; + color: @color8; } #mpd { @@ -88,56 +92,58 @@ window#waybar.PCSX2 #window { #mpd.stopped { color: @foreground; background: @background; + border-color: @color4; } -#window { +#clock { margin-top: 4px; margin-bottom: 2px; margin-left: 8px; padding-left: 16px; padding-right: 16px; border-radius: 26px; - color: @color6; - color: @color4; + color: @color3; background: @background; + border-color: @color4; +} + +#window { + color: @background; + background: @color4; } #network { color: @background; - background: @color12; + background: @color5; } #pulseaudio { color: @background; - background: @color14; + background: @color4; } #temperature { color: @background; - background: @color7; + background: @color3; } #cpu { color: @background; - background: @color3; + background: @color4; } #custom-memory { - color: @background; - background: @color2; -} - -#clock { margin-left: 8px; margin-right: 12px; padding-left: 16px; padding-right: 16px; border-radius: 26px; - color: @foreground; - background: @background; + color: @background; + background: @color5; } #tray { + border: none; margin-right: 12px; color: @foreground; background: transparent; |