Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
5f357d7eb7
|
@ -1,7 +1,7 @@
|
||||||
set MAX_PATH_PIECE_CHARS 3
|
set MAX_PATH_PIECE_CHARS 3
|
||||||
|
|
||||||
function get_hostname
|
function get_hostname
|
||||||
has_command hostname && hostname || cat /etc/hostname
|
has_command hostname && hostname --short || cat /etc/hostname
|
||||||
end
|
end
|
||||||
|
|
||||||
function fish_greeting
|
function fish_greeting
|
||||||
|
@ -40,7 +40,7 @@ function _user_and_host
|
||||||
else
|
else
|
||||||
set_color -b normal red
|
set_color -b normal red
|
||||||
end
|
end
|
||||||
printf "$USER@$hostname"
|
printf "%s@%s" $USER (get_hostname)
|
||||||
end
|
end
|
||||||
|
|
||||||
function _cur_work_dir
|
function _cur_work_dir
|
||||||
|
|
|
@ -26,6 +26,8 @@ enabled_layouts splits:split_axis=vertical,stack
|
||||||
map ctrl+shift+1 change_font_size all 12.5
|
map ctrl+shift+1 change_font_size all 12.5
|
||||||
map ctrl+shift+2 change_font_size all 18.5
|
map ctrl+shift+2 change_font_size all 18.5
|
||||||
map ctrl+shift+3 change_font_size all 26
|
map ctrl+shift+3 change_font_size all 26
|
||||||
|
map ctrl+shift+4 change_font_size all 32
|
||||||
|
map ctrl+shift+5 change_font_size all 48
|
||||||
map ctrl+shift+o launch --type=tab --stdin-source=@screen_scrollback $EDITOR
|
map ctrl+shift+o launch --type=tab --stdin-source=@screen_scrollback $EDITOR
|
||||||
|
|
||||||
map ctrl+shift+equal change_font_size all +0.5
|
map ctrl+shift+equal change_font_size all +0.5
|
||||||
|
@ -74,6 +76,7 @@ tab_bar_style separator
|
||||||
tab_separator ""
|
tab_separator ""
|
||||||
tab_bar_edge top
|
tab_bar_edge top
|
||||||
tab_title_template "{fmt.fg.tab}{fmt.bg.tab} {activity_symbol}{title} "
|
tab_title_template "{fmt.fg.tab}{fmt.bg.tab} {activity_symbol}{title} "
|
||||||
|
active_tab_font_style normal
|
||||||
|
|
||||||
## name: Catppuccin Kitty Mocha
|
## name: Catppuccin Kitty Mocha
|
||||||
## author: Catppuccin Org
|
## author: Catppuccin Org
|
||||||
|
|
|
@ -1,5 +1,12 @@
|
||||||
default_border pixel 1
|
default_border pixel 1
|
||||||
exec swayidle -w timeout 600 'notify-send "Idling in 30 seconds..."' timeout 630 'swaylock -f' timeout 660 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on" & maybe-good-morning' before-sleep 'swaylock -f'
|
exec swayidle -w \
|
||||||
|
timeout 540 'notify-send "Idling in 90 seconds"' \
|
||||||
|
timeout 570 'notify-send "Idling in 60 seconds"' \
|
||||||
|
timeout 600 'notify-send "Idling in 30 seconds..."' \
|
||||||
|
timeout 630 'swaylock -f' \
|
||||||
|
timeout 660 'swaymsg "output * dpms off"' \
|
||||||
|
resume 'swaymsg "output * dpms on" & maybe-good-morning' \
|
||||||
|
before-sleep 'swaylock -f'
|
||||||
|
|
||||||
gaps inner 10
|
gaps inner 10
|
||||||
|
|
||||||
|
@ -8,10 +15,10 @@ output "Samsung Electric Company SyncMaster H1AK500000" position 0,0
|
||||||
output "GIGA-BYTE TECHNOLOGY CO., LTD. AORUS FO48U 23070B000307" mode 3840x2160@120Hz position 1440,0
|
output "GIGA-BYTE TECHNOLOGY CO., LTD. AORUS FO48U 23070B000307" mode 3840x2160@120Hz position 1440,0
|
||||||
|
|
||||||
output "Dell Inc. DELL U2720Q CWTM623" transform 90 scale 1.5
|
output "Dell Inc. DELL U2720Q CWTM623" transform 90 scale 1.5
|
||||||
output "Dell Inc. DELL U2720Q CWTM623" position 0,0
|
output "Dell Inc. DELL U2720Q CWTM623" position 5280,0
|
||||||
|
|
||||||
output "Dell Inc. DELL U2720Q D3TM623" transform 90 scale 1.5
|
output "Dell Inc. DELL U2720Q D3TM623" transform 90 scale 1.5
|
||||||
output "Dell Inc. DELL U2720Q D3TM623" position 5280,0
|
output "Dell Inc. DELL U2720Q D3TM623" position 0,0
|
||||||
|
|
||||||
bindsym $mod+control+equal gaps inner current set 0
|
bindsym $mod+control+equal gaps inner current set 0
|
||||||
|
|
||||||
|
|
|
@ -142,7 +142,7 @@ bindsym XF86AudioPrev exec playerctl previous
|
||||||
bindsym $mod+shift+v exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
|
bindsym $mod+shift+v exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
|
||||||
|
|
||||||
bindsym $mod+control+shift+l exec swaylock
|
bindsym $mod+control+shift+l exec swaylock
|
||||||
# TODO: toggle-able swayidle? does the idle thing in waybar handle this?
|
# TODO: toggle-able swayidle?
|
||||||
# TODO: one-time swayidle/monitor-off
|
# TODO: one-time swayidle/monitor-off
|
||||||
# bindsym $mod+Control+Shift+s exec lock-and-disable-monitors
|
# bindsym $mod+Control+Shift+s exec lock-and-disable-monitors
|
||||||
|
|
||||||
|
|
Reference in a new issue