diff options
Diffstat (limited to '')
| -rw-r--r-- | .config/env | 8 | ||||
| -rw-r--r-- | .config/mimeapps.list | 38 | ||||
| -rwxr-xr-x | .config/nnn/plugins/joe_fzfcd | 20 | ||||
| -rw-r--r-- | .config/nvim/init.lua | 2 | ||||
| -rw-r--r-- | .config/nvim/lua/lsp/perlls.lua | 23 | ||||
| -rw-r--r-- | .config/nvim/lua/lsp/perlnavigator.lua | 16 | ||||
| -rw-r--r-- | .config/zsh/.zshrc | 32 | ||||
| -rw-r--r-- | .config/zsh/alias.zsh | 1 |
8 files changed, 103 insertions, 37 deletions
diff --git a/.config/env b/.config/env index ff8f825..7aaf9df 100644 --- a/.config/env +++ b/.config/env @@ -12,6 +12,7 @@ # ======================== unset MAILCHECK + # xdg export XDG_DATA_HOME="$HOME"/.local/share export XDG_CONFIG_HOME="$HOME"/.config @@ -25,6 +26,7 @@ export XDG_MUSIC_DIR="$HOME"/mu export XDG_PICTURES_DIR="$HOME"/pics export XDG_VIDEOS_DIR="$HOME"/vids export XDG_RUNTIME_DIR=/var/run/"$USER" + # Apps export EDITOR='nvim' export VISUAL="${EDITOR}" @@ -79,6 +81,7 @@ export WGETRC="$XDG_CONFIG_HOME"/wgetrc export WINEPREFIX="$XDG_DATA_HOME"/wineprefixes/default export W3M_DIR="$XDG_STATE_HOME"/w3m +# Xorg export XINITRC="$XDG_CONFIG_HOME"/x11/xinitrc export XSERVERRC="$XDG_CONFIG_HOME"/x11/xserverrc export _Z_DATA="$XDG_DATA_HOME"/z @@ -96,6 +99,11 @@ export FZF_DEFAULT_COMMAND='fd -i -H -c never -j9 -E .git -E dotfiles-bsd -E .cc export FZF_DEFAULT_OPTS='--height 60% --layout=reverse --border=left --tabstop=4' export LESS='-R -c -S' export MPD_HOST="$XDG_DATA_HOME"/mpd/socket +export NNN_OPTS='aAerRQ' +export NNN_COLORS='4132' +export NNN_FCOLORS='030304020005060801ac0507' +export NNN_ARCHIVE="\\.(7z|a|ace|alz|arc|arj|bz|bz2|cab|cpio|deb|gz|jar|lha|lz|lzh|lzma|lzo|rar|rpm|rz|t7z|tar|tbz|tbz2|tgz|tlz|txz|tZ|tzo|war|xpi|xz|Z|zip)$" +export NNN_PLUG='t:joe_fzfcdl' export RUSTFLAGS='-L /usr/local/lib' export WWW_HOME='https://start.duckduckgo.com/' export YTFZF_HIST='0' diff --git a/.config/mimeapps.list b/.config/mimeapps.list index a7d1359..7388f32 100644 --- a/.config/mimeapps.list +++ b/.config/mimeapps.list @@ -1,8 +1,8 @@ [Default Applications] x-scheme-handler/http=userapp-Firefox-SWW0Y1.desktop x-scheme-handler/https=userapp-Firefox-SWW0Y1.desktop -x-scheme-handler/ftp=librewolf.desktop -image/png=sxiv.desktop +x-scheme-handler/ftp=userapp-Firefox-SWW0Y1.desktop +image/png=nsxiv.desktop x-scheme-handler/chrome=userapp-Firefox-SWW0Y1.desktop text/html=userapp-Firefox-SWW0Y1.desktop application/x-extension-htm=userapp-Firefox-SWW0Y1.desktop @@ -11,8 +11,8 @@ application/x-extension-shtml=userapp-Firefox-SWW0Y1.desktop application/xhtml+xml=userapp-Firefox-SWW0Y1.desktop application/x-extension-xhtml=userapp-Firefox-SWW0Y1.desktop application/x-extension-xht=userapp-Firefox-SWW0Y1.desktop -application/pdf=org.pwmt.zathura-pdf-poppler.desktop -image/jpeg=imv.desktop +application/pdf=org.pwmt.zathura.desktop +image/jpeg=nsxiv.desktop image/gif=nsxiv.desktop audio/mpeg=mpv.desktop audio/flac=mpv.desktop @@ -27,18 +27,18 @@ video/ogg=mpv.desktop video/webm=mpv.desktop inode/directory=pcmanfm.desktop text/plain=nvim.desktop -application/x-shellscript=emacs.desktop -text/english=emacs.desktop -text/x-c=emacs.desktop -text/x-c++=emacs.desktop -text/x-c++hdr=emacs.desktop -text/x-c++src=emacs.desktop -text/x-chdr=emacs.desktop -text/x-csrc=emacs.desktop -text/x-java=emacs.desktop -text/x-makefile=emacs.desktop -text/x-readme=emacs.desktop -text/x-tcl=emacs.desktop +application/x-shellscript=nvim.desktop +text/english=nvim.desktop +text/x-c=nvim.desktop +text/x-c++=nvim.desktop +text/x-c++hdr=nvim.desktop +text/x-c++src=nvim.desktop +text/x-chdr=nvim.desktop +text/x-csrc=nvim.desktop +text/x-java=nvim.desktop +text/x-makefile=nvim.desktop +text/x-readme=nvim.desktop +text/x-tcl=nvim.desktop x-scheme-handler/msteams=teams.desktop video/mp4=mpv.desktop application/zip=xarchiver.desktop @@ -66,9 +66,9 @@ application/x-extension-shtml=userapp-Firefox-NVLWI0.desktop;firefox.desktop;use application/xhtml+xml=userapp-Firefox-NVLWI0.desktop;firefox.desktop;userapp-Firefox-SWW0Y1.desktop; application/x-extension-xhtml=userapp-Firefox-NVLWI0.desktop;firefox.desktop;userapp-Firefox-SWW0Y1.desktop; application/x-extension-xht=userapp-Firefox-NVLWI0.desktop;firefox.desktop;userapp-Firefox-SWW0Y1.desktop; -application/pdf=org.pwmt.zathura-pdf-mupdf.desktop;org.pwmt.zathura-pdf-poppler.desktop; +application/pdf=org.pwmt.zathura.desktop; video/webm=mpv.desktop; -text/plain=nvim.desktop;vim.desktop;org.gnome.gedit.desktop; +text/plain=nvim.desktop; video/mp4=mpv.desktop; application/zip=xarchiver.desktop;org.gnome.Nautilus.desktop; video/x-matroska=mpv.desktop; @@ -82,7 +82,7 @@ x-scheme-handler/mid=userapp-Thunderbird-SJ2821.desktop;userapp-Thunderbird-BXAR video/x-msvideo=mpv.desktop; x-scheme-handler/http=firefox.desktop;userapp-Firefox-SWW0Y1.desktop; video/quicktime=mpv.desktop; -image/jpeg=sxiv.desktop;imv.desktop; +image/jpeg=nsxiv.desktop;imv.desktop; [Removed Associations] x-scheme-handler/http=librewolf.desktop; diff --git a/.config/nnn/plugins/joe_fzfcd b/.config/nnn/plugins/joe_fzfcd new file mode 100755 index 0000000..4c74f88 --- /dev/null +++ b/.config/nnn/plugins/joe_fzfcd @@ -0,0 +1,20 @@ +#!/usr/bin/env perl + +use strict; +use warnings; +use Env qw(NNN_PIPE PWD); + +sub main { + my $dir; + + $dir = `fd -t d -L | fzf`; + chomp($dir); + open(FH, '>>', $NNN_PIPE) or die $!; + print FH '0c' . $PWD . '/' . $dir; + close(FH); + return; +} + +main(); + +__END__ diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index bdfa8bd..742d23c 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -25,4 +25,4 @@ require('lsp.bashls') require('lsp.clangd') require('lsp.gopls') require('lsp.luals') -require('lsp.perlnavigator') +require('lsp.perlls') diff --git a/.config/nvim/lua/lsp/perlls.lua b/.config/nvim/lua/lsp/perlls.lua new file mode 100644 index 0000000..b995cd2 --- /dev/null +++ b/.config/nvim/lua/lsp/perlls.lua @@ -0,0 +1,23 @@ +vim.lsp.config('perlls', { + cmd = { + 'perl', + '-MPerl::LanguageServer', + '-e', + 'Perl::LanguageServer::run', + '--', + '--port 13603', + '--nostdio 0', + }, + settings = { + perl = { + perlCmd = 'perl', + perlInc = ' ', + fileFilter = { '.pm', '.pl' }, + ignoreDirs = '.git', + }, + }, + filetypes = { 'perl' }, + root_markers = { '.git' }, +}) + +vim.lsp.enable('perlls') diff --git a/.config/nvim/lua/lsp/perlnavigator.lua b/.config/nvim/lua/lsp/perlnavigator.lua deleted file mode 100644 index 1ba0024..0000000 --- a/.config/nvim/lua/lsp/perlnavigator.lua +++ /dev/null @@ -1,16 +0,0 @@ -vim.lsp.config('perlnavigator', { - cmd = {'perlnavigator'}, - filetypes = {'perl'}, - root_markers = {'.git'}, - settings = { - perlnavigator = { - perlPath = 'perl', - enableWarnings = true, - perltidyProfile = '', - perlcriticProfile = '', - perlcriticEnabled = true, - } - } -}) - -vim.lsp.enable('perlnavigator') diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 843180b..37acce6 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -113,7 +113,37 @@ lfcd () { [ -d "$dir" ] && [ "$dir" != "$(pwd)" ] && cd "$dir" fi } -bindkey -s '^o' '^ulfcd\n' +nnncd () +{ + # Block nesting of nnn in subshells + [ "${NNNLVL:-0}" -eq 0 ] || { + echo "nnn is already running" + return + } + + # The behaviour is set to cd on quit (nnn checks if NNN_TMPFILE is set) + # If NNN_TMPFILE is set to a custom path, it must be exported for nnn to + # see. To cd on quit only on ^G, remove the "export" and make sure not to + # use a custom path, i.e. set NNN_TMPFILE *exactly* as follows: + # NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd" + export NNN_TMPFILE="/tmp/nnn_lastd" + + # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn + # stty start undef + # stty stop undef + # stty lwrap undef + # stty lnext undef + + # The command builtin allows one to alias nnn to n, if desired, without + # making an infinitely recursive alias + command nnn "$@" + + [ ! -f "$NNN_TMPFILE" ] || { + . "$NNN_TMPFILE" + rm -f -- "$NNN_TMPFILE" > /dev/null + } +} +bindkey -s '^o' '^unnncd\n' bindkey -v "^ " globalias bindkey -v " " magic-space diff --git a/.config/zsh/alias.zsh b/.config/zsh/alias.zsh index 63b8be9..41b090c 100644 --- a/.config/zsh/alias.zsh +++ b/.config/zsh/alias.zsh @@ -60,6 +60,7 @@ alias \ irssi='irssi --config="$XDG_CONFIG_HOME"/irssi/config --home="$XDG_DATA_HOME"/irssi' \ irc='irssi' \ free='freecolor' \ + n='nnn' \ gt='gpg-tui' \ lg='lazygit' \ tf='terraform' \ |