From 750eecccdb229debde1854601daf190b51ae2536 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Thu, 15 Dec 2022 21:29:12 +0100 Subject: cleaned up my aliases, added evil-surround to emacs --- .config/sxiv/exec/key-handler | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.config/sxiv/exec') diff --git a/.config/sxiv/exec/key-handler b/.config/sxiv/exec/key-handler index 5ca4443..19bcc67 100755 --- a/.config/sxiv/exec/key-handler +++ b/.config/sxiv/exec/key-handler @@ -3,7 +3,7 @@ while read file do case "$1" in - "C-d") trash-put "$file" ;; + "C-d") rm "$file" ;; "C-c") cat "$file" | xclip -sel c -t image/png ;; "C-w") xwallpaper --maximize "$file" ;; esac -- cgit v1.2.3 From a360f1fc5d89be132044a0aa8f7a8ec4e65a7d95 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Tue, 27 Dec 2022 22:25:35 +0100 Subject: fixed color in zsh, sourced Xsession.d in xinitrc, changed clangd command in lspconfig --- .config/mpd/mpd.conf | 26 ++++++++++---------------- .config/nvim/lua/user/plugins/lspconfig.lua | 2 +- .config/shell/aliasrc | 2 +- .config/sxiv/exec/key-handler | 1 + .config/x11/xinitrc | 14 +++++++++----- .config/zsh/.zshrc | 4 +--- 6 files changed, 23 insertions(+), 26 deletions(-) (limited to '.config/sxiv/exec') diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index 6f04a5d..2ebf6b5 100755 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -8,27 +8,13 @@ log_file "~/.config/mpd/log" pid_file "~/.config/mpd/pid" state_file "~/.config/mpd/mpdstate" +# default local output audio_output { type "pipewire" name "Default" -# sink "alsa_output.pci-0000_29_00.0.analog-stereo" -} - -# For some reason ncmpcpp now switches correctly, so i'm disabling this. -#audio_output { -# type "pulse" -# name "Speakers" -# sink "alsa_output.pci-0000_31_00.4.analog-stereo" -#} -# - -audio_output { - type "fifo" - name "Visualizer feed" - path "/tmp/mpd.fifo" - format "44100:16:2" } +# http streaming audio_output { type "httpd" name "My HTTP Stream" @@ -39,6 +25,14 @@ audio_output { format "44100:16:1" } +# visualizer output +audio_output { + type "fifo" + name "Visualizer feed" + path "/tmp/mpd.fifo" + format "44100:16:2" +} + input { enabled "no" plugin "qobuz" diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua index a63975b..92a728b 100644 --- a/.config/nvim/lua/user/plugins/lspconfig.lua +++ b/.config/nvim/lua/user/plugins/lspconfig.lua @@ -115,9 +115,9 @@ require 'lspconfig'.clangd.setup { flags = { debounce_text_changes = 150, }, + cmd = { "/usr/bin/clangd-13" }; } - -- suppress error messages from lang servers vim.notify = function(msg, log_level, _) if msg:match 'exit code' then diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index cdc7be8..10f32a1 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -14,7 +14,7 @@ alias z='zathura' alias cn='clear;neofetch' alias nnn='nnn -Hde' alias ea='vi ~/.config/shell/aliasrc' -#alias freyr='sudo docker run -it --rm -v /media/hdd/music:/data freyrcli/freyrjs' +alias freyr='sudo docker run -it --rm -v /media/hdd/music:/data freyrcli/freyrjs' # setting custom ascii alias neofetch='neofetch --source ~/docs/ascii/lain' diff --git a/.config/sxiv/exec/key-handler b/.config/sxiv/exec/key-handler index 19bcc67..dcbc60b 100755 --- a/.config/sxiv/exec/key-handler +++ b/.config/sxiv/exec/key-handler @@ -6,5 +6,6 @@ do "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 0c98334..dc3b2b5 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -1,24 +1,28 @@ #!/bin/sh +if [ -d "/etc/X11/Xsession.d" ]; then + for f in /etc/X11/Xsession.d/*; do + [ -x "$f" ] && . "$f" + done + unset f +fi + rfkill block all eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")" -eval "$(ssh-agent)" -xset r rate 300 30 +xset r rate 250 30 xset s off -dpms 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 -dbus-launch --sh-syntax --exit-with-session - # ibus-daemon -dxrR statusbar & +dunst & pipewire & mpd & -# /usr/local/bin/emacs --daemon & picom & set-wallpaper & diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 13c6719..c5e5f2d 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -1,7 +1,5 @@ autoload -U colors && colors -# PS1="%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[yellow]%}%~%{$fg[red]%}]%{$reset_color%}$%b " - stty stop undef autoload -U compinit @@ -56,7 +54,7 @@ TRAPINT() { return $(( 128 + $1 )) } -PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[yellow]%}%~%{$fg[red]%}]%{$reset_color%}%b %(?.%F{green}$THEME_VI_MODE_SYMBOL.%F{red}$THEME_VI_MODE_SYMBOL) ' +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%} ' setopt extendedGlob -- cgit v1.2.3 From e1737dbd191446d53d4687426eae682d31270b62 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Mon, 20 Mar 2023 13:50:42 +0100 Subject: update i guess --- .config/mpv/script-opts/encode_webm.conf | 2 +- .config/neofetch/config.conf | 4 +-- .config/nvim/lua/user/plugins/lspconfig.lua | 12 +++++++-- .config/nvim/plugin/packer_compiled.lua | 40 ++++++++++++++--------------- .config/picom/picom.conf | 4 +-- .config/shell/profile | 6 ++--- .config/sxiv/exec/key-handler | 2 +- .config/yt-dlp/config | 2 +- .config/zsh/.zshrc | 10 +++----- 9 files changed, 43 insertions(+), 39 deletions(-) (limited to '.config/sxiv/exec') diff --git a/.config/mpv/script-opts/encode_webm.conf b/.config/mpv/script-opts/encode_webm.conf index 06cdc34..93dbb74 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:a libvorbis -crf 1 -b:v 1M +codec=-c:v libvpx-vp9 -b:v 800k -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 86feaa4..149ab2e 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/sda2' '/dev/sdb1') # Disk subtitle. # What to append to the Disk subtitle. @@ -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=(15 88 88 88 88 88) +ascii_colors=(88 88 88 88 88 88) # Bold ascii logo # Whether or not to bold the ascii logo. diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua index 92a728b..1351959 100644 --- a/.config/nvim/lua/user/plugins/lspconfig.lua +++ b/.config/nvim/lua/user/plugins/lspconfig.lua @@ -56,13 +56,13 @@ require 'lspconfig'.emmet_ls.setup { flags = { debounce_text_changes = 150, }, - filetypes = { 'html', 'javascript', 'typescript', 'javascriptreact', 'typescriptreact' } + 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'.sumneko_lua.setup { +require 'lspconfig'.lua_ls.setup { on_attach = on_attach, capabilities = capabilities, flags = { @@ -118,6 +118,14 @@ require 'lspconfig'.clangd.setup { cmd = { "/usr/bin/clangd-13" }; } +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 diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index 6a3d510..6275daa 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -242,46 +242,46 @@ _G.packer_plugins = { } 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-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-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-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: 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: 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-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-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-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) _G._packer.inside_compile = false if _G._packer.needs_bufread == true then diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index 6d3640c..f3eb671 100644 --- a/.config/picom/picom.conf +++ b/.config/picom/picom.conf @@ -2,8 +2,8 @@ # empty file, just so transparency works on st opacity-rule = [ - "90:class_g = 'discord' && focused", - "90:class_g = 'discord' && !focused" + "90:class_g = 'SchildiChat' && focused", + "90:class_g = 'SchildiChat' && !focused" ] # corner-radius = 6 diff --git a/.config/shell/profile b/.config/shell/profile index 6cca5f1..0093eed 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -24,9 +24,7 @@ export XDG_SESSION_TYPE='x11' export NVM_DIR="$HOME/.config/nvm" -export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:$HOME/.cargo/bin:/sbin:/usr/sbin" +export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:$HOME/.cargo/bin:/sbin:/usr/sbin:$HOME/.rvm/bin" + -# if [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then -# exec startx -# fi diff --git a/.config/sxiv/exec/key-handler b/.config/sxiv/exec/key-handler index dcbc60b..981eb8e 100755 --- a/.config/sxiv/exec/key-handler +++ b/.config/sxiv/exec/key-handler @@ -1,6 +1,6 @@ #!/usr/bin/env bash -while read file +while read -r file do case "$1" in "C-d") rm "$file" ;; diff --git a/.config/yt-dlp/config b/.config/yt-dlp/config index e2b5628..aeb3bda 100755 --- a/.config/yt-dlp/config +++ b/.config/yt-dlp/config @@ -1 +1 @@ ---verbose -ciw -f bestvideo[ext=mp4][vcodec!*=av01]+bestaudio[ext=m4a]/best[ext=mp4]/best --add-metadata --merge-output-format mkv +--verbose -ciw -f bestvideo[ext=mp4][vcodec!*=av01]+bestaudio[ext=m4a]/best[ext=mp4]/best --merge-output-format mkv diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 016a729..e94a036 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -70,12 +70,6 @@ setopt hist_ignore_all_dups setopt hist_find_no_dups setopt hist_save_no_dups -DIRSTACKFILE="${XDG_CACHE_HOME/.cache}/zsh/dirs" -if [[ -f "$DIRSTACKFILE" ]] && (( ${#dirstack} == 0 )); then - dirstack=("${(@f)"$(< "$DIRSTACKFILE")"}") - [[ -d "${dirstack[1]}" ]] && cd -- "${dirstack[1]}" -fi - DIRSTACKSIZE='20' setopt auto_pushd @@ -111,6 +105,10 @@ 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* + 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 fi + -- cgit v1.2.3