From 5e91cd6c9388eeb4d7ac510bfb66f515e34944a0 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Fri, 7 Apr 2023 15:25:33 +0200 Subject: stopped using vim mode in zsh. it was annoying --- .config/zsh/.zshrc | 48 +++--------------------------------------------- 1 file changed, 3 insertions(+), 45 deletions(-) (limited to '.config/zsh') diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index e94a036..bdf3049 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -9,53 +9,11 @@ zmodload zsh/complist compinit _comp_options+=(globdots) -# vi mode setopt PROMPT_SUBST -THEME_VI_INS_MODE_SYMBOL=${THEME_VI_INS_MODE_SYMBOL:-'λ'} -THEME_VI_CMD_MODE_SYMBOL=${THEME_VI_CMD_MODE_SYMBOL:-'ᐅ'} - -THEME_VI_MODE_SYMBOL="${THEME_VI_INS_MODE_SYMBOL}" - -bindkey -v -export KEYTIMEOUT=1 - -# Use vim keys in tab complete menu: -bindkey -M menuselect 'h' vi-backward-char -bindkey -M menuselect 'k' vi-up-line-or-history -bindkey -M menuselect 'l' vi-forward-char -bindkey -M menuselect 'j' vi-down-line-or-history -bindkey -v '^?' backward-delete-char - -bindkey '^a' vi-beginning-of-line -bindkey '^e' vi-end-of-line - -zle-keymap-select() { - if [ "${KEYMAP}" = 'vicmd' ]; then - THEME_VI_MODE_SYMBOL="${THEME_VI_CMD_MODE_SYMBOL}" - else - THEME_VI_MODE_SYMBOL="${THEME_VI_INS_MODE_SYMBOL}" - fi - zle reset-prompt -} -zle -N zle-keymap-select - -# reset to default mode at the end of line input reading -zle-line-finish() { - THEME_VI_MODE_SYMBOL="${THEME_VI_INS_MODE_SYMBOL}" -} -zle -N zle-line-finish - -# Fix a bug when you C-c in CMD mode, you'd be prompted with CMD mode indicator -# while in fact you would be in INS mode. -# Fixed by catching SIGINT (C-c), set mode to INS and repropagate the SIGINT, -# so if anything else depends on it, we will not break it. -TRAPINT() { - THEME_VI_MODE_SYMBOL="${THEME_VI_INS_MODE_SYMBOL}" - return $(( 128 + $1 )) -} - -PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[yellow]%}%~%{$fg[red]%}]%b%(?.%F{green}$THEME_VI_MODE_SYMBOL.%F{red}$THEME_VI_MODE_SYMBOL)%{$reset_color%} ' +bindkey -e + +PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[yellow]%}%~%{$fg[red]%}]%b ' setopt extendedGlob -- cgit v1.2.3 From c2f9e9f3d01a9276f7c5f740c999a63e28ec23a8 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Sat, 15 Apr 2023 09:41:27 +0200 Subject: updated package manager aliases for portage --- .config/mpv/mpv.conf | 1 + .config/mpv/script-opts/encode_webm.conf | 2 +- .config/neofetch/config.conf | 2 +- .config/picom/picom.conf | 10 ---------- .config/shell/aliasrc | 30 +++++++++++++----------------- .config/shell/profile | 10 ++++------ .config/tmux/tmux.conf | 2 ++ .config/x11/xinitrc | 14 +++++--------- .config/zsh/.zshrc | 8 ++++++-- 9 files changed, 33 insertions(+), 46 deletions(-) (limited to '.config/zsh') diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index e467c61..d6d468d 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -3,6 +3,7 @@ profile=gpu-hq #cscale=ewa_lanczossharp vo=gpu +hwdec=vdpau keep-open=yes stop-screensaver diff --git a/.config/mpv/script-opts/encode_webm.conf b/.config/mpv/script-opts/encode_webm.conf index 93dbb74..f6d661c 100644 --- a/.config/mpv/script-opts/encode_webm.conf +++ b/.config/mpv/script-opts/encode_webm.conf @@ -13,7 +13,7 @@ preserve_filters=yes append_filter= # additional parameters passed to ffmpeg -codec=-c:v libvpx-vp9 -b:v 800k -c:a libvorbis +codec=-c:v libvpx-vp9 -crf 1 -b:v 1M -c:a libvorbis # format of the output filename # Does basic interpolation on the following variables: $f, $x, $t, $s, $e, $d, $p, $n which respectively represent diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 5fff961..0707571 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -745,7 +745,7 @@ ascii_distro="auto" # Example: # ascii_colors=(distro) - Ascii is colored based on Distro colors. # ascii_colors=(4 6 1 8 8 6) - Ascii is colored using these colors. -ascii_colors=(88 88 88 88 88 88) +ascii_colors=(distro) # Bold ascii logo # Whether or not to bold the ascii logo. diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index 335f0de..fa4d989 100644 --- a/.config/picom/picom.conf +++ b/.config/picom/picom.conf @@ -1,16 +1,6 @@ # just very slightly rounded corners # empty file, just so transparency works on st -backend = "glx"; -blur-kern = "3x3box"; -blur-method = "dual_kawase"; -blur-strength = 2; - -opacity-rule = [ - "98:class_g = 'SchildiChat' && focused", - "98:class_g = 'SchildiChat' && !focused" -] - # corner-radius = 6 # rounded-corners-exclude = [ diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 623377f..46e9ce4 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -1,24 +1,23 @@ ## MISCELLANEOUS # various shortcuts -alias reboot='sudo reboot' -alias poweroff='sudo poweroff' -alias pms='sudo pm-suspend' -alias refresh='source $ZDOTDIR/.zshrc' -alias fuck='sudo $(fc -Lln -1)' +alias reboot='doas reboot' +alias poweroff='doas poweroff' +alias refresh='. $ZDOTDIR/.zshrc' +alias fuck='doas $(fc -Lln -1)' alias open='xdg-open' alias mutt='pushd ~/.mutt/attachments; mutt; popd' alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine' alias vi="$EDITOR" -alias em='emacsclient -c -a "emacs" &' -alias emacsd='/usr/local/bin/emacs --daemon &' +alias emacsd='/usr/bin/emacs --daemon &' alias z='zathura' alias cn='clear;neofetch' alias nnn='nnn -Hde' alias ea='vi ~/.config/shell/aliasrc' +alias ez='vi ~/.config/zsh/.zshrc' alias setkeys='xset r rate 250 30 && setxkbmap -option "ctrl:nocaps"' alias cam='mpv --profile=low-latency --untimed /dev/video0' -alias freyr='sudo docker run -it --rm -v /media/hdd/music:/data freyrcli/freyrjs' +alias freyr='doas docker run -it --rm -v /media/hdd/music:/data freyrcli/freyrjs' alias ofn='/usr/bin/ls | cat -n | while read n f; do rename "s/${f%.*}/$(printf "%04d" "$n")/" "$f"; done' # setting custom ascii @@ -120,12 +119,9 @@ alias dpush='dfiles push origin' ## PACKAGE MANAGER -alias aptin='sudo apt install' -alias aptup='sudo apt update && sudo apt upgrade' -alias aptupd='sudo apt update' -alias aptupg='sudo apt upgrade' -alias aptrm='sudo apt remove' -alias aptsr='sudo apt search' -alias aptsh='sudo apt show' -alias listup='sudo apt list --upgradeable' -alias listin='sudo apt list --installed' +alias eq='equery uses' +alias emin='doas emerge -av' +alias emrm='doas emerge -ac' +alias emup='doas emerge -avuND @world' +alias ems='emerge -s' + diff --git a/.config/shell/profile b/.config/shell/profile index 0093eed..b443e3b 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -1,9 +1,9 @@ umask 0077 export _JAVA_AWT_WM_NONREPARENTING=1 -export EDITOR="nvim" +export EDITOR="nano" export TERMINAL="st" -export BROWSER="firefox" +export BROWSER="icecat" export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/.local/share" @@ -12,8 +12,6 @@ export XDG_CACHE_HOME="$HOME/.cache" export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc" export ZDOTDIR="$XDG_CONFIG_HOME/zsh" -export LC_ALL=en_US.UTF-8 - export MAIL=~/.mutt/Maildir export NO_AT_BRIDGE=1 @@ -22,9 +20,9 @@ export QT_IM_MODULE='ibus' export XMODIFIERS='@im=ibus' export XDG_SESSION_TYPE='x11' -export NVM_DIR="$HOME/.config/nvm" +export VDPAU_DRIVER=radeonsi -export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:$HOME/.cargo/bin:/sbin:/usr/sbin:$HOME/.rvm/bin" +export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:/sbin:/usr/sbin" diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 1db3b54..9ad7b50 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -1,3 +1,5 @@ +set -g default-command "${SHELL}" + # Status-bar settings set -g status-right "%H:%M" set -g window-status-current-style "underscore" diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 76a3ff5..8ccffd0 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -1,10 +1,7 @@ #!/bin/sh -if [ -d "/etc/X11/Xsession.d" ]; then - for f in /etc/X11/Xsession.d/*; do - [ -x "$f" ] && . "$f" - done - unset f +if command -v dbus-launch > /dev/null && test -z "${DBUS_SESSION_BUS_ADDRESS}"; then + eval $(dbus-launch --sh-syntax --exit-with-session) fi rfkill block all @@ -19,13 +16,12 @@ setxkbmap -option "ctrl:nocaps" xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 -ibus-daemon -dxrR -/usr/local/bin/emacs --daemon & -statusbar & +~/.fehbg +/usr/bin/emacs --daemon & pipewire & mpd & picom & -set-wallpaper & +statusbar & exec dwm diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index bdf3049..22e2763 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -11,8 +11,12 @@ _comp_options+=(globdots) setopt PROMPT_SUBST +# use emacs keybindings bindkey -e +# fix del key just inserting a tilde +bindkey "^[[3~" delete-char + PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[yellow]%}%~%{$fg[red]%}]%b ' setopt extendedGlob @@ -36,8 +40,8 @@ setopt pushd_ignore_dups setopt pushd_minus -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm -[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion +#[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +#[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion if [ -f $XDG_CONFIG_HOME/.dircolors ]; then eval "$(dircolors -b $XDG_CONFIG_HOME/.dircolors)" -- cgit v1.2.3 From 14d35abebfe5cd4b234a1f5c0cf432a85851e24f Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Thu, 4 May 2023 17:15:38 +0200 Subject: regular update --- .config/mpv/mpv.conf | 1 - .config/nnn/nnn.bash | 0 .config/shell/aliasrc | 14 ++++++++------ .config/sxiv/exec/key-handler | 2 -- .config/x11/xinitrc | 2 +- .config/zsh/.zshrc | 2 +- .ncmpcpp/config | 2 +- 7 files changed, 11 insertions(+), 12 deletions(-) mode change 100644 => 100755 .config/nnn/nnn.bash (limited to '.config/zsh') diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index d6d468d..d5267b6 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -23,4 +23,3 @@ screenshot-template="%F - [%P]v%#01n" loop-file=inf [extension.gif] loop-file=inf - diff --git a/.config/nnn/nnn.bash b/.config/nnn/nnn.bash old mode 100644 new mode 100755 diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 46e9ce4..62ccb34 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -8,17 +8,18 @@ alias fuck='doas $(fc -Lln -1)' alias open='xdg-open' alias mutt='pushd ~/.mutt/attachments; mutt; popd' alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine' -alias vi="$EDITOR" alias emacsd='/usr/bin/emacs --daemon &' alias z='zathura' alias cn='clear;neofetch' alias nnn='nnn -Hde' -alias ea='vi ~/.config/shell/aliasrc' -alias ez='vi ~/.config/zsh/.zshrc' +alias ea='$EDITOR ~/.config/shell/aliasrc' +alias ez='$EDITOR ~/.config/zsh/.zshrc' alias setkeys='xset r rate 250 30 && setxkbmap -option "ctrl:nocaps"' +alias freyr='docker run -it -v /media/hdd/music:/data freyr-dev' alias cam='mpv --profile=low-latency --untimed /dev/video0' -alias freyr='doas docker run -it --rm -v /media/hdd/music:/data freyrcli/freyrjs' -alias ofn='/usr/bin/ls | cat -n | while read n f; do rename "s/${f%.*}/$(printf "%04d" "$n")/" "$f"; done' + +# rename files in pwd in their current order to 4-digit numbers +alias ofn='/bin/ls | cat -n | while read n f; do perl-rename "s/${f%.*}/$(printf "%04d" "$n")/" "$f"; done' # setting custom ascii # alias neofetch='neofetch --source ~/docs/ascii/lain' @@ -35,6 +36,7 @@ alias grep='grep --color=auto -i' # ls shortcuts alias ls='ls -hl --color=always --group-directories-first' alias la='ls -a' +alias lc='ls | tail -n +2 | wc -l' ld() { if [ "$1" = "" ]; then @@ -121,7 +123,7 @@ alias dpush='dfiles push origin' alias eq='equery uses' alias emin='doas emerge -av' -alias emrm='doas emerge -ac' +alias emrm='doas emerge -avc' alias emup='doas emerge -avuND @world' alias ems='emerge -s' diff --git a/.config/sxiv/exec/key-handler b/.config/sxiv/exec/key-handler index 981eb8e..7539f88 100755 --- a/.config/sxiv/exec/key-handler +++ b/.config/sxiv/exec/key-handler @@ -5,7 +5,5 @@ do case "$1" in "C-d") rm "$file" ;; "C-c") cat "$file" | xclip -sel c -t image/png ;; - "C-w") xwallpaper --maximize "$file" ;; - "C-z") mv "$file" /media/hdd/pics/wallpaper/ esac done diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 8ccffd0..ecd80c1 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -16,7 +16,7 @@ setxkbmap -option "ctrl:nocaps" xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 -~/.fehbg +~/.local/bin/set-wallpaper & /usr/bin/emacs --daemon & pipewire & mpd & diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 22e2763..d27b9ac 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -68,7 +68,7 @@ fi neofetch # Add RVM to PATH for scripting. Make sure this is the last PATH variable change. -[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function* +#[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function* if [ -f $XDG_DATA_HOME/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]; then . $XDG_DATA_HOME/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh diff --git a/.ncmpcpp/config b/.ncmpcpp/config index 6669585..a9d016f 100644 --- a/.ncmpcpp/config +++ b/.ncmpcpp/config @@ -15,7 +15,7 @@ playlist_show_remaining_time = yes browser_display_mode = columns autocenter_mode = yes follow_now_playing_lyrics = yes -lyrics_fetchers = azlyrics, musixmatch, justsomelyrics, genius, internet +lyrics_fetchers = azlyrics, musixmatch, justsomelyrics, internet # UI and colors colors_enabled = yes -- cgit v1.2.3 From b85d2ad65904ae00410e1b7e019be32c44c8e51e Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Sun, 7 May 2023 09:18:59 +0200 Subject: update --- .config/nvim/lua/user/plugins/lspconfig.lua | 18 +++++++++--------- .config/shell/aliasrc | 22 +++++++++++++--------- .config/shell/profile | 5 +---- .config/tmux/tmux.conf | 3 ++- .config/zsh/.zshrc | 7 ++++++- 5 files changed, 31 insertions(+), 24 deletions(-) (limited to '.config/zsh') diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua index 1351959..43274fa 100644 --- a/.config/nvim/lua/user/plugins/lspconfig.lua +++ b/.config/nvim/lua/user/plugins/lspconfig.lua @@ -68,7 +68,7 @@ require 'lspconfig'.lua_ls.setup { flags = { debounce_text_changes = 150, }, - cmd = { "/home/cafebabe/.local/src/lua-language-server/bin/lua-language-server", "-E", "/home/cafebabe/.local/src/lua-language-server/bin/main.lua" }; + cmd = { "/home/cafebabe/.local/share/lua-language-server/bin/lua-language-server", "-E", "/home/cafebabe/.local/share/lua-language-server/bin/main.lua" }; settings = { Lua = { runtime = { @@ -115,16 +115,16 @@ require 'lspconfig'.clangd.setup { flags = { debounce_text_changes = 150, }, - cmd = { "/usr/bin/clangd-13" }; + cmd = { "clangd" }; } -require 'lspconfig'.solargraph.setup { - on_attach = on_attach, - capabilities = capabilities, - flags = { - debounce_text_changes = 150, - } -} +-- require 'lspconfig'.solargraph.setup { +-- on_attach = on_attach, +-- capabilities = capabilities, +-- flags = { +-- debounce_text_changes = 150, +-- } +-- } -- suppress error messages from lang servers vim.notify = function(msg, log_level, _) diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 62ccb34..67ae3d0 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -9,19 +9,24 @@ alias open='xdg-open' alias mutt='pushd ~/.mutt/attachments; mutt; popd' alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine' alias emacsd='/usr/bin/emacs --daemon &' +alias vi='$EDITOR' alias z='zathura' alias cn='clear;neofetch' alias nnn='nnn -Hde' -alias ea='$EDITOR ~/.config/shell/aliasrc' -alias ez='$EDITOR ~/.config/zsh/.zshrc' -alias setkeys='xset r rate 250 30 && setxkbmap -option "ctrl:nocaps"' -alias freyr='docker run -it -v /media/hdd/music:/data freyr-dev' +alias ea='vi ~/.config/shell/aliasrc' +alias ez='vi ~/.config/zsh/.zshrc' alias cam='mpv --profile=low-latency --untimed /dev/video0' # rename files in pwd in their current order to 4-digit numbers alias ofn='/bin/ls | cat -n | while read n f; do perl-rename "s/${f%.*}/$(printf "%04d" "$n")/" "$f"; done' -# setting custom ascii +# start freyr docker image to download music from spotify +alias freyr='docker run -it -v /media/hdd/music:/data freyr-dev' + +# set my preferred keyboard options +alias setkeys='xset r rate 250 30 && setxkbmap -option "ctrl:nocaps"' + +# set custom ascii # alias neofetch='neofetch --source ~/docs/ascii/lain' # cp mv and rm always verbose @@ -30,7 +35,7 @@ alias mv='mv -iv' alias rm='rm -Iv' alias mkd='mkdir -pv' -# Colorize grep output +# colorize grep output alias grep='grep --color=auto -i' # ls shortcuts @@ -46,12 +51,12 @@ ld() { fi } -# Control Audio +# control audio alias headset="wpctl set-default $(wpctl status | grep 'Headphones' | cut -b11-12)" alias speakers="wpctl set-default $(wpctl status | grep 'Speakers' | cut -b11-12)" alias setvol='pactl set-sink-volume @DEFAULT_SINK@' -# Monitor / Resolution settings, mainly for playing old-ass games +# monitor / resolution settings, mainly for playing old-ass games alias setrmon-lowres='xrandr --auto --output HDMI-A-0 --mode 640x480 --primary' alias setrmon-midres='xrandr --auto --output HDMI-A-0 --mode 800x600 --primary' alias setrmon-default='xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary' @@ -77,7 +82,6 @@ stopwatch() { done } - ## FUNCTIONS FOR CONVERTING DATE TO ISO 8601 # convert date from YYYYMMDD to YYYY-MM-DD diff --git a/.config/shell/profile b/.config/shell/profile index b443e3b..2adf26c 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -1,7 +1,7 @@ umask 0077 export _JAVA_AWT_WM_NONREPARENTING=1 -export EDITOR="nano" +export EDITOR="nvim" export TERMINAL="st" export BROWSER="icecat" @@ -23,6 +23,3 @@ export XDG_SESSION_TYPE='x11' export VDPAU_DRIVER=radeonsi export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:/sbin:/usr/sbin" - - - diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 9ad7b50..ef0dabb 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -1,7 +1,7 @@ set -g default-command "${SHELL}" # Status-bar settings -set -g status-right "%H:%M" +set -g status-right "%A, %F - %H:%M" set -g window-status-current-style "underscore" set -g message-command-style 'fg=#000000,bg=#FFFF00' set -g message-style 'fg=#000000, bg=#FFFF00' @@ -9,6 +9,7 @@ set -g status-bg '#333333' set -g status-fg '#FFFFFF' set -g set-titles on set -g set-titles-string "#T" +set -g automatic-rename off # Enable RGB colour if running in xterm(1) set-option -sa terminal-overrides ",xterm*:Tc" diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index d27b9ac..e1884a3 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -4,7 +4,10 @@ stty stop undef setopt no_nomatch autoload -U compinit +autoload -Uz vcs_info +precmd() { vcs_info } zstyle ':completion:*' menu select +zstyle ':vcs_info:git:*' formats ' (on %b)' zmodload zsh/complist compinit _comp_options+=(globdots) @@ -17,7 +20,7 @@ bindkey -e # fix del key just inserting a tilde bindkey "^[[3~" delete-char -PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[yellow]%}%~%{$fg[red]%}]%b ' +PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%M%{$fg[white]%}${vcs_info_msg_0_}:%{$fg[yellow]%}%~]%{$reset_color%}%b ' setopt extendedGlob @@ -74,3 +77,5 @@ if [ -f $XDG_DATA_HOME/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighti . $XDG_DATA_HOME/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh fi + +alias luamake=/home/cafebabe/.local/src/lua-language-server/3rd/luamake/luamake -- cgit v1.2.3 From 70980c2c53e9fc3cadd2f6eacd085dc0297f65b6 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Fri, 9 Jun 2023 18:12:20 +0200 Subject: nvim: added a lisp-lsp, but honestly no idea what i did in plugins.lua; aliasrc: removed most of the emerge aliases; profile: changed $BROWSER; zathura: changed next-/previous-page keybinds; zshrc: added edit-command-line; ncmpcpp: removed visualiser --- .config/nvim/lua/user/options.lua | 1 - .config/nvim/lua/user/plugins.lua | 5 +++ .config/nvim/lua/user/plugins/lspconfig.lua | 2 +- .config/nvim/plugin/packer_compiled.lua | 58 +++++++++++++++++------------ .config/shell/aliasrc | 13 +++---- .config/shell/profile | 4 +- .config/zathura/zathurarc | 6 +-- .config/zsh/.zshrc | 7 +++- .ncmpcpp/config | 8 +--- 9 files changed, 57 insertions(+), 47 deletions(-) (limited to '.config/zsh') diff --git a/.config/nvim/lua/user/options.lua b/.config/nvim/lua/user/options.lua index 2fdd6e2..53fbe43 100644 --- a/.config/nvim/lua/user/options.lua +++ b/.config/nvim/lua/user/options.lua @@ -22,4 +22,3 @@ vim.o.foldmethod = "expr" vim.o.foldlevelstart = 10 vim.o.foldexpr = "nvim_treesitter#foldexpr()" vim.o.hlsearch = 0 -vim.o.colorcolumn = "80" diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua index 07f8f42..53823f8 100644 --- a/.config/nvim/lua/user/plugins.lua +++ b/.config/nvim/lua/user/plugins.lua @@ -99,4 +99,9 @@ require('packer').startup(function() require('user.plugins.luasnip') end } + use {'nvim-orgmode/orgmode', + config = function() + require('user.plugins.orgmode') + end + } end) diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua index 43274fa..82b85b8 100644 --- a/.config/nvim/lua/user/plugins/lspconfig.lua +++ b/.config/nvim/lua/user/plugins/lspconfig.lua @@ -23,7 +23,7 @@ local on_attach = function(_, bufnr) buf_keymap(bufnr, 'n', 'gd', 'lua vim.lsp.buf.definition()') buf_keymap(bufnr, 'n', 'K', 'lua vim.lsp.buf.hover()') buf_keymap(bufnr, 'n', 'gi', 'lua vim.lsp.buf.implementation()') - buf_keymap(bufnr, 'n', '', 'lua vim.lsp.buf.signature_help()') + buf_keymap(bufnr, 'n', '', 'lua vim.lsp.buf.signature_help()') buf_keymap(bufnr, 'n', 'D', 'lua vim.lsp.buf.type_definition()') buf_keymap(bufnr, 'n', 'rn', 'lua vim.lsp.buf.rename()') buf_keymap(bufnr, 'n', 'gr', ':Telescope lsp_references') diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index 713ebc9..2616c59 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -183,6 +183,12 @@ _G.packer_plugins = { path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", url = "https://github.com/kyazdani42/nvim-web-devicons" }, + orgmode = { + config = { "\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.orgmode\frequire\0" }, + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/orgmode", + url = "https://github.com/nvim-orgmode/orgmode" + }, ["packer.nvim"] = { loaded = true, path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/packer.nvim", @@ -247,14 +253,22 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) --- Config for: nvim-autopairs -time([[Config for nvim-autopairs]], true) -try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") -time([[Config for nvim-autopairs]], false) +-- Config for: telescope.nvim +time([[Config for telescope.nvim]], true) +try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.telescope\frequire\0", "config", "telescope.nvim") +time([[Config for telescope.nvim]], false) +-- Config for: nvim-cmp +time([[Config for nvim-cmp]], true) +try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21user.plugins.cmp\frequire\0", "config", "nvim-cmp") +time([[Config for nvim-cmp]], false) -- Config for: nvim-treesitter time([[Config for nvim-treesitter]], true) try_loadstring("\27LJ\2\n]\0\0\3\0\4\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\3\0B\0\2\1K\0\1\0\28user.plugins.treesitter\nsetup\16spellsitter\frequire\0", "config", "nvim-treesitter") time([[Config for nvim-treesitter]], false) +-- Config for: lualine.nvim +time([[Config for lualine.nvim]], true) +try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.lualine\frequire\0", "config", "lualine.nvim") +time([[Config for lualine.nvim]], false) -- Config for: nvim-ts-autotag time([[Config for nvim-ts-autotag]], true) try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20nvim-ts-autotag\frequire\0", "config", "nvim-ts-autotag") @@ -263,30 +277,26 @@ time([[Config for nvim-ts-autotag]], false) time([[Config for nvim-lspconfig]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.lspconfig\frequire\0", "config", "nvim-lspconfig") time([[Config for nvim-lspconfig]], false) --- Config for: lualine.nvim -time([[Config for lualine.nvim]], true) -try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.lualine\frequire\0", "config", "lualine.nvim") -time([[Config for lualine.nvim]], false) --- Config for: nvim-tree.lua -time([[Config for nvim-tree.lua]], true) -try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.nvim-tree\frequire\0", "config", "nvim-tree.lua") -time([[Config for nvim-tree.lua]], false) --- Config for: LuaSnip -time([[Config for LuaSnip]], true) -try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.luasnip\frequire\0", "config", "LuaSnip") -time([[Config for LuaSnip]], false) --- Config for: telescope.nvim -time([[Config for telescope.nvim]], true) -try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.telescope\frequire\0", "config", "telescope.nvim") -time([[Config for telescope.nvim]], false) +-- Config for: orgmode +time([[Config for orgmode]], true) +try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.orgmode\frequire\0", "config", "orgmode") +time([[Config for orgmode]], false) -- Config for: dracula time([[Config for dracula]], true) try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.dracula\frequire\0", "config", "dracula") time([[Config for dracula]], false) --- Config for: nvim-cmp -time([[Config for nvim-cmp]], true) -try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21user.plugins.cmp\frequire\0", "config", "nvim-cmp") -time([[Config for nvim-cmp]], false) +-- Config for: LuaSnip +time([[Config for LuaSnip]], true) +try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.luasnip\frequire\0", "config", "LuaSnip") +time([[Config for LuaSnip]], false) +-- Config for: nvim-tree.lua +time([[Config for nvim-tree.lua]], true) +try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.nvim-tree\frequire\0", "config", "nvim-tree.lua") +time([[Config for nvim-tree.lua]], false) +-- Config for: nvim-autopairs +time([[Config for nvim-autopairs]], true) +try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") +time([[Config for nvim-autopairs]], false) _G._packer.inside_compile = false if _G._packer.needs_bufread == true then diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 07c75bf..330bb8a 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -15,13 +15,17 @@ alias cn='clear;neofetch' alias nnn='nnn -Hde' alias ea='vi ~/.config/shell/aliasrc' alias ez='vi ~/.config/zsh/.zshrc' +alias eq='equery' alias cam='mpv --profile=low-latency --untimed /dev/video0' +# need to sign hid-nintendo.ko with every kernel update +alias signmod='doas /usr/src/linux/scripts/sign-file sha512 /usr/src/linux/certs/signing_key.pem /usr/src/linux/certs/signing_key.x509' + # rename files in pwd in their current order to 4-digit numbers alias ofn='/bin/ls | cat -n | while read n f; do perl-rename "s/${f%.*}/$(printf "%04d" "$n")/" "$f"; done' # start freyr docker image to download music from spotify -alias freyr='docker run -it -v /media/hdd/music:/data freyr-dev' +#alias freyr='docker run -it -v /media/hdd/music:/data freyr-dev' # set my preferred keyboard options alias setkeys='xset r rate 250 30 && setxkbmap -option "ctrl:nocaps"' @@ -126,10 +130,3 @@ alias dfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME' alias dcomm='dfiles commit -m' alias dpush='dfiles push origin' -## PACKAGE MANAGER - -alias eq='equery' -alias emin='doas emerge -av' -alias emrm='doas emerge -avc' -alias emup='doas emerge -avuND @world' -alias ems='emerge -s' diff --git a/.config/shell/profile b/.config/shell/profile index eca8c75..b26003f 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -3,7 +3,7 @@ umask 0077 export _JAVA_AWT_WM_NONREPARENTING=1 export EDITOR="nvim" export TERMINAL="st" -export BROWSER="icecat" +export BROWSER="nyxt" export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/.local/share" @@ -26,3 +26,5 @@ export EIX_LIMIT=0 export EIX_LIMIT_COMPACT=0 export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:/sbin:/usr/sbin" + +neofetch diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc index 5836bc0..6ea7831 100644 --- a/.config/zathura/zathurarc +++ b/.config/zathura/zathurarc @@ -6,13 +6,13 @@ set selection-clipboard clipboard map u scroll half-up map d scroll half-down -map J scroll full-down -map K scroll full-up +map n scroll full-down +map p scroll full-up map D toggle_page_mode map r reload map R rotate map i recolor -map p print +map ^p print map g goto top #stop at page boundries diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index e1884a3..378ce10 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -4,6 +4,7 @@ stty stop undef setopt no_nomatch autoload -U compinit +autoload -U edit-command-line autoload -Uz vcs_info precmd() { vcs_info } zstyle ':completion:*' menu select @@ -12,6 +13,8 @@ zmodload zsh/complist compinit _comp_options+=(globdots) +zle -N edit-command-line + setopt PROMPT_SUBST # use emacs keybindings @@ -20,6 +23,8 @@ bindkey -e # fix del key just inserting a tilde bindkey "^[[3~" delete-char +bindkey '^x^e' edit-command-line + PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%M%{$fg[white]%}${vcs_info_msg_0_}:%{$fg[yellow]%}%~]%{$reset_color%}%b ' setopt extendedGlob @@ -68,8 +73,6 @@ if [ -f $XDG_CONFIG_HOME/nnn/nnn.bash ]; then . $XDG_CONFIG_HOME/nnn/nnn.bash fi -neofetch - # Add RVM to PATH for scripting. Make sure this is the last PATH variable change. #[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function* diff --git a/.ncmpcpp/config b/.ncmpcpp/config index a9d016f..8d3f5dd 100644 --- a/.ncmpcpp/config +++ b/.ncmpcpp/config @@ -18,6 +18,7 @@ follow_now_playing_lyrics = yes lyrics_fetchers = azlyrics, musixmatch, justsomelyrics, internet # UI and colors +external_editor = nvim colors_enabled = yes current_item_prefix = $(blue)$r current_item_suffix = $/r$(end) @@ -38,10 +39,3 @@ now_playing_prefix = "> " centered_cursor = yes display_bitrate = yes enable_window_title = yes - -# Visualizer -visualizer_data_source = /tmp/mpd.fifo -visualizer_output_name = Visualizer feed -visualizer_in_stereo = yes -visualizer_type = spectrum -visualizer_look = +| -- cgit v1.2.3 From 342b7b50d4f95ebf8f17b3696d4f5b9c116e75a8 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Tue, 29 Aug 2023 23:55:34 +0200 Subject: update configs --- .config/mpv/mpv.conf | 1 + .config/neofetch/config.conf | 2 +- .config/nvim/lua/user/plugins.lua | 5 --- .config/nvim/plugin/packer_compiled.lua | 62 ++++++++++++++------------------- .config/shell/aliasrc | 41 ++++++++++++++-------- .config/shell/profile | 4 ++- .config/x11/xinitrc | 15 ++++---- .config/zsh/.zshrc | 2 +- 8 files changed, 67 insertions(+), 65 deletions(-) (limited to '.config/zsh') diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index d5267b6..421f269 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -21,5 +21,6 @@ screenshot-template="%F - [%P]v%#01n" [extension.webm] loop-file=inf + [extension.gif] loop-file=inf diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 75234fc..a3c25ce 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -500,7 +500,7 @@ mpc_args=() # Example: # colors=(distro) - Text is colored based on Distro colors. # colors=(4 6 1 8 8 6) - Text is colored in the order above. -colors=(201 51 93 5 7 7) +colors=(distro) # Text Options diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua index 53823f8..07f8f42 100644 --- a/.config/nvim/lua/user/plugins.lua +++ b/.config/nvim/lua/user/plugins.lua @@ -99,9 +99,4 @@ require('packer').startup(function() require('user.plugins.luasnip') end } - use {'nvim-orgmode/orgmode', - config = function() - require('user.plugins.orgmode') - end - } end) diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index 2616c59..d97b824 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -49,8 +49,8 @@ local function save_profiles(threshold) end time([[Luarocks path setup]], true) -local package_path_str = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" +local package_path_str = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/share/lua/5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/share/lua/5.1/?/init.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/lib/luarocks/rocks-5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1692616192/lib/lua/5.1/?.so" if not string.find(package.path, package_path_str, 1, true) then package.path = package.path .. ';' .. package_path_str end @@ -183,12 +183,6 @@ _G.packer_plugins = { path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", url = "https://github.com/kyazdani42/nvim-web-devicons" }, - orgmode = { - config = { "\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.orgmode\frequire\0" }, - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/orgmode", - url = "https://github.com/nvim-orgmode/orgmode" - }, ["packer.nvim"] = { loaded = true, path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/packer.nvim", @@ -253,22 +247,6 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) --- Config for: telescope.nvim -time([[Config for telescope.nvim]], true) -try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.telescope\frequire\0", "config", "telescope.nvim") -time([[Config for telescope.nvim]], false) --- Config for: nvim-cmp -time([[Config for nvim-cmp]], true) -try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21user.plugins.cmp\frequire\0", "config", "nvim-cmp") -time([[Config for nvim-cmp]], false) --- Config for: nvim-treesitter -time([[Config for nvim-treesitter]], true) -try_loadstring("\27LJ\2\n]\0\0\3\0\4\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\3\0B\0\2\1K\0\1\0\28user.plugins.treesitter\nsetup\16spellsitter\frequire\0", "config", "nvim-treesitter") -time([[Config for nvim-treesitter]], false) --- Config for: lualine.nvim -time([[Config for lualine.nvim]], true) -try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.lualine\frequire\0", "config", "lualine.nvim") -time([[Config for lualine.nvim]], false) -- Config for: nvim-ts-autotag time([[Config for nvim-ts-autotag]], true) try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20nvim-ts-autotag\frequire\0", "config", "nvim-ts-autotag") @@ -277,26 +255,38 @@ time([[Config for nvim-ts-autotag]], false) time([[Config for nvim-lspconfig]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.lspconfig\frequire\0", "config", "nvim-lspconfig") time([[Config for nvim-lspconfig]], false) --- Config for: orgmode -time([[Config for orgmode]], true) -try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.orgmode\frequire\0", "config", "orgmode") -time([[Config for orgmode]], false) --- Config for: dracula -time([[Config for dracula]], true) -try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.dracula\frequire\0", "config", "dracula") -time([[Config for dracula]], false) --- Config for: LuaSnip -time([[Config for LuaSnip]], true) -try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.luasnip\frequire\0", "config", "LuaSnip") -time([[Config for LuaSnip]], false) +-- Config for: lualine.nvim +time([[Config for lualine.nvim]], true) +try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.lualine\frequire\0", "config", "lualine.nvim") +time([[Config for lualine.nvim]], false) -- Config for: nvim-tree.lua time([[Config for nvim-tree.lua]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.nvim-tree\frequire\0", "config", "nvim-tree.lua") time([[Config for nvim-tree.lua]], false) +-- Config for: nvim-treesitter +time([[Config for nvim-treesitter]], true) +try_loadstring("\27LJ\2\n]\0\0\3\0\4\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\3\0B\0\2\1K\0\1\0\28user.plugins.treesitter\nsetup\16spellsitter\frequire\0", "config", "nvim-treesitter") +time([[Config for nvim-treesitter]], false) +-- Config for: nvim-cmp +time([[Config for nvim-cmp]], true) +try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21user.plugins.cmp\frequire\0", "config", "nvim-cmp") +time([[Config for nvim-cmp]], false) +-- Config for: LuaSnip +time([[Config for LuaSnip]], true) +try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.luasnip\frequire\0", "config", "LuaSnip") +time([[Config for LuaSnip]], false) -- Config for: nvim-autopairs time([[Config for nvim-autopairs]], true) try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") time([[Config for nvim-autopairs]], false) +-- Config for: telescope.nvim +time([[Config for telescope.nvim]], true) +try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.telescope\frequire\0", "config", "telescope.nvim") +time([[Config for telescope.nvim]], false) +-- Config for: dracula +time([[Config for dracula]], true) +try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.dracula\frequire\0", "config", "dracula") +time([[Config for dracula]], false) _G._packer.inside_compile = false if _G._packer.needs_bufread == true then diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 20ed30a..abf8ebb 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -1,35 +1,37 @@ ## MISCELLANEOUS # various shortcuts -alias reboot='doas reboot' -alias poweroff='doas poweroff' +alias reboot='sudo reboot' +alias poweroff='sudo poweroff' alias refresh='. $ZDOTDIR/.zshrc' -alias fuck='doas $(fc -Lln -1)' +alias fuck='sudo $(fc -Lln -1)' alias open='xdg-open' alias mutt='pushd ~/.mutt/attachments; mutt; popd' alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine' alias emacsd='/usr/bin/emacs --daemon &' alias vi='$EDITOR' alias z='zathura' -alias cn='clear;neofetch' alias nnn='nnn -Hde' +alias cn='clear;neofetch' alias ea='vi ~/.config/shell/aliasrc' alias ez='vi ~/.config/zsh/.zshrc' alias eq='equery' alias sr='su - root' alias cam='mpv --profile=low-latency --untimed /dev/video0' +alias df='df -h' +alias tma='tmux a -t' # need to sign hid-nintendo.ko with every kernel update -alias signmod='doas /usr/src/linux/scripts/sign-file sha512 /usr/src/linux/certs/signing_key.pem /usr/src/linux/certs/signing_key.x509' +alias signmod='sudo /usr/src/linux/scripts/sign-file sha512 /usr/src/linux/certs/signing_key.pem /usr/src/linux/certs/signing_key.x509' # rename files in pwd in their current order to 4-digit numbers alias ofn='/bin/ls | cat -n | while read n f; do perl-rename "s/${f%.*}/$(printf "%04d" "$n")/" "$f"; done' # start freyr docker image to download music from spotify -#alias freyr='docker run -it -v /media/hdd/music:/data freyr-dev' +# alias freyr='docker run -it -v /media/hdd/music:/data freyr-dev' # set my preferred keyboard options -alias setkeys='xset r rate 250 30 && setxkbmap -option "ctrl:nocaps"' +alias setkeys='xset r rate 250 30 && setxkbmap -layout us,us -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle"' # pad numbers in filenames with zeros alias padz='perl-rename "s/\d+/sprintf(\"%02d\",$&)/e"' @@ -59,18 +61,29 @@ lsd() { fi } +gls() { + if [ "$2" = "" ]; then + ls | grep "$1" + else + ls "$2" | grep "$1" + fi +} + # control audio alias headset="wpctl set-default $(wpctl status | grep 'Headphones' | cut -b11-12)" alias speakers="wpctl set-default $(wpctl status | grep 'Speakers' | cut -b11-12)" alias setvol='pactl set-sink-volume @DEFAULT_SINK@' -# monitor / resolution settings, mainly for playing old-ass games -alias setrmon-lowres='xrandr --auto --output HDMI-A-0 --mode 640x480 --primary' -alias setrmon-midres='xrandr --auto --output HDMI-A-0 --mode 800x600 --primary' -alias setrmon-default='xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary' -alias setlmon-lowres='xrandr --auto --output DisplayPort-2 --mode 640x480 --left-of HDMI-A-0' -alias setlmon-midres='xrandr --auto --output DisplayPort-2 --mode 800x600 --left-of HDMI-A-0' -alias setlmon-default='xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0' +# monitor settings +alias rmlr='xrandr --auto --output HDMI-A-0 --mode 640x480 --primary' +alias rmmr='xrandr --auto --output HDMI-A-0 --mode 800x600 --primary' +alias rmdr='xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary' +alias lmlr='xrandr --auto --output DisplayPort-2 --mode 640x480 --left-of HDMI-A-0' +alias lmmr='xrandr --auto --output DisplayPort-2 --mode 800x600 --left-of HDMI-A-0' +alias lmdr='xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0' +alias mbl='sudo ddcutil --display 1 setvcp 10 0 && doas ddcutil --display 2 setvcp 10 0' +alias mbm='sudo ddcutil --display 1 setvcp 10 50 && doas ddcutil --display 2 setvcp 10 50' +alias mbh='sudo ddcutil --display 1 setvcp 10 80 && doas ddcutil --display 2 setvcp 10 80' # function for timer and stopwatch timer() { diff --git a/.config/shell/profile b/.config/shell/profile index b181879..397b25a 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -3,7 +3,7 @@ umask 0077 export _JAVA_AWT_WM_NONREPARENTING=1 export EDITOR="nvim" export TERMINAL="st" -export BROWSER="firefox-bin" +export BROWSER="firefox" export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/.local/share" @@ -25,6 +25,8 @@ export VDPAU_DRIVER=radeonsi export EIX_LIMIT=0 export EIX_LIMIT_COMPACT=0 +export LC_ALL=en_US.utf8 + export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:/sbin:/usr/sbin" neofetch diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 05fa704..5150125 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -1,23 +1,24 @@ #!/bin/sh -if command -v dbus-launch > /dev/null && test -z "${DBUS_SESSION_BUS_ADDRESS}"; then - eval $(dbus-launch --sh-syntax --exit-with-session) -fi +# if command -v dbus-launch > /dev/null && test -z "${DBUS_SESSION_BUS_ADDRESS}"; then +# eval $(dbus-launch --sh-syntax --exit-with-session) +# fi -eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")" +eval "$(gpg-agent --daemon --allow-preset-passphrase)" eval "$(ssh-agent)" xset r rate 200 20 xset s off -dpms -setxkbmap -option "ctrl:nocaps" +setxkbmap -layout us,us -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle" xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 ~/.local/bin/set-wallpaper & -/usr/bin/emacs --daemon & -otd & +# /usr/bin/emacs --daemon & + pipewire & +otd-daemon & mpd & picom & statusbar & diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 378ce10..19cc643 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -61,7 +61,7 @@ fi # FZF Section export FZF_DEFAULT_OPS="--extended" -export FZF_DEFAULT_COMMAND="fdfind --type f" +export FZF_DEFAULT_COMMAND="find -type f" export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" if [ -f $HOME/.fzf/fzf.zsh ]; then -- cgit v1.2.3 From b8ad8f60d1e9b1f9e2f6889d63a1b5166cf8d085 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Tue, 31 Oct 2023 20:29:57 +0100 Subject: added apt aliases --- .config/i3status/config | 2 +- .config/nnn/nnn.bash | 2 +- .config/nvim/lua/user/plugins/lspconfig.lua | 50 +++++++++++++++++------------ .config/shell/aliasrc | 9 ++++-- .config/x11/xinitrc | 2 +- .config/zsh/.zshrc | 5 +-- 6 files changed, 42 insertions(+), 28 deletions(-) (limited to '.config/zsh') diff --git a/.config/i3status/config b/.config/i3status/config index 8fb7d28..315dae5 100644 --- a/.config/i3status/config +++ b/.config/i3status/config @@ -44,5 +44,5 @@ volume master { } tztime local { - format = "%A, %Y-%m-%d %H:%M" + format = "%A, %Y-%m-%d %H:%M " } diff --git a/.config/nnn/nnn.bash b/.config/nnn/nnn.bash index 92a10dd..966ba30 100755 --- a/.config/nnn/nnn.bash +++ b/.config/nnn/nnn.bash @@ -1,4 +1,4 @@ # NNN -export NNN_PLUG='t:preview-tabbed;' +export NNN_PLUG='t:preview-tui;b:preview-tabbed' export NNN_FIFO="/tmp/nnn.fifo" diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua index 67d82a7..2e51445 100644 --- a/.config/nvim/lua/user/plugins/lspconfig.lua +++ b/.config/nvim/lua/user/plugins/lspconfig.lua @@ -59,27 +59,37 @@ require 'lspconfig'.emmet_ls.setup { filetypes = { 'html', 'javascript', 'typescript', 'javascriptreact', 'typescriptreact', 'eruby' } } +-- require'lspconfig'.lua_ls.setup { +-- on_init = function(client) +-- local path = client.workspace_folders[1].name +-- if not vim.loop.fs_stat(path..'/.luarc.json') and not vim.loop.fs_stat(path..'/.luarc.jsonc') then +-- client.config.settings = vim.tbl_deep_extend('force', client.config.settings.Lua, { +-- runtime = { +-- -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) +-- version = 'LuaJIT' +-- }, +-- -- Make the server aware of Neovim runtime files +-- workspace = { +-- library = { vim.env.VIMRUNTIME } +-- -- or pull in all of 'runtimepath'. NOTE: this is a lot slower +-- -- library = vim.api.nvim_get_runtime_file("", true) +-- }, +-- cmd = { "~/.emacs.d/.cache/lsp/lua-language-server/bin/lua-language-server" }, +-- }) + +-- client.notify("workspace/didChangeConfiguration", { settings = client.config.settings }) +-- end +-- return true +-- end +-- } + require'lspconfig'.lua_ls.setup { - on_init = function(client) - local path = client.workspace_folders[1].name - if not vim.loop.fs_stat(path..'/.luarc.json') and not vim.loop.fs_stat(path..'/.luarc.jsonc') then - client.config.settings = vim.tbl_deep_extend('force', client.config.settings.Lua, { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = 'LuaJIT' - }, - -- Make the server aware of Neovim runtime files - workspace = { - library = { vim.env.VIMRUNTIME } - -- or pull in all of 'runtimepath'. NOTE: this is a lot slower - -- library = vim.api.nvim_get_runtime_file("", true) - } - }) - - client.notify("workspace/didChangeConfiguration", { settings = client.config.settings }) - end - return true - end + on_attach = on_attach, + capabilities = capabilities, + flags = { + debounce_text_changes = 150, + }, + cmd = { "/home/cafebabe/.emacs.d/.cache/lsp/lua-language-server/bin/lua-language-server" }, } require 'lspconfig'.bashls.setup { diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 0599553..0757b44 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -24,7 +24,7 @@ alias tma='tmux a -t' alias tmn='tmux new-session -s' # rename files in pwd in their current order to 4-digit numbers -alias ofn='/bin/ls | cat -n | while read n f; do perl-rename "s/${f%.*}/$(printf "%04d" "$n")/" "$f"; done' +alias ofn='/bin/ls | cat -n | while read n f; do rename "s/${f%.*}/$(printf "%04d" "$n")/" "$f"; done' # start freyr docker image to download music from spotify # alias freyr='docker run -it -v /media/hdd/music:/data freyr-dev' @@ -34,7 +34,7 @@ alias setkeys='xset r rate 250 30 && setxkbmap -layout us,us -variant dvorak, -o alias setus='setxkbmap -layout us,us -option "ctrl:nocaps"' # pad numbers in filenames with zeros -alias padz='perl-rename "s/\d+/sprintf(\"%02d\",$&)/e"' +alias padz='rename "s/\d+/sprintf(\"%02d\",$&)/e"' # set custom ascii # alias neofetch='neofetch --source ~/docs/ascii/lain' @@ -143,10 +143,13 @@ alias dfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME' alias dcomm='dfiles commit -m' alias dpush='dfiles push origin' -# package manager +# package management alias aptsr='apt search' alias aptin='sudo apt install' alias aptrm='sudo apt remove --autoremove' alias aptupd='sudo apt update' alias aptupg='sudo apt upgrade' alias aptup='aptupd && aptupg' +alias aptli='apt list --installed' +alias aptlu='apt list --upgradable' +alias aptman='apt-mark showmanual' diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 4305681..d2db958 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -16,7 +16,7 @@ setxkbmap -layout us,us -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,gr xrdb -merge ~/.Xresources ~/.local/bin/set-wallpaper & -/usr/bin/emacs --daemon & +/usr/local/bin/emacs --daemon & urxvtd -q -o -f & pipewire & diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 19cc643..efdc061 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -80,5 +80,6 @@ if [ -f $XDG_DATA_HOME/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighti . $XDG_DATA_HOME/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh fi - -alias luamake=/home/cafebabe/.local/src/lua-language-server/3rd/luamake/luamake +if [ -f $XDG_DATA_HOME/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh ]; then + . $XDG_DATA_HOME/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh +fi -- cgit v1.2.3 From 9e2fd9be321d50d3166d224f8dc0e2d748945699 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Thu, 2 Nov 2023 22:16:31 +0100 Subject: update --- .Xresources | 10 ++++++++-- .config/mpd/mpd.conf | 2 +- .config/neofetch/config.conf | 33 ++++++++++++++++++--------------- .config/shell/aliasrc | 10 ++++++---- .config/shell/profile | 1 + .config/zsh/.zshrc | 2 +- 6 files changed, 35 insertions(+), 23 deletions(-) (limited to '.config/zsh') diff --git a/.Xresources b/.Xresources index 14fc10e..42c0bf2 100644 --- a/.Xresources +++ b/.Xresources @@ -1,7 +1,13 @@ -URxvt*font: xft:Hack Nerd Font Mono:size=11:antialias=True,xft:JoyPixels:pixelsize=10 +/* URxvt*font: xft:Hack Nerd Font Mono:size=11:antialias=True,xft:JoyPixels:pixelsize=10 */ + +URxvt.font: xft:Iosevka:style=Regular:size=13:antialias=True,xft:JoyPixels:pixelsize=10 +URxvt.boldFont: xft:Iosevka Term:style=Bold:size=13:antialias=True +URxvt.italicFont: xft:Iosevka Term:style=Italic:size=13:antialias=True +URxvt.boldItalicFont: xft:Iosevka Term:style=Bold Italic:size=13:antialias=True !! colors and stuff -URxvt.letterSpace: 0 +/* URxvt.letterSpace: 0 */ +URxvt.letterSpace: 1 URxvt.scrollBar: False URxvt.depth: 32 URxvt.background: [90]#000000 diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index 0e7073d..ff72d84 100755 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -1,5 +1,5 @@ bind_to_address "0.0.0.0" -#bind_to_address "/run/mpd/socket" +# bind_to_address "/run/mpd/socket" music_directory "/media/hdd/music" playlist_directory "~/.config/mpd/playlists" diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 8b98a51..8c29d6e 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -3,20 +3,23 @@ print_info() { info title - prin "${cl9}┌─────────────────────────────────────────────────────┐" - info "\n \n " distro - info "\n \n " kernel - info "\n \n " uptime - info "\n \n 󰏗" packages - info "\n \n " shell - info "\n \n " resolution - info "\n \n " term - info "\n \n " cpu - info "\n \n 󰊚" gpu - info "\n \n " memory - info "\n \n " disk - prin "${cl9}└──────────────────────────────────── ${cl0} ${cl1} ${cl2} ${cl3} ${cl4} ${cl5} ${cl6} $(color 15) ${cl9}┘" - prin "\n" + prin "$(color 12)╭──────────── $(color 10)Software$(color 12) ────────────────────" + info "$(color 12)│ $(color 14)OS" distro + info "$(color 12)│ $(color 14)Kernel" kernel + info "$(color 12)│ $(color 14)Packages" packages + info "$(color 12)│ $(color 14)Shell" shell + info "$(color 12)│ $(color 14)WM" wm + info "$(color 12)│ $(color 14)Terminal" term + prin "$(color 12)├──────────── $(color 10)Hardware$(color 12) ────────────────────" + info "$(color 12)│ $(color 14)CPU" cpu + info "$(color 12)│ $(color 14)GPU" gpu + info "$(color 12)│ $(color 14)Memory" memory + info "$(color 12)│ $(color 14)Disk" disk + prin "$(color 12)├───────────── $(color 10)Uptime$(color 12) ─────────────────────" + info "$(color 12)│" uptime + prin "$(color 12)╰──────────────────────────────────────────" + + info cols } reset="\033[0m" @@ -401,7 +404,7 @@ disk_show=('/' '/home' '/dev/sda1' '/dev/sdb1') # none: 'Disk: 74G / 118G (66%)' # 'Disk: 74G / 118G (66%)' # 'Disk: 74G / 118G (66%)' -disk_subtitle="none" +disk_subtitle="dir" # Disk percent. # Show/Hide disk percent. diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 0757b44..9338ed9 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -145,10 +145,12 @@ alias dpush='dfiles push origin' # package management alias aptsr='apt search' -alias aptin='sudo apt install' -alias aptrm='sudo apt remove --autoremove' -alias aptupd='sudo apt update' -alias aptupg='sudo apt upgrade' +alias aptsh='apt show' +alias aptin='sudo apt-get install' +alias aptrm='sudo apt-get remove --autoremove' +alias aptarm='sudo apt-get autoremove' +alias aptupd='sudo apt-get update' +alias aptupg='sudo apt-get upgrade' alias aptup='aptupd && aptupg' alias aptli='apt list --installed' alias aptlu='apt list --upgradable' diff --git a/.config/shell/profile b/.config/shell/profile index 075c5dd..05fd3d7 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -19,6 +19,7 @@ export GTK_IM_MODULE='ibus' export QT_IM_MODULE='ibus' export XMODIFIERS='@im=ibus' export XDG_SESSION_TYPE='x11' +export XDG_CURRENT_DESKTOP='i3' export VDPAU_DRIVER=radeonsi diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index efdc061..0ed250f 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -25,7 +25,7 @@ bindkey "^[[3~" delete-char bindkey '^x^e' edit-command-line -PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%M%{$fg[white]%}${vcs_info_msg_0_}:%{$fg[yellow]%}%~]%{$reset_color%}%b ' +PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%m%{$fg[white]%}${vcs_info_msg_0_}:%{$fg[yellow]%}%~]%{$reset_color%}%b ' setopt extendedGlob -- cgit v1.2.3 From c82f4cdc9a403fedce61fabeed5272a9bf8f1df0 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Sat, 9 Mar 2024 01:35:35 +0100 Subject: finally remembered to update this, lol --- .Xresources | 23 +++++++----- .config/i3/config | 6 ++- .config/i3status/config | 22 ++++++++--- .config/mpv/mpv.conf | 18 ++++++--- .config/picom/picom.conf | 9 +---- .config/shell/aliasrc | 94 ++++++++++++++++------------------------------- .config/shell/profile | 5 +-- .config/tmux/tmux.conf | 2 + .config/x11/xinitrc | 9 +++-- .config/zathura/zathurarc | 4 ++ .config/zsh/.zshrc | 2 +- .ncmpcpp/config | 4 +- .vim/vimrc | 1 + .xinitrc | 2 +- .zprofile | 2 +- 15 files changed, 100 insertions(+), 103 deletions(-) (limited to '.config/zsh') diff --git a/.Xresources b/.Xresources index badf203..270c6ab 100644 --- a/.Xresources +++ b/.Xresources @@ -1,17 +1,20 @@ -/* URxvt*font: xft:Hack Nerd Font Mono:size=11:antialias=True,xft:JoyPixels:pixelsize=10 */ +URxvt.preeditType:Root +! input method +URxvt.imLocale: ja_JP.utf8 +URxvt.imFont: xft:WenQuanYi Micro Hei Mono:size=12 +URxvt.inputMethod: ibus -URxvt.font: xft:Iosevka:style=Regular:size=13:antialias=True,xft:JoyPixels:pixelsize=10,xft:WenQuanYi Micro Hei Mono:size=12 -URxvt.boldFont: xft:Iosevka:style=Bold:size=13:antialias=True -URxvt.italicFont: xft:Iosevka:style=Italic:size=13:antialias=True -URxvt.boldItalicFont: xft:Iosevka:style=Bold Italic:size=13:antialias=True +URxvt.*font: xft:Iosevka Term Custom:style=Regular:size=13:antialias=True,xft:JoyPixels:pixelsize=10 -!! colors and stuff -/* URxvt.letterSpace: 0 */ -URxvt.letterSpace: 1 -URxvt.scrollBar: False +!! true transparency URxvt.depth: 32 URxvt.background: [90]#000000 URxvt.foreground: #ffffff + +!! visuals and colors +/* URxvt.letterSpace: 0 */ +URxvt.letterSpace: 2 +URxvt.scrollBar: False URxvt.externalBorder: 0 URxvt.internalBorder: 0 URxvt.backgroundBorder: 0 @@ -43,7 +46,7 @@ URxvt.color15: #cccccc !! perl extensions -URxvt.perl-ext-common: default,url-select,resize-font,selection-to-clipboard +URxvt.perl-ext-common: default,url-select,resize-font,selection-to-clipboard,-confirm-paste URxvt.matcher.button: 1 URxvt.keysym.M-u: perl:url-select:select_next URxvt.url-select.launcher: /usr/bin/xdg-open diff --git a/.config/i3/config b/.config/i3/config index 9cff316..b67d6a0 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -6,13 +6,15 @@ set $mod Mod4 # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. -font pango:Iosevka 10 +font pango:Iosevka Term Custom 10 for_window [class="floating"] floating enable # no_focus [all] # focus_on_window_activation none +# focus_follows_mouse no + # Use wpctl to adjust volume in Pipewire. set $refresh_i3status killall -SIGUSR1 i3status bindsym XF86AudioRaiseVolume exec --no-startup-id wpctl set-volume @DEFAULT_SINK@ 5%+ && $refresh_i3status @@ -43,8 +45,10 @@ bindsym $mod+Shift+C kill bindsym $mod+Shift+F exec firefox -P default-release bindsym $mod+Shift+B exec firefox -P less-strict bindsym $mod+Shift+E exec emacsclient -c -a "emacs" +bindsym $mod+z exec boomer bindsym $mod+c exec mpdmenu bindsym $mod+Shift+M exec mpdinfo +bindsym $mod+b exec bm bindsym --release Print exec scrot -u -e 'mv $f ~/pics/' bindsym --release $mod+Print exec scrot -s -e 'mv $f ~/pics/' diff --git a/.config/i3status/config b/.config/i3status/config index 22eba0c..903d43d 100644 --- a/.config/i3status/config +++ b/.config/i3status/config @@ -11,20 +11,32 @@ general { interval = 5 } -order += "ethernet enp39s0" +order += "ethernet br0" +order += "ethernet tun0" +order += "cpu_temperature 0" order += "disk /" order += "load" order += "memory" order += "volume master" order += "tztime local" -ethernet enp39s0 { - format_up = "enp39s0: %ip (%speed)" - format_down = "enp39s0: down" +ethernet br0 { + format_up = "E: %ip" + format_down = "E: down" +} + +ethernet tun0 { + format_up = "VPN: %ip" + format_down = "VPN: down" +} + +cpu_temperature 0 { + format = "CPU Temp: %degrees °C" + path = "/sys/devices/platform/nct6775.2592/hwmon/hwmon3/temp1_input" } disk "/" { - format = "total: %used" + format = "Porn Folder: %used" } load { diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index 421f269..8dcfc78 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -1,14 +1,22 @@ -profile=gpu-hq -#scale=ewa_lanczossharp -#cscale=ewa_lanczossharp +profile=high-quality -vo=gpu +vo=gpu-next +gpu-api=vulkan hwdec=vdpau +scale=ewa_lanczossharp +cscale=ewa_lanczossharp +dscale=ewa_lanczossharp + +ao=pipewire +pipewire-buffer=16 +audio-swresample-o=resampler=soxr,precision=28 +audio-samplerate=192000 +audio-format=float keep-open=yes -stop-screensaver border=no no-border +scale-antiring=0.7 msg-color=yes term-osd-bar=yes diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index fa4d989..2fdb8f4 100644 --- a/.config/picom/picom.conf +++ b/.config/picom/picom.conf @@ -1,8 +1 @@ -# just very slightly rounded corners -# empty file, just so transparency works on st - -# corner-radius = 6 - -# rounded-corners-exclude = [ -# "class_g = 'dwm'" -# ]; +# empty file, just so transparency works. diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 68e4818..1385f11 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -4,25 +4,25 @@ alias reboot='doas reboot' alias poweroff='doas poweroff' alias refresh='. $ZDOTDIR/.zshrc' -alias zzz='doas loginctl suspend' -alias fuck='doas $(fc -Lln -1)' -alias open='xdg-open' alias mutt='cd ~/.mutt/attachments; mutt; cd -' alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine' alias emd='/usr/bin/emacs --daemon &' alias emc='emacsclient -c -a "emacs"' -alias vi='$EDITOR' alias z='zathura' alias nnn='nnn -Hde' alias cn='clear;neofetch' -alias ea='vi ~/.config/shell/aliasrc' -alias ez='vi ~/.config/zsh/.zshrc' +alias ea='$EDITOR ~/.config/shell/aliasrc' +alias ez='$EDITOR ~/.config/zsh/.zshrc' +alias ep='$EDITOR ~/.config/shell/profile' alias lr='su - root' alias cam='mpv --profile=low-latency --untimed /dev/video0' alias df='df -h' alias tma='tmux a -t' alias tmn='tmux new-session -s' +# compiler +alias clang='clang -march=native -O3 -flto=thin' + # rename files in pwd in their current order to 4-digit numbers alias ofn='/bin/ls | cat -n | while read n f; do rename "s/${f%.*}/$(printf "%04d" "$n")/" "$f"; done' @@ -30,16 +30,18 @@ alias ofn='/bin/ls | cat -n | while read n f; do rename "s/${f%.*}/$(printf "%04 # alias freyr='docker run -it -v /media/hdd/music:/data freyr-dev' # set my preferred keyboard options -alias setkeys='xset r rate 250 30 && setxkbmap -layout us,de -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle"' +alias setkeys='xset r rate 250 30 && setxkbmap -option "ctrl:nocaps"' alias setus='setxkbmap -layout us -option "ctrl:nocaps"' # pad numbers in filenames with zeros -alias padz='rename "s/\d+/sprintf(\"%02d\",$&)/e"' +alias padz='perl-rename "s/\d+/sprintf(\"%02d\",$&)/e"' # set custom ascii # alias neofetch='neofetch --source ~/docs/ascii/lain' # cp mv and rm always verbose +# alias cp='cp -iv' +# alias mv='mv -iv' alias cp='cp -iv' alias mv='mv -iv' alias rm='rm -Iv' @@ -49,65 +51,21 @@ alias mkd='mkdir -pv' alias grep='grep --color=auto -i' # ls shortcuts -alias ls='ls -hl --color=always --group-directories-first' -alias la='ls -a' -alias lc='ls | tail -n +2 | wc -l' - -lsd() { - if [ "$1" = "" ]; then - ls -d */; - else - ls -d $1/*/ | sed "s|$1/||"; - fi -} - -gls() { - if [ "$2" = "" ]; then - ls | grep "$1" - else - ls "$2" | grep "$1" - fi -} +alias ls='ls --color=always --group-directories-first' +alias ll='ls -lh' +alias la='ll -A' +alias lc='ls | wc -l' # control audio alias headset="wpctl set-default $(wpctl status | grep 'Headphones' | cut -b11-12)" alias speakers="wpctl set-default $(wpctl status | grep 'Speakers' | cut -b11-12)" -# monitor settings -alias rmlr='xrandr --auto --output HDMI-A-0 --mode 640x480 --primary' -alias rmmr='xrandr --auto --output HDMI-A-0 --mode 800x600 --primary' -alias rmdr='xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary' -alias lmlr='xrandr --auto --output DisplayPort-2 --mode 640x480 --left-of HDMI-A-0' -alias lmmr='xrandr --auto --output DisplayPort-2 --mode 800x600 --left-of HDMI-A-0' -alias lmdr='xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0' -alias mbl='ddcutil --display 1 setvcp 10 10 && ddcutil --display 2 setvcp 10 10' -alias mbm='ddcutil --display 1 setvcp 10 50 && ddcutil --display 2 setvcp 10 50' -alias mbh='ddcutil --display 1 setvcp 10 80 && ddcutil --display 2 setvcp 10 80' - -# function for timer and stopwatch -timer() { - date1=$((`date +%s` + $1)); - while [ "$date1" -ge `date +%s` ]; do - echo -ne "$(date -u --date @$(($date1 - `date +%s`)) +%H:%M:%S)\r"; - sleep 0.1 - done - notify-send "Time Up"; pw-play "/usr/share/sounds/freedesktop/stereo/complete.oga" -} - -stopwatch() { - date1=`date +%s`; - while true; do - echo -ne "$(date -u --date @$((`date +%s` - $date1)) +%H:%M:%S)\r"; - sleep 0.1 - done -} - ## FUNCTIONS FOR CONVERTING DATE TO ISO 8601 # convert date from YYYYMMDD to YYYY-MM-DD date-convert() { for i in *; do - mv "${i}" "$(echo "${i}" | + /bin/mv "${i}" "$(echo "${i}" | sed 's/\([0-9][0-9][0-9][0-9]\)\([0-9][0-9]\)\([0-9][0-9]\)/\1-\2-\3/')" done; } @@ -115,7 +73,7 @@ date-convert() { # reverse date from DD-MM-YYYY to YYYY-MM-DD date-reverse() { for i in *; do - mv "${i}" "$(echo "${i}" | + /bin/mv "${i}" "$(echo "${i}" | sed 's/\([0-9][0-9]\)-\([0-9][0-9]\)-\([0-9][0-9][0-9][0-9]\)/\3-\1-\2/')" done; } @@ -124,7 +82,11 @@ date-reverse() { # convert video files to webm mkwebm() { - ffmpeg -i "${1}" -c:v libvpx-vp9 -crf 32 -b:v 300K -c:a libvorbis "${1%.*}".webm + ffmpeg -i "${1}" -c:v libvpx-vp9 -crf 12 -b:v 1M -c:a libvorbis "${1%.*}".webm +} + +mkmp4() { + ffmpeg -i "${1}" -c:v libx264 -crf 32 -b:v 1M -c:a aac "${1%.*}".mp4 } ## GIT @@ -147,9 +109,15 @@ alias dpush='dfiles push origin' alias qu='equery u' alias qd='equery d' alias qg='equery g' -alias emup='doas emerge -avuND @world' -alias pemup='emerge -pvuNDt @world' -alias emin='doas emerge -av' +alias qf='equery f' +alias qb='equery b' +alias qy='equery y' +alias eli='eix -c --installed' +alias els='eix -c --selected' +alias pemup='emerge -pvuND @world' +alias emup='doas emerge -vuND @world' alias pemin='emerge -pv' -alias emrm='doas emerge -avc' +alias emin='doas emerge -v' +alias pemrm='emerge -pvc' +alias emrm='doas emerge -vc' alias emsr='emerge -s' diff --git a/.config/shell/profile b/.config/shell/profile index a762e89..7b86bda 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -2,7 +2,7 @@ umask 0077 export _JAVA_AWT_WM_NONREPARENTING=1 export EDITOR="vim" -export TERMINAL="st" +export TERMINAL="urxvt" export BROWSER="firefox" export XDG_CONFIG_HOME="$HOME/.config" @@ -30,6 +30,5 @@ export LC_ALL=en_US.utf8 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib64/pkgconfig" +export MANPATH="$MANPATH:/usr/local/man" export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:$HOME/.npm/bin:/sbin:/usr/sbin" - -neofetch diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 8bd037f..389f1ff 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -43,6 +43,8 @@ bind C-w killp bind C-q killw bind C-p previous-window bind C-n next-window +bind -n M-n swap-window -t +1\; select-window -t +1 +bind -n M-p swap-window -t -1\; select-window -t -1 bind -n M-h resize-pane -L 5 bind -n M-j resize-pane -D 5 bind -n M-k resize-pane -U 5 diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 3dd9c9a..091a42d 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -7,18 +7,21 @@ fi eval "$(gpg-agent --daemon --allow-preset-passphrase)" eval "$(ssh-agent)" -xrandr --auto --output DisplayPort-2 --mode 1920x1080 --primary -xrandr --auto --output HDMI-A-0 --mode 1600x900 --left-of DisplayPort-2 +xrandr --addmode HDMI-A-0 1280x960 +xrandr --output HDMI-A-0 --mode 1280x960 --primary +xrandr --output DisplayPort-1 --mode 1920x1080 --right-of HDMI-A-0 +xrandr --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 xset r rate 250 30 xset s off -dpms -setxkbmap -layout us,de -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle" +setxkbmap -option "ctrl:nocaps" xrdb -merge ~/.Xresources ~/.local/bin/set-wallpaper & /usr/bin/emacs --daemon & urxvtd -q -o -f & +ibus-daemon -d -r -x pipewire & picom & mpd & diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc index 6ea7831..fac9838 100644 --- a/.config/zathura/zathurarc +++ b/.config/zathura/zathurarc @@ -8,6 +8,10 @@ map u scroll half-up map d scroll half-down map n scroll full-down map p scroll full-up +map [fullscreen] u scroll half-up +map [fullscreen] d scroll half-down +map [fullscreen] n scroll full-down +map [fullscreen] p scroll full-up map D toggle_page_mode map r reload map R rotate diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 0ed250f..6a5661f 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -25,7 +25,7 @@ bindkey "^[[3~" delete-char bindkey '^x^e' edit-command-line -PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%m%{$fg[white]%}${vcs_info_msg_0_}:%{$fg[yellow]%}%~]%{$reset_color%}%b ' +PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%m%{$fg[white]%}${vcs_info_msg_0_}:%{$fg[yellow]%}%15<..<%~%<<]%{$reset_color%}%b ' setopt extendedGlob diff --git a/.ncmpcpp/config b/.ncmpcpp/config index 085037e..a2b23af 100644 --- a/.ncmpcpp/config +++ b/.ncmpcpp/config @@ -15,10 +15,10 @@ playlist_show_remaining_time = yes browser_display_mode = columns autocenter_mode = yes follow_now_playing_lyrics = yes -lyrics_fetchers = azlyrics, musixmatch, justsomelyrics, internet +lyrics_fetchers = azlyrics, musixmatch, justsomelyrics, genius, internet # UI and colors -external_editor = nvim +external_editor = vim colors_enabled = yes current_item_prefix = $(blue)$r current_item_suffix = $/r$(end) diff --git a/.vim/vimrc b/.vim/vimrc index bc71bcf..16d60ea 100644 --- a/.vim/vimrc +++ b/.vim/vimrc @@ -10,6 +10,7 @@ set hidden set noswapfile set laststatus=2 set shortmess+=c +set clipboard=unnamedplus let g:markdown_fenced_languages = ['javascript', 'js=javascript', 'json=javascript'] diff --git a/.xinitrc b/.xinitrc index 518bb5d..de9369a 120000 --- a/.xinitrc +++ b/.xinitrc @@ -1 +1 @@ -.config/x11/xinitrc \ No newline at end of file +/home/cafebabe/.config/x11/xinitrc \ No newline at end of file diff --git a/.zprofile b/.zprofile index 8486fca..57ff7d6 120000 --- a/.zprofile +++ b/.zprofile @@ -1 +1 @@ -.config/shell/profile \ No newline at end of file +/home/cafebabe/.config/shell/profile \ No newline at end of file -- cgit v1.2.3