From ee92c6100fd18a80309bcaa86d1cbc20f8f2cd49 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Fri, 23 Dec 2022 21:20:52 +0100 Subject: added a bunch of stuff and relocated some files --- .config/zsh/.zshrc | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 .config/zsh/.zshrc (limited to '.config/zsh') diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc new file mode 100644 index 0000000..ec2f9e0 --- /dev/null +++ b/.config/zsh/.zshrc @@ -0,0 +1,112 @@ +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 +zstyle ':completion:*' menu select +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]%}]%{$reset_color%}%b %(?.%F{green}$THEME_VI_MODE_SYMBOL.%F{red}$THEME_VI_MODE_SYMBOL) ' + +setopt extendedGlob + +HISTFILE=$ZDOTDIR/.zsh_history +HISTSIZE='2000' +SAVEHIST='1000' + +# ignore duplicate in history +setopt hist_expire_dups_first +setopt hist_ignore_dups +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 +setopt pushd_silent +setopt pushd_ignore_dups +setopt pushd_minus + +macchina + +if [ -f $XDG_CONFIG_HOME/.dircolors ]; then + eval "$(dircolors -b $XDG_CONFIG_HOME/.dircolors)" +fi + +if [ -f $XDG_CONFIG_HOME/shell/aliasrc ]; then + . $XDG_CONFIG_HOME/shell/aliasrc +fi + +if [ -f $HOME/.fzf/fzf.zsh ]; then + . $HOME/.fzf/fzf.zsh +fi + +export FZF_DEFAULT_OPS="--extended" +export FZF_DEFAULT_COMMAND="fdfind --type f" +export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" + +# NNN +if [ -f $XDG_CONFIG_HOME/nnn/nnn.bash ]; then + . $XDG_CONFIG_HOME/nnn/nnn.bash +fi + +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 From 5da0902c8d705b2ad5c0baa7ff62cb459b02ea5e Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Sat, 24 Dec 2022 14:07:10 +0100 Subject: updated --- .config/mpd/mpd.conf | 12 +++++----- .config/nvim/plugin/packer_compiled.lua | 40 ++++++++++++++++----------------- .config/shell/aliasrc | 6 ++--- .config/shell/profile | 5 ++++- .config/x11/xinitrc | 10 ++++----- .config/zsh/.zshrc | 5 ++++- .ncmpcpp/config | 2 +- 7 files changed, 43 insertions(+), 37 deletions(-) (limited to '.config/zsh') diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index 1b10341..f409799 100755 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -1,12 +1,12 @@ -bind_to_address "0.0.0.0" +bind_to_address "127.0.0.1" #bind_to_address "/run/mpd/socket" -music_directory "/hdd/music" +music_directory "/media/hdd/music" playlist_directory "~/.config/mpd/playlists" -db_file "~/.config/mpd/database" -log_file "~/.config/mpd/log" -pid_file "~/.config/mpd/pid" -state_file "~/.config/mpd/mpdstate" +db_file "~/.config/mpd/database" +log_file "~/.config/mpd/log" +pid_file "~/.config/mpd/pid" +state_file "~/.config/mpd/mpdstate" audio_output { type "pipewire" diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index 75d1f59..6a3d510 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -242,30 +242,38 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], 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: 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-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: 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-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-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: 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") @@ -274,14 +282,6 @@ time([[Config for LuaSnip]], false) 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-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 b328c56..af0be04 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -1,8 +1,8 @@ ## MISCELLANEOUS # various shortcuts -alias reboot='sudo openrc-shutdown -r' -alias poweroff='sudo openrc-shutdown -p' +alias reboot='sudo reboot' +alias poweroff='sudo poweroff' alias pms='sudo pm-suspend' alias refresh='source $ZDOTDIR/.zshrc' alias fuck='sudo $(fc -Lln -1)' @@ -11,7 +11,7 @@ alias mutt='pushd ~/.mutt/attachments; mutt; popd' alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine' alias vi="$EDITOR" alias z='zathura' -alias cn='clear;macchina' +alias cn='clear;neofetch' alias nnn='nnn -Hde' alias freyr='sudo docker run -it --rm -v /media/hdd/music:/data freyrcli/freyrjs' diff --git a/.config/shell/profile b/.config/shell/profile index a774d0e..ea3879e 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -1,4 +1,4 @@ -umask 0076 +umask 0077 export _JAVA_AWT_WM_NONREPARENTING=1 export EDITOR="nvim" @@ -23,8 +23,11 @@ export QT_IM_MODULE='ibus' export XMODIFIERS='@im=ibus' 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" # if [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then # exec startx # fi + diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index cbaec52..b2e6a2a 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -2,8 +2,8 @@ rfkill block all -eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")" -eval "$(ssh-agent)" +# eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")" +# eval "$(ssh-agent)" xset r rate 300 30 xset s off -dpms @@ -14,13 +14,13 @@ xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 dbus-launch --sh-syntax --exit-with-session -ibus-daemon -dxrR +# ibus-daemon -dxrR statusbar & pipewire & mpd & -/usr/local/bin/emacs --daemon & +# /usr/local/bin/emacs --daemon & picom & set-wallpaper & -exec dwm >/dev/null 2>&1 +exec dwm diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index ec2f9e0..b63c931 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -84,7 +84,10 @@ setopt pushd_silent setopt pushd_ignore_dups setopt pushd_minus -macchina +neofetch + +[ -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)" diff --git a/.ncmpcpp/config b/.ncmpcpp/config index 763ee0a..6669585 100644 --- a/.ncmpcpp/config +++ b/.ncmpcpp/config @@ -4,7 +4,7 @@ lyrics_directory = ~/.ncmpcpp/lyrics mpd_host = localhost mpd_port = 6600 -mpd_music_dir = /hdd/music +mpd_music_dir = /media/hdd/music mpd_connection_timeout = 5 # Playlist -- cgit v1.2.3 From 66ebf6e1e49075c36ce8e1a3e869985f6b171581 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Sun, 25 Dec 2022 23:27:37 +0100 Subject: added http audio output to mpd --- .config/mpd/mpd.conf | 16 ++++++++++++++-- .config/shell/aliasrc | 6 +++++- .config/x11/xinitrc | 4 ++-- .config/zsh/.zshrc | 12 +++++++----- 4 files changed, 28 insertions(+), 10 deletions(-) (limited to '.config/zsh') diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index f409799..6f04a5d 100755 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -1,5 +1,5 @@ -bind_to_address "127.0.0.1" -#bind_to_address "/run/mpd/socket" +bind_to_address "0.0.0.0" +#bind_to_address "/run/mpd/socket" music_directory "/media/hdd/music" playlist_directory "~/.config/mpd/playlists" @@ -29,6 +29,16 @@ audio_output { format "44100:16:2" } +audio_output { + type "httpd" + name "My HTTP Stream" + encoder "vorbis" # 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 + format "44100:16:1" +} + input { enabled "no" plugin "qobuz" @@ -44,3 +54,5 @@ decoder { plugin "wildmidi" config_file "/etc/timidity/timidity.cfg" } + +mixer_type "software" diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index af0be04..cdc7be8 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -13,7 +13,11 @@ alias vi="$EDITOR" alias z='zathura' alias cn='clear;neofetch' alias nnn='nnn -Hde' -alias freyr='sudo docker run -it --rm -v /media/hdd/music:/data freyrcli/freyrjs' +alias ea='vi ~/.config/shell/aliasrc' +#alias freyr='sudo docker run -it --rm -v /media/hdd/music:/data freyrcli/freyrjs' + +# setting custom ascii +alias neofetch='neofetch --source ~/docs/ascii/lain' # cp mv and rm always verbose alias cp='cp -iv' diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index b2e6a2a..0c98334 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -2,8 +2,8 @@ rfkill block all -# eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")" -# eval "$(ssh-agent)" +eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")" +eval "$(ssh-agent)" xset r rate 300 30 xset s off -dpms diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index b63c931..13c6719 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -84,7 +84,6 @@ setopt pushd_silent setopt pushd_ignore_dups setopt pushd_minus -neofetch [ -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 @@ -97,19 +96,22 @@ if [ -f $XDG_CONFIG_HOME/shell/aliasrc ]; then . $XDG_CONFIG_HOME/shell/aliasrc fi -if [ -f $HOME/.fzf/fzf.zsh ]; then - . $HOME/.fzf/fzf.zsh -fi - +# FZF Section export FZF_DEFAULT_OPS="--extended" export FZF_DEFAULT_COMMAND="fdfind --type f" export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" +if [ -f $HOME/.fzf/fzf.zsh ]; then + . $HOME/.fzf/fzf.zsh +fi + # NNN if [ -f $XDG_CONFIG_HOME/nnn/nnn.bash ]; then . $XDG_CONFIG_HOME/nnn/nnn.bash fi +neofetch + 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 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/zsh') 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 782ee288d7a60e9f1359d6aa439ddc0f28ed09e6 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Fri, 17 Feb 2023 00:03:57 +0100 Subject: add metadata to yt-dlp vids, changed mkwebm video codec, re-added ibus-daemon to xinitrc --- .config/picom/picom.conf | 5 +++++ .config/shell/aliasrc | 39 ++++++++++++++++++++++++++++++++------- .config/x11/xinitrc | 2 +- .config/yt-dlp/config | 2 +- .config/zsh/.zshrc | 1 + 5 files changed, 40 insertions(+), 9 deletions(-) (limited to '.config/zsh') diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index fa4d989..6d3640c 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 +opacity-rule = [ + "90:class_g = 'discord' && focused", + "90:class_g = 'discord' && !focused" +] + # corner-radius = 6 # rounded-corners-exclude = [ diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 7cc0a9d..c107f4d 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -14,6 +14,8 @@ alias z='zathura' alias cn='clear;neofetch' alias nnn='nnn -Hde' alias ea='vi ~/.config/shell/aliasrc' +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' # setting custom ascii @@ -28,10 +30,18 @@ alias mkd='mkdir -pv' # Colorize grep output alias grep='grep --color=auto -i' -# color ls, always full info and human readable; group dirs +# ls shortcuts alias ls='ls -hl --color=always --group-directories-first' alias la='ls -a' +ld() { + if [ "$1" = "" ]; then + ls -d */; + else + ls -d $1/*/ | sed "s|$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)" @@ -45,6 +55,25 @@ alias setlmon-lowres='xrandr --auto --output DisplayPort-2 --mode 640x480 --left 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' +# 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 @@ -63,15 +92,11 @@ date-reverse() { done; } -## DOWNLOADING AND CONVERTING VIDEO - -# shortcuts for most used yt-dlp settings -alias ytvid='yt-dlp -o "/media/hdd/vids/random/%(title)s.%(ext)s" --remux-video "mkv"' -alias ytarchive='yt-dlp -o "/media/hdd/vids/archives/%(uploader)s/%(upload_date)s - %(title)s/%(title)s.%(ext)s" --remux-video "mkv"' +## CONVERTING VIDEO # convert video files to webm mkwebm() { - ffmpeg -i "${1}" -crf 1 -b:v 1M -c:a libvorbis "${1%.*}".webm + ffmpeg -i "${1}" -c:v libvpx-vp9 -crf 1 -b:v 1M -c:a libvorbis "${1%.*}".webm } ## GIT diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 220c9ff..d106aa8 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -19,7 +19,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 -# ibus-daemon -dxrR +ibus-daemon -dxrR statusbar & pipewire & mpd & diff --git a/.config/yt-dlp/config b/.config/yt-dlp/config index aeb3bda..e2b5628 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 --merge-output-format mkv +--verbose -ciw -f bestvideo[ext=mp4][vcodec!*=av01]+bestaudio[ext=m4a]/best[ext=mp4]/best --add-metadata --merge-output-format mkv diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index c5e5f2d..016a729 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -1,6 +1,7 @@ autoload -U colors && colors stty stop undef +setopt no_nomatch autoload -U compinit zstyle ':completion:*' menu select -- 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/zsh') 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