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/neofetch/config.conf | 2 +- .config/picom/picom.conf | 5 +++++ .config/shell/aliasrc | 1 + .config/zsh/.zshrc | 48 +++----------------------------------------- 4 files changed, 10 insertions(+), 46 deletions(-) diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 149ab2e..5fff961 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -364,7 +364,7 @@ gtk3="off" # disk_show=('/'): # 'Disk (/): 74G / 118G (66%)' # -disk_show=('/' '/home' '/dev/sda2' '/dev/sdb1') +disk_show=('/' '/home' '/dev/sda2') # Disk subtitle. # What to append to the Disk subtitle. diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index a095613..335f0de 100644 --- a/.config/picom/picom.conf +++ b/.config/picom/picom.conf @@ -1,6 +1,11 @@ # 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" diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 5d21bf7..623377f 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -105,6 +105,7 @@ mkwebm() { ## GIT # general shortcuts +alias status='git status' alias commit='git commit -m' alias fetch='git fetch' alias upstream='git push --set-upstream origin' 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(-) 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 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(-) 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 9a3d9c575c85e8b9bed8afb64afde22ebfef5b8f Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Sun, 7 May 2023 09:42:28 +0200 Subject: cleaned up a bit --- .config/nnn/plugins/.cbcp | 51 ---- .config/nnn/plugins/.iconlookup | 428 --------------------------------- .config/nnn/plugins/.nmv | 180 -------------- .config/nnn/plugins/.nnn-plugin-helper | 38 --- .config/nnn/plugins/.ntfy | 22 -- 5 files changed, 719 deletions(-) delete mode 100755 .config/nnn/plugins/.cbcp delete mode 100755 .config/nnn/plugins/.iconlookup delete mode 100755 .config/nnn/plugins/.nmv delete mode 100644 .config/nnn/plugins/.nnn-plugin-helper delete mode 100755 .config/nnn/plugins/.ntfy diff --git a/.config/nnn/plugins/.cbcp b/.config/nnn/plugins/.cbcp deleted file mode 100755 index 70f9b75..0000000 --- a/.config/nnn/plugins/.cbcp +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env sh - -# Description: Copy selection to system clipboard as newline-separated entries -# Dependencies: -# - tr -# - xclip/xsel (Linux) -# - pbcopy (macOS) -# - termux-clipboard-set (Termux) -# - clip.exe (WSL) -# - clip (Cygwin) -# - wl-copy (Wayland) -# - clipboard (Haiku) -# -# Limitation: breaks if a filename has newline in it -# -# Note: For a space-separated list: -# xargs -0 < "$SELECTION" -# -# Shell: POSIX compliant -# Author: Arun Prakash Jana - -IFS="$(printf '%b_' '\n')"; IFS="${IFS%_}" # protect trailing \n - -selection=${NNN_SEL:-${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.selection} -[ -s "$selection" ] || { echo "plugin .cbcp error: empty selection" >&2 ; exit 1; } - -if type xsel >/dev/null 2>&1; then - # Linux - tr '\0' '\n' < "$selection" | xsel -bi -elif type xclip >/dev/null 2>&1; then - # Linux - tr '\0' '\n' < "$selection" | xclip -sel clip -elif type pbcopy >/dev/null 2>&1; then - # macOS - tr '\0' '\n' < "$selection" | pbcopy -elif type termux-clipboard-set >/dev/null 2>&1; then - # Termux - tr '\0' '\n' < "$selection" | termux-clipboard-set -elif type clip.exe >/dev/null 2>&1; then - # WSL - tr '\0' '\n' < "$selection" | clip.exe -elif type clip >/dev/null 2>&1; then - # Cygwin - tr '\0' '\n' < "$selection" | clip -elif type wl-copy >/dev/null 2>&1; then - # Wayland - tr '\0' '\n' < "$selection" | wl-copy -elif type clipboard >/dev/null 2>&1; then - # Haiku - tr '\0' '\n' < "$selection" | clipboard --stdin -fi diff --git a/.config/nnn/plugins/.iconlookup b/.config/nnn/plugins/.iconlookup deleted file mode 100755 index d48d676..0000000 --- a/.config/nnn/plugins/.iconlookup +++ /dev/null @@ -1,428 +0,0 @@ -#!/usr/bin/env sh - -# Description: Print icons in front of list of directories/files - -# Dependencies: awk - -# Usage -# 1. Set colors and/or icons to your liking -# 2. Pipe any directory listing to iconlookup and it will output prepended icons -# 3. preview-tui uses the script to prepend icon to directory listings -# 4. Aditionally you can consider adding it to your PATH and/or FZF_DEFAULT_COMMAND to -# make it work with various fzf plugins (make sure you also add --ansi to your FZF_DEFAULT_OPTS) - -# Shell: POSIX compliant - -# Author: Luuk van Baal (https://github.com/luukvbaal/iconlookup) - -icon_lookup() { -awk 'BEGIN { -# Set your ANSI colorscheme below (https://en.wikipedia.org/wiki/ANSI_escape_code#Colors). -# Default uses standard nnn icon colors, 8 and 24-bit nord themes are commented out. - colordepth=8 #colordepth=8 #colordepth=24 - color_dirtxt=39 #color_dirtxt=111 #color_dirtxt="129;161;193" - color_filetxt=15 #color_filetxt=111 #color_filetxt="129;161;193" - color_default=39 #color_default=111 #color_default="129;161;193" - color_video=93 #color_video=110 #color_video="136;192;208" - color_audio=220 #color_audio=150 #color_audio="163;190;140" - color_image=82 #color_image=150 #color_image="163;190;140" - color_docs=202 #color_docs=173 #color_docs="208;135;112" - color_archive=209 #color_archive=179 #color_archive="235;203;139" - color_c=81 #color_c=150 #color_c="163;190;140" - color_java=32 #color_java=139 #color_java="180;142;173" - color_js=47 #color_js=109 #color_js="143;188;187" - color_react=39 #color_react=111 #color_react="129;161;193" - color_css=199 #color_css=110 #color_css="136;192;208" - color_python=227 #color_python=68 #color_python="94;129;172" - color_lua=19 #color_lua=167 #color_lua="191;97;106" - color_document=15 #color_document=173 #color_document="208;135;112" - color_fsharp=31 #color_fsharp=179 #color_fsharp="180;142;173" - color_ruby=160 #color_ruby=150 #color_ruby="163;190;140" - color_scala=196 #color_scala=139 #color_scala="143;188;187" - color_shell=47 #color_shell=109 #color_shell="143;188;187" - color_vim=28 #color_vim=109 #color_vim="143;188;187" - -# icons[][1] contains icon and icons[][2] contains color - icons["directory"][1] = ""; icons["directory"][2] = color_default - icons["file"][1] = ""; icons["file"][2] = color_default - icons["exec"][1] = ""; icons["exec"][2] = color_default - icons["manual"][1] = ""; icons["manual"][2] = color_docs - icons["pipe"][1] = "ﳣ"; icons["pipe"][2] = color_default - icons["socket"][1] = "ﳧ"; icons["socket"][2] = color_default - icons["door"][1] = "➡"; icons["door"][2] = color_default - -# top level and common icons - icons[".git"][1] = ""; icons[".git"][2] = color_default - icons["desktop"][1] = "ﲾ"; icons["desktop"][2] = color_default - icons["briefcase"][1] = ""; icons["briefcase"][2] = color_default - icons["document"][1] = ""; icons["document"][2] = color_default - icons["downloads"][1] = ""; icons["downloads"][2] = color_default - icons["music"][1] = ""; icons["music"][2] = color_default - icons["musicfile"][1] = ""; icons["musicfile"][2] = color_audio - icons["pictures"][1] = ""; icons["pictures"][2] = color_default - icons["picturefile"][1] = ""; icons["picturefile"][2] = color_image - icons["public"][1] = ""; icons["public"][2] = color_default - icons["templates"][1] = "陼"; icons["templates"][2] = color_default - icons["videos"][1] = ""; icons["videos"][2] = color_default - icons["videofile"][1] = "ﳜ"; icons["videofile"][2] = color_video - icons["changelog"][1] = ""; icons["changelog"][2] = color_docs - icons["configure"][1] = ""; icons["configure"][2] = color_default - icons["license"][1] = ""; icons["license"][2] = color_docs - icons["makefile"][1] = ""; icons["makefile"][2] = color_default - icons["archive"][1] = ""; icons["archive"][2] = color_archive - icons["script"][1] = ""; icons["script"][2] = color_shell - icons["cplusplus"][1] = ""; icons["cplusplus"][2] = color_c - icons["java"][1] = ""; icons["java"][2] = color_java - icons["clojure"][1] = ""; icons["clojure"][2] = color_default - icons["js"][1] = ""; icons["js"][2] = color_js - icons["linux"][1] = ""; icons["linux"][2] = color_default - icons["fsharp"][1] = ""; icons["fsharp"][2] = color_fsharp - icons["ruby"][1] = ""; icons["ruby"][2] = color_ruby - icons["c"][1] = ""; icons["c"][2] = color_c - icons["chess"][1] = ""; icons["chess"][2] = color_default - icons["haskell"][1] = ""; icons["haskell"][2] = color_vim - icons["html"][1] = ""; icons["html"][2] = color_default - icons["react"][1] = ""; icons["react"][2] = color_react - icons["python"][1] = ""; icons["python"][2] = color_python - icons["database"][1] = ""; icons["database"][2] = color_default - icons["worddoc"][1] = ""; icons["worddoc"][2] = color_document - icons["playlist"][1] = "蘿"; icons["playlist"][2] = color_audio - icons["opticaldisk"][1] = ""; icons["opticaldisk"][2] = color_archive - -# numbers - icons["1"][1] = icons["manual"][1]; icons["1"][2] = icons["manual"][2] - icons["7z"][1] = icons["archive"][1]; icons["7z"][2] = icons["archive"][2] - -# a - icons["a"][1] = icons["manual"][1]; icons["a"][2] = icons["manual"][2] - icons["apk"][1] = icons["archive"][1]; icons["apk"][2] = icons["archive"][2] - icons["asm"][1] = icons["file"][1]; icons["asm"][2] = icons["file"][2] - icons["aup"][1] = icons["musicfile"][1]; icons["aup"][2] = icons["musicfile"][2] - icons["avi"][1] = icons["videofile"][1]; icons["avi"][2] = icons["videofile"][2] - -# b - icons["bat"][1] = icons["script"][1]; icons["bat"][2] = icons["script"][2] - icons["bin"][1] = ""; icons["bin"][2] = color_default - icons["bmp"][1] = icons["picturefile"][1]; icons["bmp"][2] = icons["picturefile"][2] - icons["bz2"][1] = icons["archive"][1]; icons["bz2"][2] = icons["archive"][2] - -# c - icons["cplusplus"][1] = icons["cplusplus"][1]; icons["cplusplus"][2] = icons["cplusplus"][2] - icons["cabal"][1] = icons["haskell"][1]; icons["cab"][2] = icons["haskell"][2] - icons["cab"][1] = icons["archive"][1]; icons["cab"][2] = icons["archive"][2] - icons["cbr"][1] = icons["archive"][1]; icons["cbr"][2] = icons["archive"][2] - icons["cbz"][1] = icons["archive"][1]; icons["cbz"][2] = icons["archive"][2] - icons["cc"][1] = icons["cplusplus"][1]; icons["cc"][2] = icons["cplusplus"][2] - icons["class"][1] = icons["java"][1]; icons["class"][2] = icons["java"][2] - icons["clj"][1] = icons["clojure"][1]; icons["clj"][2] = icons["clojure"][2] - icons["cljc"][1] = icons["clojure"][1]; icons["cljc"][2] = icons["clojure"][2] - icons["cljs"][1] = icons["clojure"][1]; icons["cljs"][2] = icons["clojure"][2] - icons["cmake"][1] = icons["makefile"][1]; icons["cmake"][2] = icons["makefile"][2] - icons["coffee"][1] = ""; icons["coffee"][2] = color_default - icons["conf"][1] = icons["configure"][1]; icons["conf"][2] = icons["configure"][2] - icons["cpio"][1] = icons["archive"][1]; icons["cpio"][2] = icons["archive"][2] - icons["cpp"][1] = icons["cplusplus"][1]; icons["cpp"][2] = icons["cplusplus"][2] - icons["css"][1] = ""; icons["css"][2] = color_css - icons["cue"][1] = icons["playlist"][1]; icons["cue"][2] = icons["playlist"][2] - icons["cvs"][1] = icons["configure"][1]; icons["cvs"][2] = icons["configure"][2] - icons["cxx"][1] = icons["cplusplus"][1]; icons["cxx"][2] = icons["cplusplus"][2] - -# d - icons["db"][1] = icons["database"][1]; icons["db"][2] = icons["database"][2] - icons["deb"][1] = ""; icons["deb"][2] = color_archive - icons["diff"][1] = ""; icons["diff"][2] = color_default - icons["dll"][1] = icons["script"][1]; icons["dll"][2] = icons["script"][2] - icons["doc"][1] = icons["worddoc"][1]; icons["doc"][2] = icons["worddoc"][2] - icons["docx"][1] = icons["worddoc"][1]; icons["docx"][2] = icons["worddoc"][2] - -# e - icons["ejs"][1] = icons["js"][1]; icons["ejs"][2] = icons["js"][2] - icons["elf"][1] = icons["linux"][1]; icons["elf"][2] = icons["linux"][2] - icons["epub"][1] = icons["manual"][1]; icons["epub"][2] = icons["manual"][2] - icons["exe"][1] = icons["exec"][1]; icons["exe"][2] = icons["exec"][2] - -# f - icons["fsharp"][1] = icons["fsharp"][1]; icons["fsharp"][2] = icons["fsharp"][2] - icons["flac"][1] = icons["musicfile"][1]; icons["flac"][2] = icons["musicfile"][2] - icons["fen"][1] = icons["chess"][1]; icons["fen"][2] = icons["chess"][2] - icons["flv"][1] = icons["videofile"][1]; icons["flv"][2] = icons["videofile"][2] - icons["fs"][1] = icons["fsharp"][1]; icons["fs"][2] = icons["fsharp"][2] - icons["fsi"][1] = icons["fsharp"][1]; icons["fsi"][2] = icons["fsharp"][2] - icons["fsscript"][1] = icons["fsharp"][1]; icons["fsscript"][2] = icons["fsharp"][2] - icons["fsx"][1] = icons["fsharp"][1]; icons["fsx"][2] = icons["fsharp"][2] - -# g - icons["gem"][1] = icons["ruby"][1]; icons["gem"][2] = icons["ruby"][2] - icons["gif"][1] = icons["picturefile"][1]; icons["gif"][2] = icons["picturefile"][2] - icons["go"][1] = "ﳑ"; icons["go"][2] = color_default - icons["gz"][1] = icons["archive"][1]; icons["gz"][2] = icons["archive"][2] - icons["gzip"][1] = icons["archive"][1]; icons["gzip"][2] = icons["archive"][2] - -# h - icons["h"][1] = icons["c"][1]; icons["h"][2] = icons["c"][2] - icons["hh"][1] = icons["cplusplus"][1]; icons["hh"][2] = icons["cplusplus"][2] - icons["hpp"][1] = icons["cplusplus"][1]; icons["hpp"][2] = icons["cplusplus"][2] - icons["hs"][1] = icons["haskell"][1]; icons["hs"][2] = icons["haskell"][2] - icons["htaccess"][1] = icons["configure"][1]; icons["htaccess"][2] = icons["configure"][2] - icons["htpasswd"][1] = icons["configure"][1]; icons["htpasswd"][2] = icons["configure"][2] - icons["htm"][1] = icons["html"][1]; icons["htm"][2] = icons["html"][2] - icons["hxx"][1] = icons["cplusplus"][1]; icons["hxx"][2] = icons["cplusplus"][2] - -# i - icons["ico"][1] = icons["picturefile"][1]; icons["ico"][2] = icons["picturefile"][2] - icons["img"][1] = icons["opticaldisk"][1]; icons["img"][2] = icons["opticaldisk"][2] - icons["ini"][1] = icons["configure"][1]; icons["ini"][2] = icons["configure"][2] - icons["iso"][1] = icons["opticaldisk"][1]; icons["iso"][2] = icons["opticaldisk"][2] - -# j - icons["jar"][1] = icons["java"][1]; icons["jar"][2] = icons["java"][2] - icons["java"][1] = icons["java"][1]; icons["java"][2] = icons["java"][2] - icons["jl"][1] = icons["configure"][1]; icons["jl"][2] = icons["configure"][2] - icons["jpeg"][1] = icons["picturefile"][1]; icons["jpeg"][2] = icons["picturefile"][2] - icons["jpg"][1] = icons["picturefile"][1]; icons["jpg"][2] = icons["picturefile"][2] - icons["json"][1] = "ﬥ"; icons["json"][2] = color_js - icons["jsx"][1] = icons["react"][1]; icons["jsx"][2] = icons["react"][2] - -# k - -# l - icons["lha"][1] = icons["archive"][1]; icons["lha"][2] = icons["archive"][2] - icons["lhs"][1] = icons["haskell"][1]; icons["lhs"][2] = icons["haskell"][2] - icons["ilog"][1] = icons["document"][1]; icons["ilog"][2] = icons["document"][2] - icons["lua"][1] = ""; icons["lua"][2] = color_lua - icons["lzh"][1] = icons["archive"][1]; icons["lzh"][2] = icons["archive"][2] - icons["lzma"][1] = icons["archive"][1]; icons["lzma"][2] = icons["archive"][2] - -# m - icons["m"][1] = "ﴜ"; icons["mat"][2] = color_c - icons["m4a"][1] = icons["musicfile"][1]; icons["m4a"][2] = icons["musicfile"][2] - icons["m4v"][1] = icons["videofile"][1]; icons["m4v"][2] = icons["videofile"][2] - icons["mat"][1] = ""; icons["mat"][2] = color_c - icons["markdown"][1] = ""; icons["markdown"][2] = color_docs - icons["md"][1] = ""; icons["md"][2] = color_docs - icons["mk"][1] = icons["makefile"][1]; icons["mk"][2] = icons["makefile"][2] - icons["mkv"][1] = icons["videofile"][1]; icons["mkv"][2] = icons["videofile"][2] - icons["mov"][1] = icons["videofile"][1]; icons["mov"][2] = icons["videofile"][2] - icons["mp3"][1] = icons["musicfile"][1]; icons["mp3"][2] = icons["musicfile"][2] - icons["mp4"][1] = icons["videofile"][1]; icons["mp4"][2] = icons["videofile"][2] - icons["mpeg"][1] = icons["videofile"][1]; icons["mpeg"][2] = icons["videofile"][2] - icons["mpg"][1] = icons["videofile"][1]; icons["mpg"][2] = icons["videofile"][2] - icons["msi"][1] = ""; icons["msi"][2] = color_default - -# n - icons["nix"][1] = ""; icons["nix"][2] = color_fsharp - -# o - icons["o"][1] = icons["manual"][1]; icons["o"][2] = icons["manual"][2] - icons["ogg"][1] = icons["musicfile"][1]; icons["ogg"][2] = icons["musicfile"][2] - icons["odownload"][1] = icons["download"][1]; icons["odownload"][2] = icons["download"][2] - icons["out"][1] = icons["linux"][1]; icons["out"][2] = icons["linux"][2] - -# p - icons["part"][1] = icons["download"][1]; icons["part"][2] = icons["download"][2] - icons["patch"][1] = icons["diff"][1]; icons["patch"][2] = icons["diff"][2] - icons["pdf"][1] = ""; icons["pdf"][2] = color_docs - icons["pgn"][1] = icons["chess"][1]; icons["pgn"][2] = icons["chess"][2] - icons["php"][1] = ""; icons["php"][2] = color_default - icons["png"][1] = icons["picturefile"][1]; icons["png"][2] = icons["picturefile"][2] - icons["ppt"][1] = ""; icons["ppt"][2] = color_default - icons["pptx"][1] = ""; icons["pptx"][2] = color_default - icons["psb"][1] = ""; icons["psb"][2] = color_default - icons["psd"][1] = ""; icons["psd"][2] = color_default - icons["py"][1] = icons["python"][1]; icons["py"][2] = icons["python"][2] - icons["pyc"][1] = icons["python"][1]; icons["pyc"][2] = icons["python"][2] - icons["pyd"][1] = icons["python"][1]; icons["pyd"][2] = icons["python"][2] - icons["pyo"][1] = icons["python"][1]; icons["pyo"][2] = icons["python"][2] - -# q - -# r - icons["rar"][1] = icons["archive"][1]; icons["rar"][2] = icons["archive"][2] - icons["rc"][1] = icons["configure"][1]; icons["rc"][2] = icons["configure"][2] - icons["rom"][1] = ""; icons["rom"][2] = color_default - icons["rpm"][1] = icons["archive"][1]; icons["rpm"][2] = icons["archive"][2] - icons["rss"][1] = "參"; icons["rss"][2] = color_default - icons["rtf"][1] = ""; icons["rtf"][2] = color_default - -# s - icons["sass"][1] = ""; icons["sass"][2] = color_css - icons["scss"][1] = ""; icons["scss"][2] = color_css - icons["so"][1] = icons["manual"][1]; icons["so"][2] = icons["manual"][2] - icons["scala"][1] = ""; icons["scala"][2] = color_scala - icons["sh"][1] = icons["script"][1]; icons["sh"][2] = icons["script"][2] - icons["slim"][1] = icons["script"][1]; icons["slim"][2] = icons["script"][2] - icons["sln"][1] = ""; icons["sln"][2] = color_default - icons["sql"][1] = icons["database"][1]; icons["sql"][2] = icons["database"][2] - icons["srt"][1] = ""; icons["srt"][2] = color_default - icons["isub"][1] = ""; icons["isub"][2] = color_default - icons["svg"][1] = icons["picturefile"][1]; icons["svg"][2] = icons["picturefile"][2] - -# t - icons["tar"][1] = icons["archive"][1]; icons["tar"][2] = icons["archive"][2] - icons["tex"][1] = ""; icons["tex"][2] = color_default - icons["tgz"][1] = icons["archive"][1]; icons["tgz"][2] = icons["archive"][2] - icons["ts"][1] = ""; icons["ts"][2] = color_js - icons["tsx"][1] = icons["react"][1]; icons["tsx"][2] = icons["react"][2] - icons["txt"][1] = icons["document"][1]; icons["txt"][2] = icons["document"][2] - icons["txz"][1] = icons["archive"][1]; icons["txz"][2] = icons["archive"][2] - -# u - -# v - icons["vid"][1] = icons["videofile"][1]; icons["vid"][2] = icons["videofile"][2] - icons["vim"][1] = ""; icons["vim"][2] = color_vim - icons["vimrc"][1] = ""; icons["vimrc"][2] = color_vim - icons["vtt"][1] = ""; icons["vtt"][2] = color_default -# w - icons["wav"][1] = icons["musicfile"][1]; icons["wav"][2] = icons["musicfile"][2] - icons["webm"][1] = icons["videofile"][1]; icons["webm"][2] = icons["videofile"][2] - icons["wma"][1] = icons["videofile"][1]; icons["wma"][2] = icons["videofile"][2] - icons["wmv"][1] = icons["videofile"][1]; icons["wmv"][2] = icons["videofile"][2] - -# x - icons["xbps"][1] = icons["archive"][1]; icons["xbps"][2] = color_archive - icons["xcf"][1] = icons["picturefile"][1]; icons["xcf"][2] = color_image - icons["xhtml"][1] = icons["html"][1]; icons["xhtml"][2] = icons["html"][2] - icons["xls"][1] = ""; icons["xls"][2] = color_default - icons["xlsx"][1] = ""; icons["xlsx"][2] = color_default - icons["xml"][1] = icons["html"][1]; icons["xml"][2] = icons["html"][2] - icons["xz"][1] = icons["archive"][1]; icons["xz"][2] = icons["archive"][2] - -# y - icons["yaml"][1] = icons["configure"][1]; icons["yaml"][2] = icons["configure"][2] - icons["yml"][1] = icons["configure"][1]; icons["yml"][2] = icons["configure"][2] -# z - icons["zip"][1] = icons["archive"][1]; icons["zip"][2] = icons["archive"][2] - icons["zsh"][1] = icons["script"][1]; icons["zsh"][2] = icons["script"][2] - icons["zst"][1] = icons["archive"][1]; icons["zst"][2] = icons["archive"][2] - - FS = "." - limit = ENVIRON["limit"] - switch (colordepth) { - case "4": - escape="\033[" - break; - case "8": - escape="\033[38;5;" - break; - case "24": - escape="\033[38;2;" - break; - } - bstr = ENVIRON["beforestr"] -} -{ - # dont print cwd . and leading ./ from tree -f - if ($0 ~/^\.$/) - next - ent = ($0 ~/^\.\//) ? substr($0, 3, length($0) - 2) : $0 - ext = $NF - - # Print icons, set color and bold directories by using ansi escape codes - if (ext in icons) - printcolor(icons[ext][1], icons[ext][2], color_filetxt, ent, "10") - else - switch (substr(ent, length(ent), 1)) { - case "/": - printcolor(icons["directory"][1], color_default, color_dirtxt, ent, "1") - break; - case "*": - printcolor(icons["exe"][1], color_default, color_filetxt, ent, "10") - break; - case "|": - printcolor(icons["pipe"][1], color_default, color_filetxt, ent, "10") - break; - case "=": - printcolor(icons["socket"][1], color_default, color_filetxt, ent, "10") - break; - case ">": - printcolor(icons["door"][1], color_default, color_filetxt, ent, "10") - break; - default: - printcolor(icons["file"][1], color_default, color_filetxt, ent, "10") - } -} -function printcolor(i, c, d, n, b) { - if (limit != "" && length(n) + 2 > limit) - n = substr(n, 1, limit - 2) - printf "\033[0m" - printf "%s%s%s;%sm%s %s%sm%s\n", bstr, escape, c, b, i, escape, d, n -}' -printf '\033[0m' -} - -print_begin() { - printf '%s\n' "$1" | sed 's/\\n/\n/g' -} - -print_end() { - printf '%s\n' "$1" | sed 's/\\n/\n/g' -} - -print_help() { - printf 'Icon Lookup\n -Usage: - iconlookup [options] - iconlookup [-bBe] [string] - iconlookup -l [number] - iconlookup (-h | --help) - - Prepend icons to list of files based on extension or appended indicator by ls/tree "-F" flag ("/" for directory, "*" for executable etc.) - -Options: - -h --help -? Show this screen. - -b --before Prepend str before icon. - -B --begin Prepend str before output. - -e --end Append str after output. - -l --limit Limit line length to [number] characters.' -} - -while :; do - case $1 in - -h|-\?|--help) - print_help - exit ;; - -B|--begin) - if [ -n "$2" ]; then - print_begin "$2" - fi - shift ;; - -e|--end) - if [ -n "$2" ]; then - end=1 - endstr="$2" - fi - shift ;; - -b|--before) - if [ -n "$2" ]; then - export beforestr="$2" - fi - shift ;; - -l|--limit) - if [ -n "$2" ]; then - export limit="$2" - shift - else - printf 'ERROR: "--limit" requires a non-empty option argument.\n' - exit - fi ;; - --) - shift - break ;; - -?*) - printf 'WARNING: Unknown option ignored: %s\n' "$1" ;; - *) break ;; - esac - shift -done - -if [ ! -t 0 ]; then - [ -n "$beforestr" ] && limit="$((limit - ${#beforestr}))" - icon_lookup -else - printf 'ERROR: no data provided...\nExpecting a directory listing in stdin\n' -fi - -if [ -n "$end" ]; then - print_end "$endstr" -fi diff --git a/.config/nnn/plugins/.nmv b/.config/nnn/plugins/.nmv deleted file mode 100755 index 37e887d..0000000 --- a/.config/nnn/plugins/.nmv +++ /dev/null @@ -1,180 +0,0 @@ -#!/usr/bin/env bash - -# Description: An almost fully POSIX compliant batch file renamer -# -# Note: nnn auto-detects and invokes this plugin if available -# Whitespace is used as delimiter for read. -# The plugin doesn't support filenames with leading or trailing whitespace -# To use NNN_LIST your shell must support readlink(1) -# -# Capabilities: -# 1. Basic file rename -# 2. Detects order change -# 3. Can move files -# 4. Can remove files -# 5. Switch number pairs to swap filenames -# -# Shell: bash -# Author: KlzXS - -EDITOR="${EDITOR:-vi}" -TMPDIR="${TMPDIR:-/tmp}" -NNN_INCLUDE_HIDDEN="${NNN_INCLUDE_HIDDEN:-0}" -VERBOSE="${VERBOSE:-0}" -RECURSIVE="${RECURSIVE:-0}" - -case "$NNN_TRASH" in - 1) - RM_UTIL="trash-put" ;; - 2) - RM_UTIL="gio trash" ;; - *) - RM_UTIL="rm -ri" ;; -esac - -selection=${NNN_SEL:-${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.selection} -exit_status=0 - -dst_file=$(mktemp "$TMPDIR/.nnnXXXXXX") - -if [ -s "$selection" ]; then - printf "Rename 'c'urrent / 's'election? " - read -r resp - - if ! [ "$resp" = "c" ] && ! [ "$resp" = "s" ]; then - exit 1 - fi -fi - -if [ "$resp" = "s" ]; then - arr=$(tr '\0' '\n' < "$selection") -else - findcmd="find . ! -name ." - - if [ "$RECURSIVE" -eq 0 ]; then - findcmd="$findcmd -prune" - fi - - if [ "$NNN_INCLUDE_HIDDEN" -eq 0 ]; then - findcmd="$findcmd ! -name \".*\"" - fi - - if [ -z "$NNN_LIST" ]; then - findcmd="$findcmd -print" - else - findcmd="$findcmd -printf "'"'"$NNN_LIST/%P\n"'"' - fi - - arr=$(eval "$findcmd" | sort) -fi - -lines=$(printf "%s\n" "$arr" | wc -l) -width=${#lines} - -printf "%s" "$arr" | awk '{printf("%'"${width}"'d %s\n", NR, $0)}' > "$dst_file" - -items=("~") -while IFS='' read -r line; do - if [ -n "$NNN_LIST" ]; then - line=$(readlink "$line" || printf "%s" "$line") - fi - - items+=("$line"); -done < <(printf "%s\n" "$arr") - -$EDITOR "$dst_file" - -while read -r num name; do - if [ -z "$name" ]; then - if [ -z "$num" ]; then - continue - fi - - printf "%s: unable to parse line, aborting\n" "$0" - exit 1 - fi - - # check if $num is an integer - if [ ! "$num" -eq "$num" ] 2> /dev/null; then - printf "%s: unable to parse line, aborting\n" "$0" - exit 1 - fi - - src=${items[$num]} - - if [ -z "$src" ]; then - printf "%s: unknown item number %s\n" "$0" "$num" > /dev/stderr - continue - elif [ "$name" != "$src" ]; then - if [ -z "$name" ]; then - continue - fi - - if [ ! -e "$src" ] && [ ! -L "$src" ]; then - printf "%s: %s does not exit\n" "$0" "$src" > /dev/stderr - - unset "items[$num]" - continue - fi - - # handle swaps - if [ -e "$name" ] || [ -L "$name" ]; then - tmp="$name~" - c=0 - - while [ -e "$tmp" ] || [ -L "$tmp" ]; do - c=$((c+1)) - tmp="$tmp~$c" - done - - if mv "$name" "$tmp"; then - if [ "$VERBOSE" -ne 0 ]; then - printf "'%s' -> '%s'\n" "$name" "$tmp" - fi - else - printf "%s: failed to rename %s to %s: %s\n" "$0" "$name" "$tmp" "$!" > /dev/stderr - exit_status=1 - fi - - for key in "${!items[@]}"; do - if [ "${items[$key]}" = "$name" ]; then - items[$key]="$tmp" - fi - done - fi - - dir=$(dirname "$name") - if [ ! -d "$dir" ] && ! mkdir -p "$dir"; then - printf "%s: failed to create directory tree %s\n" "$0" "$dir" > /dev/stderr - exit_status=1 - elif ! mv -i "$src" "$name"; then - printf "%s: failed to rename %s to %s: %s\n" "$0" "$name" "$tmp" "$!" > /dev/stderr - exit_status=1 - else - if [ -d "$name" ]; then - for key in "${!items[@]}"; do - items[$key]=$(printf "%s" "${items[$key]}" | sed "s|^$src\(\$\|\/\)|$name\1|") - done - - if [ "$VERBOSE" -ne 0 ]; then - printf "'%s' => '%s'\n" "$src" "$name" - fi - else - true - if [ "$VERBOSE" -ne 0 ]; then - printf "'%s' -> '%s'\n" "$src" "$name" - fi - fi - fi - fi - - unset "items[$num]" -done <"$dst_file" - -unset "items[0]" -for item in "${items[@]}"; do - $RM_UTIL "$item" -done - -rm "$dst_file" -exit $exit_status diff --git a/.config/nnn/plugins/.nnn-plugin-helper b/.config/nnn/plugins/.nnn-plugin-helper deleted file mode 100644 index a0377ac..0000000 --- a/.config/nnn/plugins/.nnn-plugin-helper +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env sh - -# Description: Helper script for plugins -# -# Shell: POSIX compliant -# Author: Anna Arad - -selection=${NNN_SEL:-${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.selection} -export selection - -## Set CUR_CTX to 1 to open directory in current context -CUR_CTX=0 -export CUR_CTX - -## Ask nnn to switch to directory $1 in context $2. -## If $2 is not provided, the function asks explicitly. -nnn_cd () { - dir="$1" - - if [ -z "$NNN_PIPE" ]; then - echo "No pipe file found" 1>&2 - return - fi - - if [ -n "$2" ]; then - context=$2 - elif [ $CUR_CTX -ne 1 ]; then - printf "Choose context 1-4 (blank for current): " - read -r context - fi - - printf "%s" "${context:-0}c$dir" > "$NNN_PIPE" -} - -cmd_exists () { - type "$1" > /dev/null 2>&1 - echo $? -} diff --git a/.config/nnn/plugins/.ntfy b/.config/nnn/plugins/.ntfy deleted file mode 100755 index 2a61478..0000000 --- a/.config/nnn/plugins/.ntfy +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env sh - -# Description: Show a notification -# -# Details: nnn invokes this plugin to show notification when a cp/mv/rm operation is complete. -# -# Dependencies: notify-send (Ubuntu)/ntfy (https://github.com/dschep/ntfy)/osascript (macOS)/notify (Haiku) -# -# Shell: POSIX compliant -# Author: Anna Arad - -OS="$(uname)" - -if type notify-send >/dev/null 2>&1; then - notify-send nnn "Done!" -elif [ "$OS" = "Darwin" ]; then - osascript -e 'display notification "Done!" with title "nnn"' -elif type ntfy >/dev/null 2>&1; then - ntfy -t nnn send "Done!" -elif [ "$OS" = "Haiku" ]; then - notify --title "nnn" "Done!" -fi -- cgit v1.2.3 From c72de1d239aac325155fc840cd226309435538de Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Fri, 26 May 2023 11:20:50 +0200 Subject: using vim-tmux-navigator; some other updates --- .config/nvim/lua/user/keymaps.lua | 6 --- .config/nvim/lua/user/options.lua | 3 +- .config/nvim/lua/user/plugins.lua | 1 + .config/nvim/lua/user/plugins/telescope.lua | 2 +- .config/nvim/plugin/packer_compiled.lua | 37 ++++++++++-------- .config/shell/aliasrc | 8 ++-- .config/shell/profile | 3 ++ .config/tmux/tmux.conf | 59 ++++++++++++++++++++++------- .config/x11/xinitrc | 5 +-- .config/zathura/zathurarc | 14 ++++++- 10 files changed, 92 insertions(+), 46 deletions(-) diff --git a/.config/nvim/lua/user/keymaps.lua b/.config/nvim/lua/user/keymaps.lua index 59c323c..b174f65 100644 --- a/.config/nvim/lua/user/keymaps.lua +++ b/.config/nvim/lua/user/keymaps.lua @@ -8,12 +8,6 @@ keymap('n', 'Q', ':bufdo bdelete') -- Allow gf to open non-existant files keymap('n', 'gf', ':edit ') --- Quick navigation between splits -keymap('n', '', 'h') -keymap('n', '', 'j') -keymap('n', '', 'k') -keymap('n', '', 'l') - -- Open the current file in the default program keymap('n', 'x', ':!xdg-open %') diff --git a/.config/nvim/lua/user/options.lua b/.config/nvim/lua/user/options.lua index 0c35dfc..2fdd6e2 100644 --- a/.config/nvim/lua/user/options.lua +++ b/.config/nvim/lua/user/options.lua @@ -17,8 +17,9 @@ vim.o.splitright = 1 vim.o.splitbelow = 1 vim.o.clipboard = 'unnamedplus' -- Use Linux system clipboard vim.o.updatetime = 250 -- Decrease CursorHold delay -vim.o.redrawtime = 10000 -- Allow more time for loading syntax on large files +vim.o.redrawtime = 10000 -- Allow more time for loading syntax 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 755f0e9..07f8f42 100644 --- a/.config/nvim/lua/user/plugins.lua +++ b/.config/nvim/lua/user/plugins.lua @@ -4,6 +4,7 @@ require('packer').startup(function() use { 'tpope/vim-surround' } use { 'tpope/vim-eunuch' } use { 'tpope/vim-sleuth' } + use { 'christoomey/vim-tmux-navigator' } use { 'dracula/vim', diff --git a/.config/nvim/lua/user/plugins/telescope.lua b/.config/nvim/lua/user/plugins/telescope.lua index b1d1136..5f7023f 100644 --- a/.config/nvim/lua/user/plugins/telescope.lua +++ b/.config/nvim/lua/user/plugins/telescope.lua @@ -4,7 +4,7 @@ local keymap = require 'lib.utils'.keymap keymap('n', ';f', [[lua require('telescope.builtin').find_files()]]) keymap('n', ';r', [[lua require('telescope.builtin').live_grep()]]) -keymap('n', ';\\', [[lua require('telescope.builtin').buffers()]]) +keymap('n', ';b', [[lua require('telescope.builtin').buffers()]]) require('telescope').setup { defaults = { diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index 6275daa..713ebc9 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -238,18 +238,23 @@ _G.packer_plugins = { loaded = true, path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-surround", url = "https://github.com/tpope/vim-surround" + }, + ["vim-tmux-navigator"] = { + loaded = true, + path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-tmux-navigator", + url = "https://github.com/christoomey/vim-tmux-navigator" } } time([[Defining packer_plugins]], 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-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: 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-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") @@ -258,30 +263,30 @@ 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: 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: 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-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-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-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: 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) +-- 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) _G._packer.inside_compile = false if _G._packer.needs_bufread == true then diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 67ae3d0..07c75bf 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -26,6 +26,9 @@ 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"' +# pad numbers in filenames with zeros +alias padz='perl-rename "s/\d+/sprintf(\"%02d\",$&)/e"' + # set custom ascii # alias neofetch='neofetch --source ~/docs/ascii/lain' @@ -43,7 +46,7 @@ alias ls='ls -hl --color=always --group-directories-first' alias la='ls -a' alias lc='ls | tail -n +2 | wc -l' -ld() { +lsd() { if [ "$1" = "" ]; then ls -d */; else @@ -125,9 +128,8 @@ alias dpush='dfiles push origin' ## PACKAGE MANAGER -alias eq='equery uses' +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 2adf26c..eca8c75 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -22,4 +22,7 @@ export XDG_SESSION_TYPE='x11' export VDPAU_DRIVER=radeonsi +export EIX_LIMIT=0 +export EIX_LIMIT_COMPACT=0 + 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 ef0dabb..caf8066 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -20,23 +20,56 @@ set -g default-terminal "tmux-256color" # Set history-limit set -g history-limit 30000 +# various window option +set -g base-index 1 +set -g pane-base-index 1 +set-window-option -g pane-base-index 1 +set-option -g renumber-windows on +setw -g aggressive-resize on + ## KEYBINDS # Change the prefix key to C-a -set -g prefix C-a +set -g prefix C-Space unbind C-b -bind C-a send-prefix - -bind C-v split-window -v # split vertically -bind C-h split-window -h # split horizontally -bind C-w killp # kill pane -bind C-q killw # kill window -bind -n M-h select-pane -L -bind -n M-l select-pane -R -bind -n M-k select-pane -U -bind -n M-j select-pane -D - -# Turn the mouse on, but without copy mode dragging +bind C-Space send-prefix + +bind C-v split-window -v -c "#{pane_current_path}" +bind C-s split-window -h -c "#{pane_current_path}" +bind C-w killp +bind C-q killw +bind C-p previous-window +bind C-n next-window +# bind -n C-h select-pane -L +# bind -n C-j select-pane -D +# bind -n C-k select-pane -U +# bind -n C-l select-pane -R +bind -n M-h resize-pane -L 5 +bind -n M-j resize-pane -D 5 +bind -n M-k resize-pane -U 5 +bind -n M-l resize-pane -R 5 + +# Smart pane switching with awareness of Vim splits. +# See: https://github.com/christoomey/vim-tmux-navigator +is_vim="ps -o state= -o comm= -t '#{pane_tty}' \ + | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|l?n?vim?x?)(diff)?$'" +bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h' 'select-pane -L' +bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' 'select-pane -D' +bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' 'select-pane -U' +bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' 'select-pane -R' +tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")' +if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \ + "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\' 'select-pane -l'" +if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \ + "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\' 'select-pane -l'" + +bind-key -T copy-mode-vi 'C-h' select-pane -L +bind-key -T copy-mode-vi 'C-j' select-pane -D +bind-key -T copy-mode-vi 'C-k' select-pane -U +bind-key -T copy-mode-vi 'C-l' select-pane -R +bind-key -T copy-mode-vi 'C-\' select-pane -l + +# Turn the mouse off set -g mouse off # Keys to toggle monitoring activity in a window and the synchronize-panes option diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index ecd80c1..a3a9bda 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -4,12 +4,10 @@ if command -v dbus-launch > /dev/null && test -z "${DBUS_SESSION_BUS_ADDRESS}"; eval $(dbus-launch --sh-syntax --exit-with-session) fi -rfkill block all - eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")" eval "$(ssh-agent)" -xset r rate 250 30 +xset r rate 200 20 xset s off -dpms setxkbmap -option "ctrl:nocaps" @@ -24,4 +22,3 @@ picom & statusbar & exec dwm - diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc index 452e116..5836bc0 100644 --- a/.config/zathura/zathurarc +++ b/.config/zathura/zathurarc @@ -3,13 +3,23 @@ set statusbar-h-padding 0 set statusbar-v-padding 0 set page-padding 1 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 D toggle_page_mode map r reload map R rotate -map K zoom in -map J zoom out map i recolor map p print map g goto top + +#stop at page boundries +set scroll-page-aware true +set scroll-full-overlap 0.01 +set scroll-step 100 + +unmap f +map f toggle_fullscreen +map [fullscreen] f toggle_fullscreen -- 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(-) 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 93e56a12d85df2e1aee2af2898728660bbecc6f4 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Fri, 9 Jun 2023 19:05:18 +0200 Subject: added my nyxt configs --- .config/nyxt/commands.lisp | 9 ++++++ .config/nyxt/config.lisp | 58 ++++++++++++++++++++++++++++++++++ .config/nyxt/keybinds.lisp | 8 +++++ .config/nyxt/scripts/weather | 3 ++ .config/nyxt/search-engines.lisp | 45 ++++++++++++++++++++++++++ .config/nyxt/status.lisp | 29 +++++++++++++++++ .config/nyxt/themes/cafebabe-dark.lisp | 37 ++++++++++++++++++++++ .config/nyxt/url-redirects.lisp | 30 ++++++++++++++++++ 8 files changed, 219 insertions(+) create mode 100644 .config/nyxt/commands.lisp create mode 100644 .config/nyxt/config.lisp create mode 100644 .config/nyxt/keybinds.lisp create mode 100755 .config/nyxt/scripts/weather create mode 100644 .config/nyxt/search-engines.lisp create mode 100644 .config/nyxt/status.lisp create mode 100644 .config/nyxt/themes/cafebabe-dark.lisp create mode 100644 .config/nyxt/url-redirects.lisp diff --git a/.config/nyxt/commands.lisp b/.config/nyxt/commands.lisp new file mode 100644 index 0000000..159916f --- /dev/null +++ b/.config/nyxt/commands.lisp @@ -0,0 +1,9 @@ +(in-package #:nyxt-user) + +(define-command-global show-weather () + (echo (uiop:run-program "~/.config/nyxt/scripts/weather" :output :string))) + +;;opens current url in different browser replace firefox with your browser/path +(define-command-global open-external-browser () + "Open the current url in external browser" + (uiop:run-program (list "firefox-bin" (render-url (url (current-buffer)))))) diff --git a/.config/nyxt/config.lisp b/.config/nyxt/config.lisp new file mode 100644 index 0000000..c28b669 --- /dev/null +++ b/.config/nyxt/config.lisp @@ -0,0 +1,58 @@ +(in-package #:nyxt-user) + +(reset-asdf-registries) + +(defvar *web-buffer-modes* + '(:emacs-mode + :blocker-mode + :force-https-mode + :reduce-tracking-mode + :user-script-mode + :no-script-mode + :no-webgl-mode)) + +(define-nyxt-user-system-and-load nyxt-user/basic-config + :components ("commands" "keybinds" "status" "url-redirects" "themes/cafebabe-dark.lisp")) + +;;; EXAMPLE +;; (define-nyxt-user-system-and-load "nyxt-user/nx-fruit-proxy" +;; :description "This proxy system saves us if nx-fruit fails to load. +;; Otherwise it will break all the config loading." +;; :depends-on ("nx-fruit")) + +(define-nyxt-user-system-and-load "nyxt-user/search-engines" + :depends-on (:nx-search-engines) :components ("search-engines")) + +(define-configuration browser + ((restore-session-on-startup-p nil) + (remote-execution-p t) + (external-editor-program + (list "emacsclient" "-cn" "-a" "" "-F")))) + +(define-configuration nyxt/mode/user-script:user-script-mode + ((nyxt/mode/user-script:user-scripts + (list + (make-instance 'nyxt/mode/user-script:user-script :base-path #p"~/.config/nyxt/scripts/4chan-x.user.js"))))) + +(define-configuration (:modable-buffer :prompt-buffer :editor-buffer) + ((default-modes `(:emacs-mode ,@%slot-value%)))) + +(define-configuration :prompt-buffer + ((dynamic-attribute-width-p t))) + +(define-configuration :web-buffer + ((search-always-auto-complete-p nil) + (global-history-p t))) + +(define-configuration :browser + ((default-new-buffer-url (quri:uri "nyxt:nyxt/mode/repl:repl")))) + +(define-configuration :web-buffer + ((default-modes `(,@*web-buffer-modes* ,@%slot-value%)))) + +(define-configuration :reduce-tracking-mode + ((query-tracking-parameters + (append '("utm_source" "utm_medium" "utm_campaign" "utm_term" "utm_content") + %slot-value%)) + (preferred-user-agent + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36"))) diff --git a/.config/nyxt/keybinds.lisp b/.config/nyxt/keybinds.lisp new file mode 100644 index 0000000..3e96620 --- /dev/null +++ b/.config/nyxt/keybinds.lisp @@ -0,0 +1,8 @@ +(in-package #:nyxt-user) + +(define-configuration buffer + ((override-map (let ((map (make-keymap "my-override-map"))) + (define-key map + "M-I" 'show-weather + "C-2" 'open-external-browser) + map)))) diff --git a/.config/nyxt/scripts/weather b/.config/nyxt/scripts/weather new file mode 100755 index 0000000..0992d24 --- /dev/null +++ b/.config/nyxt/scripts/weather @@ -0,0 +1,3 @@ +#!/bin/sh + +curl wttr.in/Ludwigshafen?format=3 diff --git a/.config/nyxt/search-engines.lisp b/.config/nyxt/search-engines.lisp new file mode 100644 index 0000000..718ab11 --- /dev/null +++ b/.config/nyxt/search-engines.lisp @@ -0,0 +1,45 @@ +(in-package #:nyxt-user) + +(defvar *duckduckgo-keywords* + '(:theme :dark + :help-improve-duckduckgo nil + :homepage-privacy-tips nil + :privacy-newsletter nil + :newsletter-reminders nil + :install-reminders nil + :install-duckduckgo nil + :units-of-measure :metric + :keyboard-shortcuts t + :advertisements nil + :open-in-new-tab nil + :infinite-scroll t + :safe-search :off + :font-size :medium + :header-behavior :on-fixed + :font :helvetica + :background-color "000000") + "My DDG settings, shared between the usual, image-search and other +types of DuckDuckGo.") + +(define-configuration (buffer web-buffer) + ((search-engines (list (engines:duckduckgo-html-only :shortcut "dho") + (apply #'engines:duckduckgo + :shortcut "d" *duckduckgo-keywords*) + (apply #'engines:duckduckgo-images + :shortcut "i" *duckduckgo-keywords*) + (make-instance 'search-engine + :shortcut "aw" + :search-url "https://wiki.archlinux.org/index.php?search=~a&title=Special%3ASearch&fulltext=Search" + :fallback-url "https://wiki.archlinux.org") + (make-instance 'search-engine + :shortcut "gen" + :search-url "https://wiki.gentoo.org/index.php?title=Sepcial%3ASearch&search=~a&go=Go" + :fallback-url "https://wiki.gentoo.org") + (make-instance 'search-engine + :shortcut "lbx" + :search-url "https://search.cafebabe.gay/search.php?q=~a" + :fallback-url "https://search.cafebabe.gay") + (engines:invidious + :shortcut "yt" + :base-search-url "https://invidious.cafebabe.gay/search?q=~a" + :fallback-url "https://invidious.cafebabe.gay"))))) diff --git a/.config/nyxt/status.lisp b/.config/nyxt/status.lisp new file mode 100644 index 0000000..50d2090 --- /dev/null +++ b/.config/nyxt/status.lisp @@ -0,0 +1,29 @@ +(in-package #:nyxt-user) + +(define-configuration :status-buffer + "Display modes as short glyphs." + ((glyph-mode-presentation-p t))) + +(define-configuration :force-https-mode ((glyph "ϕ"))) +(define-configuration :reduce-tracking-mode ((glyph "τ"))) +(define-configuration :no-script-mode ((glyph "σ"))) +(define-configuration :no-webgl-mode ((glyph "ω"))) +(define-configuration :blocker-mode ((glyph "β"))) + +(define-configuration status-buffer + "Hide most of the status elements but URL and modes." + ((style (str:concat + %slot-value% + (theme:themed-css (theme *browser*) + `("#controls,#tabs" + :display none !important)))))) + +(defmethod format-status-load-status ((status status-buffer)) + "A fancier load status." + (spinneret:with-html-string + (:span (if (web-buffer-p (current-buffer)) + (case (slot-value (current-buffer) 'nyxt::status) + (:unloaded "∅") + (:loading "∞") + (:finished "")) + "")))) diff --git a/.config/nyxt/themes/cafebabe-dark.lisp b/.config/nyxt/themes/cafebabe-dark.lisp new file mode 100644 index 0000000..0ccffe1 --- /dev/null +++ b/.config/nyxt/themes/cafebabe-dark.lisp @@ -0,0 +1,37 @@ +(in-package #:nyxt-user) + +;; this automatically darkens Webkit-native interfaces and sends the +;; "prefers-color-scheme: dark" to all the supporting websites. +(setf (uiop:getenv "GTK_THEME") "Adwaita:dark") + +(define-configuration browser + ((theme (make-instance + 'theme:theme + :background-color "#000000" + :accent-color "#CD5C5C" + :accent-alt-color "#6C2429" + :warning-color "#CEFF00" + :primary-color "rgb(170, 170, 170)" + :secondary-color "rgb(100, 100, 100)")))) + +(define-configuration :dark-mode + "Overriding the ugly gray-ish default colors" + ((style + (theme:themed-css (theme *browser*) + `(* + :background-color ,(if (theme:dark-p theme:theme) + theme:background + theme:on-background) + "!important" + :background-image none "!important" + :color ,(if (theme:dark-p theme:theme) + theme:on-background + theme:background) + "!important") + `(a + :background-color ,(if (theme:dark-p theme:theme) + theme:background + theme:on-background) + "!important" + :background-image none "!important" + :color ,theme:primary "!important"))))) diff --git a/.config/nyxt/url-redirects.lisp b/.config/nyxt/url-redirects.lisp new file mode 100644 index 0000000..5069c1c --- /dev/null +++ b/.config/nyxt/url-redirects.lisp @@ -0,0 +1,30 @@ +(in-package #:nyxt-user) + +(defparameter old-reddit-handler + (url-dispatching-handler + 'old-reddit-dispatcher + (match-regex "https?\:\/\/?.*?reddit\.com") + (lambda (url) + (quri:copy-uri url :host "old.reddit.com")))) + +(defparameter invidious-handler + (url-dispatching-handler + 'invidious-dispatcher + (match-regex "https?\:\/\/?.*?(?:youtube\.com|youtu\.be|youtube-nocookie\.com).*") + (lambda (url) + (quri:copy-uri url :host "invidious.cafebabe.gay")))) + +(defparameter wikiless-handler + (url-dispatching-handler + 'wikiless-dispatcher + (match-regex "https?\:\/\/?.*?wikipedia\.org.*") + (lambda (url) + (quri:copy-uri url :host "wikiless.org")))) + +(define-configuration buffer + ((request-resource-hook + (reduce #'hooks:add-hook + (list old-reddit-handler + invidious-handler + wikiless-handler) + :initial-value %slot-default%)))) -- cgit v1.2.3 From 1796493a7a9a54ea8e304e75ad4ded8df0d869e3 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Mon, 12 Jun 2023 23:18:41 +0200 Subject: change: switched list-buffers and switch-buffer keybind; added my invidious instance as search-engine --- .config/nyxt/keybinds.lisp | 14 ++++++++++++-- .config/nyxt/search-engines.lisp | 10 +++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.config/nyxt/keybinds.lisp b/.config/nyxt/keybinds.lisp index 3e96620..52087d9 100644 --- a/.config/nyxt/keybinds.lisp +++ b/.config/nyxt/keybinds.lisp @@ -1,8 +1,18 @@ (in-package #:nyxt-user) (define-configuration buffer - ((override-map (let ((map (make-keymap "my-override-map"))) + ((override-map (let ((map (make-keymap "custom-map"))) (define-key map "M-I" 'show-weather - "C-2" 'open-external-browser) + "C-2" 'open-external-browser + "C-x C-b" 'switch-buffer + "C-x b" 'list-buffers) map)))) + +;;;; for some reason this does not work, even though it's from the manual +;; (define-configuration base-mode +;; ((keyscheme-map +;; (define-keyscheme-map "my-base" (list :import %slot-value%) +;; keyscheme:emacs +;; (list +;; "C-x C-b" NIL))))) diff --git a/.config/nyxt/search-engines.lisp b/.config/nyxt/search-engines.lisp index 718ab11..4c7dec5 100644 --- a/.config/nyxt/search-engines.lisp +++ b/.config/nyxt/search-engines.lisp @@ -35,11 +35,11 @@ types of DuckDuckGo.") :shortcut "gen" :search-url "https://wiki.gentoo.org/index.php?title=Sepcial%3ASearch&search=~a&go=Go" :fallback-url "https://wiki.gentoo.org") - (make-instance 'search-engine - :shortcut "lbx" - :search-url "https://search.cafebabe.gay/search.php?q=~a" - :fallback-url "https://search.cafebabe.gay") (engines:invidious :shortcut "yt" :base-search-url "https://invidious.cafebabe.gay/search?q=~a" - :fallback-url "https://invidious.cafebabe.gay"))))) + :fallback-url "https://invidious.cafebabe.gay") + (make-instance 'search-engine + :shortcut "lbx" + :search-url "https://search.cafebabe.gay/search.php?q=~a" + :fallback-url "https://search.cafebabe.gay"))))) -- cgit v1.2.3 From 23f3dcc4cc986507ba20a30d9312be9a3fc9d188 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Sat, 24 Jun 2023 02:22:27 +0200 Subject: regular update --- .config/mpd/mpd.conf | 2 +- .config/neofetch/config.conf | 2 +- .config/nyxt/config.lisp | 9 ++++++++- .config/pipewire/pipewire.conf | 6 +++--- .config/shell/aliasrc | 1 - .config/tmux/tmux.conf | 4 ++-- .config/x11/xinitrc | 1 + 7 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index 2ebf6b5..4bdd05b 100755 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -10,7 +10,7 @@ state_file "~/.config/mpd/mpdstate" # default local output audio_output { - type "pipewire" + type "pulse" name "Default" } diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 0707571..75234fc 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -364,7 +364,7 @@ gtk3="off" # disk_show=('/'): # 'Disk (/): 74G / 118G (66%)' # -disk_show=('/' '/home' '/dev/sda2') +disk_show=('/' '/home' '/dev/sda1' '/dev/sdb1') # Disk subtitle. # What to append to the Disk subtitle. diff --git a/.config/nyxt/config.lisp b/.config/nyxt/config.lisp index c28b669..bfdb308 100644 --- a/.config/nyxt/config.lisp +++ b/.config/nyxt/config.lisp @@ -32,7 +32,14 @@ (define-configuration nyxt/mode/user-script:user-script-mode ((nyxt/mode/user-script:user-scripts (list - (make-instance 'nyxt/mode/user-script:user-script :base-path #p"~/.config/nyxt/scripts/4chan-x.user.js"))))) + (make-instance 'nyxt/mode/user-script:user-script :base-path #p"~/.config/nyxt/scripts/4chan-x.user.js") + (make-instance 'nyxt/mode/user-script:user-script :base-path #p"~/.config/nyxt/scripts/onee-chan.user.js"))))) + +(define-configuration nyxt/mode/proxy:proxy-mode + ((nyxt/mode/proxy:proxy (make-instance 'proxy + :url (quri:uri "socks5://localhost:9050") + :allowlist '("localhost" "localhost:8080") + :proxied-downloads-p t)))) (define-configuration (:modable-buffer :prompt-buffer :editor-buffer) ((default-modes `(:emacs-mode ,@%slot-value%)))) diff --git a/.config/pipewire/pipewire.conf b/.config/pipewire/pipewire.conf index af1ff82..7073ff8 100644 --- a/.config/pipewire/pipewire.conf +++ b/.config/pipewire/pipewire.conf @@ -26,10 +26,10 @@ context.properties = { core.name = pipewire-0 # core name and socket name ## Properties for the DSP configuration. - #default.clock.rate = 48000 + default.clock.rate = 48000 #default.clock.allowed-rates = [ 48000 ] - #default.clock.quantum = 1024 - default.clock.min-quantum = 16 + default.clock.quantum = 192 + default.clock.min-quantum = 192 #default.clock.max-quantum = 2048 #default.clock.quantum-limit = 8192 #default.video.width = 640 diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 330bb8a..396915d 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -129,4 +129,3 @@ alias push='git push origin' alias dfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME' alias dcomm='dfiles commit -m' alias dpush='dfiles push origin' - diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index caf8066..55f477c 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -34,8 +34,8 @@ set -g prefix C-Space unbind C-b bind C-Space send-prefix -bind C-v split-window -v -c "#{pane_current_path}" -bind C-s split-window -h -c "#{pane_current_path}" +bind C-s split-window -v -c "#{pane_current_path}" +bind C-v split-window -h -c "#{pane_current_path}" bind C-w killp bind C-q killw bind C-p previous-window diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index a3a9bda..05fa704 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -16,6 +16,7 @@ xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 ~/.local/bin/set-wallpaper & /usr/bin/emacs --daemon & +otd & pipewire & mpd & picom & -- cgit v1.2.3 From 1006987466e98b661a98164c1795ff5682d4260b Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Sat, 1 Jul 2023 22:24:19 +0200 Subject: update --- .config/mpd/mpd.conf | 6 +-- .config/nvim/lua/user/plugins/lspconfig.lua | 2 +- .config/nyxt/commands.lisp | 9 ---- .config/nyxt/config.lisp | 65 ----------------------------- .config/nyxt/keybinds.lisp | 18 -------- .config/nyxt/scripts/weather | 3 -- .config/nyxt/search-engines.lisp | 45 -------------------- .config/nyxt/status.lisp | 29 ------------- .config/nyxt/themes/cafebabe-dark.lisp | 37 ---------------- .config/nyxt/url-redirects.lisp | 30 ------------- .config/shell/aliasrc | 1 + .config/shell/profile | 2 +- .config/tmux/tmux.conf | 15 ++++--- .ncmpcpp/config | 2 +- 14 files changed, 14 insertions(+), 250 deletions(-) delete mode 100644 .config/nyxt/commands.lisp delete mode 100644 .config/nyxt/config.lisp delete mode 100644 .config/nyxt/keybinds.lisp delete mode 100755 .config/nyxt/scripts/weather delete mode 100644 .config/nyxt/search-engines.lisp delete mode 100644 .config/nyxt/status.lisp delete mode 100644 .config/nyxt/themes/cafebabe-dark.lisp delete mode 100644 .config/nyxt/url-redirects.lisp diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index 4bdd05b..0e7073d 100755 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -2,7 +2,7 @@ bind_to_address "0.0.0.0" #bind_to_address "/run/mpd/socket" music_directory "/media/hdd/music" -playlist_directory "~/.config/mpd/playlists" +playlist_directory "~/.config/mpd/playlists" db_file "~/.config/mpd/database" log_file "~/.config/mpd/log" pid_file "~/.config/mpd/pid" @@ -17,8 +17,8 @@ audio_output { # http streaming audio_output { type "httpd" - name "My HTTP Stream" - encoder "vorbis" # optional, vorbis or lame + name "HTTP Stream" + encoder "lame" # optional, vorbis or lame port "8001" quality "8.0" # do not define if bitrate is defined # bitrate "256" # do not define if quality is defined diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua index 82b85b8..39f27c3 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/nyxt/commands.lisp b/.config/nyxt/commands.lisp deleted file mode 100644 index 159916f..0000000 --- a/.config/nyxt/commands.lisp +++ /dev/null @@ -1,9 +0,0 @@ -(in-package #:nyxt-user) - -(define-command-global show-weather () - (echo (uiop:run-program "~/.config/nyxt/scripts/weather" :output :string))) - -;;opens current url in different browser replace firefox with your browser/path -(define-command-global open-external-browser () - "Open the current url in external browser" - (uiop:run-program (list "firefox-bin" (render-url (url (current-buffer)))))) diff --git a/.config/nyxt/config.lisp b/.config/nyxt/config.lisp deleted file mode 100644 index bfdb308..0000000 --- a/.config/nyxt/config.lisp +++ /dev/null @@ -1,65 +0,0 @@ -(in-package #:nyxt-user) - -(reset-asdf-registries) - -(defvar *web-buffer-modes* - '(:emacs-mode - :blocker-mode - :force-https-mode - :reduce-tracking-mode - :user-script-mode - :no-script-mode - :no-webgl-mode)) - -(define-nyxt-user-system-and-load nyxt-user/basic-config - :components ("commands" "keybinds" "status" "url-redirects" "themes/cafebabe-dark.lisp")) - -;;; EXAMPLE -;; (define-nyxt-user-system-and-load "nyxt-user/nx-fruit-proxy" -;; :description "This proxy system saves us if nx-fruit fails to load. -;; Otherwise it will break all the config loading." -;; :depends-on ("nx-fruit")) - -(define-nyxt-user-system-and-load "nyxt-user/search-engines" - :depends-on (:nx-search-engines) :components ("search-engines")) - -(define-configuration browser - ((restore-session-on-startup-p nil) - (remote-execution-p t) - (external-editor-program - (list "emacsclient" "-cn" "-a" "" "-F")))) - -(define-configuration nyxt/mode/user-script:user-script-mode - ((nyxt/mode/user-script:user-scripts - (list - (make-instance 'nyxt/mode/user-script:user-script :base-path #p"~/.config/nyxt/scripts/4chan-x.user.js") - (make-instance 'nyxt/mode/user-script:user-script :base-path #p"~/.config/nyxt/scripts/onee-chan.user.js"))))) - -(define-configuration nyxt/mode/proxy:proxy-mode - ((nyxt/mode/proxy:proxy (make-instance 'proxy - :url (quri:uri "socks5://localhost:9050") - :allowlist '("localhost" "localhost:8080") - :proxied-downloads-p t)))) - -(define-configuration (:modable-buffer :prompt-buffer :editor-buffer) - ((default-modes `(:emacs-mode ,@%slot-value%)))) - -(define-configuration :prompt-buffer - ((dynamic-attribute-width-p t))) - -(define-configuration :web-buffer - ((search-always-auto-complete-p nil) - (global-history-p t))) - -(define-configuration :browser - ((default-new-buffer-url (quri:uri "nyxt:nyxt/mode/repl:repl")))) - -(define-configuration :web-buffer - ((default-modes `(,@*web-buffer-modes* ,@%slot-value%)))) - -(define-configuration :reduce-tracking-mode - ((query-tracking-parameters - (append '("utm_source" "utm_medium" "utm_campaign" "utm_term" "utm_content") - %slot-value%)) - (preferred-user-agent - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36"))) diff --git a/.config/nyxt/keybinds.lisp b/.config/nyxt/keybinds.lisp deleted file mode 100644 index 52087d9..0000000 --- a/.config/nyxt/keybinds.lisp +++ /dev/null @@ -1,18 +0,0 @@ -(in-package #:nyxt-user) - -(define-configuration buffer - ((override-map (let ((map (make-keymap "custom-map"))) - (define-key map - "M-I" 'show-weather - "C-2" 'open-external-browser - "C-x C-b" 'switch-buffer - "C-x b" 'list-buffers) - map)))) - -;;;; for some reason this does not work, even though it's from the manual -;; (define-configuration base-mode -;; ((keyscheme-map -;; (define-keyscheme-map "my-base" (list :import %slot-value%) -;; keyscheme:emacs -;; (list -;; "C-x C-b" NIL))))) diff --git a/.config/nyxt/scripts/weather b/.config/nyxt/scripts/weather deleted file mode 100755 index 0992d24..0000000 --- a/.config/nyxt/scripts/weather +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -curl wttr.in/Ludwigshafen?format=3 diff --git a/.config/nyxt/search-engines.lisp b/.config/nyxt/search-engines.lisp deleted file mode 100644 index 4c7dec5..0000000 --- a/.config/nyxt/search-engines.lisp +++ /dev/null @@ -1,45 +0,0 @@ -(in-package #:nyxt-user) - -(defvar *duckduckgo-keywords* - '(:theme :dark - :help-improve-duckduckgo nil - :homepage-privacy-tips nil - :privacy-newsletter nil - :newsletter-reminders nil - :install-reminders nil - :install-duckduckgo nil - :units-of-measure :metric - :keyboard-shortcuts t - :advertisements nil - :open-in-new-tab nil - :infinite-scroll t - :safe-search :off - :font-size :medium - :header-behavior :on-fixed - :font :helvetica - :background-color "000000") - "My DDG settings, shared between the usual, image-search and other -types of DuckDuckGo.") - -(define-configuration (buffer web-buffer) - ((search-engines (list (engines:duckduckgo-html-only :shortcut "dho") - (apply #'engines:duckduckgo - :shortcut "d" *duckduckgo-keywords*) - (apply #'engines:duckduckgo-images - :shortcut "i" *duckduckgo-keywords*) - (make-instance 'search-engine - :shortcut "aw" - :search-url "https://wiki.archlinux.org/index.php?search=~a&title=Special%3ASearch&fulltext=Search" - :fallback-url "https://wiki.archlinux.org") - (make-instance 'search-engine - :shortcut "gen" - :search-url "https://wiki.gentoo.org/index.php?title=Sepcial%3ASearch&search=~a&go=Go" - :fallback-url "https://wiki.gentoo.org") - (engines:invidious - :shortcut "yt" - :base-search-url "https://invidious.cafebabe.gay/search?q=~a" - :fallback-url "https://invidious.cafebabe.gay") - (make-instance 'search-engine - :shortcut "lbx" - :search-url "https://search.cafebabe.gay/search.php?q=~a" - :fallback-url "https://search.cafebabe.gay"))))) diff --git a/.config/nyxt/status.lisp b/.config/nyxt/status.lisp deleted file mode 100644 index 50d2090..0000000 --- a/.config/nyxt/status.lisp +++ /dev/null @@ -1,29 +0,0 @@ -(in-package #:nyxt-user) - -(define-configuration :status-buffer - "Display modes as short glyphs." - ((glyph-mode-presentation-p t))) - -(define-configuration :force-https-mode ((glyph "ϕ"))) -(define-configuration :reduce-tracking-mode ((glyph "τ"))) -(define-configuration :no-script-mode ((glyph "σ"))) -(define-configuration :no-webgl-mode ((glyph "ω"))) -(define-configuration :blocker-mode ((glyph "β"))) - -(define-configuration status-buffer - "Hide most of the status elements but URL and modes." - ((style (str:concat - %slot-value% - (theme:themed-css (theme *browser*) - `("#controls,#tabs" - :display none !important)))))) - -(defmethod format-status-load-status ((status status-buffer)) - "A fancier load status." - (spinneret:with-html-string - (:span (if (web-buffer-p (current-buffer)) - (case (slot-value (current-buffer) 'nyxt::status) - (:unloaded "∅") - (:loading "∞") - (:finished "")) - "")))) diff --git a/.config/nyxt/themes/cafebabe-dark.lisp b/.config/nyxt/themes/cafebabe-dark.lisp deleted file mode 100644 index 0ccffe1..0000000 --- a/.config/nyxt/themes/cafebabe-dark.lisp +++ /dev/null @@ -1,37 +0,0 @@ -(in-package #:nyxt-user) - -;; this automatically darkens Webkit-native interfaces and sends the -;; "prefers-color-scheme: dark" to all the supporting websites. -(setf (uiop:getenv "GTK_THEME") "Adwaita:dark") - -(define-configuration browser - ((theme (make-instance - 'theme:theme - :background-color "#000000" - :accent-color "#CD5C5C" - :accent-alt-color "#6C2429" - :warning-color "#CEFF00" - :primary-color "rgb(170, 170, 170)" - :secondary-color "rgb(100, 100, 100)")))) - -(define-configuration :dark-mode - "Overriding the ugly gray-ish default colors" - ((style - (theme:themed-css (theme *browser*) - `(* - :background-color ,(if (theme:dark-p theme:theme) - theme:background - theme:on-background) - "!important" - :background-image none "!important" - :color ,(if (theme:dark-p theme:theme) - theme:on-background - theme:background) - "!important") - `(a - :background-color ,(if (theme:dark-p theme:theme) - theme:background - theme:on-background) - "!important" - :background-image none "!important" - :color ,theme:primary "!important"))))) diff --git a/.config/nyxt/url-redirects.lisp b/.config/nyxt/url-redirects.lisp deleted file mode 100644 index 5069c1c..0000000 --- a/.config/nyxt/url-redirects.lisp +++ /dev/null @@ -1,30 +0,0 @@ -(in-package #:nyxt-user) - -(defparameter old-reddit-handler - (url-dispatching-handler - 'old-reddit-dispatcher - (match-regex "https?\:\/\/?.*?reddit\.com") - (lambda (url) - (quri:copy-uri url :host "old.reddit.com")))) - -(defparameter invidious-handler - (url-dispatching-handler - 'invidious-dispatcher - (match-regex "https?\:\/\/?.*?(?:youtube\.com|youtu\.be|youtube-nocookie\.com).*") - (lambda (url) - (quri:copy-uri url :host "invidious.cafebabe.gay")))) - -(defparameter wikiless-handler - (url-dispatching-handler - 'wikiless-dispatcher - (match-regex "https?\:\/\/?.*?wikipedia\.org.*") - (lambda (url) - (quri:copy-uri url :host "wikiless.org")))) - -(define-configuration buffer - ((request-resource-hook - (reduce #'hooks:add-hook - (list old-reddit-handler - invidious-handler - wikiless-handler) - :initial-value %slot-default%)))) diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 396915d..20ed30a 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -16,6 +16,7 @@ alias nnn='nnn -Hde' 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' # need to sign hid-nintendo.ko with every kernel update diff --git a/.config/shell/profile b/.config/shell/profile index b26003f..b181879 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="nyxt" +export BROWSER="firefox-bin" export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/.local/share" diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 55f477c..dc495a9 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -40,10 +40,6 @@ bind C-w killp bind C-q killw bind C-p previous-window bind C-n next-window -# bind -n C-h select-pane -L -# bind -n C-j select-pane -D -# bind -n C-k select-pane -U -# bind -n C-l select-pane -R bind -n M-h resize-pane -L 5 bind -n M-j resize-pane -D 5 bind -n M-k resize-pane -U 5 @@ -63,12 +59,15 @@ if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \ if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \ "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\' 'select-pane -l'" -bind-key -T copy-mode-vi 'C-h' select-pane -L -bind-key -T copy-mode-vi 'C-j' select-pane -D -bind-key -T copy-mode-vi 'C-k' select-pane -U -bind-key -T copy-mode-vi 'C-l' select-pane -R +bind-key -T copy-mode-vi 'C-H' select-pane -L +bind-key -T copy-mode-vi 'C-J' select-pane -D +bind-key -T copy-mode-vi 'C-K' select-pane -U +bind-key -T copy-mode-vi 'C-L' select-pane -R bind-key -T copy-mode-vi 'C-\' select-pane -l +bind C-l send-keys 'C-l' +bind C-k send-keys 'C-k' + # Turn the mouse off set -g mouse off diff --git a/.ncmpcpp/config b/.ncmpcpp/config index 8d3f5dd..085037e 100644 --- a/.ncmpcpp/config +++ b/.ncmpcpp/config @@ -1,6 +1,6 @@ # Files ncmpcpp_directory = ~/.ncmpcpp -lyrics_directory = ~/.ncmpcpp/lyrics +lyrics_directory = ~/.config/mpd/lyrics mpd_host = localhost mpd_port = 6600 -- 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(-) 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 b423014b0e51a8324e7ff0fb925d7e7c4000cd45 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Mon, 30 Oct 2023 14:11:13 +0100 Subject: update for new system --- .config/neofetch/config.conf | 30 ++++++++--------- .config/nvim/init.lua | 1 + .config/nvim/lua/user/keymaps.lua | 8 +++++ .config/nvim/lua/user/options.lua | 49 +++++++++++++-------------- .config/nvim/lua/user/plugins.lua | 1 - .config/nvim/lua/user/plugins/lspconfig.lua | 51 +++++++++++------------------ .config/nvim/plugin/packer_compiled.lua | 41 ++++++++++------------- .config/shell/aliasrc | 31 ++++++++++++------ .config/x11/xinitrc | 16 ++++----- 9 files changed, 116 insertions(+), 112 deletions(-) diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index a3c25ce..342ef76 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -4,19 +4,19 @@ print_info() { info title # prin "\n \n " "$(curl wttr.in/?0?q?T | awk '/°(C|F)/ {printf $(NF-1) $(NF) " ("a")"} /,/ {a=$0}')" prin "${cl9}┌────────────────────────────────────────────────────┐" - info "\n \n  " distro - info "\n \n  " model - info "\n \n  " kernel - info "\n \n  " uptime - info "\n \n  " packages - info "\n \n  " shell - info "\n \n  " resolution - info "\n \n  " wm - info "\n \n  " term - info "\n \n  " cpu - info "\n \n  " gpu - info "\n \n  " memory - info "\n \n  " disk + info "\n \n OS" distro + info "\n \n Host" model + info "\n \n Kernel" kernel + info "\n \n Uptime" uptime + info "\n \n Packages" packages + info "\n \n Shell" shell + info "\n \n Screens" resolution + info "\n \n WM" wm + info "\n \n Terminal" term + info "\n \n CPU" cpu + info "\n \n GPU" gpu + info "\n \n Memory" memory + info "\n \n " disk prin "${cl9}└─────────────────────────────────── $(color 1) $(color 2) $(color 3) $(color 4) $(color 5) $(color 6) $(color 7) $(color 8) ${cl9}┘" prin "\n" } @@ -388,7 +388,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. @@ -537,7 +537,7 @@ underline_char="-" # Example: # separator="->": 'Shell-> bash' # separator=" =": 'WM = dwm' -separator=" " +separator=":" # Color Blocks diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index f71bdb7..49556fb 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -10,5 +10,6 @@ require('user.options') require('user.plugins') require('user.keymaps') require('user.misc') +-- require('user.dvorak') --vim: nospell diff --git a/.config/nvim/lua/user/keymaps.lua b/.config/nvim/lua/user/keymaps.lua index b174f65..777d099 100644 --- a/.config/nvim/lua/user/keymaps.lua +++ b/.config/nvim/lua/user/keymaps.lua @@ -2,6 +2,7 @@ local keymap = require 'lib.utils'.keymap vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' +vim.g.tmux_navigator_no_mappings=1 keymap('n', 'Q', ':bufdo bdelete') @@ -23,3 +24,10 @@ keymap('i', 'jj', '') keymap('n', 'cd', ':cd %:p:h:pwd') keymap('n', 'E', ':EslintFixAll') + +-- Change tmux-navigator keybinds +keymap('n', '', ':TmuxNavigateLeft') +keymap('n', '', ':TmuxNavigateDown') +keymap('n', '', ':TmuxNavigateUp') +keymap('n', '', ':TmuxNavigateRight') +keymap('n', '', ':TmuxNavigatePrevious') diff --git a/.config/nvim/lua/user/options.lua b/.config/nvim/lua/user/options.lua index 53fbe43..510485f 100644 --- a/.config/nvim/lua/user/options.lua +++ b/.config/nvim/lua/user/options.lua @@ -1,24 +1,25 @@ -vim.o.guicursor = 'a:block' -vim.o.expandtab = true -vim.o.shiftwidth = 4 -vim.o.tabstop = 4 -vim.o.signcolumn = 'yes:2' -vim.o.relativenumber = true -vim.o.number = true -vim.o.termguicolors = true -vim.o.ignorecase = true -vim.o.smartcase = true -vim.o.wildmode = 'longest:full,full' -vim.o.wrap = false -vim.o.scrolloff = 8 -vim.o.sidescrolloff = 8 -vim.o.cursorline = 1 -vim.o.splitright = 1 -vim.o.splitbelow = 1 -vim.o.clipboard = 'unnamedplus' -- Use Linux system clipboard -vim.o.updatetime = 250 -- Decrease CursorHold delay -vim.o.redrawtime = 10000 -- Allow more time for loading syntax -vim.o.foldmethod = "expr" -vim.o.foldlevelstart = 10 -vim.o.foldexpr = "nvim_treesitter#foldexpr()" -vim.o.hlsearch = 0 +vim.o.guicursor='a:block' +vim.o.expandtab=true +vim.o.shiftwidth=4 +vim.o.softtabstop=4 +vim.o.tabstop=4 +vim.o.signcolumn='yes:2' +vim.o.relativenumber=true +vim.o.number=true +vim.o.termguicolors=true +vim.o.ignorecase=true +vim.o.smartcase=true +vim.o.wildmode='longest:full,full' +vim.o.wrap=false +vim.o.scrolloff=8 +vim.o.sidescrolloff=8 +vim.o.cursorline=true +vim.o.splitright=true +vim.o.splitbelow=true +vim.o.clipboard='unnamedplus' +vim.o.updatetime=250 +vim.o.redrawtime=10000 +vim.o.foldmethod="expr" +vim.o.foldlevelstart=10 +vim.o.foldexpr="nvim_treesitter#foldexpr()" +vim.o.hlsearch=false diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua index 07f8f42..ae21e4f 100644 --- a/.config/nvim/lua/user/plugins.lua +++ b/.config/nvim/lua/user/plugins.lua @@ -3,7 +3,6 @@ require('packer').startup(function() use { 'tpope/vim-commentary' } use { 'tpope/vim-surround' } use { 'tpope/vim-eunuch' } - use { 'tpope/vim-sleuth' } use { 'christoomey/vim-tmux-navigator' } use { diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua index 39f27c3..67d82a7 100644 --- a/.config/nvim/lua/user/plugins/lspconfig.lua +++ b/.config/nvim/lua/user/plugins/lspconfig.lua @@ -59,38 +59,27 @@ require 'lspconfig'.emmet_ls.setup { filetypes = { 'html', 'javascript', 'typescript', 'javascriptreact', 'typescriptreact', 'eruby' } } -local runtime_path = vim.split(package.path, ';') -table.insert(runtime_path, "lua/?.lua") -table.insert(runtime_path, "lua/?/init.lua") -require 'lspconfig'.lua_ls.setup { - on_attach = on_attach, - capabilities = capabilities, - flags = { - debounce_text_changes = 150, - }, - 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 = { - -- Tell language server which version of lua is used. - version = 'LuaJIT', - -- Setup lua path - path = runtime_path, - }, - diagnostics = { - -- Recognize globals - globals = { 'vim', 'use', 'parse' }, - }, - workspace = { - -- Make server aware of Neovim runtime files - library = vim.api.nvim_get_runtime_file("", true), - }, - -- Do not send telemetry data - telemetry = { - enable = false, - }, +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 } require 'lspconfig'.bashls.setup { diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index d97b824..a009beb 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.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" +local package_path_str = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/share/lua/5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/share/lua/5.1/?/init.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/lib/luarocks/rocks-5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/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 @@ -229,11 +229,6 @@ _G.packer_plugins = { path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-eunuch", url = "https://github.com/tpope/vim-eunuch" }, - ["vim-sleuth"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-sleuth", - url = "https://github.com/tpope/vim-sleuth" - }, ["vim-surround"] = { loaded = true, path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-surround", @@ -247,14 +242,18 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], 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") -time([[Config for nvim-ts-autotag]], 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: nvim-lspconfig 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: 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") +time([[Config for nvim-ts-autotag]], 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") @@ -263,26 +262,22 @@ time([[Config for lualine.nvim]], false) 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: 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: 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: 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") diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index abf8ebb..4358402 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -4,25 +4,24 @@ alias reboot='sudo reboot' alias poweroff='sudo poweroff' alias refresh='. $ZDOTDIR/.zshrc' +alias zzz='sudo zzz' alias fuck='sudo $(fc -Lln -1)' alias open='xdg-open' -alias mutt='pushd ~/.mutt/attachments; mutt; popd' +alias mutt='cd ~/.mutt/attachments; mutt; cd -' alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine' -alias emacsd='/usr/bin/emacs --daemon &' +alias emacsd='/usr/local/bin/emacs --daemon &' +alias em='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 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='sudo /usr/src/linux/scripts/sign-file sha512 /usr/src/linux/certs/signing_key.pem /usr/src/linux/certs/signing_key.x509' +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' @@ -32,6 +31,7 @@ alias ofn='/bin/ls | cat -n | while read n f; do perl-rename "s/${f%.*}/$(printf # set my preferred keyboard options alias setkeys='xset r rate 250 30 && setxkbmap -layout us,us -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle"' +alias setus='setxkbmap -layout us,us -option "ctrl:nocaps"' # pad numbers in filenames with zeros alias padz='perl-rename "s/\d+/sprintf(\"%02d\",$&)/e"' @@ -81,9 +81,9 @@ 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' +alias mbl='sudo ddcutil --display 1 setvcp 10 0 && sudo ddcutil --display 2 setvcp 10 0' +alias mbm='sudo ddcutil --display 1 setvcp 10 50 && sudo ddcutil --display 2 setvcp 10 50' +alias mbh='sudo ddcutil --display 1 setvcp 10 80 && sudo ddcutil --display 2 setvcp 10 80' # function for timer and stopwatch timer() { @@ -125,7 +125,7 @@ date-reverse() { # convert video files to webm mkwebm() { - ffmpeg -i "${1}" -c:v libvpx-vp9 -crf 1 -b:v 1M -c:a libvorbis "${1%.*}".webm + ffmpeg -i "${1}" -c:v libvpx-vp9 -crf 32 -b:v 300K -c:a libvorbis "${1%.*}".webm } ## GIT @@ -143,3 +143,14 @@ alias push='git push origin' 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 pacin='sudo pacman -S' +alias pacrm='sudo pacman -Rns' +alias pacup='sudo pacman -Syu' +alias pacsr='pacman -Ss' +alias pacbr='pacman -Slq | fzf --preview "pacman -Si {}" --layout=reverse' +alias yayin='yay -S' +alias yayrm='yay -Rns' +alias yayup='yay -Syu' +alias yaysr='yay -Ss' diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 5150125..b879037 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -4,23 +4,23 @@ # eval $(dbus-launch --sh-syntax --exit-with-session) # fi -eval "$(gpg-agent --daemon --allow-preset-passphrase)" +# eval "$(gpg-agent --daemon --allow-preset-passphrase)" eval "$(ssh-agent)" +xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary +xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 + xset r rate 200 20 xset s off -dpms 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 +xrdb -merge ~/.Xresources ~/.local/bin/set-wallpaper & # /usr/bin/emacs --daemon & +urxvtd -q -o -f & pipewire & -otd-daemon & -mpd & picom & -statusbar & +mpd & -exec dwm +exec i3 -- cgit v1.2.3 From a86a9b0100fd406b910467f078b86fc40f240a5d Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Mon, 30 Oct 2023 17:54:49 +0100 Subject: added .Xresources to tracked files --- .Xresources | 47 +++++++++++++++++++++++++++++++++++ .config/neofetch/config.conf | 58 +++++++++++++++++++++++++++++--------------- .config/shell/aliasrc | 24 ++++++++---------- .config/x11/xinitrc | 12 ++++----- 4 files changed, 101 insertions(+), 40 deletions(-) create mode 100644 .Xresources diff --git a/.Xresources b/.Xresources new file mode 100644 index 0000000..14fc10e --- /dev/null +++ b/.Xresources @@ -0,0 +1,47 @@ +URxvt*font: xft:Hack Nerd Font Mono:size=11:antialias=True,xft:JoyPixels:pixelsize=10 + +!! colors and stuff +URxvt.letterSpace: 0 +URxvt.scrollBar: False +URxvt.depth: 32 +URxvt.background: [90]#000000 +URxvt.foreground: #ffffff +URxvt.externalBorder: 0 +URxvt.internalBorder: 0 +URxvt.backgroundBorder: 0 +URxvt.borderLess: False +!! black +URxvt.color0: #000000 +URxvt.color8: #343636 +!! red +URxvt.color1: #e74c7c +URxvt.color9: #c26f6f +!! green +URxvt.color2: #6bb05d +URxvt.color10: #8dc776 +!! yellow +URxvt.color3: #e59e67 +URxvt.color11: #e7ac7e +!! indigo +URxvt.color4: #5b98a9 +URxvt.color12: #7ab3c3 +!! lavender +URxvt.color5: #b185db +URxvt.color13: #bb84e5 +!! cyan +URxvt.color6: #51a39f +URxvt.color14: #6db0ad +!! white +URxvt.color7: #c4c4c4 +URxvt.color15: #cccccc + + +!! perl extensions +URxvt.perl-ext-common: default,url-select,resize-font,selection-to-clipboard +URxvt.matcher.button: 1 +URxvt.keysym.M-u: perl:url-select:select_next +URxvt.url-select.launcher: /usr/bin/xdg-open +URxvt.url-select.underline: true + +URxvt.iso14755: False +URxvt.iso14755_52: False diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 342ef76..14bb86b 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -1,31 +1,49 @@ # See this wiki page for more info # https://github.com/dylanaraps/neofetch/wiki/Customizing-Info + print_info() { info title - # prin "\n \n " "$(curl wttr.in/?0?q?T | awk '/°(C|F)/ {printf $(NF-1) $(NF) " ("a")"} /,/ {a=$0}')" - prin "${cl9}┌────────────────────────────────────────────────────┐" - info "\n \n OS" distro - info "\n \n Host" model - info "\n \n Kernel" kernel - info "\n \n Uptime" uptime - info "\n \n Packages" packages - info "\n \n Shell" shell - info "\n \n Screens" resolution - info "\n \n WM" wm - info "\n \n Terminal" term - info "\n \n CPU" cpu - info "\n \n GPU" gpu - info "\n \n Memory" memory - info "\n \n " disk - prin "${cl9}└─────────────────────────────────── $(color 1) $(color 2) $(color 3) $(color 4) $(color 5) $(color 6) $(color 7) $(color 8) ${cl9}┘" + prin "\n" + prin "${cl9}┌─────────────────────────────────────────────────────┐" + info "\n \n " distro + info "\n \n " model + info "\n \n " kernel + info "\n \n " uptime + info "\n \n 󰏗" packages + info "\n \n " shell + info "\n \n " resolution + info "\n \n " de + info "\n \n 󰔎"theme + info "\n \n " term + info "\n \n " term_font + 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" } reset="\033[0m" - +gray="\033[1;90m" +red="\033[1;31m" +green="\033[1;32m" +yellow="\033[1;33m" +blue="\033[1;34m" +magenta="\033[1;35m" +cyan="\033[1;36m" +white="\033[1;37m" + +cl0="${gray}" +cl1="${red}" +cl2="${green}" +cl3="${yellow}" +cl4="${blue}" +cl5="${magenta}" +cl6="${cyan}" +cl7="${white}" cl9="${reset}" - # Title @@ -388,7 +406,7 @@ disk_show=('/' '/home' '/dev/sda1' '/dev/sdb1') # none: 'Disk: 74G / 118G (66%)' # 'Disk: 74G / 118G (66%)' # 'Disk: 74G / 118G (66%)' -disk_subtitle="dir" +disk_subtitle="none" # Disk percent. # Show/Hide disk percent. @@ -537,7 +555,7 @@ underline_char="-" # Example: # separator="->": 'Shell-> bash' # separator=" =": 'WM = dwm' -separator=":" +separator=" " # Color Blocks diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 4358402..e6a5114 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -4,20 +4,20 @@ alias reboot='sudo reboot' alias poweroff='sudo poweroff' alias refresh='. $ZDOTDIR/.zshrc' -alias zzz='sudo zzz' +alias zzz='sudo pm-suspend' alias fuck='sudo $(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 emacsd='/usr/local/bin/emacs --daemon &' -alias em='emacsclient -c -a "emacs"' +alias emd='/usr/local/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 sr='su - root' +alias lr='su - root' alias cam='mpv --profile=low-latency --untimed /dev/video0' alias df='df -h' alias tma='tmux a -t' @@ -72,7 +72,6 @@ gls() { # 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 settings alias rmlr='xrandr --auto --output HDMI-A-0 --mode 640x480 --primary' @@ -145,12 +144,9 @@ alias dcomm='dfiles commit -m' alias dpush='dfiles push origin' # package manager -alias pacin='sudo pacman -S' -alias pacrm='sudo pacman -Rns' -alias pacup='sudo pacman -Syu' -alias pacsr='pacman -Ss' -alias pacbr='pacman -Slq | fzf --preview "pacman -Si {}" --layout=reverse' -alias yayin='yay -S' -alias yayrm='yay -Rns' -alias yayup='yay -Syu' -alias yaysr='yay -Ss' +alias aptsr='apt search' +alias aptin='sudo apt install' +alias aptrm='sudo apt remove' +alias aptupd='sudo apt update' +alias aptupg='sudo apt upgrade' +alias aptup='aptupd && aptupg' diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index b879037..4305681 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -1,22 +1,22 @@ #!/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)" +eval "$(gpg-agent --daemon --allow-preset-passphrase)" eval "$(ssh-agent)" xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 -xset r rate 200 20 +xset r rate 250 30 xset s off -dpms setxkbmap -layout us,us -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle" xrdb -merge ~/.Xresources ~/.local/bin/set-wallpaper & -# /usr/bin/emacs --daemon & +/usr/bin/emacs --daemon & urxvtd -q -o -f & pipewire & -- cgit v1.2.3 From 84f8c56dd5625dde193fe75be15ca606631e4606 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Mon, 30 Oct 2023 18:49:52 +0100 Subject: migrated from sxiv over to nsxiv --- .config/nsxiv/exec/key-handler | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 .config/nsxiv/exec/key-handler diff --git a/.config/nsxiv/exec/key-handler b/.config/nsxiv/exec/key-handler new file mode 100755 index 0000000..7539f88 --- /dev/null +++ b/.config/nsxiv/exec/key-handler @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +while read -r file +do + case "$1" in + "C-d") rm "$file" ;; + "C-c") cat "$file" | xclip -sel c -t image/png ;; + esac +done -- cgit v1.2.3 From 3eb1eacde6c6c4b54e7fef2285c115a3d35d1ae8 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Mon, 30 Oct 2023 23:18:43 +0100 Subject: added i3 to tracked files --- .config/i3/config | 156 ++++++++++++++++++++++++++++++++++++++++++ .config/i3status/config | 48 +++++++++++++ .config/neofetch/config.conf | 1 - .config/shell/aliasrc | 2 +- .config/shell/profile | 1 + .config/sxiv/exec/key-handler | 9 --- 6 files changed, 206 insertions(+), 11 deletions(-) create mode 100644 .config/i3/config create mode 100644 .config/i3status/config delete mode 100755 .config/sxiv/exec/key-handler diff --git a/.config/i3/config b/.config/i3/config new file mode 100644 index 0000000..39968b6 --- /dev/null +++ b/.config/i3/config @@ -0,0 +1,156 @@ +# i3 config file (v4) +# +# Please see https://i3wm.org/docs/userguide.html for a complete reference! + +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:Hack Nerd Font 10 + +for_window [class="floating"] floating enable + +# 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 +bindsym XF86AudioLowerVolume exec --no-startup-id wpctl set-volume @DEFAULT_SINK@ 5%- && $refresh_i3status +bindsym XF86AudioMute exec --no-startup-id wpctl set-mute @DEFAULT_SINK@ toggle && $refresh_i3status +bindsym XF86AudioMicMute exec --no-startup-id wpctl set-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status +bindsym XF86AudioNext exec --no-startup-id mpc next +bindsym XF86AudioPrev exec --no-startup-id mpc prev +bindsym XF86AudioPlay exec --no-startup-id mpc toggle + +# # Use Mouse+$mod to drag floating windows to their wanted position +floating_modifier $mod + +# # move tiling windows via drag & drop by left-clicking into the title bar, +# # or left-clicking anywhere into the window while holding the floating modifier. +tiling_drag modifier titlebar + +# start a terminal +bindsym $mod+Return exec urxvtc + +# start dmenu +bindsym $mod+p exec --no-startup-id dmenu_run -fn "Hack Nerd Font:size=11" -nb "#222222" -nf "#bbbbbb" -sb "#005577" -sf "#eeeeee" + +# kill focused window +bindsym $mod+Shift+C kill + +# application launchers +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+c exec mpdmenu +bindsym $mod+Shift+M exec mpdinfo +bindsym --release Print exec scrot -u -e 'mv $f ~/pics/' +bindsym --release $mod+Print exec scrot -s -e 'mv $f ~/pics/' + +# change focus +bindsym $mod+h focus left +bindsym $mod+j focus down +bindsym $mod+k focus up +bindsym $mod+l focus right + +# # alternatively, you can use the cursor keys: +# bindsym $mod+Left focus left +# bindsym $mod+Down focus down +# bindsym $mod+Up focus up +# bindsym $mod+Right focus right + +# move focused window +bindsym $mod+Shift+H move left +bindsym $mod+Shift+J move down +bindsym $mod+Shift+K move up +bindsym $mod+Shift+L move right + +# # alternatively, you can use the cursor keys: +# bindsym $mod+Shift+Left move left +# bindsym $mod+Shift+Down move down +# bindsym $mod+Shift+Up move up +# bindsym $mod+Shift+Right move right + +# split in horizontal orientation +bindsym $mod+s split v + +# split in vertical orientation +bindsym $mod+v split h + +# enter fullscreen mode for the focused container +bindsym $mod+f fullscreen toggle + +# change container layout (stacked, tabbed, toggle split) +bindsym $mod+comma layout stacking +bindsym $mod+t layout tabbed +bindsym $mod+period layout toggle split + +# toggle tiling / floating +bindsym $mod+Shift+space floating toggle + +# change focus between tiling / floating windows +bindsym $mod+space focus mode_toggle + +# focus the parent container +bindsym $mod+a focus parent + +# focus the child container +bindsym $mod+d focus child + +# Define names for default workspaces for which we configure key bindings later on. +# We use variables to avoid repeating the names in multiple places. +set $ws1 "1" +set $ws2 "2" +set $ws3 "3" +set $ws4 "4" + +# switch to workspace +bindsym $mod+1 workspace number $ws1 +bindsym $mod+2 workspace number $ws2 +bindsym $mod+3 workspace number $ws3 +bindsym $mod+4 workspace number $ws4 + +# move focused container to workspace +bindsym $mod+Shift+1 move container to workspace number $ws1 +bindsym $mod+Shift+2 move container to workspace number $ws2 +bindsym $mod+Shift+3 move container to workspace number $ws3 +bindsym $mod+Shift+4 move container to workspace number $ws4 + +# reload the configuration file +bindsym $mod+Shift+O reload +# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) +bindsym $mod+Shift+R restart +# exit i3 (logs you out of your X session) +bindsym $mod+Shift+Control+Q exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'" + +# resize window (you can also use the mouse for that) +mode "resize" { + # These bindings trigger as soon as you enter the resize mode + + # Pressing left will shrink the window’s width. + # Pressing right will grow the window’s width. + # Pressing up will shrink the window’s height. + # Pressing down will grow the window’s height. + bindsym h resize shrink width 10 px or 10 ppt + bindsym j resize grow height 10 px or 10 ppt + bindsym k resize shrink height 10 px or 10 ppt + bindsym l resize grow width 10 px or 10 ppt + + # # same bindings, but for the arrow keys + # bindsym Left resize shrink width 10 px or 10 ppt + # bindsym Down resize grow height 10 px or 10 ppt + # bindsym Up resize shrink height 10 px or 10 ppt + # bindsym Right resize grow width 10 px or 10 ppt + + # back to normal: Enter or Escape or $mod+r + bindsym Return mode "default" + bindsym Escape mode "default" + bindsym $mod+r mode "default" +} + +bindsym $mod+r mode "resize" + +# Start i3bar to display a workspace bar (plus the system information i3status +# finds out, if available) +bar { + position top + status_command i3status +} diff --git a/.config/i3status/config b/.config/i3status/config new file mode 100644 index 0000000..8fb7d28 --- /dev/null +++ b/.config/i3status/config @@ -0,0 +1,48 @@ +# i3status configuration file. +# see "man i3status" for documentation. + +# It is important that this file is edited as UTF-8. +# The following line should contain a sharp s: +# ß +# If the above line is not correctly displayed, fix your editor first! + +general { + colors = true + interval = 5 +} + +order += "ethernet eth0" +order += "disk /" +order += "load" +order += "memory" +order += "volume master" +order += "tztime local" + +ethernet eth0{ + format_up = "eth0: %ip (%speed)" + format_down = "eth0: down" +} + +disk "/" { + format = "root: %avail" +} + +load { + format = "Load: %1min" +} + +memory { + format = "Memory: %used/%total" + threshold_degraded = "3GB" + format_degraded = "MEMORY < %available" +} + +volume master { + format = "♪: %volume" + format_muted = "♪: muted (%volume)" + device = "default" +} + +tztime local { + format = "%A, %Y-%m-%d %H:%M" +} diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 14bb86b..00a22e0 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -3,7 +3,6 @@ print_info() { info title - prin "\n" prin "${cl9}┌─────────────────────────────────────────────────────┐" info "\n \n " distro info "\n \n " model diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index e6a5114..0599553 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -146,7 +146,7 @@ alias dpush='dfiles push origin' # package manager alias aptsr='apt search' alias aptin='sudo apt install' -alias aptrm='sudo apt remove' +alias aptrm='sudo apt remove --autoremove' alias aptupd='sudo apt update' alias aptupg='sudo apt upgrade' alias aptup='aptupd && aptupg' diff --git a/.config/shell/profile b/.config/shell/profile index 397b25a..075c5dd 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -27,6 +27,7 @@ export EIX_LIMIT_COMPACT=0 export LC_ALL=en_US.utf8 +export LD_LIBRARY_PATH="/usr/lib:/usr/local/lib" export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:/sbin:/usr/sbin" neofetch diff --git a/.config/sxiv/exec/key-handler b/.config/sxiv/exec/key-handler deleted file mode 100755 index 7539f88..0000000 --- a/.config/sxiv/exec/key-handler +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -while read -r file -do - case "$1" in - "C-d") rm "$file" ;; - "C-c") cat "$file" | xclip -sel c -t image/png ;; - esac -done -- cgit v1.2.3 From 85d9b6cb732805246b50c1b232974573062816a4 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Tue, 31 Oct 2023 00:27:33 +0100 Subject: removed neofetch configs that were not working --- .config/neofetch/config.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 00a22e0..8b98a51 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -5,16 +5,12 @@ print_info() { info title prin "${cl9}┌─────────────────────────────────────────────────────┐" info "\n \n " distro - info "\n \n " model info "\n \n " kernel info "\n \n " uptime info "\n \n 󰏗" packages info "\n \n " shell info "\n \n " resolution - info "\n \n " de - info "\n \n 󰔎"theme info "\n \n " term - info "\n \n " term_font info "\n \n " cpu info "\n \n 󰊚" gpu info "\n \n " memory -- cgit v1.2.3 From 0c1c8b0a62f78181efa37363431b9d1d28621b91 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Tue, 31 Oct 2023 02:55:36 +0100 Subject: fixed stuff --- .config/nvim/plugin/packer_compiled.lua | 299 -------------------------------- 1 file changed, 299 deletions(-) delete mode 100644 .config/nvim/plugin/packer_compiled.lua diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua deleted file mode 100644 index a009beb..0000000 --- a/.config/nvim/plugin/packer_compiled.lua +++ /dev/null @@ -1,299 +0,0 @@ --- Automatically generated packer.nvim plugin loader code - -if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then - vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') - return -end - -vim.api.nvim_command('packadd packer.nvim') - -local no_errors, error_msg = pcall(function() - -_G._packer = _G._packer or {} -_G._packer.inside_compile = true - -local time -local profile_info -local should_profile = false -if should_profile then - local hrtime = vim.loop.hrtime - profile_info = {} - time = function(chunk, start) - if start then - profile_info[chunk] = hrtime() - else - profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 - end - end -else - time = function(chunk, start) end -end - -local function save_profiles(threshold) - local sorted_times = {} - for chunk_name, time_taken in pairs(profile_info) do - sorted_times[#sorted_times + 1] = {chunk_name, time_taken} - end - table.sort(sorted_times, function(a, b) return a[2] > b[2] end) - local results = {} - for i, elem in ipairs(sorted_times) do - if not threshold or threshold and elem[2] > threshold then - results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' - end - end - if threshold then - table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)') - end - - _G._packer.profile_output = results -end - -time([[Luarocks path setup]], true) -local package_path_str = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/share/lua/5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/share/lua/5.1/?/init.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/lib/luarocks/rocks-5.1/?.lua;/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/cafebabe/.cache/nvim/packer_hererocks/2.1.1697887905/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 - -if not string.find(package.cpath, install_cpath_pattern, 1, true) then - package.cpath = package.cpath .. ';' .. install_cpath_pattern -end - -time([[Luarocks path setup]], false) -time([[try_loadstring definition]], true) -local function try_loadstring(s, component, name) - local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) - if not success then - vim.schedule(function() - vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) - end) - end - return result -end - -time([[try_loadstring definition]], false) -time([[Defining packer_plugins]], true) -_G.packer_plugins = { - LuaSnip = { - 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.luasnip\frequire\0" }, - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/LuaSnip", - url = "https://github.com/L3MON4D3/LuaSnip" - }, - ["cmp-buffer"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/cmp-buffer", - url = "https://github.com/hrsh7th/cmp-buffer" - }, - ["cmp-nvim-lsp"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", - url = "https://github.com/hrsh7th/cmp-nvim-lsp" - }, - ["cmp-nvim-lsp-signature-help"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp-signature-help", - url = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help" - }, - ["cmp-nvim-lua"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua", - url = "https://github.com/hrsh7th/cmp-nvim-lua" - }, - ["cmp-path"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/cmp-path", - url = "https://github.com/jessarcher/cmp-path" - }, - dracula = { - 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.dracula\frequire\0" }, - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/dracula", - url = "https://github.com/dracula/vim" - }, - ["lsp-colors.nvim"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/lsp-colors.nvim", - url = "https://github.com/folke/lsp-colors.nvim" - }, - ["lspkind-nvim"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/lspkind-nvim", - url = "https://github.com/onsails/lspkind-nvim" - }, - ["lualine.nvim"] = { - 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.lualine\frequire\0" }, - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/lualine.nvim", - url = "https://github.com/nvim-lualine/lualine.nvim" - }, - ["nvim-autopairs"] = { - config = { "\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" }, - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-autopairs", - url = "https://github.com/windwp/nvim-autopairs" - }, - ["nvim-cmp"] = { - config = { "\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" }, - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-cmp", - url = "https://github.com/hrsh7th/nvim-cmp" - }, - ["nvim-code-action-menu"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-code-action-menu", - url = "https://github.com/weilbith/nvim-code-action-menu" - }, - ["nvim-lspconfig"] = { - config = { "\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" }, - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", - url = "https://github.com/neovim/nvim-lspconfig" - }, - ["nvim-tree.lua"] = { - config = { "\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" }, - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-tree.lua", - url = "https://github.com/kyazdani42/nvim-tree.lua" - }, - ["nvim-treesitter"] = { - config = { "\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" }, - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-treesitter", - url = "https://github.com/nvim-treesitter/nvim-treesitter" - }, - ["nvim-treesitter-textobjects"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-treesitter-textobjects", - url = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects" - }, - ["nvim-ts-autotag"] = { - config = { "\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" }, - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-ts-autotag", - url = "https://github.com/windwp/nvim-ts-autotag" - }, - ["nvim-ts-context-commentstring"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-ts-context-commentstring", - url = "https://github.com/JoosepAlviste/nvim-ts-context-commentstring" - }, - ["nvim-web-devicons"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", - url = "https://github.com/kyazdani42/nvim-web-devicons" - }, - ["packer.nvim"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/packer.nvim", - url = "https://github.com/wbthomason/packer.nvim" - }, - playground = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/playground", - url = "https://github.com/nvim-treesitter/playground" - }, - ["plenary.nvim"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/plenary.nvim", - url = "https://github.com/nvim-lua/plenary.nvim" - }, - ["popup.nvim"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/popup.nvim", - url = "https://github.com/nvim-lua/popup.nvim" - }, - ["schemastore.nvim"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/schemastore.nvim", - url = "https://github.com/b0o/schemastore.nvim" - }, - ["spellsitter.nvim"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/spellsitter.nvim", - url = "https://github.com/lewis6991/spellsitter.nvim" - }, - ["telescope.nvim"] = { - config = { "\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" }, - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/telescope.nvim", - url = "https://github.com/nvim-telescope/telescope.nvim" - }, - ["vim-commentary"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-commentary", - url = "https://github.com/tpope/vim-commentary" - }, - ["vim-eunuch"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-eunuch", - url = "https://github.com/tpope/vim-eunuch" - }, - ["vim-surround"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-surround", - url = "https://github.com/tpope/vim-surround" - }, - ["vim-tmux-navigator"] = { - loaded = true, - path = "/home/cafebabe/.local/share/nvim/site/pack/packer/start/vim-tmux-navigator", - url = "https://github.com/christoomey/vim-tmux-navigator" - } -} - -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: nvim-lspconfig -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: 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") -time([[Config for nvim-ts-autotag]], 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: 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: 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: 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 - vim.cmd("doautocmd BufRead") -end -_G._packer.needs_bufread = false - -if should_profile then save_profiles() end - -end) - -if not no_errors then - error_msg = error_msg:gsub('"', '\\"') - vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') -end -- 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(-) 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(-) 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 d94fe2d07f49b60a240e34da4b980c8403f30283 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Mon, 13 Nov 2023 00:26:24 +0100 Subject: update --- .Xresources | 8 ++++---- .config/i3/config | 7 ++++++- .config/i3status/config | 10 +++++----- .config/neofetch/config.conf | 2 +- .config/nsxiv/exec/key-handler | 9 --------- .config/nvim/lua/user/plugins/lspconfig.lua | 2 +- .config/shell/aliasrc | 29 ++++++++--------------------- .config/shell/profile | 5 +++-- .config/tmux/tmux.conf | 3 +++ .config/x11/xinitrc | 6 +++--- .config/yt-dlp/config | 0 11 files changed, 34 insertions(+), 47 deletions(-) delete mode 100755 .config/nsxiv/exec/key-handler mode change 100755 => 100644 .config/yt-dlp/config diff --git a/.Xresources b/.Xresources index 42c0bf2..badf203 100644 --- a/.Xresources +++ b/.Xresources @@ -1,9 +1,9 @@ /* 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 +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 !! colors and stuff /* URxvt.letterSpace: 0 */ diff --git a/.config/i3/config b/.config/i3/config index 39968b6..b740e24 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -6,10 +6,13 @@ 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:Hack Nerd Font 10 +font pango:Iosevka 10 for_window [class="floating"] floating enable +# no_focus [all] +# focus_on_window_activation none + # 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 @@ -151,6 +154,8 @@ bindsym $mod+r mode "resize" # Start i3bar to display a workspace bar (plus the system information i3status # finds out, if available) bar { + font pango:Hack Nerd Font 10 position top + tray_output primary status_command i3status } diff --git a/.config/i3status/config b/.config/i3status/config index 315dae5..5e76340 100644 --- a/.config/i3status/config +++ b/.config/i3status/config @@ -11,20 +11,20 @@ general { interval = 5 } -order += "ethernet eth0" +order += "ethernet enp39s0" order += "disk /" order += "load" order += "memory" order += "volume master" order += "tztime local" -ethernet eth0{ - format_up = "eth0: %ip (%speed)" - format_down = "eth0: down" +ethernet enp39s0 { + format_up = "enp39s0: %ip (%speed)" + format_down = "enp39s0: down" } disk "/" { - format = "root: %avail" + format = "root: %used" } load { diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 8c29d6e..b1c0964 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -380,7 +380,7 @@ gtk3="off" # disk_show=('/'): # 'Disk (/): 74G / 118G (66%)' # -disk_show=('/' '/home' '/dev/sda1' '/dev/sdb1') +disk_show=('/' '/dev/sda1' '/dev/sdb1') # Disk subtitle. # What to append to the Disk subtitle. diff --git a/.config/nsxiv/exec/key-handler b/.config/nsxiv/exec/key-handler deleted file mode 100755 index 7539f88..0000000 --- a/.config/nsxiv/exec/key-handler +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -while read -r file -do - case "$1" in - "C-d") rm "$file" ;; - "C-c") cat "$file" | xclip -sel c -t image/png ;; - esac -done diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua index 2e51445..5685ce7 100644 --- a/.config/nvim/lua/user/plugins/lspconfig.lua +++ b/.config/nvim/lua/user/plugins/lspconfig.lua @@ -89,7 +89,7 @@ require'lspconfig'.lua_ls.setup { flags = { debounce_text_changes = 150, }, - cmd = { "/home/cafebabe/.emacs.d/.cache/lsp/lua-language-server/bin/lua-language-server" }, + cmd = { "lua-language-server" }, } require 'lspconfig'.bashls.setup { diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 9338ed9..1ed8842 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -1,15 +1,15 @@ ## MISCELLANEOUS # various shortcuts -alias reboot='sudo reboot' -alias poweroff='sudo poweroff' +alias reboot='doas reboot' +alias poweroff='doas poweroff' alias refresh='. $ZDOTDIR/.zshrc' -alias zzz='sudo pm-suspend' -alias fuck='sudo $(fc -Lln -1)' +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/local/bin/emacs --daemon &' +alias emd='/usr/bin/emacs --daemon &' alias emc='emacsclient -c -a "emacs"' alias vi='$EDITOR' alias z='zathura' @@ -80,9 +80,9 @@ 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 && sudo ddcutil --display 2 setvcp 10 0' -alias mbm='sudo ddcutil --display 1 setvcp 10 50 && sudo ddcutil --display 2 setvcp 10 50' -alias mbh='sudo ddcutil --display 1 setvcp 10 80 && sudo ddcutil --display 2 setvcp 10 80' +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() { @@ -142,16 +142,3 @@ alias push='git push origin' alias dfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME' alias dcomm='dfiles commit -m' alias dpush='dfiles push origin' - -# package management -alias aptsr='apt search' -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' -alias aptman='apt-mark showmanual' diff --git a/.config/shell/profile b/.config/shell/profile index 05fd3d7..3b8d72b 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -28,7 +28,8 @@ export EIX_LIMIT_COMPACT=0 export LC_ALL=en_US.utf8 -export LD_LIBRARY_PATH="/usr/lib:/usr/local/lib" -export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:/sbin:/usr/sbin" +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 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 dc495a9..8bd037f 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -20,6 +20,9 @@ set -g default-terminal "tmux-256color" # Set history-limit set -g history-limit 30000 +# enable emacs mode-keys +set -g mode-keys emacs + # various window option set -g base-index 1 set -g pane-base-index 1 diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index d2db958..93065e5 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -7,8 +7,8 @@ fi eval "$(gpg-agent --daemon --allow-preset-passphrase)" eval "$(ssh-agent)" -xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary -xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 +xrandr --auto --output DisplayPort-2 --mode 1920x1080 --primary +xrandr --auto --output HDMI-A-0 --mode 1600x900 --left-of DisplayPort-2 xset r rate 250 30 xset s off -dpms @@ -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/local/bin/emacs --daemon & +/usr/bin/emacs --daemon & urxvtd -q -o -f & pipewire & diff --git a/.config/yt-dlp/config b/.config/yt-dlp/config old mode 100755 new mode 100644 -- cgit v1.2.3 From 73db28ea4d42fd6100f4d670473196e8d46cbe70 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Tue, 14 Nov 2023 12:06:25 +0100 Subject: emerge aliases --- .config/shell/aliasrc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 1ed8842..1004487 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -142,3 +142,14 @@ alias push='git push origin' alias dfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME' alias dcomm='dfiles commit -m' alias dpush='dfiles push origin' + +# package management +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 pemin='emerge -pv' +alias emrm='doas emerge -avc' +alias emsr='emerge -s' -- cgit v1.2.3 From fc808ae714f1e629081c5d5cfc240e3f444598f2 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Wed, 22 Nov 2023 15:02:31 +0100 Subject: went back to vim --- .config/i3/config | 2 +- .config/i3status/config | 2 +- .config/nvim/ftplugin/javascript.vim | 9 -- .config/nvim/init.lua | 15 --- .config/nvim/lua/lib/utils.lua | 22 ----- .config/nvim/lua/user/keymaps.lua | 33 ------- .config/nvim/lua/user/misc.lua | 6 -- .config/nvim/lua/user/options.lua | 25 ----- .config/nvim/lua/user/plugins.lua | 101 -------------------- .config/nvim/lua/user/plugins/cmp.lua | 73 -------------- .config/nvim/lua/user/plugins/dracula.lua | 13 --- .config/nvim/lua/user/plugins/lspconfig.lua | 138 --------------------------- .config/nvim/lua/user/plugins/lualine.lua | 64 ------------- .config/nvim/lua/user/plugins/luasnip.lua | 9 -- .config/nvim/lua/user/plugins/nvim-tree.lua | 13 --- .config/nvim/lua/user/plugins/telescope.lua | 25 ----- .config/nvim/lua/user/plugins/treesitter.lua | 31 ------ .config/nvim/snippets/all.lua | 23 ----- .config/shell/aliasrc | 4 +- .config/shell/profile | 2 +- .config/x11/xinitrc | 2 +- .vim/vimrc | 77 +++++++++++++++ 22 files changed, 83 insertions(+), 606 deletions(-) delete mode 100644 .config/nvim/ftplugin/javascript.vim delete mode 100644 .config/nvim/init.lua delete mode 100644 .config/nvim/lua/lib/utils.lua delete mode 100644 .config/nvim/lua/user/keymaps.lua delete mode 100644 .config/nvim/lua/user/misc.lua delete mode 100644 .config/nvim/lua/user/options.lua delete mode 100644 .config/nvim/lua/user/plugins.lua delete mode 100644 .config/nvim/lua/user/plugins/cmp.lua delete mode 100644 .config/nvim/lua/user/plugins/dracula.lua delete mode 100644 .config/nvim/lua/user/plugins/lspconfig.lua delete mode 100644 .config/nvim/lua/user/plugins/lualine.lua delete mode 100644 .config/nvim/lua/user/plugins/luasnip.lua delete mode 100644 .config/nvim/lua/user/plugins/nvim-tree.lua delete mode 100644 .config/nvim/lua/user/plugins/telescope.lua delete mode 100644 .config/nvim/lua/user/plugins/treesitter.lua delete mode 100644 .config/nvim/snippets/all.lua create mode 100644 .vim/vimrc diff --git a/.config/i3/config b/.config/i3/config index b740e24..9cff316 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -154,7 +154,7 @@ bindsym $mod+r mode "resize" # Start i3bar to display a workspace bar (plus the system information i3status # finds out, if available) bar { - font pango:Hack Nerd Font 10 + font pango:Hack Nerd Font 9 position top tray_output primary status_command i3status diff --git a/.config/i3status/config b/.config/i3status/config index 5e76340..22eba0c 100644 --- a/.config/i3status/config +++ b/.config/i3status/config @@ -24,7 +24,7 @@ ethernet enp39s0 { } disk "/" { - format = "root: %used" + format = "total: %used" } load { diff --git a/.config/nvim/ftplugin/javascript.vim b/.config/nvim/ftplugin/javascript.vim deleted file mode 100644 index 4ffe06d..0000000 --- a/.config/nvim/ftplugin/javascript.vim +++ /dev/null @@ -1,9 +0,0 @@ -setl nospell -setl nowrap -setl tabstop=2 -setl shiftwidth=2 -setl expandtab -let b:vcm_tab_complete = 'javascript' -let b:javascript_fold = 1 -let g:javascript_plugin_jsdoc = 1 -let g:jsx_ext_required = 0 diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua deleted file mode 100644 index 49556fb..0000000 --- a/.config/nvim/init.lua +++ /dev/null @@ -1,15 +0,0 @@ --- __ _ _ --- ___ __ _ / _| ___ | |__ __ _| |__ ___ --- / __| / _' | |_ / _ \| _ \ / _' | _ \ / _ \ --- | |__ / (_| | _| __/| |_) / (_| | |_) | __/ --- \___|\___._/_| \___||____/\___._/____/ \___/ --- --- Personal vim configuration of cafebabe - -require('user.options') -require('user.plugins') -require('user.keymaps') -require('user.misc') --- require('user.dvorak') - ---vim: nospell diff --git a/.config/nvim/lua/lib/utils.lua b/.config/nvim/lua/lib/utils.lua deleted file mode 100644 index 8abbabd..0000000 --- a/.config/nvim/lua/lib/utils.lua +++ /dev/null @@ -1,22 +0,0 @@ -local M = {} - -M.keymap = function(mode, lhs, rhs, opts) - vim.api.nvim_set_keymap( - mode, - lhs, - rhs, - vim.tbl_extend('keep', opts or {}, { noremap = true, silent = true }) - ) -end - -M.buf_keymap = function(bufnr, mode, lhs, rhs, opts) - vim.api.nvim_buf_set_keymap( - bufnr, - mode, - lhs, - rhs, - vim.tbl_extend('keep', opts or {}, { noremap = true, silent = true }) - ) -end - -return M diff --git a/.config/nvim/lua/user/keymaps.lua b/.config/nvim/lua/user/keymaps.lua deleted file mode 100644 index 777d099..0000000 --- a/.config/nvim/lua/user/keymaps.lua +++ /dev/null @@ -1,33 +0,0 @@ -local keymap = require 'lib.utils'.keymap - -vim.g.mapleader = ' ' -vim.g.maplocalleader = ' ' -vim.g.tmux_navigator_no_mappings=1 - -keymap('n', 'Q', ':bufdo bdelete') - --- Allow gf to open non-existant files -keymap('n', 'gf', ':edit ') - --- Open the current file in the default program -keymap('n', 'x', ':!xdg-open %') - --- Resize with arrows -keymap('n', '', ':resize +2') -keymap('n', '', ':resize -2') -keymap('n', '', ':vertical resize -2') -keymap('n', '', ':vertical resize +2') - --- Quickly escape to normal mode -keymap('i', 'jj', '') - -keymap('n', 'cd', ':cd %:p:h:pwd') - -keymap('n', 'E', ':EslintFixAll') - --- Change tmux-navigator keybinds -keymap('n', '', ':TmuxNavigateLeft') -keymap('n', '', ':TmuxNavigateDown') -keymap('n', '', ':TmuxNavigateUp') -keymap('n', '', ':TmuxNavigateRight') -keymap('n', '', ':TmuxNavigatePrevious') diff --git a/.config/nvim/lua/user/misc.lua b/.config/nvim/lua/user/misc.lua deleted file mode 100644 index 88d47cf..0000000 --- a/.config/nvim/lua/user/misc.lua +++ /dev/null @@ -1,6 +0,0 @@ -vim.cmd [[ - augroup Indentation - autocmd! - autocmd FileType html set inde= - augroup END -]] diff --git a/.config/nvim/lua/user/options.lua b/.config/nvim/lua/user/options.lua deleted file mode 100644 index 510485f..0000000 --- a/.config/nvim/lua/user/options.lua +++ /dev/null @@ -1,25 +0,0 @@ -vim.o.guicursor='a:block' -vim.o.expandtab=true -vim.o.shiftwidth=4 -vim.o.softtabstop=4 -vim.o.tabstop=4 -vim.o.signcolumn='yes:2' -vim.o.relativenumber=true -vim.o.number=true -vim.o.termguicolors=true -vim.o.ignorecase=true -vim.o.smartcase=true -vim.o.wildmode='longest:full,full' -vim.o.wrap=false -vim.o.scrolloff=8 -vim.o.sidescrolloff=8 -vim.o.cursorline=true -vim.o.splitright=true -vim.o.splitbelow=true -vim.o.clipboard='unnamedplus' -vim.o.updatetime=250 -vim.o.redrawtime=10000 -vim.o.foldmethod="expr" -vim.o.foldlevelstart=10 -vim.o.foldexpr="nvim_treesitter#foldexpr()" -vim.o.hlsearch=false diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua deleted file mode 100644 index ae21e4f..0000000 --- a/.config/nvim/lua/user/plugins.lua +++ /dev/null @@ -1,101 +0,0 @@ -require('packer').startup(function() - use { 'wbthomason/packer.nvim' } -- Let packer manage itself - use { 'tpope/vim-commentary' } - use { 'tpope/vim-surround' } - use { 'tpope/vim-eunuch' } - use { 'christoomey/vim-tmux-navigator' } - - use { - 'dracula/vim', - as = 'dracula', - config = function() - require('user.plugins.dracula') - end - } - use { - 'windwp/nvim-autopairs', - config = function() - require('nvim-autopairs').setup() - end - } - - use { - 'windwp/nvim-ts-autotag', - config = function() - require('nvim-ts-autotag').setup() - end - } - - use { - 'kyazdani42/nvim-tree.lua', - requires = 'kyazdani42/nvim-web-devicons', - config = function() - require('user.plugins.nvim-tree') - end - } - use { - 'nvim-treesitter/nvim-treesitter', - run = ':TSUpdate', - requires = { - 'nvim-treesitter/playground', - 'nvim-treesitter/nvim-treesitter-textobjects', - 'lewis6991/spellsitter.nvim', - 'JoosepAlviste/nvim-ts-context-commentstring', - }, - config = function() - require('spellsitter').setup() - require('user.plugins.treesitter') - end - } - - use { - 'neovim/nvim-lspconfig', - requires = { - 'b0o/schemastore.nvim', - 'folke/lsp-colors.nvim', - 'weilbith/nvim-code-action-menu', - }, - config = function() - require('user.plugins.lspconfig') - end - } - use { - 'hrsh7th/nvim-cmp', - requires = { - 'hrsh7th/cmp-nvim-lsp', - 'hrsh7th/cmp-buffer', - 'jessarcher/cmp-path', - 'hrsh7th/cmp-nvim-lua', - 'L3MON4D3/LuaSnip', - 'onsails/lspkind-nvim', - 'hrsh7th/cmp-nvim-lsp-signature-help', - }, - config = function() - require('user.plugins.cmp') - end - } - use { - 'nvim-telescope/telescope.nvim', - requires = { - 'nvim-lua/popup.nvim', - 'nvim-lua/plenary.nvim', - 'kyazdani42/nvim/nvim-web-devicons', - }, - config = function() - require('user.plugins.telescope') - end - } - use { - 'nvim-lualine/lualine.nvim', - requires = 'kyazdani42/nvim-web-devicons', - config = function() - require('user.plugins.lualine') - end - } - use { - 'L3MON4D3/LuaSnip', - config = function() - require('user.plugins.luasnip') - end - } -end) diff --git a/.config/nvim/lua/user/plugins/cmp.lua b/.config/nvim/lua/user/plugins/cmp.lua deleted file mode 100644 index 81cd2ee..0000000 --- a/.config/nvim/lua/user/plugins/cmp.lua +++ /dev/null @@ -1,73 +0,0 @@ -local has_words_before = function() - local line, col = unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match '%s' == nil -end - -local luasnip = require 'luasnip' -local cmp = require 'cmp' -local lspkind = require 'lspkind' - --- Set completeopt to have a better completion experience -vim.o.completeopt = 'menuone,longest,preview' - -cmp.setup({ - experimental = { - ghost_text = true, - }, - formatting = { - format = lspkind.cmp_format { - mode = 'symbol', - menu = { - nvim_lsp = '[LSP]', - nvim_lua = '[Lua]', - buffer = '[BUF]', - }, - }, - }, - snippet = { - expand = function(args) - require('luasnip').lsp_expand(args.body) - end, - }, - mapping = { - [''] = cmp.mapping.select_prev_item(), - [''] = cmp.mapping.select_next_item(), - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.close(), - [''] = cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.replace, - select = false, - }, - [''] = cmp.mapping(function(fallback) - if luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - elseif cmp.visible() then - cmp.select_next_item() - elseif has_words_before() then - cmp.complete() - else - fallback() - end - end, { 'i', 's' }), - [''] = cmp.mapping(function(fallback) - if luasnip.jumpable(-1) then - luasnip.jump(-1) - elseif cmp.visible() then - cmp.select_prev_item() - else - fallback() - end - - end, { 'i', 's' }), - }, - sources = { - { name = 'nvim_lsp' }, - { name = 'nvim_lsp_signature_help' }, - { name = 'nvim_lua' }, - { name = 'luasnip' }, - { name = 'path' }, - { name = 'buffer' }, - }, -}) diff --git a/.config/nvim/lua/user/plugins/dracula.lua b/.config/nvim/lua/user/plugins/dracula.lua deleted file mode 100644 index 77926a0..0000000 --- a/.config/nvim/lua/user/plugins/dracula.lua +++ /dev/null @@ -1,13 +0,0 @@ -vim.cmd([[ - augroup DraculaOverrides - autocmd! - autocmd ColorScheme dracula highlight! link Pmenu DraculaBg - autocmd ColorScheme dracula highlight link NormalFloat DraculaBgLight - autocmd ColorScheme dracula highlight FloatBorder guifg=none guibg=none - autocmd ColorScheme dracula highlight DraculaBoundary guibg=none - autocmd ColorScheme dracula highlight DraculaDiffDelete ctermbg=none guibg=none - autocmd ColorScheme dracula highlight DraculaComment cterm=italic gui=italic - autocmd ColorScheme dracula highlight Normal guibg=none - augroup end - colorscheme dracula -]]) diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua deleted file mode 100644 index 5685ce7..0000000 --- a/.config/nvim/lua/user/plugins/lspconfig.lua +++ /dev/null @@ -1,138 +0,0 @@ -local buf_option = vim.api.nvim_buf_set_option -local buf_keymap = require 'lib.utils'.buf_keymap - -vim.diagnostic.config { - virtual_text = false, - severity_sort = true, - float = { - source = true, - focus = false, - format = function(diagnostic) - if diagnostic.user_data ~= nil and diagnostic.user_data.lsp.code ~= nil then - return string.format("%s: %s", diagnostic.user_data.lsp.code, diagnostic.message) - end - return diagnostic.message - end, - } -} - -local on_attach = function(_, bufnr) - buf_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') - - buf_keymap(bufnr, 'n', 'gD', 'lua vim.lsp.buf.declaration()') - 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', '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') - - buf_keymap(bufnr, 'n', 'ca', ':CodeActionMenu') - buf_keymap(bufnr, 'v', 'ca', ':CodeActionMenu') - - buf_keymap(bufnr, 'n', 'd', 'lua vim.diagnostic.open_float()') - buf_keymap(bufnr, 'n', '[d', 'lua vim.diagnostic.goto_prev()') - buf_keymap(bufnr, 'n', ']d', 'lua vim.diagnostic.goto_next()') - buf_keymap(bufnr, 'n', 'F', 'lua vim.lsp.buf.format { async = true }') - - -- Autoformat on save doesn't work with server_capabilities, even - -- though it's the replacement for the deprecated resolved_capabilities. - - -- if _.server_capabilities.document_formatting then - -- vim.api.nvim_command [[augroup Format]] - -- vim.api.nvim_command [[autocmd! * ]] - -- vim.api.nvim_command [[autocmd BufWritePre lua vim.lsp.buf.formatting_seq_sync()]] - -- vim.api.nvim_command [[augroup END]] - -- end -end - --- provide additional completion capabilities -local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities()) - -require 'lspconfig'.emmet_ls.setup { - on_attach = on_attach, - capabilities = capabilities, - flags = { - debounce_text_changes = 150, - }, - 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_attach = on_attach, - capabilities = capabilities, - flags = { - debounce_text_changes = 150, - }, - cmd = { "lua-language-server" }, -} - -require 'lspconfig'.bashls.setup { - on_attach = on_attach, - capabilities = capabilities, - flags = { - debounce_text_changes = 150, - }, -} - -require 'lspconfig'.pylsp.setup { - on_attach = on_attach, - capabilities = capabilities, - flags = { - debounce_text_changes = 150, - }, -} - -require 'lspconfig'.clangd.setup { - on_attach = on_attach, - capabilities = capabilities, - flags = { - debounce_text_changes = 150, - }, - cmd = { "clangd" }; -} - --- 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, _) - if msg:match 'exit code' then - return - end - if log_level == vim.log.levels.ERROR then - vim.api.nvim_err_writeln(msg) - else - vim.api.nvim_echo({ { msg } }, true, {}) - end -end diff --git a/.config/nvim/lua/user/plugins/lualine.lua b/.config/nvim/lua/user/plugins/lualine.lua deleted file mode 100644 index 6ac5cee..0000000 --- a/.config/nvim/lua/user/plugins/lualine.lua +++ /dev/null @@ -1,64 +0,0 @@ --- local tabLineHl = vim.api.nvim_get_hl_by_name('TabLine', true) --- local bg = '#' .. bit.tohex(tabLineHl.background, 6) --- local fg = '#' .. bit.tohex(tabLineHl.foreground, 6) -local fg = '#F8F8F2' -- DraculaFg -local bg = '#21222C' -- DraculaBgDark -local separator = '#424450' -- DraculaSubtle --- local fg = '#' .. bit.tohex(vim.api.nvim_get_hl_by_name('DraculaFg', true).foreground, 6) --- local bg = '#' .. bit.tohex(vim.api.nvim_get_hl_by_name('DraculaBgDark', true).background, 6) --- local separator = '#' .. bit.tohex(vim.api.nvim_get_hl_by_name('DraculaSubtle', true).foreground, 6) - -require('lualine').setup { - options = { - component_separators = '', - section_separators = '▕', - theme = { - normal = { - a = { fg = fg, bg = bg }, - b = { fg = fg, bg = bg }, - c = { fg = fg, bg = bg }, - x = { fg = fg, bg = bg }, - y = { fg = fg, bg = bg }, - z = { fg = fg, bg = bg }, - }, - inactive = { c = { fg = fg, bg = bg } }, - }, - }, - sections = { - lualine_a = { - 'mode', - { '"▏"', color = { fg = separator } }, - }, - lualine_b = { - 'branch', - 'diff', - { '"▕"', color = { fg = separator } }, - '"🖧  " .. tostring(#vim.tbl_keys(vim.lsp.buf_get_clients()))', - { 'diagnostics', sources = { 'nvim_diagnostic' } }, - { '"▏"', color = { fg = separator } }, - }, - lualine_c = { 'filename' }, - lualine_x = { - 'filetype', - 'encoding', - 'fileformat', - }, - lualine_y = { - { '"▕"', color = { fg = separator } }, - '(vim.bo.expandtab and "␠ " or "⇥ ") .. " " .. vim.bo.shiftwidth', - { '"▏"', color = { fg = separator } }, - }, - lualine_z = { - 'location', - 'progress', - }, - }, - -- tabline = { - -- lualine_a = { - -- {'buffers'} - -- }, - -- lualine_z = { - -- {'tabs'} - -- } - -- } -} diff --git a/.config/nvim/lua/user/plugins/luasnip.lua b/.config/nvim/lua/user/plugins/luasnip.lua deleted file mode 100644 index 2e7462a..0000000 --- a/.config/nvim/lua/user/plugins/luasnip.lua +++ /dev/null @@ -1,9 +0,0 @@ -local ls = require "luasnip" -require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/snippets" }) - -ls.config.set_config { - history = true, - updateevents = 'TextChanged,TextChangedI', - enable_autosnippets = true, -} - diff --git a/.config/nvim/lua/user/plugins/nvim-tree.lua b/.config/nvim/lua/user/plugins/nvim-tree.lua deleted file mode 100644 index 3c425c5..0000000 --- a/.config/nvim/lua/user/plugins/nvim-tree.lua +++ /dev/null @@ -1,13 +0,0 @@ -require('nvim-tree').setup { - renderer = { - highlight_opened_files = "all", - group_empty = true, - }, - git = { - ignore = false, - }, -} - -vim.cmd [[highlight NvimTreeIndentMarker guifg=#30323E]] - -vim.api.nvim_set_keymap('n', 'n', ':NvimTreeFindFileToggle', { silent = true, noremap = true }) diff --git a/.config/nvim/lua/user/plugins/telescope.lua b/.config/nvim/lua/user/plugins/telescope.lua deleted file mode 100644 index 5f7023f..0000000 --- a/.config/nvim/lua/user/plugins/telescope.lua +++ /dev/null @@ -1,25 +0,0 @@ -local telescope = require 'telescope' -local actions = require 'telescope.actions' -local keymap = require 'lib.utils'.keymap - -keymap('n', ';f', [[lua require('telescope.builtin').find_files()]]) -keymap('n', ';r', [[lua require('telescope.builtin').live_grep()]]) -keymap('n', ';b', [[lua require('telescope.builtin').buffers()]]) - -require('telescope').setup { - defaults = { - sorting_strategy = 'ascending', - mappings = { - i = { - [""] = actions.close, - [''] = actions.cycle_history_next, - [''] = actions.cycle_history_prev, - }, - }, - file_ignore_patterns = { - '.git/', - 'node_modules/', - 'android/', - }, - } -} diff --git a/.config/nvim/lua/user/plugins/treesitter.lua b/.config/nvim/lua/user/plugins/treesitter.lua deleted file mode 100644 index 32c74ee..0000000 --- a/.config/nvim/lua/user/plugins/treesitter.lua +++ /dev/null @@ -1,31 +0,0 @@ -require('nvim-treesitter.configs').setup { - indent = { - enable = true, - disable = { 'html' }, - }, - highlight = { - enable = true, - disable = { 'NvimTree' }, - additional_vim_regex_highlighting = true, - }, - textobjects = { - select = { - enable = true, - lookahead = true, - keymaps = { - ['ia'] = '@parameter.inner', - -- ['aa'] = { - -- php = "" '@parameter.outer', - - -- python = "(function_definition) @function", - -- cpp = "(function_definition) @function", - -- c = "(function_definition) @function", - -- java = "(method_declaration) @function", - -- }, - }, - }, - }, - context_commentstring = { - enable = true, - }, -} diff --git a/.config/nvim/snippets/all.lua b/.config/nvim/snippets/all.lua deleted file mode 100644 index 78c33db..0000000 --- a/.config/nvim/snippets/all.lua +++ /dev/null @@ -1,23 +0,0 @@ -return { - parse('sktn', '\ -\ -\ -\ - Website Title\ - \ - \ - \ -\ -\ -\ -
\ -

Header Text

\ -
\ -
\ -

Lorem ipsum bla, bla, bla...

\ -
\ -\ -\ -\ -'), -} diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 1004487..68e4818 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -30,8 +30,8 @@ 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,us -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle"' -alias setus='setxkbmap -layout us,us -option "ctrl:nocaps"' +alias setkeys='xset r rate 250 30 && setxkbmap -layout us,de -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle"' +alias setus='setxkbmap -layout us -option "ctrl:nocaps"' # pad numbers in filenames with zeros alias padz='rename "s/\d+/sprintf(\"%02d\",$&)/e"' diff --git a/.config/shell/profile b/.config/shell/profile index 3b8d72b..a762e89 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -1,7 +1,7 @@ umask 0077 export _JAVA_AWT_WM_NONREPARENTING=1 -export EDITOR="nvim" +export EDITOR="vim" export TERMINAL="st" export BROWSER="firefox" diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 93065e5..3dd9c9a 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -12,7 +12,7 @@ xrandr --auto --output HDMI-A-0 --mode 1600x900 --left-of DisplayPort-2 xset r rate 250 30 xset s off -dpms -setxkbmap -layout us,us -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle" +setxkbmap -layout us,de -variant dvorak, -option "ctrl:nocaps,lv3:rwin_switch,grp:alt_space_toggle" xrdb -merge ~/.Xresources ~/.local/bin/set-wallpaper & diff --git a/.vim/vimrc b/.vim/vimrc new file mode 100644 index 0000000..bc71bcf --- /dev/null +++ b/.vim/vimrc @@ -0,0 +1,77 @@ +filetype plugin indent on +syntax enable +set nocompatible +set modeline +set modelines=5 +set nobackup +set nowritebackup +set updatetime=300 +set hidden +set noswapfile +set laststatus=2 +set shortmess+=c + +let g:markdown_fenced_languages = ['javascript', 'js=javascript', 'json=javascript'] + +let $RTP=split(&runtimepath, ',')[0] +let $RC="$HOME/.vim/vimrc" + +call plug#begin() + +Plug 'dracula/vim', { 'as': 'dracula' } +Plug 'tpope/vim-commentary' +Plug 'tpope/vim-surround' + +call plug#end() + +colorscheme dracula + +hi Normal ctermbg=black + +set autoindent +set smartindent +set expandtab +set tabstop=4 +set shiftwidth=4 + +set number +set relativenumber +set showcmd +set cmdheight=1 +set completeopt=menuone,noinsert,noselect +set splitright +set splitbelow +set ignorecase +set smartcase +set showmatch +set signcolumn=yes +set incsearch +set diffopt+=vertical + +" Use ^] to jump to tag under cursor +" Use g^] for ambiguous tags +" Use ^t to jump back up the tag stack +command! MakeTags !ctags -R * + +let mapleader="\" + +nmap h +nmap j +nmap k +nmap l + +nmap Q :bufdo bdelete + +nmap ve :edit $MYVIMRC +nmap vr :source $MYVIMRC :doautocmd BufRead + +nnoremap m :MaximizerToggle! +nnoremap F :ALEFix +nnoremap d :cd %:p:h:pwd + +vnoremap "+y +nnoremap "+p + +map gf :edit + +nmap x :!xdg-open % -- 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(-) 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 From f65e69f1f4b41785426bb830e73541aeb0d957e0 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Sat, 9 Mar 2024 01:47:24 +0100 Subject: whoops --- .xinitrc | 2 +- .zprofile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.xinitrc b/.xinitrc index de9369a..518bb5d 120000 --- a/.xinitrc +++ b/.xinitrc @@ -1 +1 @@ -/home/cafebabe/.config/x11/xinitrc \ No newline at end of file +.config/x11/xinitrc \ No newline at end of file diff --git a/.zprofile b/.zprofile index 57ff7d6..8486fca 120000 --- a/.zprofile +++ b/.zprofile @@ -1 +1 @@ -/home/cafebabe/.config/shell/profile \ No newline at end of file +.config/shell/profile \ No newline at end of file -- cgit v1.2.3