From 46df8b7b62eecaef5e3a4f1a224b0511aae72d22 Mon Sep 17 00:00:00 2001 From: Joachim Nielandt Date: Wed, 23 Aug 2023 09:44:16 +0200 Subject: [PATCH] Working on sway changes. --- dot_config/foot/foot.ini | 156 +++++++++++++++++++++++++++++++++ dot_config/polybar/config.tmpl | 4 +- dot_config/sway/config | 7 ++ dot_config/waybar/config | 2 +- dot_zshrc.tmpl | 28 ++++-- 5 files changed, 187 insertions(+), 10 deletions(-) create mode 100644 dot_config/foot/foot.ini diff --git a/dot_config/foot/foot.ini b/dot_config/foot/foot.ini new file mode 100644 index 0000000..51d9cea --- /dev/null +++ b/dot_config/foot/foot.ini @@ -0,0 +1,156 @@ +# -*- conf -*- + +# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd) +#term=foot-extra #(or xterm-256color if built with -Dterminfo=disabled) +# login-shell=no + +font=Hasklug Nerd Font:size=9 +# font-bold= +# font-italic= +# font-bold-italic= +# line-height= +# letter-spacing=0 +# horizontal-letter-offset=0 +# vertical-letter-offset=0 +# underline-offset= +# box-drawings-uses-font-glyphs=no +# dpi-aware=yes + +# initial-window-size-pixels=700x500 # Or, +# initial-window-size-chars= +# initial-window-mode=windowed +pad=5x5 # optionally append 'center' +resize-delay-ms=50 + +# notify=notify-send -a ${app-id} -i ${app-id} ${title} ${body} + +# bold-text-in-bright=no +# bell=none +# word-delimiters=,│`|:"'()[]{}<> +# selection-target=primary +# workers= + +[bell] +# urgent=no +# notify=no +# command= +# command-focused=no + +[scrollback] +lines=10000 +# multiplier=3.0 +# indicator-position=relative +# indicator-format= + +[url] +# launch=xdg-open ${url} +# label-letters=sadfjklewcmpgh +# osc8-underline=url-mode +# protocols = http, https, ftp, ftps, file, gemini, gopher + +[cursor] +# style=block +color= 141a1b eeeeee +# blink=no +# beam-thickness=1.5 +# underline-thickness= + +[mouse] +# hide-when-typing=no +# alternate-scroll-mode=yes + +[colors] +alpha=0.9 +foreground=eeeeee +background=141a1b +regular0=141a1B # black +regular1=cd3f45 # red +regular2=9fca56 # green +regular3=e6cd69 # yellow +regular4=16a085 # blue +regular5=a074c4 # magenta +regular6=55b5db # cyan +regular7=d6d6d6 # white +bright0=41535B # bright black +bright1=cd3f45 # red +bright2=9fca56 # green +bright3=e6cd69 # yellow +bright4=16a085 # blue +bright5=a074c4 # magenta +bright6=55b5db # cyan +bright7=ffffff # bright white +# 16 = <256-color palette #16> +# ... +# 255 = <256-color palette #255> +# selection-foreground= +# selection-background= +# jump-labels= +# urls= + +[csd] +# preferred=server +# size=26 +# color= +# button-width=26 +# button-color= +# button-minimize-color= +# button-maximize-color= +# button-close-color= + +[key-bindings] +# scrollback-up-page=Shift+Page_Up +# scrollback-up-half-page=none +# scrollback-up-line=none +# scrollback-down-page=Shift+Page_Down +# scrollback-down-half-page=none +# scrollback-down-line=none +# clipboard-copy=Control+Shift+c +# clipboard-paste=Control+Shift+v +# primary-paste=Shift+Insert +# 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 +# spawn-terminal=Control+Shift+n +# minimize=none +# maximize=none +# fullscreen=none +# pipe-visible=[sh -c "xurls | fuzzel | xargs -r firefox"] none +# 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 + +[search-bindings] +# cancel=Control+g Escape +# commit=Return +# find-prev=Control+r +# find-next=Control+s +# cursor-left=Left Control+b +# cursor-left-word=Control+Left Mod1+b +# cursor-right=Right Control+f +# cursor-right-word=Control+Right Mod1+f +# cursor-home=Home Control+a +# cursor-end=End Control+e +# delete-prev=BackSpace +# delete-prev-word=Mod1+BackSpace Control+BackSpace +# delete-next=Delete +# delete-next-word=Mod1+d Control+Delete +# extend-to-word-boundary=Control+w +# extend-to-next-whitespace=Control+Shift+w +# clipboard-paste=Control+v Control+y +# primary-paste=Shift+Insert + +[url-bindings] +# cancel=Control+g Control+d Escape +# toggle-url-visible=t + +[mouse-bindings] +# primary-paste=BTN_MIDDLE +# select-begin=BTN_LEFT +# select-begin-block=Control+BTN_LEFT +# select-extend=BTN_RIGHT +# select-extend-character-wise=Control+BTN_RIGHT +# select-word=BTN_LEFT-2 +# select-word-whitespace=Control+BTN_LEFT-2 +# select-row=BTN_LEFT-3 diff --git a/dot_config/polybar/config.tmpl b/dot_config/polybar/config.tmpl index b995d83..be16e3c 100644 --- a/dot_config/polybar/config.tmpl +++ b/dot_config/polybar/config.tmpl @@ -110,7 +110,7 @@ bottom = false ;border-right-size = 16 ;unused modules - mpd xbacklight backlight-acpi alsa modules-left = i3 -modules-center = temperature gpu-temp battery xkeyboard memory cpu filesystem updates-pacman updates-aurhelper reboot-check xbacklight top-process +modules-center = temperature battery xkeyboard memory cpu filesystem updates-pacman updates-aurhelper reboot-check xbacklight top-process modules-right = net wifi0 vpn ; TRAY MANAGEMENT @@ -966,7 +966,7 @@ type = internal/battery ; This is useful in case the battery never reports 100% charge ; Default: 100 -full-at = 98 +full-at = 96 ; format-low once this charge percentage is reached ; Default: 10 diff --git a/dot_config/sway/config b/dot_config/sway/config index f741caa..44c5e31 100644 --- a/dot_config/sway/config +++ b/dot_config/sway/config @@ -24,6 +24,13 @@ exec hash dbus-update-activation-environment 2>/dev/null && \ dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK # make idea work - should be fine now exec wmname LG3D +# sway fixes for screensharing +# https://github.com/emersion/xdg-desktop-portal-wlr/wiki/%22It-doesn't-work%22-Troubleshooting-Checklist +#XDG_CURRENT_DESKTOP=sway +#MOZ_ENABLE_WAYLAND=1 +exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway +exec systemctl --user stop pipewire xdg-desktop-portal xdg-desktop-portal-wlr +exec systemctl --user start pipewire ### Idle configuration # diff --git a/dot_config/waybar/config b/dot_config/waybar/config index 84db984..d3ca4ed 100644 --- a/dot_config/waybar/config +++ b/dot_config/waybar/config @@ -99,7 +99,7 @@ }, "cpu": { "format": "{usage}%  {icon}", - "format-icons": ["x", "y", "z"], + "format-icons": ["󱟒", "󱟓", "󱟕"], "tooltip": true }, "memory": { diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl index 3d8c5a1..1cdd0eb 100644 --- a/dot_zshrc.tmpl +++ b/dot_zshrc.tmpl @@ -51,6 +51,11 @@ setopt notify # Beep on error unsetopt beep +# The following lines were added by compinstall +zstyle :compinstall filename '/home/joachim/.zshrc' +autoload -Uz compinit +compinit +# End of lines added by compinstall # load zgenom source "${HOME}/.zgenom/zgenom.zsh" @@ -74,11 +79,14 @@ if ! zgenom saved; then # load powerlevel10k zgenom load romkatv/powerlevel10k powerlevel10k + # Provide tips about aliases, give hint when using a command that has one + zgenom load djui/alias-tips + # This ZSH plugin enables using fzf to search your command history and do file searches. zgenom load unixorn/fzf-zsh-plugin - # Provide tips about aliases, give hint when using a command that has one - zgenom load djui/alias-tips + # search in zsh history + zgenom load zsh-users/zsh-history-substring-search # generate the init script from plugins above zgenom save @@ -124,12 +132,15 @@ bindkey -v '^?' backward-delete-char # must be after -v # enable backwards search with ctrl-r bindkey '^R' history-incremental-search-backward +bindkey "^R" history-incremental-pattern-search-backward +bindkey "^F" history-incremental-pattern-search-forward -# The following lines were added by compinstall -zstyle :compinstall filename '/home/joachim/.zshrc' -autoload -Uz compinit -compinit -# End of lines added by compinstall +# sway fixes for screensharing +# https://github.com/emersion/xdg-desktop-portal-wlr/wiki/%22It-doesn't-work%22-Troubleshooting-Checklist +export XDG_CURRENT_DESKTOP=sway +export MOZ_ENABLE_WAYLAND=1 +# doing this in sway config now +#dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway # this supposedly fixes the slow pasting into shell # zstyle ':bracketed-paste-magic' active-widgets '.self-*' @@ -142,5 +153,8 @@ compinit # [[ ! -f ~/.p10k.console.zsh ]] || source ~/.p10k.console.zsh #fi +# got to source this fzf file manually? +[[ ! -f ~/.fzf/fzf.zsh ]] || source ~/.fzf/fzf.zsh + # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh