mirror of
https://mzte.de/git/LordMZTE/dotfiles.git
synced 2024-12-13 21:32:58 +01:00
overhaul waybar and wayfire configs
This commit is contained in:
parent
cbda22cccf
commit
0d09d14f55
GPG key ID:
B64802DC33A64FF6
5 changed files with 131 additions and 150 deletions
58
.config/hypr/control-keybinds.conf.cgt
Normal file
58
.config/hypr/control-keybinds.conf.cgt
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
# Media keys
|
||||
bind = ,XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%
|
||||
bind = ,XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%
|
||||
bind = ,XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
|
||||
bind = ,XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle
|
||||
bind = ,XF86AudioPlay, exec, playerctl play-pause
|
||||
bind = ,XF86AudioStop, exec, playerctl stop
|
||||
bind = ,XF86AudioNext, exec, playerctl next
|
||||
bind = ,XF86AudioPrev, exec, playerctl previous
|
||||
|
||||
# Control keys
|
||||
bind = SUPER + SHIFT, E, exit,
|
||||
bind = SUPER + SHIFT, Q, killactive,
|
||||
bind = SUPER + SHIFT, SPACE, togglefloating,
|
||||
bind = SUPER, P, pseudo, # dwindle
|
||||
bind = SUPER, R, togglesplit, # dwindle
|
||||
bind = SUPER, F, fullscreen,
|
||||
|
||||
# Move focus with mainMod + arrow keys
|
||||
bind = SUPER, left, movefocus, l
|
||||
bind = SUPER, right, movefocus, r
|
||||
bind = SUPER, up, movefocus, u
|
||||
bind = SUPER, down, movefocus, d
|
||||
|
||||
# HJKL
|
||||
bind = SUPER, H, movefocus, l
|
||||
bind = SUPER, L, movefocus, r
|
||||
bind = SUPER, K, movefocus, u
|
||||
bind = SUPER, J, movefocus, d
|
||||
|
||||
# Window Moving
|
||||
bind = SUPER + SHIFT, left, movewindow, l
|
||||
bind = SUPER + SHIFT, right, movewindow, r
|
||||
bind = SUPER + SHIFT, up, movewindow, u
|
||||
bind = SUPER + SHIFT, down, movewindow, d
|
||||
|
||||
# HJKL
|
||||
bind = SUPER + SHIFT, H, movewindow, l
|
||||
bind = SUPER + SHIFT, L, movewindow, r
|
||||
bind = SUPER + SHIFT, K, movewindow, u
|
||||
bind = SUPER + SHIFT, J, movewindow, d
|
||||
|
||||
# Workspace keybinds
|
||||
<! for i = 1, 9 do !>
|
||||
bind = SUPER, <% i %>, workspace, <% i %>
|
||||
bind = SUPER SHIFT, <% i %>, movetoworkspacesilent, <% i %>
|
||||
<! end !>
|
||||
|
||||
bind = SUPER, 0, workspace, 10
|
||||
bind = SUPER SHIFT, 0, movetoworkspacesilent, 10
|
||||
|
||||
# Scroll through existing workspaces with mainMod + scroll
|
||||
bind = SUPER, mouse_down, workspace, e+1
|
||||
bind = SUPER, mouse_up, workspace, e-1
|
||||
|
||||
# Move/resize windows with mainMod + LMB/RMB and dragging
|
||||
bindm = SUPER, mouse:272, movewindow
|
||||
bindm = SUPER, mouse:273, resizewindow
|
||||
|
|
@ -1,26 +1,7 @@
|
|||
# See https://wiki.hyprland.org/Configuring/Monitors/
|
||||
#monitor=,preferred,auto,auto
|
||||
$mainMod = SUPER
|
||||
|
||||
<% opt.getDeviceConf "hyprland.conf" %>
|
||||
|
||||
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
|
||||
|
||||
# Execute your favorite apps at launch
|
||||
# exec-once = waybar & hyprpaper & firefox
|
||||
|
||||
# Source a file (multi-file configs)
|
||||
# source = ~/.config/hypr/myColors.conf
|
||||
|
||||
# Some default env vars.
|
||||
env = XCURSOR_SIZE,24
|
||||
|
||||
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
|
||||
input {
|
||||
kb_layout = de
|
||||
kb_variant =
|
||||
kb_model =
|
||||
kb_rules =
|
||||
|
||||
follow_mouse = 2
|
||||
|
||||
|
|
@ -32,20 +13,16 @@ input {
|
|||
}
|
||||
|
||||
general {
|
||||
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
||||
|
||||
gaps_in = 5
|
||||
gaps_out = 20
|
||||
border_size = 2
|
||||
col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
|
||||
col.inactive_border = rgba(595959aa)
|
||||
border_size = 2.5
|
||||
col.active_border = rgba(f38ba8ee) rgba(a6e3a1ee) 45deg
|
||||
col.inactive_border = rgba(11111baa)
|
||||
|
||||
layout = dwindle
|
||||
}
|
||||
|
||||
decoration {
|
||||
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
||||
|
||||
rounding = 0
|
||||
|
||||
blur {
|
||||
|
|
@ -63,14 +40,13 @@ decoration {
|
|||
animations {
|
||||
enabled = yes
|
||||
|
||||
# Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
|
||||
|
||||
bezier = overshoot, 0.05, 0.9, 0.1, 1.05
|
||||
bezier = linear, 0.0, 0.0, 1.0, 1.0
|
||||
|
||||
animation = windows, 1, 7, overshoot
|
||||
animation = windowsOut, 1, 7, default, popin 80%
|
||||
animation = border, 1, 10, default
|
||||
animation = borderangle, 1, 8, default
|
||||
animation = borderangle, 1, 16, linear, loop
|
||||
animation = fade, 1, 7, default
|
||||
animation = workspaces, 1, 6, overshoot, slidefade 20%
|
||||
}
|
||||
|
|
@ -85,118 +61,18 @@ misc {
|
|||
}
|
||||
|
||||
dwindle {
|
||||
# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
|
||||
pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
|
||||
preserve_split = yes # you probably want this
|
||||
pseudotile = yes
|
||||
preserve_split = yes
|
||||
}
|
||||
|
||||
master {
|
||||
# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
|
||||
new_is_master = true
|
||||
}
|
||||
|
||||
gestures {
|
||||
# See https://wiki.hyprland.org/Configuring/Variables/ for more
|
||||
workspace_swipe = off
|
||||
}
|
||||
|
||||
# Example per-device config
|
||||
# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
|
||||
device:epic-mouse-v1 {
|
||||
sensitivity = -0.5
|
||||
}
|
||||
|
||||
# Example windowrule v1
|
||||
# windowrule = float, ^(kitty)$
|
||||
# Example windowrule v2
|
||||
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
|
||||
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
|
||||
|
||||
# Media keys
|
||||
bind = ,XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%
|
||||
bind = ,XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%
|
||||
bind = ,XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
|
||||
bind = ,XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle
|
||||
bind = ,XF86AudioPlay, exec, playerctl play-pause
|
||||
bind = ,XF86AudioStop, exec, playerctl stop
|
||||
bind = ,XF86AudioNext, exec, playerctl next
|
||||
bind = ,XF86AudioPrev, exec, playerctl previous
|
||||
|
||||
bind = $mainMod + SHIFT, E, exit,
|
||||
bind = $mainMod + SHIFT, Q, killactive,
|
||||
bind = $mainMod + SHIFT, SPACE, togglefloating,
|
||||
bind = $mainMod, P, pseudo, # dwindle
|
||||
bind = $mainMod, R, togglesplit, # dwindle
|
||||
bind = $mainMod, F, fullscreen,
|
||||
|
||||
bind = $mainMod, RETURN, exec, foot # need to hard-code foot here, because WezTerm is currently too incompetent for WL
|
||||
bind = $mainMod + CTRL, E, exec, <% opt.commands.file_manager %>
|
||||
bind = ALT, SPACE, exec, rofi -show combi
|
||||
bind = $mainMod + CTRL, B, exec, <% opt.commands.browser %>
|
||||
bind = $mainMod + SHIFT, P, exec, gpower2
|
||||
bind = ,PRINT, exec, XDG_CURRENT_DESKTOP=sway flameshot gui
|
||||
bind = SHIFT, PRINT, exec, grim -g "$(slurp)" - | feh -
|
||||
bind = $mainMod + SHIFT, W, exec, randomwallpaper
|
||||
|
||||
# Move focus with mainMod + arrow keys
|
||||
bind = $mainMod, left, movefocus, l
|
||||
bind = $mainMod, right, movefocus, r
|
||||
bind = $mainMod, up, movefocus, u
|
||||
bind = $mainMod, down, movefocus, d
|
||||
|
||||
# HJKL
|
||||
bind = $mainMod, H, movefocus, l
|
||||
bind = $mainMod, L, movefocus, r
|
||||
bind = $mainMod, K, movefocus, u
|
||||
bind = $mainMod, J, movefocus, d
|
||||
|
||||
# Window Moving
|
||||
bind = $mainMod + SHIFT, left, movewindow, l
|
||||
bind = $mainMod + SHIFT, right, movewindow, r
|
||||
bind = $mainMod + SHIFT, up, movewindow, u
|
||||
bind = $mainMod + SHIFT, down, movewindow, d
|
||||
|
||||
# HJKL
|
||||
bind = $mainMod + SHIFT, H, movewindow, l
|
||||
bind = $mainMod + SHIFT, L, movewindow, r
|
||||
bind = $mainMod + SHIFT, K, movewindow, u
|
||||
bind = $mainMod + SHIFT, J, movewindow, 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
|
||||
|
||||
# Move active window to a workspace with mainMod + SHIFT + [0-9]
|
||||
bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1
|
||||
bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2
|
||||
bind = $mainMod SHIFT, 3, movetoworkspacesilent, 3
|
||||
bind = $mainMod SHIFT, 4, movetoworkspacesilent, 4
|
||||
bind = $mainMod SHIFT, 5, movetoworkspacesilent, 5
|
||||
bind = $mainMod SHIFT, 6, movetoworkspacesilent, 6
|
||||
bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7
|
||||
bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8
|
||||
bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9
|
||||
bind = $mainMod SHIFT, 0, movetoworkspacesilent, 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
|
||||
source = ~/.config/hypr/control-keybinds.conf
|
||||
source = ~/.config/hypr/prog-keybinds.conf
|
||||
|
||||
env = XDG_SESSION_TYPE, wayland
|
||||
env = MOZ_ENABLE_WAYLAND, 1
|
||||
|
||||
env = XCURSOR_SIZE, <% opt.cursor.size %>
|
||||
|
||||
<! if opt.nvidia then -- nvidia workarounds !>
|
||||
env = LIBVA_DRIVER_NAME, nvidia
|
||||
env = GBM_BACKEND, nvidia-drm
|
||||
|
|
|
|||
9
.config/hypr/prog-keybinds.conf
Normal file
9
.config/hypr/prog-keybinds.conf
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
bind = SUPER, RETURN, exec, foot # need to hard-code foot here, because WezTerm is currently too incompetent for WL
|
||||
bind = SUPER + CTRL, E, exec, <% opt.commands.file_manager %>
|
||||
bind = ALT, SPACE, exec, rofi -show combi
|
||||
bind = SUPER + CTRL, B, exec, <% opt.commands.browser %>
|
||||
bind = SUPER + SHIFT, P, exec, gpower2
|
||||
bind = ,PRINT, exec, grim -g "$(slurp; sleep 1)" ~/Downloads/screenshot.png
|
||||
bind = SHIFT, PRINT, exec, grim -g "$(slurp; sleep 1)" - | feh -
|
||||
bind = SUPER + SHIFT, W, exec, randomwallpaper
|
||||
|
||||
|
|
@ -5,20 +5,34 @@
|
|||
"height": 16, // Waybar height (to be removed for auto height)
|
||||
// "width": 1280, // Waybar width
|
||||
"spacing": 4, // Gaps between modules (4px)
|
||||
|
||||
"layer": "top",
|
||||
|
||||
//<! if opt.wayland_compositor == "river" then !>
|
||||
"modules-left": ["river/tags"],
|
||||
"modules-center": ["river/window"],
|
||||
"modules-left": [
|
||||
"river/tags"
|
||||
],
|
||||
"modules-center": [
|
||||
"river/window"
|
||||
],
|
||||
//<! elseif opt.wayland_compositor == "hyprland" then !>
|
||||
"modules-left": ["hyprland/workspaces", "hyprland/window"],
|
||||
"modules-left": [
|
||||
"hyprland/workspaces",
|
||||
"hyprland/window"
|
||||
],
|
||||
//<! end !>
|
||||
|
||||
"modules-right": ["cpu", "memory", "pulseaudio", "temperature", "battery", "battery#bat2", "clock", "tray"],
|
||||
|
||||
"hyprland/workspaces": {},
|
||||
|
||||
"modules-right": [
|
||||
"cpu",
|
||||
"memory",
|
||||
"pulseaudio",
|
||||
"gamemode",
|
||||
"temperature",
|
||||
"battery",
|
||||
"battery#bat2",
|
||||
"clock",
|
||||
"tray"
|
||||
],
|
||||
"gamemode": {
|
||||
"format": "{glyph} {count}"
|
||||
},
|
||||
"tray": {
|
||||
// "icon-size": 21,
|
||||
"spacing": 10
|
||||
|
|
@ -41,7 +55,11 @@
|
|||
"critical-threshold": 80,
|
||||
// "format-critical": "{temperatureC}°C {icon}",
|
||||
"format": "{temperatureC}°C {icon}",
|
||||
"format-icons": ["", "", ""]
|
||||
"format-icons": [
|
||||
"",
|
||||
"",
|
||||
""
|
||||
]
|
||||
},
|
||||
"battery": {
|
||||
"states": {
|
||||
|
|
@ -55,7 +73,13 @@
|
|||
"format-alt": "{time} {icon}",
|
||||
// "format-good": "", // An empty format will hide the module
|
||||
// "format-full": "",
|
||||
"format-icons": ["", "", "", "", ""]
|
||||
"format-icons": [
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
""
|
||||
]
|
||||
},
|
||||
"battery#bat2": {
|
||||
"bat": "BAT2"
|
||||
|
|
@ -75,9 +99,12 @@
|
|||
"phone": "",
|
||||
"portable": "",
|
||||
"car": "",
|
||||
"default": ["", "", ""]
|
||||
"default": [
|
||||
"",
|
||||
"",
|
||||
""
|
||||
]
|
||||
},
|
||||
"on-click": "pavucontrol"
|
||||
},
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ window#waybar.PCSX2 #window {
|
|||
margin-bottom: 0;
|
||||
transition: none;
|
||||
color: @base;
|
||||
background: @green;
|
||||
background: @blue;
|
||||
}
|
||||
|
||||
#clock {
|
||||
|
|
@ -127,6 +127,17 @@ window#waybar.PCSX2 #window {
|
|||
background: @mantle;
|
||||
}
|
||||
|
||||
#gamemode {
|
||||
margin-top: 8px;
|
||||
margin-left: 8px;
|
||||
padding-left: 16px;
|
||||
padding-right: 16px;
|
||||
margin-bottom: 0;
|
||||
transition: none;
|
||||
color: @text;
|
||||
background: @red;
|
||||
}
|
||||
|
||||
#tray {
|
||||
margin-top: 8px;
|
||||
margin-left: 8px;
|
||||
|
|
|
|||
Loading…
Reference in a new issue