summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.config/env8
-rw-r--r--.config/lf/lfrc1
-rw-r--r--.config/mimeapps.list38
-rw-r--r--.config/mpv/mpv.conf2
-rwxr-xr-x.config/nnn/plugins/joe_fzfcd20
-rw-r--r--.config/nvim/init.lua2
-rw-r--r--.config/nvim/lua/config/lazy.lua2
-rw-r--r--.config/nvim/lua/lsp/perlls.lua23
-rw-r--r--.config/nvim/lua/lsp/perlnavigator.lua16
-rw-r--r--.config/x11/xinitrc19
-rw-r--r--.config/zsh/.zshrc32
-rw-r--r--.config/zsh/alias.zsh19
-rw-r--r--.config/zsh/plugins.zsh2
-rwxr-xr-x.local/bin/dmapps2
-rwxr-xr-x.local/bin/dmlog2
-rwxr-xr-x.local/bin/scr12
-rwxr-xr-x.local/bin/scr227
-rwxr-xr-x.local/bin/scr32
18 files changed, 142 insertions, 77 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/lf/lfrc b/.config/lf/lfrc
index 60a0964..5565b0b 100644
--- a/.config/lf/lfrc
+++ b/.config/lf/lfrc
@@ -68,6 +68,7 @@ map <c-s> $$SHELL
map <c-n> push :mkdir<space>
map <f-7> push :mkdir<space>
map <c-r> reload
+map <c-g> clear
cmap <c-g> cmd-escape
map x !$f
map X $$f
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/mpv/mpv.conf b/.config/mpv/mpv.conf
index d1f0c60..749a32a 100644
--- a/.config/mpv/mpv.conf
+++ b/.config/mpv/mpv.conf
@@ -1,5 +1,5 @@
# video-sync=display-resample
-vo=x11
+vo=gpu
osc=yes
cache=yes
demuxer-max-bytes=4GiB
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/config/lazy.lua b/.config/nvim/lua/config/lazy.lua
index 5041634..2b8d66d 100644
--- a/.config/nvim/lua/config/lazy.lua
+++ b/.config/nvim/lua/config/lazy.lua
@@ -83,7 +83,7 @@ require('lazy').setup({
default_overlength = 80,
grace_length = 1,
highlight_to_eol = true,
- disable_ft = { 'qf', 'help', 'man', 'checkhealth', 'lazy', 'packer', 'NvimTree', 'Telescope', 'WhichKey', 'text', 'csv', 'lua', 'gosum', '' }
+ disable_ft = { 'qf', 'help', 'man', 'checkhealth', 'lazy', 'packer', 'NvimTree', 'Telescope', 'WhichKey', 'text', 'csv', 'lua', 'gosum', 'sh', '' }
}
end
},
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/x11/xinitrc b/.config/x11/xinitrc
index 8c23f02..8d033d2 100644
--- a/.config/x11/xinitrc
+++ b/.config/x11/xinitrc
@@ -63,14 +63,15 @@ start_apps() {
}
export LANG='en_US.UTF-8'
-[ $host = "mother" ] && xrandr \
- --output HDMI-0 --mode 1920x1080 --pos 2560x0 --rotate normal \
- --output DP-0 --off \
- --output DP-1 --off \
- --output DP-2 --off \
- --output DP-3 --off \
- --output DP-4 --primary --mode 2560x1440 --rate 180 --pos 0x0 --rotate normal \
- --output DP-5 --off
+[ $host = "mother" ] && "$HOME"/.local/bin/scr2
+# [ $host = "mother" ] && xrandr \
+# --output HDMI-0 --mode 1920x1080 --pos 2560x0 --rotate normal \
+# --output DP-0 --off \
+# --output DP-1 --off \
+# --output DP-2 --off \
+# --output DP-3 --off \
+# --output DP-4 --primary --mode 2560x1440 --rate 180 --pos 0x0 --rotate normal \
+# --output DP-5 --off
[ $host = "po-rbo" ] && xrandr \
--output eDP-1 --mode 1920x1200 --pos 0x0 --rotate normal \
--output HDMI-1 --primary --mode 2560x1440 --pos 1920x0 --rotate normal \
@@ -79,7 +80,7 @@ export LANG='en_US.UTF-8'
--output VIRTUAL-1 --off
dunst_shit
-startif picom
+[ $host = "po-rbo" ] && startif picom
pgrep $mpd >/dev/null || $mpd >/dev/null 2>&1
xset s off
xset -dpms
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 4b01038..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' \
@@ -158,24 +159,6 @@ de() {
$VISUAL $sc
cd $p
}
-eebin() {
- file=$(find "$HOME"/.local/bin -type f | fzf)
- [ $? -ne 0 ] && return
- bsdsetsid emacsclient -c "$file"
- kill -9 "$(ps -p $$ -oppid=)"
-}
-eeconf() {
- file=$(find "$HOME"/.config -type f | fzf)
- [ $? -ne 0 ] && return
- bsdsetsid emacsclient -c "$file"
- kill -9 "$(ps -p $$ -oppid=)"
-}
-ee() {
- file=$(find . -type f | fzf)
- [ $? -ne 0 ] && return
- bsdsetsid emacsclient -c "$file"
- kill -9 "$(ps -p $$ -oppid=)"
-}
pa() {
if [ -d $HOME/.local/packs ] && cd $HOME/.local/packs || return 1
dir=$(\ls $HOME/.local/packs | fzf)
diff --git a/.config/zsh/plugins.zsh b/.config/zsh/plugins.zsh
index 9e13701..77bffa1 100644
--- a/.config/zsh/plugins.zsh
+++ b/.config/zsh/plugins.zsh
@@ -13,4 +13,4 @@
source $HOME/.local/packs/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh >/dev/null
source $HOME/.local/packs/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh >/dev/null
-[[ -r "/usr/share/z/z.sh" ]] && source /usr/share/z/z.sh
+# [[ -r "/usr/share/z/z.sh" ]] && source /usr/share/z/z.sh
diff --git a/.local/bin/dmapps b/.local/bin/dmapps
index ccefc76..0ce4c81 100755
--- a/.local/bin/dmapps
+++ b/.local/bin/dmapps
@@ -41,6 +41,7 @@ use constant PROG_LIST => "" .
"Liferea" . "\n" .
"HexChat" . "\n" .
"--- Audio ---" . "\n" .
+"Ardour" . "\n" .
"REAPER" . "\n" .
"Audacity" . "\n" .
"Pulse Control Panel" . "\n" .
@@ -104,6 +105,7 @@ sub run
exec("signal-desktop") if $action =~ "Signal";
exec("liferea") if $action =~ "Liferea";
exec("hexchat") if $action =~ "HexChat";
+ exec("ardour8") if $action =~ "Ardour";
exec("reaper") if $action =~ "REAPER";
exec("audacity") if $action =~ "Audacity";
exec("pavucontrol") if $action =~ "Pulse Control Panel";
diff --git a/.local/bin/dmlog b/.local/bin/dmlog
index 7264d75..9244cbf 100755
--- a/.local/bin/dmlog
+++ b/.local/bin/dmlog
@@ -90,6 +90,7 @@ sub action
);
sleep 2;
if (HOSTNAME eq 'mother') {
+ system('umount', '-f', '/var/dev/ceres');
exec(LOGINCTL_PATH, 'suspend');
}
elsif (HOSTNAME eq 'po-rbo') {
@@ -109,6 +110,7 @@ sub action
elsif ($var eq ${+LIST}[3]) {
if (confirm($var, $color) == 1) {
if (HOSTNAME eq 'mother') {
+ system('umount', '-f', '/var/dev/ceres');
exec(LOGINCTL_PATH, 'reboot');
}
elsif (HOSTNAME eq 'po-rbo') {
diff --git a/.local/bin/scr1 b/.local/bin/scr1
index 9e94aef..4c41065 100755
--- a/.local/bin/scr1
+++ b/.local/bin/scr1
@@ -6,7 +6,7 @@ xrandr \
--output DP-1 --off \
--output DP-2 --off \
--output DP-3 --off \
- --output DP-4 --primary --mode 2560x1440 --rate 180 --pos 0x0 --rotate normal \
+ --output DP-4 --primary --mode 2560x1440 --rate 144 --pos 0x0 --rotate normal \
--output DP-5 --off
setwp "$HOME"/pics/wp.png
diff --git a/.local/bin/scr2 b/.local/bin/scr2
index ea823c8..b0e7063 100755
--- a/.local/bin/scr2
+++ b/.local/bin/scr2
@@ -1,12 +1,23 @@
#!/bin/sh
-xrandr \
- --output HDMI-0 --mode 1920x1080 --pos 2560x0 --rotate normal \
- --output DP-0 --off \
- --output DP-1 --off \
- --output DP-2 --off \
- --output DP-3 --off \
- --output DP-4 --primary --mode 2560x1440 --rate 180 --pos 0x0 --rotate normal \
- --output DP-5 --off
+if [ $1 == "low" ]; then
+ xrandr \
+ --output HDMI-0 --mode 1920x1080 --pos 1920x0 --rotate normal \
+ --output DP-0 --off \
+ --output DP-1 --off \
+ --output DP-2 --off \
+ --output DP-3 --off \
+ --output DP-4 --primary --mode 1920x1080 --rate 180 --pos 0x0 --rotate normal \
+ --output DP-5 --off
+else
+ xrandr \
+ --output HDMI-0 --mode 1920x1080 --pos 2560x0 --rotate normal \
+ --output DP-0 --off \
+ --output DP-1 --off \
+ --output DP-2 --off \
+ --output DP-3 --off \
+ --output DP-4 --primary --mode 2560x1440 --rate 144 --pos 0x0 --rotate normal \
+ --output DP-5 --off
+fi
setwp "$HOME"/pics/wp.png
diff --git a/.local/bin/scr3 b/.local/bin/scr3
index 1724e90..a035fb0 100755
--- a/.local/bin/scr3
+++ b/.local/bin/scr3
@@ -6,7 +6,7 @@ xrandr \
--output DP-1 --off \
--output DP-2 --mode 1680x1050 --pos 0x0 --rotate normal \
--output DP-3 --off \
- --output DP-4 --primary --mode 2560x1440 --rate 180 --pos 1680x0 --rotate normal \
+ --output DP-4 --primary --mode 2560x1440 --rate 144 --pos 1680x0 --rotate normal \
--output DP-5 --off
powered by cgit. Copyright (c) 2020-2023, Joe - this website does not use cookies or php or js