From a66988a6e884273b13a12a85ab80dd08e8a7ce4a Mon Sep 17 00:00:00 2001 From: Benjamin Chausse Date: Fri, 13 Oct 2023 10:43:49 -0400 Subject: Lots of changes --- .Xresources##hostname.intern | 2 +- .config/aliasrc | 9 - .config/fontconfig/fonts.conf | 4 +- .config/lf/cleaner | 4 + .config/lf/icons | 112 ++++++++++ .config/lf/lfrc | 164 ++++++++++++++ .config/lf/scope | 56 +++++ .config/nvim/UltiSnips/mail.snippets | 20 -- .config/nvim/after/plugin/colors.lua | 8 - .config/nvim/after/plugin/fugitive.lua | 1 - .config/nvim/after/plugin/harpoon.lua | 10 - .config/nvim/after/plugin/lsp.lua | 4 - .config/nvim/after/plugin/orgmode.lua | 20 -- .config/nvim/after/plugin/telescope.lua | 7 - .config/nvim/after/plugin/treesitter.lua | 34 --- .config/nvim/after/plugin/undotree.lua | 1 - .config/nvim/ftplugin/csv.vim | 0 .config/nvim/ftplugin/go.vim | 17 -- .config/nvim/ftplugin/python.vim | 0 .config/nvim/ftplugin/r.vim | 4 - .config/nvim/ftplugin/rmd.vim | 6 - .config/nvim/ftplugin/rnoweb.vim | 8 - .config/nvim/ftplugin/tex.vim | 0 .config/nvim/init.lua | 3 +- .config/nvim/init.vim | 244 --------------------- .config/nvim/lua/ben/init.lua | 3 - .config/nvim/lua/ben/packer.lua | 43 ---- .config/nvim/lua/ben/remap.lua | 2 - .config/shortcutrc | 11 +- .config/sxhkd/sxhkdrc | 7 +- .local/bin/crontog | 5 - .local/bin/makewall | 28 +++ .local/bin/remaps | 2 - .local/bin/shortcutgen | 2 + .../fonts/ApercuMono/FontsFree-Net-ApercuMono.ttf | Bin 26076 -> 0 bytes .../Font Awesome 5 Brands-Regular-400.otf | Bin 475468 -> 0 bytes .../Font Awesome 5 Free-Regular-400.otf | Bin 97112 -> 0 bytes .../FontAwesome/Font Awesome 5 Free-Solid-900.otf | Bin 591244 -> 0 bytes .../LigLinLibertineMONerdFont-Mono.otf | Bin 2228592 -> 0 bytes ...us Material Design Icons Plus Weather Icons.otf | Bin 2409036 -> 0 bytes ...us Material Design Icons Plus Weather Icons.otf | Bin 2427180 -> 0 bytes ...us Material Design Icons Plus Weather Icons.otf | Bin 2171272 -> 0 bytes ...us Material Design Icons Plus Weather Icons.otf | Bin 2366768 -> 0 bytes ...us Material Design Icons Plus Weather Icons.otf | Bin 2444348 -> 0 bytes ...us Material Design Icons Plus Weather Icons.otf | Bin 2463516 -> 0 bytes ...us Material Design Icons Plus Weather Icons.otf | Bin 2549016 -> 0 bytes ...us Material Design Icons Plus Weather Icons.otf | Bin 2427508 -> 0 bytes ...us Material Design Icons Plus Weather Icons.otf | Bin 2376724 -> 0 bytes .profile | 9 +- .xinitrc##hostname.intern | 4 +- .zshrc | 15 +- 51 files changed, 403 insertions(+), 466 deletions(-) create mode 100755 .config/lf/cleaner create mode 100755 .config/lf/icons create mode 100755 .config/lf/lfrc create mode 100755 .config/lf/scope delete mode 100644 .config/nvim/UltiSnips/mail.snippets delete mode 100644 .config/nvim/after/plugin/colors.lua delete mode 100644 .config/nvim/after/plugin/fugitive.lua delete mode 100644 .config/nvim/after/plugin/harpoon.lua delete mode 100644 .config/nvim/after/plugin/lsp.lua delete mode 100644 .config/nvim/after/plugin/orgmode.lua delete mode 100644 .config/nvim/after/plugin/telescope.lua delete mode 100644 .config/nvim/after/plugin/treesitter.lua delete mode 100644 .config/nvim/after/plugin/undotree.lua delete mode 100644 .config/nvim/ftplugin/csv.vim delete mode 100644 .config/nvim/ftplugin/go.vim delete mode 100644 .config/nvim/ftplugin/python.vim delete mode 100644 .config/nvim/ftplugin/r.vim delete mode 100644 .config/nvim/ftplugin/rmd.vim delete mode 100644 .config/nvim/ftplugin/rnoweb.vim delete mode 100644 .config/nvim/ftplugin/tex.vim delete mode 100755 .config/nvim/init.vim delete mode 100644 .config/nvim/lua/ben/init.lua delete mode 100644 .config/nvim/lua/ben/packer.lua delete mode 100644 .config/nvim/lua/ben/remap.lua delete mode 100755 .local/bin/crontog create mode 100755 .local/bin/makewall delete mode 100644 .local/share/fonts/ApercuMono/FontsFree-Net-ApercuMono.ttf delete mode 100644 .local/share/fonts/FontAwesome/Font Awesome 5 Brands-Regular-400.otf delete mode 100644 .local/share/fonts/FontAwesome/Font Awesome 5 Free-Regular-400.otf delete mode 100644 .local/share/fonts/FontAwesome/Font Awesome 5 Free-Solid-900.otf delete mode 100644 .local/share/fonts/linux-libertine/LigLinLibertineMONerdFont-Mono.otf delete mode 100644 .local/share/fonts/linux-libertine/Linux Libertine Display O Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf delete mode 100644 .local/share/fonts/linux-libertine/Linux Libertine Initials O Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf delete mode 100644 .local/share/fonts/linux-libertine/Linux Libertine Mono O Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf delete mode 100644 .local/share/fonts/linux-libertine/Linux Libertine O Bold Italic Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf delete mode 100644 .local/share/fonts/linux-libertine/Linux Libertine O Bold Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf delete mode 100644 .local/share/fonts/linux-libertine/Linux Libertine O Italic Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf delete mode 100644 .local/share/fonts/linux-libertine/Linux Libertine O Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf delete mode 100644 .local/share/fonts/linux-libertine/Linux Libertine O Semibold Italic Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf delete mode 100644 .local/share/fonts/linux-libertine/Linux Libertine O Semibold Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf diff --git a/.Xresources##hostname.intern b/.Xresources##hostname.intern index d11ada1..c14fc72 100644 --- a/.Xresources##hostname.intern +++ b/.Xresources##hostname.intern @@ -42,7 +42,7 @@ ! No support for bold coloring; would be #626a73. !other -*.alpha: 0.69 +*.alpha: 0.80 Sxiv.background: #111A1F Sxiv.foreground: #9B9257 diff --git a/.config/aliasrc b/.config/aliasrc index 60ba839..2f68613 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -20,24 +20,15 @@ | cdd | cd .. | | e | $EDITOR | | ew | nvim ./main.rnw | -| fu | fuck | -| f | vicd | | g | git | | goobook | goobook -c $HOME/.config/goobook/config | | gor | go run *.go | | info | info --vi-keys | | mmi | make && sudo make install && [ -f config.def.h ] && rm config.h | -| op | e main.rnw | | R | R -q | -| td | todotxt-machine -c ~/.config/todotxt-machine/config | | tmcd | tmux attach-session -t | | tmdd | tmux kill-session -t | | tmls | tmux list-sessions | -| vc | expressvpn connect && dwmbar | -| vd | expressvpn disconnect && dwmbar | -| vm | expressvpn connect camo && dwmbar | -| vpn | expressvpn | -| vs | expressvpn connect smart && dwmbar | | xx | chmod +x | | yadog | yadm log --all --decorate --oneline --graph | |---------+-----------------------------------------------------------------| diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 0025c36..320a8ac 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -28,13 +28,15 @@ monospace + Vulf Mono + Cousine Nerd Font + GoMono Nerd Font Lig LinLibertineMO Nerd Font Lig Linux Libertine Mono O Linux Libertine Mono O Brutalist Mono Cartograph Mono CF Maison Mono - Fira Code Liberation Mono diff --git a/.config/lf/cleaner b/.config/lf/cleaner new file mode 100755 index 0000000..a184d84 --- /dev/null +++ b/.config/lf/cleaner @@ -0,0 +1,4 @@ +#!/bin/sh +if [ -n "$FIFO_UEBERZUG" ]; then + printf '{"action": "remove", "identifier": "PREVIEW"}\n' > "$FIFO_UEBERZUG" +fi diff --git a/.config/lf/icons b/.config/lf/icons new file mode 100755 index 0000000..567fa8d --- /dev/null +++ b/.config/lf/icons @@ -0,0 +1,112 @@ +di 󰉋 +fi 󰈔 +tw  +ow 󰉋 +ln 󱅷 +or  +ex 󱁼 +*.yml 󱁻 +*.yaml 󱁻 +*.conf 󱁻 +*.go  +*.org  +*.sh  +*.o 󱉟 +*.c  +*.h  +*.cpp  +*.hpp  +*.vim  +*.txt 󰏪 +*.mom 󰏪 +*.me 󰏪 +*.ms 󰏪 +*.avif  +*.png  +*.webp  +*.ico  +*.jpg  +*.jpe  +*.jpeg  +*.gif  +*.svg 󰕠 +*.tif  +*.tiff  +*.xcf 󱠓 +*.html 󰖟 +*.xml 󰗀 +*.gpg  +*.css  +*.pdf  +*.djvu  +*.epub  +*.csv 󰱿 +*.xlsx 󰱿 +*.aux 󱉟 +*.lof 󱉟 +*.log 󱉟 +*.lot 󱉟 +*.fls 󱉟 +*.out 󱉟 +*.toc 󱉟 +*.fmt 󱉟 +*.fot 󱉟 +*.cb 󱉟 +*.cb2 󱉟 +.*.lb 󱉟 +*.fdb_latexmk 󱉟 +*.synctex 󱉟 +*.synctex(busy) 󱉟 +*.synctex.gz 󱉟 +*.synctex.gz(busy) 󱉟 +*.pdfsync 󱉟 +*.tex 󱛉 +*.Rnw 󱛉 +*.rnw 󱛉 +*.md 󰽛 +*.r  +*.R  +*.rmd  +*.Rmd  +*.m 󰈕 +*.mp3  +*.opus  +*.ogg  +*.m4a  +*.flac 󰽰 +*.wav 󰽰 +*.mkv 󰈫 +*.mp4 󰈫 +*.webm 󰈫 +*.mpeg 󰈫 +*.avi 󰈫 +*.mov 󰈫 +*.mpg 󰈫 +*.wmv 󰈫 +*.m4b 󰈫 +*.flv 󰈫 +*.zip  +*.rar  +*.7z  +*.tar  +*.z64  +*.v64  +*.n64  +*.gba  +*.nes  +*.gdi  +*.1  +*.nfo  +*.info  +*.log  +*.iso  +*.img  +*.bib 󰑴 +*.ged 👪 +*.part 󰴔 +*.torrent 󰻈 +*.jar  +*.java  +*.wiki  +*.sql 󱙋 +*.lua  diff --git a/.config/lf/lfrc b/.config/lf/lfrc new file mode 100755 index 0000000..4c36a01 --- /dev/null +++ b/.config/lf/lfrc @@ -0,0 +1,164 @@ +# Luke's lf settings + + +# Note on Image Previews +# For those wanting image previews, like this system, there are four steps to +# set it up. These are done automatically for LARBS users, but I will state +# them here for others doing it manually. +# +# 1. ueberzug must be installed. +# 2. The scope file (~/.config/lf/scope for me), must have a command similar to +# mine to generate ueberzug images. +# 3. A `set cleaner` line as below is a cleaner script. +# 4. lf should be started through a wrapper script (~/.local/bin/lfub for me) +# that creates the environment for ueberzug. This command can be be aliased +# in your shellrc (`alias lf="lfub") or if set to a binding, should be +# called directly instead of normal lf. + +# Basic vars +set shellopts '-eu' +set ifs "\n" +set scrolloff 10 +set icons +set period 1 +set hiddenfiles ".*:*.aux:*.log:*.bbl:*.bcf:*.blg:*.run.xml" +set cleaner '~/.config/lf/cleaner' +set previewer '~/.config/lf/scope' +set autoquit true + +# cmds/functions +cmd open ${{ + case $(file --mime-type "$(readlink -f $f)" -b) in + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet) localc $fx ;; + image/vnd.djvu|application/pdf|application/octet-stream|application/postscript) setsid -f zathura $fx >/dev/null 2>&1 ;; + text/*|application/json|inode/x-empty|application/x-subrip) $EDITOR $fx;; + image/x-xcf) setsid -f gimp $f >/dev/null 2>&1 ;; + image/svg+xml) display -- $f ;; + image/*) rotdir $f | grep -i "\.\(png\|jpg\|jpeg\|gif\|webp\|avif\|tif\|ico\)\(_large\)*$" | + setsid -f nsxiv -aio 2>/dev/null | while read -r file; do + [ -z "$file" ] && continue + lf -remote "send select \"$file\"" + lf -remote "send toggle" + done & + ;; + audio/*|video/x-ms-asf) mpv --audio-display=no $f ;; + video/*) setsid -f mpv $f -quiet >/dev/null 2>&1 ;; + application/pdf|application/vnd.djvu|application/epub*) setsid -f zathura $fx >/dev/null 2>&1 ;; + application/pgp-encrypted) $EDITOR $fx ;; + application/vnd.openxmlformats-officedocument.wordprocessingml.document|application/vnd.oasis.opendocument.text|application/vnd.openxmlformats-officedocument.spreadsheetml.sheet|application/octet-stream|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.openxmlformats-officedocument.presentationml.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.presentation|application/vnd.ms-powerpoint|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.formula|application/vnd.oasis.opendocument.database) setsid -f libreoffice $fx >/dev/null 2>&1 ;; + *) for f in $fx; do setsid -f $OPENER $f >/dev/null 2>&1; done;; + esac +}} + +cmd mkdir $mkdir -p "$(echo $* | tr ' ' '\ ')" + +cmd extract ${{ + clear; tput cup $(($(tput lines)/3)); tput bold + set -f + printf "%s\n\t" "$fx" + printf "extract?[y/N]" + read ans + [ $ans = "y" ] && aunpack $fx +}} + +cmd delete ${{ + clear; tput cup $(($(tput lines)/3)); tput bold + set -f + printf "%s\n\t" "$fx" + printf "delete?[y/N]" + read ans + [ $ans = "y" ] && rm -rf -- $fx +}} + +cmd moveto ${{ + clear; tput cup $(($(tput lines)/3)); tput bold + set -f + clear; echo "Move to where?" + dest="$(sed -e 's/\s*#.*//' -e '/^$/d' -e 's/^\S*\s*//' ${XDG_CONFIG_HOME:-$HOME/.config}/shell/bm-dirs | fzf | sed 's|~|$HOME|')" && + for x in $fx; do + eval mv -iv \"$x\" \"$dest\" + done && + notify-send "🚚 File(s) moved." "File(s) moved to $dest." +}} + +cmd copyto ${{ + clear; tput cup $(($(tput lines)/3)); tput bold + set -f + clear; echo "Copy to where?" + dest="$(sed -e 's/\s*#.*//' -e '/^$/d' -e 's/^\S*\s*//' ${XDG_CONFIG_HOME:-$HOME/.config}/shell/bm-dirs | fzf | sed 's|~|$HOME|')" && + for x in $fx; do + eval cp -ivr \"$x\" \"$dest\" + done && + notify-send "📋 File(s) copied." "File(s) copies to $dest." +}} + +cmd setbg "$1" + +cmd bulkrename ${{ + tmpfile_old="$(mktemp)" + tmpfile_new="$(mktemp)" + + [ -n "$fs" ] && fs=$(basename -a $fs) || fs=$(ls) + + echo "$fs" > "$tmpfile_old" + echo "$fs" > "$tmpfile_new" + $EDITOR "$tmpfile_new" + + [ "$(wc -l < "$tmpfile_old")" -eq "$(wc -l < "$tmpfile_new")" ] || { rm -f "$tmpfile_old" "$tmpfile_new"; exit 1; } + + paste "$tmpfile_old" "$tmpfile_new" | while IFS="$(printf '\t')" read -r src dst + do + [ "$src" = "$dst" ] || [ -e "$dst" ] || mv -- "$src" "$dst" + done + + rm -f "$tmpfile_old" "$tmpfile_new" + lf -remote "send $id unselect" +}} + +# Bindings +map $lf -remote "send $id select \"$(fzf)\"" +map J $lf -remote "send $id cd $(sed -e 's/\s*#.*//' -e '/^$/d' -e 's/^\S*\s*//' ${XDG_CONFIG_HOME:-$HOME/.config}/shell/bm-dirs | fzf)" +map D delete +map push :mkdir +map reload +map set hidden! +map shell +map x $$f +map X !$f +map o &mimeopen "$f" +map O $mimeopen --ask "$f" + +map A :rename; cmd-end # at the very end +map c push A # new rename +map I :rename; cmd-home # at the very beginning +map i :rename # before extension +map a :rename; cmd-right # after extension +map B bulkrename +map b $setbg $f + +map down +map up +map V push :!nvim + +map W $setsid -f $TERMINAL >/dev/null 2>&1 + +map Y $printf "%s" "$fx" | xclip -selection clipboard + +# Source Bookmarks +# source "~/.config/lf/shortcutrc" + +# TODO: Automate this +map gcf cd ~/.config +map gdl cd ~/Downloads +map gwp cd ~/Pictures/wallpapers +map gdb cd ~/Dropbox +map gvi cd ~/.config/nvim +map gvdi cd ~/Workspace/vdi +map gws cd ~/Workspace +map gwb cd ~/Workspace/website +map gsc cd ~/.local/bin +map gcp cd ~/.local/src +map gsx cd ~/.config/sxhkd +map gimg cd ~/Dropbox/A/Personnal/Photos/unsorted +map gsf cd ~/Dropbox/A/scholar/sherbrooke/s3 +map gcmp cd ~/.local/src diff --git a/.config/lf/scope b/.config/lf/scope new file mode 100755 index 0000000..cc55669 --- /dev/null +++ b/.config/lf/scope @@ -0,0 +1,56 @@ +#!/bin/sh + +# File preview handler for lf. + +set -C -f +IFS="$(printf '%b_' '\n')"; IFS="${IFS%_}" + +image() { + if [ -f "$1" ] && [ -n "$DISPLAY" ] && [ -z "$WAYLAND_DISPLAY" ] && command -V ueberzug >/dev/null 2>&1; then + printf '{"action": "add", "identifier": "PREVIEW", "x": "%s", "y": "%s", "width": "%s", "height": "%s", "scaler": "contain", "path": "%s"}\n' "$4" "$5" "$(($2-1))" "$(($3-1))" "$1" > "$FIFO_UEBERZUG" + else + mediainfo "$6" + fi +} + +ifub() { + [ -n "$DISPLAY" ] && [ -z "$WAYLAND_DISPLAY" ] && command -V ueberzug >/dev/null 2>&1 +} + +# Note that the cache file name is a function of file information, meaning if +# an image appears in multiple places across the machine, it will not have to +# be regenerated once seen. + +case "$(file --dereference --brief --mime-type -- "$1")" in + image/avif) CACHE="${XDG_CACHE_HOME:-$HOME/.cache}/lf/thumb.$(stat --printf '%n\0%i\0%F\0%s\0%W\0%Y' -- "$(readlink -f "$1")" | sha256sum | cut -d' ' -f1)" + [ ! -f "$CACHE" ] && convert "$1" "$CACHE.jpg" + image "$CACHE.jpg" "$2" "$3" "$4" "$5" "$1" ;; + image/vnd.djvu) + CACHE="${XDG_CACHE_HOME:-$HOME/.cache}/lf/thumb.$(stat --printf '%n\0%i\0%F\0%s\0%W\0%Y' -- "$(readlink -f "$1")" | sha256sum | cut -d' ' -f1)" + [ ! -f "$CACHE" ] && djvused "$1" -e 'select 1; save-page-with /dev/stdout' | convert -density 200 - "$CACHE.jpg" > /dev/null 2>&1 + image "$CACHE.jpg" "$2" "$3" "$4" "$5" "$1" ;; + image/*) image "$1" "$2" "$3" "$4" "$5" "$1" ;; + text/html) lynx -width="$4" -display_charset=utf-8 -dump "$1" ;; + text/troff) man ./ "$1" | col -b ;; + text/* | */xml | application/json | application/x-ndjson) bat --terminal-width "$(($4-2))" -f "$1" ;; + audio/* | application/octet-stream) mediainfo "$1" || exit 1 ;; + video/* ) + CACHE="${XDG_CACHE_HOME:-$HOME/.cache}/lf/thumb.$(stat --printf '%n\0%i\0%F\0%s\0%W\0%Y' -- "$(readlink -f "$1")" | sha256sum | cut -d' ' -f1)" + [ ! -f "$CACHE" ] && ffmpegthumbnailer -i "$1" -o "$CACHE" -s 0 + image "$CACHE" "$2" "$3" "$4" "$5" "$1" + ;; + */pdf) + CACHE="${XDG_CACHE_HOME:-$HOME/.cache}/lf/thumb.$(stat --printf '%n\0%i\0%F\0%s\0%W\0%Y' -- "$(readlink -f "$1")" | sha256sum | cut -d' ' -f1)" + [ ! -f "$CACHE.jpg" ] && pdftoppm -jpeg -f 1 -singlefile "$1" "$CACHE" + image "$CACHE.jpg" "$2" "$3" "$4" "$5" "$1" + ;; + */epub+zip|*/mobi*) + CACHE="${XDG_CACHE_HOME:-$HOME/.cache}/lf/thumb.$(stat --printf '%n\0%i\0%F\0%s\0%W\0%Y' -- "$(readlink -f "$1")" | sha256sum | cut -d' ' -f1)" + [ ! -f "$CACHE.jpg" ] && gnome-epub-thumbnailer "$1" "$CACHE.jpg" + image "$CACHE.jpg" "$2" "$3" "$4" "$5" "$1" + ;; + application/*zip) atool --list -- "$1" ;; + *opendocument*) odt2txt "$1" ;; + application/pgp-encrypted) gpg -d -- "$1" ;; +esac +exit 1 diff --git a/.config/nvim/UltiSnips/mail.snippets b/.config/nvim/UltiSnips/mail.snippets deleted file mode 100644 index 352dd31..0000000 --- a/.config/nvim/UltiSnips/mail.snippets +++ /dev/null @@ -1,20 +0,0 @@ -snippet sig-en "English email signature" --Benjamin Chausse - ------------------ -~Website: chausse.xyz -~GPG Key: chausse.xyz/library/chaussebenjamin.asc -~Signal: (+1)-438-395-4349 ------------------ -endsnippet - -snippet sig-fr "Signature de courriel en français" --Benjamin Chausse - ------------------ -~Site web: chausse.xyz -~Clé gpg: chausse.xyz/library/chaussebenjamin.asc -~Signal: (+1)-438-395-4349 ------------------ -endsnippet - diff --git a/.config/nvim/after/plugin/colors.lua b/.config/nvim/after/plugin/colors.lua deleted file mode 100644 index 33e9aaf..0000000 --- a/.config/nvim/after/plugin/colors.lua +++ /dev/null @@ -1,8 +0,0 @@ -function ColorMyPencils(color) - color = color or "everforest" - vim.cmd.colorscheme(color) - vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) - vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) -end - -ColorMyPencils() diff --git a/.config/nvim/after/plugin/fugitive.lua b/.config/nvim/after/plugin/fugitive.lua deleted file mode 100644 index 80c9070..0000000 --- a/.config/nvim/after/plugin/fugitive.lua +++ /dev/null @@ -1 +0,0 @@ -vim.keymap.set("n", "gs", vim.cmd.Git) diff --git a/.config/nvim/after/plugin/harpoon.lua b/.config/nvim/after/plugin/harpoon.lua deleted file mode 100644 index eed35ed..0000000 --- a/.config/nvim/after/plugin/harpoon.lua +++ /dev/null @@ -1,10 +0,0 @@ -local mark = require("harpoon.mark") -local ui = require("harpoon.ui") - -vim.keymap.set("n", "a", mark.add_file) -vim.keymap.set("n", "", ui.toggle_quick_menu) - -vim.keymap.set("n", "", function() ui.nav_file(1) end) -vim.keymap.set("n", "", function() ui.nav_file(2) end) -vim.keymap.set("n", "", function() ui.nav_file(3) end) -vim.keymap.set("n", "", function() ui.nav_file(4) end) diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua deleted file mode 100644 index d39b467..0000000 --- a/.config/nvim/after/plugin/lsp.lua +++ /dev/null @@ -1,4 +0,0 @@ -local lsp = require('lsp-zero') - -lsp.preset("recomended") -lsp.setup() diff --git a/.config/nvim/after/plugin/orgmode.lua b/.config/nvim/after/plugin/orgmode.lua deleted file mode 100644 index d51a4d8..0000000 --- a/.config/nvim/after/plugin/orgmode.lua +++ /dev/null @@ -1,20 +0,0 @@ --- Load custom treesitter grammar for org filetype -require('orgmode').setup_ts_grammar() - --- Treesitter configuration -require('nvim-treesitter.configs').setup { - -- If TS highlights are not enabled at all, or disabled via `disable` prop, - -- highlighting will fallback to default Vim syntax highlighting - highlight = { - enable = true, - -- Required for spellcheck, some LaTex highlights and - -- code block highlights that do not have ts grammar - additional_vim_regex_highlighting = {'org'}, - }, - ensure_installed = {'org'}, -- Or run :TSUpdate org -} - -require('orgmode').setup({ - org_agenda_files = {'~/Dropbox/org/*', '~/my-orgs/**/*'}, - org_default_notes_file = '~/Dropbox/org/refile.org', -}) diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua deleted file mode 100644 index d7b6471..0000000 --- a/.config/nvim/after/plugin/telescope.lua +++ /dev/null @@ -1,7 +0,0 @@ -local builtin = require('telescope.builtin') -vim.keymap.set('n', 'ff', builtin.find_files, {}) -vim.keymap.set('n', 'fg', builtin.git_files, {}) -vim.keymap.set('n', 'fb', builtin.buffers, {}) -vim.keymap.set('n', 'fh', builtin.help_tags, {}) -vim.keymap.set('n', 'fq', builtin.live_grep, {}) - diff --git a/.config/nvim/after/plugin/treesitter.lua b/.config/nvim/after/plugin/treesitter.lua deleted file mode 100644 index c24c5d7..0000000 --- a/.config/nvim/after/plugin/treesitter.lua +++ /dev/null @@ -1,34 +0,0 @@ -require'nvim-treesitter.configs'.setup { - -- A list of parser names, or "all" (the five listed parsers should always be installed) - ensure_installed = { "c", - "lua", - "vim", - "vimdoc", - "query", - "latex", - "bibtex", - "csv", - "diff", - "dockerfile", - "bash", - "org", - "go" - }, - - -- Install parsers synchronously (only applied to `ensure_installed`) - sync_install = false, - - -- Automatically install missing parsers when entering buffer - -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally - auto_install = true, - - highlight = { - enable = true, - - -- Setting this to true will run `:h syntax` and tree-sitter at the same time. - -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). - -- Using this option may slow down your editor, and you may see some duplicate highlights. - -- Instead of true it can also be a list of languages - additional_vim_regex_highlighting = false, - }, -} diff --git a/.config/nvim/after/plugin/undotree.lua b/.config/nvim/after/plugin/undotree.lua deleted file mode 100644 index b6b9276..0000000 --- a/.config/nvim/after/plugin/undotree.lua +++ /dev/null @@ -1 +0,0 @@ -vim.keymap.set("n", "u", vim.cmd.UndotreeToggle) diff --git a/.config/nvim/ftplugin/csv.vim b/.config/nvim/ftplugin/csv.vim deleted file mode 100644 index e69de29..0000000 diff --git a/.config/nvim/ftplugin/go.vim b/.config/nvim/ftplugin/go.vim deleted file mode 100644 index 9d2ab4e..0000000 --- a/.config/nvim/ftplugin/go.vim +++ /dev/null @@ -1,17 +0,0 @@ -" Go deoplete -let g:deoplete#sources#go#gocode_binary = '$GOPATH/bin/gocode' -" GoRun Split Reuse -function! ReuseVimGoTerm(cmd) abort - for w in nvim_list_wins() - if "goterm" == nvim_buf_get_option(nvim_win_get_buf(w), 'filetype') - call nvim_win_close(w, v:true) - break - endif - endfor - execute a:cmd -endfunction -let g:go_term_enabled = 1 -let g:go_term_mode = "silent keepalt rightbelow 35 vsplit" -let g:go_def_reuse_buffer = 1 -autocmd FileType go nmap r :call ReuseVimGoTerm('GoRun') - diff --git a/.config/nvim/ftplugin/python.vim b/.config/nvim/ftplugin/python.vim deleted file mode 100644 index e69de29..0000000 diff --git a/.config/nvim/ftplugin/r.vim b/.config/nvim/ftplugin/r.vim deleted file mode 100644 index 309483b..0000000 --- a/.config/nvim/ftplugin/r.vim +++ /dev/null @@ -1,4 +0,0 @@ -" Nvim-R -let R_rconsole_width = 0 -let R_openpdf = 0 - diff --git a/.config/nvim/ftplugin/rmd.vim b/.config/nvim/ftplugin/rmd.vim deleted file mode 100644 index fae453d..0000000 --- a/.config/nvim/ftplugin/rmd.vim +++ /dev/null @@ -1,6 +0,0 @@ -" Nvim-R -let R_rconsole_width = 0 -let R_openpdf = 0 -au BufWritePost *.rmd silent! :call RWeave("nobib", 1, 1) -au VimLeave *.rmd !texclear % - diff --git a/.config/nvim/ftplugin/rnoweb.vim b/.config/nvim/ftplugin/rnoweb.vim deleted file mode 100644 index f4b7453..0000000 --- a/.config/nvim/ftplugin/rnoweb.vim +++ /dev/null @@ -1,8 +0,0 @@ -autocmd BufEnter * :UltiSnipsAddFiletypes tex.r - -" Nvim-R -let R_rconsole_width = 0 -let R_openpdf = 0 -au BufWritePost *.rnw, silent! :call RWeave("nobib", 1, 1) -au VimLeave *.rnw !texclear % - diff --git a/.config/nvim/ftplugin/tex.vim b/.config/nvim/ftplugin/tex.vim deleted file mode 100644 index e69de29..0000000 diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 32d840c..3465962 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1 +1,2 @@ -require("ben") +require("ben.core") +require("ben.lazy") diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim deleted file mode 100755 index d7d3f0a..0000000 --- a/.config/nvim/init.vim +++ /dev/null @@ -1,244 +0,0 @@ -" _ -" (_) -" __ ___ _ __ ___ _ __ ___ -" \ \ / / | '_ ` _ \| '__/ __| -" \ V /| | | | | | | | | (__ -" \_/ |_|_| |_| |_|_| \___| -" -" - -" Vim Plug {{{ - -" Plug Autoinstall {{{ -if ! filereadable(system('echo -n "${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/plug.vim"')) - echo "Downloading junegunn/vim-plug to manage plugins..." - silent !mkdir -p ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/ - silent !curl "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/plug.vim - autocmd VimEnter * PlugInstall -endif -" }}} - -" Plugins -call plug#begin() -" Bracket Completion -Plug 'jiangmiao/auto-pairs' -" Automated vim bulletpoints -Plug 'dkarter/bullets.vim' -" Vim css hex highlight -Plug 'chrisbra/Colorizer' -" Deoplete -Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } -" LaTeX deoplete -Plug 'hisaknown/deoplete-latex' -" Todoist with vim? -Plug 'romgrk/todoist.nvim', { 'do': ':TodoistInstall' } -" Minimal writing environment -Plug 'junegunn/goyo.vim' -" markdown preview vim -Plug 'iamcco/markdown-preview.nvim' -" Nice markdown formatting -Plug 'godlygeek/tabular', { 'for': 'markdown' } -Plug 'plasticboy/vim-markdown', { 'for': 'markdown' } -" Generate buffers -Plug 'AndrewRadev/bufferize.vim' -" Emmet -Plug 'mattn/emmet-vim', { 'for': [ 'markdown', 'html' ] } -" html preview -Plug 'turbio/bracey.vim', { 'for': [ 'html', 'stylesheet', 'javascript'] } -" My colorscheme -Plug 'ChausseBenjamin/friffle-vim' -" Elly colorscheme -Plug 'ryuta69/elly.vim' -" Vim Fugitive -Plug 'tpope/vim-fugitive' -" Vim-Surround -Plug 'tpope/vim-surround' -" Vim repeat for dot command on vim surround -Plug 'tpope/vim-repeat' -" Vimtex -Plug 'lervag/vimtex', { 'for': ['tex', 'aux', 'bib'] } -" Commentary -Plug 'tpope/vim-commentary' -" Vim snippet manager/tool -Plug 'sirver/UltiSnips' -" Vim snippet library -Plug 'honza/vim-snippets' -" French grammar checker -Plug 'dpelle/vim-Grammalecte' -" All purpose grammar checker -Plug 'dpelle/vim-LanguageTool' -" sxhkd syntax -Plug 'kovetskiy/sxhkd-vim', { 'for': 'sxhkdrc' } -" Google cal inside vim -Plug 'itchyny/calendar.vim' -" Turning vim into an R IDE -Plug 'jalvesaq/Nvim-R', { 'for': [ 'R', 'Rnoweb', 'tex', 'aux', 'bib' ] } -" csv filetype for vim -Plug 'chrisbra/csv.vim' -" Quick highlighting -Plug 'qxxxb/vim-searchhi' -" Split resizing made easy -Plug 'simeji/winresizer' -call plug#end() -" }}} -" Sensible defaults {{{ -" Aesthetics & basics -syntax on -colo friffle -" colorscheme tweaks {{{ -hi Normal guibg=NONE -hi CursorLineNr guibg=NONE -hi Constant guibg=NONE -hi Conceal guibg=NONE -hi Folded guibg=NONE -hi ColorColumn guibg='#738c9c' -hi Todo guibg='#acb3b5' guifg='#340001' -hi Search guifg='#810002' guibg='#738c9c' -" }}} -" weird Goyo behavior fix {{{ -au User GoyoEnter,GoyoLeave hi Normal guibg=NONE -au User GoyoEnter,GoyoLeave hi StatusLineNC guibg=NONE -au User GoyoEnter,GoyoLeave hi StatusLine guibg=NONE -au User GoyoEnter,GoyoLeave hi VertSplit guibg=NONE -" }}} -set tgc " Use my terminal's colors -set lz " Lazy redraw -> Quicker vim -set t_Co=256 " 256 colors -set enc=utf-8 -set wmnu " Display all matching file when we tab complete -set nosc " Don't show the previously typed command -set nu rnu " Ablolute Relative number hybrid -set ru " View column count -set ls=0 " Disable the statusline -set sb spr " Sensible split directions -set ts=2 " A sensible tab width -set shiftwidth=2 " A sensible tab width -set et " Expanding tabs -set foldmethod=marker " vim folding - -" Completion -set path+=** " Provides tab-completion for all file related tasks -set wim=longest,list,full " set completion mode -set runtimepath+=~/.config/nvim/plugged/deoplete.nvim -let g:deoplete#enable_at_startup = 1 - -" Wrapping -set wrap -set lbr - -" Custom semicolon leader -let mapleader=";" -" Tab space for quick commands -nnoremap : - -" Spelling -set complete+=kspell " Better Spell Checking -set spl=fr " French prose - -" Tag Editing -inoremap t <++> -inoremap : /<++>"_c4l - -" Quickly save -nnoremap w :update - -" Logical way to Y ank -nnoremap Y y$ - -" Easily escape terminal mode -tnoremap - -" Split motion -nnoremap h -nnoremap j -nnoremap k -nnoremap l - -" Saving and quitting buffers -nnoremap ZF ZQ -nnoremap w :update - -" Remove trailing white spaces -autocmd BufWritePre * %s/\s\+$//e - -" }}} -" Workflow specific {{{ - -" 'o'pen pdf for the current document -nnoremap o :!opout % -nnoremap c :update \| :!compiler % -nnoremap r :update \| :!compiler % \| :!sage %:r.sagetex.sage && compiler % - -" Auto-enable Goyo for certain filetypes -au filetype mail,todoist Goyo - -" }}} -" Plugin related {{{ - -" Todoist.nvim -let todoist = { -\ 'icons': { -\ 'unchecked': ' ', -\ 'checked': ' ', -\ 'loading': ' ', -\ 'error': ' ', -\ }, -\} - -" Markdown syntax -let g:vim_markdown_strikethrough = 1 -let g:vim_markdown_folding_disabled = 1 -set conceallevel=2 - -" Bufferize -let g:bufferize_command = 'vnew' - -" Bracey -let g:bracey_browser_command = "firefox" - -" Grammalecte -let g:grammalecte_cli_py = "/usr/bin/grammalecte-cli" - -" Calendar.vim -let g:calendar_google_calendar = 1 -let g:calendar_frame = 'default' -source ~/.cache/calendar.vim/credentials.vim - -" Emmet.vim -let g:user_emmet_leader_key=',' - -" Vimtex -" pdf viewer - let g:vimtex_view_general_viewer = 'open' - let g:vimtex_view_general_options = '-a zathura' - let g:tex_flavor = 'latex' -" TOC - nnoremap :VimtexTocToggle -" Underscore errors - let g:tex_no_error=1 - -" Nvim-R -" Folding - let r_syntax_folding = 1 - set foldnestmax=1 - set foldmethod=marker -" Follow colorscheme - let rout_follow_colorscheme = 0 - -" Arduino -let g:arduino_cmd = '/usr/bin/arduino' -let g:arduino_dir = '/usr/share/arduino' - -" Ultisnips -let g:UltiSnipsExpandTrigger="" -let g:UltiSnipsJumpForwardTrigger=";" -let g:UltiSnipsJumpBackwardTrigger=";n" - " If you want :UltiSnipsEdit to split your window. -let g:UltiSnipsEditSplit="vertical" -" Snippet directory -let g:UltiSnipsSnippetDirectories=[$HOME.'/.config/nvim/UltiSnips'] - -" }}} - -" See immediate results when edditing this file -autocmd BufWritePost ~/.config/nvim/init.vim :source % diff --git a/.config/nvim/lua/ben/init.lua b/.config/nvim/lua/ben/init.lua deleted file mode 100644 index f774278..0000000 --- a/.config/nvim/lua/ben/init.lua +++ /dev/null @@ -1,3 +0,0 @@ -require("ben.remap") -require("ben.packer") - diff --git a/.config/nvim/lua/ben/packer.lua b/.config/nvim/lua/ben/packer.lua deleted file mode 100644 index c17f4e2..0000000 --- a/.config/nvim/lua/ben/packer.lua +++ /dev/null @@ -1,43 +0,0 @@ ----Only required if you have packer configured as `opt` -vim.cmd [[packadd packer.nvim]] - -return require('packer').startup(function(use) - -- Packer can manage itself - use 'wbthomason/packer.nvim' - use { - 'nvim-telescope/telescope.nvim', tag = '0.1.3', - -- or , branch = '0.1.x', - requires = { {'nvim-lua/plenary.nvim'} } - } - use({ - 'sainnhe/everforest', - config = function() - vim.cmd('colorscheme everforest') - end - }) - use ('ChausseBenjamin/friffle-vim') - use('nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'}) - use('theprimeagen/harpoon') - use('mbbill/undotree') - use('tpope/vim-fugitive') - use('tpope/vim-surround') - use { - 'VonHeikemen/lsp-zero.nvim', - branch = 'v2.x', - requires = { - -- LSP Support - {'neovim/nvim-lspconfig'}, -- Required - {'williamboman/mason.nvim'}, -- Optional - {'williamboman/mason-lspconfig.nvim'}, -- Optional - -- Autocompletion - {'hrsh7th/nvim-cmp'}, -- Required - {'hrsh7th/cmp-nvim-lsp'}, -- Required - {'L3MON4D3/LuaSnip'}, -- Required - } - } - use {'nvim-treesitter/nvim-treesitter'} - use {'nvim-orgmode/orgmode', config = function() - require('orgmode').setup{} - end} - use ('github/copilot.nvim') -end) diff --git a/.config/nvim/lua/ben/remap.lua b/.config/nvim/lua/ben/remap.lua deleted file mode 100644 index b760350..0000000 --- a/.config/nvim/lua/ben/remap.lua +++ /dev/null @@ -1,2 +0,0 @@ -vim.g.mapleader = " " -vim.keymap.set("n", "pv", vim.cmd.Ex) diff --git a/.config/shortcutrc b/.config/shortcutrc index b2c54b7..325b975 100644 --- a/.config/shortcutrc +++ b/.config/shortcutrc @@ -16,18 +16,15 @@ # (It can contain environmental variables) |----------------+-----+--------------------------------------------------| -| Bibliographies | bb | $HOME/Dropbox/A/Scholar/All/References | | Config | cf | $HOME/.config | -| Downloads | dl | $HOME/Dropbox/Downloads | +| Downloads | dl | $HOME/Downloads | +| Wallpaper | wp | $HOME/Pictures/wallpapers | | Dropbox | db | $HOME/Dropbox | | Music | ms | $HOME/Music | | Neovim | vi | $HOME/.config/nvim | -| Personnal | ps | $HOME/Dropbox/A/Personnal/ | -| Wallpapers | wp | $HOME/Dropbox/A/Personnal/Photos/Wallpapers | -| RSS | rss | $HOME/.config/newsboat | -| Scholar | sf | $HOME/Dropbox/A/Scholar/CEGEP/session6 | +| VDI | vdi | $HOME/Workspace/vdi | | Scripts | sc | $HOME/.local/bin | | Hotkeys | sx | $HOME/.config/sxhkd | | Images | img | $HOME/Dropbox/A/Personnal/Photos/unsorted | -| Compilation | cmp | $HOME/.local/src | +| Compilation | cp | $HOME/.local/src | |----------------+-----+--------------------------------------------------| diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc index 19132b2..b8e5261 100644 --- a/.config/sxhkd/sxhkdrc +++ b/.config/sxhkd/sxhkdrc @@ -99,6 +99,9 @@ super + shift + 0 # dwmc setgaps 0 #-# Miscellaneous #-# +## Lock Screen +super + BackSpace + slock ## Quit Current App super + q kill -15 `xdotool getwindowfocus getwindowpid` @@ -144,7 +147,7 @@ XF86WLAN killall nmtui || dropdowntoggle network nmtui ## TUI Audio Mixer (alsamixer) super + p - killall alsamixer || dropdowntoggle audio alsamixer -c 0 + flameshot gui ## TODOs (Todoist.nvim) super + space dropdowntoggle todoist nvim +Todoist @@ -202,7 +205,7 @@ alt + Escape #-# PrintScreen Utilities #-# ## Entire Screen Print - scrot -q 100 -z && notify-send -i "$HOME/.fonts/svg/image.svg" -a Screenshot "Full screenshot completed" + flamehsot gui ## Current window alt + Print scrot -q 100 -u -z && notify-send -i "$HOME/.fonts/svg/image.svg" -a Screenshot "Window screenshot completed" diff --git a/.local/bin/crontog b/.local/bin/crontog deleted file mode 100755 index 93c2d30..0000000 --- a/.local/bin/crontog +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# Toggles all cronjobs off/on. -# Stores disabled crontabs in ~/.consaved until restored. - -([ -f ~/.config/cronsaved ] && crontab - < ~/.config/cronsaved && rm ~/.config/cronsaved && notify-send "🕓 Cronjobs re-enabled.") || ( crontab -l > ~/.config/cronsaved && crontab -r && notify-send "🕓 Cronjobs saved and disabled.") diff --git a/.local/bin/makewall b/.local/bin/makewall new file mode 100755 index 0000000..f0fc854 --- /dev/null +++ b/.local/bin/makewall @@ -0,0 +1,28 @@ +#!/bin/sh + +wallDir="$XDG_CONFIG_HOME/wallpapers" + +# Acquire the list of connected displays +displays=$(xrandr | grep " connected" | sed 's/^\([a-Z,0-9,-]*\).*/\1/') + +# If there is a wallpaper with a filename matching the display +# name, set it as the wallpaper for that display. +# ex: DP-1.jpg and DP-1.png are both valid filenames +# Otherwise, set the wallpaper to the default wallpaper +# (default.png or default.jpg) +setDisplay() { + case $(ls $wallDir) in + *"$1"*) + wall=$(ls $wallDir | grep "$1" | head -n 1) + xwallpaper --output $1 --zoom $wallDir/$wall ;; + *) + wall=$(ls $wallDir | grep "default" | head -n 1) + xwallpaper --output $1 --zoom $wallDir/$wall ;; + esac +} + +# Set the wallpaper for each display +for display in $displays; do + setDisplay $display +done + diff --git a/.local/bin/remaps b/.local/bin/remaps index 595022d..ed6ae43 100755 --- a/.local/bin/remaps +++ b/.local/bin/remaps @@ -9,5 +9,3 @@ setxkbmap -option caps:super killall xcape 2>/dev/null ; xcape -e 'Super_L=Escape' # Map the menu button to right super as well. xmodmap -e 'keycode 135 = Super_R' -# Software fix for key bounce (debouncing) -xkbset bo 50 diff --git a/.local/bin/shortcutgen b/.local/bin/shortcutgen index e5817d9..0020ec9 100755 --- a/.local/bin/shortcutgen +++ b/.local/bin/shortcutgen @@ -53,6 +53,8 @@ vifmy=$( echo "$vifm" | sed " s/|/:copy/") echo "$vifmcd\n\n$vifmv\n\n$vifmy" > ~/.cache/vifm-shortcuts + + # #---Testing---# # # echo "$raw" | sed "s/[A-z,a-z,0-9]*\s*|//" diff --git a/.local/share/fonts/ApercuMono/FontsFree-Net-ApercuMono.ttf b/.local/share/fonts/ApercuMono/FontsFree-Net-ApercuMono.ttf deleted file mode 100644 index 22dfdff..0000000 Binary files a/.local/share/fonts/ApercuMono/FontsFree-Net-ApercuMono.ttf and /dev/null differ diff --git a/.local/share/fonts/FontAwesome/Font Awesome 5 Brands-Regular-400.otf b/.local/share/fonts/FontAwesome/Font Awesome 5 Brands-Regular-400.otf deleted file mode 100644 index 8ba7054..0000000 Binary files a/.local/share/fonts/FontAwesome/Font Awesome 5 Brands-Regular-400.otf and /dev/null differ diff --git a/.local/share/fonts/FontAwesome/Font Awesome 5 Free-Regular-400.otf b/.local/share/fonts/FontAwesome/Font Awesome 5 Free-Regular-400.otf deleted file mode 100644 index 3ec6277..0000000 Binary files a/.local/share/fonts/FontAwesome/Font Awesome 5 Free-Regular-400.otf and /dev/null differ diff --git a/.local/share/fonts/FontAwesome/Font Awesome 5 Free-Solid-900.otf b/.local/share/fonts/FontAwesome/Font Awesome 5 Free-Solid-900.otf deleted file mode 100644 index cac31d8..0000000 Binary files a/.local/share/fonts/FontAwesome/Font Awesome 5 Free-Solid-900.otf and /dev/null differ diff --git a/.local/share/fonts/linux-libertine/LigLinLibertineMONerdFont-Mono.otf b/.local/share/fonts/linux-libertine/LigLinLibertineMONerdFont-Mono.otf deleted file mode 100644 index 8e6ba56..0000000 Binary files a/.local/share/fonts/linux-libertine/LigLinLibertineMONerdFont-Mono.otf and /dev/null differ diff --git a/.local/share/fonts/linux-libertine/Linux Libertine Display O Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf b/.local/share/fonts/linux-libertine/Linux Libertine Display O Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf deleted file mode 100644 index 570e7fa..0000000 Binary files a/.local/share/fonts/linux-libertine/Linux Libertine Display O Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf and /dev/null differ diff --git a/.local/share/fonts/linux-libertine/Linux Libertine Initials O Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf b/.local/share/fonts/linux-libertine/Linux Libertine Initials O Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf deleted file mode 100644 index b09b0aa..0000000 Binary files a/.local/share/fonts/linux-libertine/Linux Libertine Initials O Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf and /dev/null differ diff --git a/.local/share/fonts/linux-libertine/Linux Libertine Mono O Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf b/.local/share/fonts/linux-libertine/Linux Libertine Mono O Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf deleted file mode 100644 index e89e93d..0000000 Binary files a/.local/share/fonts/linux-libertine/Linux Libertine Mono O Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf and /dev/null differ diff --git a/.local/share/fonts/linux-libertine/Linux Libertine O Bold Italic Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf b/.local/share/fonts/linux-libertine/Linux Libertine O Bold Italic Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf deleted file mode 100644 index 42e3e12..0000000 Binary files a/.local/share/fonts/linux-libertine/Linux Libertine O Bold Italic Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf and /dev/null differ diff --git a/.local/share/fonts/linux-libertine/Linux Libertine O Bold Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf b/.local/share/fonts/linux-libertine/Linux Libertine O Bold Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf deleted file mode 100644 index b95d56c..0000000 Binary files a/.local/share/fonts/linux-libertine/Linux Libertine O Bold Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf and /dev/null differ diff --git a/.local/share/fonts/linux-libertine/Linux Libertine O Italic Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf b/.local/share/fonts/linux-libertine/Linux Libertine O Italic Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf deleted file mode 100644 index 479207a..0000000 Binary files a/.local/share/fonts/linux-libertine/Linux Libertine O Italic Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf and /dev/null differ diff --git a/.local/share/fonts/linux-libertine/Linux Libertine O Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf b/.local/share/fonts/linux-libertine/Linux Libertine O Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf deleted file mode 100644 index 42277fb..0000000 Binary files a/.local/share/fonts/linux-libertine/Linux Libertine O Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf and /dev/null differ diff --git a/.local/share/fonts/linux-libertine/Linux Libertine O Semibold Italic Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf b/.local/share/fonts/linux-libertine/Linux Libertine O Semibold Italic Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf deleted file mode 100644 index c13de2b..0000000 Binary files a/.local/share/fonts/linux-libertine/Linux Libertine O Semibold Italic Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf and /dev/null differ diff --git a/.local/share/fonts/linux-libertine/Linux Libertine O Semibold Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf b/.local/share/fonts/linux-libertine/Linux Libertine O Semibold Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf deleted file mode 100644 index 71c646f..0000000 Binary files a/.local/share/fonts/linux-libertine/Linux Libertine O Semibold Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Font Logos (Font Linux) Plus Material Design Icons Plus Weather Icons.otf and /dev/null differ diff --git a/.profile b/.profile index 5db1d7d..d55f3fe 100644 --- a/.profile +++ b/.profile @@ -4,14 +4,15 @@ export PATH=$PATH$( find $HOME/.local/bin/ -type d -printf ":%p" ) export PATH=$PATH:$HOME/.cargo/bin export PATH=$PATH:/root/.local/bin export PATH=$PATH:$HOME/.local/bin +export PATH=$PATH:/usr/local/go/bin export QT_QPA_PLATFORMTHEME="qt5ct" -export EDITOR=/usr/bin/nvim +export EDITOR=/usr/local/bin/nvim export READER=/usr/bin/zathura export GTK2_RC_FILES="$HOME/.gtkrc-2.0" export QT_QPA_PLATFORMTHEME="qt5ct" export GRDB="dropbox://default@/git-private" -export TERMINAL=st -export TERM=st +export TERMINAL=/usr/local/bin/st +export TERM=/usr/local/bin/st export BIB=$HOME/Dropbox/A/Scholar/All/References export REFERBIB=$HOME/Dropbox/A/Scholar/All/References/bibliography.refer export DISTRIB_ID=arch @@ -45,3 +46,5 @@ eval "$(gh completion -s zsh)" # Generate shortcuts and aliases shortcutgen aliasgen +. "$HOME/.cargo/env" +export PATH=$PATH:/home/master/.local/src/Geekbench-6.2.0-Linuxexport PATH=$PATH:/home/master/.local/src/Geekbench-6.2.0-Linuxexport PATH=$PATH:/home/master/.local/src/Geekbench-6.2.0-Linux \ No newline at end of file diff --git a/.xinitrc##hostname.intern b/.xinitrc##hostname.intern index b2b3cfc..3874551 100644 --- a/.xinitrc##hostname.intern +++ b/.xinitrc##hostname.intern @@ -1,6 +1,6 @@ xwallpaper --zoom ~/.cache/wall.png & +$HOME/.dropbox-dist/dropboxd & sxhkd & -remaps & dunst & unclutter & picom -b & @@ -8,7 +8,7 @@ echo us > $HOME/.cache/layout xrdb -load $HOME/.Xresources flashfocus -n 30 -o 0.75 -v ERROR & dwmblocks & -newsup & +remaps & while true; do dwm >/dev/null done diff --git a/.zshrc b/.zshrc index 2ec23dd..60790f1 100644 --- a/.zshrc +++ b/.zshrc @@ -72,7 +72,8 @@ precmd_functions+=( precmd_vcs_info ) setopt prompt_subst # Prompt theme -PROMPT=" %B%F{blue}𝜑 %b%F{yellow}" +PROMPT=" %B%F{blue}𝄞 %b%F{yellow}" +# PROMPT=" %B%F{blue}𝜑 %b%F{yellow}" # PROMPT=" %B%F{blue}π %b%F{yellow}" # RPROMPT="\$vcs_info_msg_1_ %B%F{magenta}(%B%F{cyan}%1/%B%F{magenta})" RPROMPT="\$vcs_info_msg_0_ %B%F{magenta}(%B%F{cyan}%1/%B%F{magenta})" @@ -84,6 +85,18 @@ source $HOME/.cache/zsh-aliases* source $HOME/.cache/zsh-shortcuts source $HOME/.cache/shell-vars +lfcd () { + tmp="$(mktemp -uq)" + trap 'rm -f $tmp >/dev/null 2>&1 && trap - HUP INT QUIT TERM PWR EXIT' HUP INT QUIT TERM PWR EXIT + lfub -last-dir-path="$tmp" "$@" + if [ -f "$tmp" ]; then + dir="$(cat "$tmp")" + [ -d "$dir" ] && [ "$dir" != "$(pwd)" ] && cd "$dir" + fi +} +alias f='lfcd' + + # Load zsh-syntax-highlighting; should be last. source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null -- cgit v1.2.3