From 88557ac9be2959432614c3e9fcd05e043dd2e0fa Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 15 Jan 2019 09:11:59 -0500 Subject: [PATCH 01/36] plugin location --- .config/nvim/init.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index b462bbd..e71979d 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -6,7 +6,7 @@ let mapleader =" " -call plug#begin('~/.vim/plugged') +call plug#begin('~/.config/nvim/plugged') Plug 'junegunn/goyo.vim' Plug 'PotatoesMaster/i3-vim-syntax' Plug 'jreybert/vimagit' From e8687d15f772762db7cf51d4ccc8a0fece6ce0f1 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 15 Jan 2019 09:46:05 -0500 Subject: [PATCH 02/36] neovim plugin fix --- {.vim => .config/nvim}/autoload/plug.vim | 0 .vim | 1 + 2 files changed, 1 insertion(+) rename {.vim => .config/nvim}/autoload/plug.vim (100%) create mode 120000 .vim diff --git a/.vim/autoload/plug.vim b/.config/nvim/autoload/plug.vim similarity index 100% rename from .vim/autoload/plug.vim rename to .config/nvim/autoload/plug.vim diff --git a/.vim b/.vim new file mode 120000 index 0000000..63c7159 --- /dev/null +++ b/.vim @@ -0,0 +1 @@ +.config/nvim/ \ No newline at end of file From 4c658cf8b33337d50dcc44ea939751317c118455 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 15 Jan 2019 12:17:06 -0500 Subject: [PATCH 03/36] peachpuff --- .config/nvim/init.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index e71979d..d1cc03e 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -15,6 +15,7 @@ Plug 'vimwiki/vimwiki' call plug#end() " Some basics: + color peachpuff set nocompatible filetype plugin on syntax on From 00d5e97f32147d6ef30c07cf00b00bc1f2538056 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 15 Jan 2019 19:48:22 -0500 Subject: [PATCH 04/36] for small displays --- .scripts/tools/setbg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scripts/tools/setbg b/.scripts/tools/setbg index 00e996a..c9e4a94 100755 --- a/.scripts/tools/setbg +++ b/.scripts/tools/setbg @@ -1,4 +1,4 @@ #!/bin/sh # Sets the background. If given an argument, will set file as background. [ ! -z "$1" ] && cp "$1" ~/.config/wall.png && notify-send -i "$HOME/.config/wall.png" "Wallpaper changed." -xwallpaper --center ~/.config/wall.png +xwallpaper --maximize ~/.config/wall.png From 62bec93648b7966e1e3862c7fd5a30ec7dd4a7df Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Thu, 17 Jan 2019 12:18:41 -0500 Subject: [PATCH 05/36] compiler simplification --- .scripts/tools/compiler | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/.scripts/tools/compiler b/.scripts/tools/compiler index cf628aa..7d3bf1d 100755 --- a/.scripts/tools/compiler +++ b/.scripts/tools/compiler @@ -1,21 +1,14 @@ #!/bin/sh - # This script will compile or run another finishing operation on a document. I # have this script run via vim. # -# tex files: Compiles to pdf, including bibliography if necessary -# md files: Compiles to pdf via pandoc -# rmd files: Compiles via R Markdown -# c files: Compiles via whatever compiler is set to cc. Usually gcc. -# py files: runs via python command -# go files: compiles and runs with "go run" -# config.h files: (For suckless utils) recompiles and installs program. -# all others: run `sent` to show a presentation +# Compiles .tex. groff (.mom, .ms), .rmd, .md. +# Opens .sent files as sent presentations. +# Runs scripts based on extention or shebang file=$(readlink -f "$1") dir=$(dirname "$file") base="${file%.*}" -shebang=$(sed -n 1p "$file") cd "$dir" || exit @@ -29,22 +22,16 @@ textype() { \ $command --output-directory="$dir" "$base" } -shebangtest() { - case "$shebang" in - \#\!*) "$file" ;; - *) sent "$file" 2>/dev/null & ;; - esac -} - case "$file" in *\.ms) refer -PS -e "$file" | groff -me -ms -kejpt -T pdf > "$base".pdf ;; *\.mom) refer -PS -e "$file" | groff -mom -kejpt -T pdf > "$base".pdf ;; *\.rmd) echo "require(rmarkdown); render('$file')" | R -q --vanilla ;; *\.tex) textype "$file" ;; *\.md) pandoc "$file" --pdf-engine=xelatex -o "$base".pdf ;; - *config.h) make && sudo make install ;; + *config.h) sudo make install ;; *\.c) cc "$file" -o "$base" && "$base" ;; *\.py) python "$file" ;; *\.go) go run "$file" ;; - *) shebangtest ;; + *\.sent) setsid sent "$file" 2>/dev/null & ;; + *) sed 1q "$file" | grep "^#!/" | sed "s/^#!//" | xargs -r -I % "$file" ;; esac From 7a0346d01ae533a2b1dc65df99803612f87c7c7b Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Fri, 18 Jan 2019 13:20:51 -0500 Subject: [PATCH 06/36] 1 multimon fix --- .scripts/i3cmds/displayselect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scripts/i3cmds/displayselect b/.scripts/i3cmds/displayselect index 2c3133f..84d1855 100755 --- a/.scripts/i3cmds/displayselect +++ b/.scripts/i3cmds/displayselect @@ -49,7 +49,7 @@ morescreen() { # If multi-monitor is selected and there are more than two screen multimon() { # Multi-monitor handler. case "$(echo "$screens" | wc -l)" in - 1) xrandr $(echo "$allposs" | awk '{print "--output", $1, "--off"}' | tr '\n' ' ') ;; + 1) xrandr $(echo "$allposs" | grep -v "$screens" | awk '{print "--output", $1, "--off"}' | tr '\n' ' ') ;; 2) twoscreen ;; *) morescreen ;; esac ;} From 2eaabe4fbd6ba9d46e1e61af8c3504d611776fe8 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Fri, 18 Jan 2019 13:21:25 -0500 Subject: [PATCH 07/36] svgs will be added later --- .scripts/cron/checkup | 2 +- .scripts/cron/newsup | 4 ++-- .scripts/i3cmds/dmenumount | 6 +++--- .scripts/i3cmds/dmenuumount | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.scripts/cron/checkup b/.scripts/cron/checkup index 770c349..a32cdcb 100755 --- a/.scripts/cron/checkup +++ b/.scripts/cron/checkup @@ -3,7 +3,7 @@ ping -q -w 1 -c 1 `ip r | grep -m 1 default | cut -d ' ' -f 3` >/dev/null || exit -notify-send -i "$PIX/larbs.gif" "Checking for pacakge updates..." +notify-send -i "$PIX/larbs.svg" "Checking for pacakge updates..." sudo pacman -Syyuw --noconfirm || notify-send "Error downloading updates. diff --git a/.scripts/cron/newsup b/.scripts/cron/newsup index 598cced..a760daa 100755 --- a/.scripts/cron/newsup +++ b/.scripts/cron/newsup @@ -4,7 +4,7 @@ ping -q -t 1 -c 1 `ip r | grep -m 1 default | cut -d ' ' -f 3` >/dev/null || exit -/usr/bin/notify-send -i "$PIX/rss.gif" "Updating RSS feeds..." +/usr/bin/notify-send -i "$HOME/.pix/rss.svg" "Updating RSS feeds..." pgrep -x newsboat >/dev/null && /usr/bin/xdotool key --window "$(/usr/bin/xdotool search --name newsboat)" R && exit @@ -13,4 +13,4 @@ pkill -RTMIN+6 i3blocks /usr/bin/newsboat -x reload rm -f ~/.config/newsboat/.update pkill -RTMIN+6 i3blocks -/usr/bin/notify-send -i "$PIX/rss.gif" "RSS feed update complete." +/usr/bin/notify-send -i "$HOME/.pix/rss.svg" "RSS feed update complete." diff --git a/.scripts/i3cmds/dmenumount b/.scripts/i3cmds/dmenumount index 4de7438..a270886 100755 --- a/.scripts/i3cmds/dmenumount +++ b/.scripts/i3cmds/dmenumount @@ -17,21 +17,21 @@ getmount() { \ mountusb() { \ chosen="$(echo "$usbdrives" | dmenu -i -p "Mount which drive?" | awk '{print $1}')" - sudo -A mount "$chosen" && notify-send "$chosen mounted." && exit 0 + sudo -A mount "$chosen" && notify-send -i "$PIX/usb.svg" "$chosen mounted." && exit 0 getmount "/mnt /media /mount /home -maxdepth 5 -type d" partitiontype="$(lsblk -no "fstype" "$chosen")" case "$partitiontype" in "vfat") sudo -A mount -t vfat "$chosen" "$mp" -o rw,umask=0000;; *) sudo -A mount "$chosen" "$mp"; user="$(whoami)"; ug="$(groups | awk '{print $1}')"; sudo -A chown "$user":"$ug" 741 "$mp";; esac - notify-send "$chosen mounted to $mp." + notify-send -i "$PIX/usb.svg" "$chosen mounted to $mp." } mountandroid() { \ chosen=$(echo "$anddrives" | dmenu -i -p "Which Android device?" | cut -d : -f 1) getmount "$HOME -maxdepth 3 -type d" simple-mtpfs --device "$chosen" "$mp" - notify-send "Android device mounted to $mp." + notify-send -i "$PIX/android.svg" "Android device mounted to $mp." } asktype() { \ diff --git a/.scripts/i3cmds/dmenuumount b/.scripts/i3cmds/dmenuumount index a267010..3191ec5 100755 --- a/.scripts/i3cmds/dmenuumount +++ b/.scripts/i3cmds/dmenuumount @@ -7,13 +7,13 @@ unmountusb() { [ -z "$drives" ] && exit chosen=$(echo "$drives" | dmenu -i -p "Unmount which drive?" | awk '{print $1}') [ -z "$chosen" ] && exit - sudo -A umount "$chosen" && pgrep -x dunst && notify-send "$chosen unmounted." + sudo -A umount "$chosen" && pgrep -x dunst && notify-send -i "$PIX/usb.svg" "$chosen unmounted." } unmountandroid() { \ chosen=$(awk '/simple-mtpfs/ {print $2}' /etc/mtab | dmenu -i -p "Unmount which device?") [ -z "$chosen" ] && exit - fusermount -u "$chosen" && pgrep -x dunst && notify-send "$chosen unmounted." + fusermount -u "$chosen" && pgrep -x dunst && notify-send -i "$PIX/android.svg" "$chosen unmounted." } asktype() { \ From cb2fab9067b39e65cc9b1cc086886724355b8b38 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 19 Jan 2019 10:19:10 -0500 Subject: [PATCH 08/36] colorscheme fix, , is leader, new plugins --- .config/nvim/init.vim | 46 ++++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index d1cc03e..63e31c4 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -1,21 +1,22 @@ -" _ -" __ _(_)_ __ ___ _ __ ___ -" \ \ / / | '_ ` _ \| '__/ __| -" \ V /| | | | | | | | | (__ -" \_/ |_|_| |_| |_|_| \___| - -let mapleader =" " +let mapleader ="," call plug#begin('~/.config/nvim/plugged') +Plug 'tpope/vim-surround' +Plug 'scrooloose/nerdtree' Plug 'junegunn/goyo.vim' Plug 'PotatoesMaster/i3-vim-syntax' Plug 'jreybert/vimagit' Plug 'LukeSmithxyz/vimling' Plug 'vimwiki/vimwiki' +Plug 'bling/vim-airline' +Plug 'tpope/vim-commentary' call plug#end() +set bg=light +set mouse=a +set nohlsearch +set clipboard=unnamedplus " Some basics: - color peachpuff set nocompatible filetype plugin on syntax on @@ -35,6 +36,10 @@ call plug#end() " Splits open at the bottom and right, which is non-retarded, unlike vim defaults. set splitbelow splitright +" Nerd tree + map :NERDTreeToggle + autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif + " Shortcutting split navigation, saving a keypress: map h map j @@ -52,7 +57,7 @@ call plug#end() nnoremap S :%s//g " Compile document, be it groff/LaTeX/markdown/etc. - map c :w! \| !compiler % + map c :w! \| !compiler % " Open corresponding .pdf/.html or preview map p :!opout % @@ -62,17 +67,11 @@ call plug#end() " Ensure files are read as what I want: let g:vimwiki_ext2syntax = {'.Rmd': 'markdown', '.rmd': 'markdown','.md': 'markdown', '.markdown': 'markdown', '.mdown': 'markdown'} + let g:vimwiki_list = [{'path': '~/vimwiki', 'syntax': 'markdown', 'ext': '.md'}] autocmd BufRead,BufNewFile /tmp/calcurse*,~/.calcurse/notes/* set filetype=markdown autocmd BufRead,BufNewFile *.ms,*.me,*.mom,*.man set filetype=groff autocmd BufRead,BufNewFile *.tex set filetype=tex -" Readmes autowrap text: - autocmd BufRead,BufNewFile *.md set tw=79 - -" Use urlscan to choose and open a url: - :noremap u :w !urlscan -r 'linkhandler {}' - :noremap ,, !urlscan -r 'linkhandler {}' - " Copy selected text to system clipboard (requires gvim/nvim/vim-x11 installed): vnoremap "+y map "+P @@ -86,22 +85,15 @@ call plug#end() autocmd BufWritePre * %s/\s\+$//e " When shortcut files are updated, renew bash and ranger configs with new material: - autocmd BufWritePost ~/.bm* !shortcuts + autocmd BufWritePost ~/.bmdirs,~/.bmfiles !shortcuts " Run xrdb whenever Xdefaults or Xresources are updated. autocmd BufWritePost ~/.Xresources,~/.Xdefaults !xrdb % " Navigating with guides - inoremap /<++>"_c4l - vnoremap /<++>"_c4l - map /<++>"_c4l - - "____ _ _ -"/ ___| _ __ (_)_ __ _ __ ___| |_ ___ -"\___ \| '_ \| | '_ \| '_ \ / _ \ __/ __| - "___) | | | | | |_) | |_) | __/ |_\__ \ -"|____/|_| |_|_| .__/| .__/ \___|\__|___/ - "|_| |_| + inoremap /<++>"_c4l + vnoremap /<++>"_c4l + map /<++>"_c4l """LATEX " Word count: From 126264ea908bcb65162606df1f08b62af70659bc Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sun, 20 Jan 2019 17:39:03 -0500 Subject: [PATCH 09/36] qndl separate script --- .scripts/tools/qndl | 11 +++++++++++ .scripts/tools/queueandnotify | 7 +------ 2 files changed, 12 insertions(+), 6 deletions(-) create mode 100755 .scripts/tools/qndl diff --git a/.scripts/tools/qndl b/.scripts/tools/qndl new file mode 100755 index 0000000..ffe3647 --- /dev/null +++ b/.scripts/tools/qndl @@ -0,0 +1,11 @@ +#!/bin/sh +# $1 is a url; $2 is a command +[ -z "$1" ] && exit +base="$(basename "$1")" +notify-send -i "$PIX/dl.svg" "Queuing $base..." +cmd="$2" +[ -z "$cmd" ] && cmd="youtube-dl --add-metadata" +idnum="$(tsp $cmd "$1")" +realname="$(echo "$base" | sed "s/?\(source\|dest\).*//;s/%20/ /g")" +tsp -D "$idnum" mv "$base" "$realname" +tsp -D "$idnum" notify-send -i "$PIX/check.svg" "$realname done." diff --git a/.scripts/tools/queueandnotify b/.scripts/tools/queueandnotify index 332668f..a1417ec 100755 --- a/.scripts/tools/queueandnotify +++ b/.scripts/tools/queueandnotify @@ -7,12 +7,7 @@ queuefile="$HOME/.local/share/newsboat/queue" while read -r line; do [ -z "$line" ] && continue url="$(echo "$line" | awk '{print $1}')" - base="$(basename "$url")" - notify-send -i "$PIX/dl.png" "Queuing $base..." - idnum="$(tsp curl -LO "$url")" - realname="$(echo "$base" | sed "s/?\(source\|dest\).*//;s/%20/ /g")" - tsp -D "$idnum" mv "$base" "$realname" - tsp -D "$idnum" notify-send -i "$PIX/check.png" "$realname done." + qndl "$url" "curl -LO" done < "$queuefile" echo > "$queuefile" From b6d17549e9f7429d000ccb8bdb5d2717d299a265 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sun, 20 Jan 2019 17:39:21 -0500 Subject: [PATCH 10/36] lockscreen simplification --- .scripts/i3cmds/lockscreen | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/.scripts/i3cmds/lockscreen b/.scripts/i3cmds/lockscreen index b745a6a..456857f 100755 --- a/.scripts/i3cmds/lockscreen +++ b/.scripts/i3cmds/lockscreen @@ -1,19 +1,9 @@ #!/bin/sh - -rm -f /tmp/locked.png - -# If `imagemagick` is not installed, use a blank screen. -[ -f /usr/bin/convert ] && -scrot -m -z /tmp/base.png && -pgrep -x dunst && notify-send -i ~/.scripts/pix/lock.png "Locking computer..." && -convert /tmp/base.png -blur 0x8 /tmp/locked.png - -# Pause music (mocp, mpd and send the pause key to all mpv videos): -mocp -P >/dev/null 2>&1 +# Pause mpd and send the pause key to all mpv videos: mpc pause >/dev/null 2>&1 pauseallmpv >/dev/null 2>&1 -i3lock -e -f -c 000000 -i /tmp/locked.png +i3lock -e -f -c 1d2021 # In five seconds, turn off display unless key press in last 4 seconds. sleep 5 && [ 4000 -lt "$(xssstate -i)" ] && pgrep -x i3lock && xset dpms force off From 713f4812cd01c3021793c6c881377c7122bc52d7 Mon Sep 17 00:00:00 2001 From: 8bitmcu Date: Sun, 20 Jan 2019 20:27:17 -0400 Subject: [PATCH 11/36] fixes unplugged displays not getting disabled --- .scripts/i3cmds/displayselect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scripts/i3cmds/displayselect b/.scripts/i3cmds/displayselect index 84d1855..e526014 100755 --- a/.scripts/i3cmds/displayselect +++ b/.scripts/i3cmds/displayselect @@ -65,7 +65,7 @@ chosen=$(printf "%s\\nmulti-monitor\\nmanual selection" "$screens" | dmenu -i -p case "$chosen" in "manual selection") arandr ; exit ;; "multi-monitor") multimon ;; - *) xrandr --output "$chosen" --auto --scale 1.0x1.0 $(echo "$screens" | grep -v "$chosen" | awk '{print "--output", $1, "--off"}' | tr '\n' ' ') ;; + *) xrandr --output "$chosen" --auto --scale 1.0x1.0 $(echo "$allposs" | grep -v "$chosen" | awk '{print "--output", $1, "--off"}' | tr '\n' ' ') ;; esac setbg # Fix background if screen size/arangement has changed. From 266cd8d6ccd6a1833dacd68b0141299a3bc1aeed Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sun, 20 Jan 2019 22:29:39 -0500 Subject: [PATCH 12/36] uploading icon added --- .scripts/statusbar/torrent | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.scripts/statusbar/torrent b/.scripts/statusbar/torrent index 06ddd3e..8534cb1 100755 --- a/.scripts/statusbar/torrent +++ b/.scripts/statusbar/torrent @@ -6,10 +6,12 @@ transmission-remote -l | grep % | s/.*Seeding.*/Z/g; s/.*100%.*/N/g; s/.*Idle.*/B/g; + s/.*Uploading.*/L/g; s/.*%.*/M/g" | sort -h | uniq -c | sed " # Now we replace the standin letters with icons. s/A/🛑/g; s/B/⌛️/g; + s/L/🔼/g; s/M/🔽/g; s/N/✅/g; s/Z/🌱/g" | awk '{print $2, $1}' | tr '\n' ' ' | sed -e "s/ $//g" @@ -18,7 +20,8 @@ case $BLOCK_BUTTON in 1) $TERMINAL -e transmission-remote-cli ;; 3) pgrep -x dunst >/dev/null && notify-send "Torrent module: 🛑: paused -⏳: waiting +⏳: idle (seeds needed) +🔼: uploading (unfinished) 🔽: downloading ✅: done 🌱: done and seeding" ;; From b51dc418c618884017f2dc6e54153da2a98e743d Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sun, 20 Jan 2019 22:30:28 -0500 Subject: [PATCH 13/36] trans svgs --- .scripts/tools/transadd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.scripts/tools/transadd b/.scripts/tools/transadd index 8cc7e80..0ab4784 100755 --- a/.scripts/tools/transadd +++ b/.scripts/tools/transadd @@ -7,6 +7,6 @@ # transmission-daemon sometimes fails to take remote requests in its first # moments. -pgrep -x transmission-da || (transmission-daemon && note "Starting daemon..." "$PIX/dl.png" && sleep 3 && pkill -RTMIN+7 i3blocks) +pgrep -x transmission-da || (transmission-daemon && note "Starting daemon..." "$PIX/dl.svg" && sleep 3 && pkill -RTMIN+7 i3blocks) -transmission-remote -a "$@" && note "Torrent added." "$PIX/dl.png" +transmission-remote -a "$@" && note "Torrent added." "$PIX/dl.svg" From 63bc59e4fca5dcde403c028f5a4b4ea3753a83b8 Mon Sep 17 00:00:00 2001 From: LoganDungeon Date: Tue, 22 Jan 2019 11:03:51 +0100 Subject: [PATCH 14/36] corrected hardcoded st to $term --- .config/i3/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/i3/config b/.config/i3/config index c30ef9a..ef8aab1 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -198,7 +198,7 @@ bindsym $mod+Shift+x exec --no-startup-id prompt "Shutdown computer?" "$shutdow bindsym $mod+c exec --no-startup-id freealf bindsym $mod+Shift+c exec --no-startup-id camtoggle -bindsym $mod+v exec --no-startup-id st -e vim -c "VimwikiIndex" +bindsym $mod+v exec --no-startup-id $term -e vim -c "VimwikiIndex" #bindsym $mod+Shift+v bindsym $mod+b bar mode toggle From a0906c68f33924a036c2b788e7f7febcf5b77b7d Mon Sep 17 00:00:00 2001 From: xDroid Date: Fri, 25 Jan 2019 10:54:29 +0800 Subject: [PATCH 15/36] Added window id from xdotool in mainpick. Copied a similar parameter `"$(xdotool getactivewindow)"` from the second option (a.k.a "current window") to the fifth. --- .scripts/i3cmds/maimpick | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scripts/i3cmds/maimpick b/.scripts/i3cmds/maimpick index f3f72fe..34eb1a3 100755 --- a/.scripts/i3cmds/maimpick +++ b/.scripts/i3cmds/maimpick @@ -4,6 +4,6 @@ case "$(printf "a selected area\\ncurrent window\\nfull screen\\na selected area "current window") maim -i "$(xdotool getactivewindow)" pic-window-"$(date '+%y%m%d-%H%M-%S').png" ;; "full screen") maim pic-full-"$(date '+%y%m%d-%H%M-%S').png" ;; "a selected area (copy)") maim -s | xclip -selection clipboard -t image/png ;; - "current window (copy)") maim -i | xclip -selection clipboard -t image/png ;; + "current window (copy)") maim -i "$(xdotool getactivewindow)" | xclip -selection clipboard -t image/png ;; "full screen (copy)") maim | xclip -selection clipboard -t image/png ;; esac From 489f5fbdb67c5f86958f057d54db34e1ce19b2a0 Mon Sep 17 00:00:00 2001 From: xDroid Date: Fri, 25 Jan 2019 11:03:26 +0800 Subject: [PATCH 16/36] Fixed typo in maimpick. --- .scripts/i3cmds/maimpick | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scripts/i3cmds/maimpick b/.scripts/i3cmds/maimpick index 34eb1a3..07d032f 100755 --- a/.scripts/i3cmds/maimpick +++ b/.scripts/i3cmds/maimpick @@ -1,5 +1,5 @@ #!/bin/sh -case "$(printf "a selected area\\ncurrent window\\nfull screen\\na selected area (copy)\\ncurrent window (copy)\\nfullscreen (copy)" | dmenu -l 6 -i -p "Screenshot which area?")" in +case "$(printf "a selected area\\ncurrent window\\nfull screen\\na selected area (copy)\\ncurrent window (copy)\\nfull screen (copy)" | dmenu -l 6 -i -p "Screenshot which area?")" in "a selected area") maim -s pic-selected-"$(date '+%y%m%d-%H%M-%S').png" ;; "current window") maim -i "$(xdotool getactivewindow)" pic-window-"$(date '+%y%m%d-%H%M-%S').png" ;; "full screen") maim pic-full-"$(date '+%y%m%d-%H%M-%S').png" ;; From 9db4ce46cd108afba6738ed5bd5d179fcef906d4 Mon Sep 17 00:00:00 2001 From: Mark Hoekveen Date: Sat, 26 Jan 2019 23:07:08 +0100 Subject: [PATCH 17/36] Fixes readme typo for tutorialvid shortcut --- .readme.mom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readme.mom b/.readme.mom index 37aa7cc..1dbc699 100644 --- a/.readme.mom +++ b/.readme.mom @@ -74,7 +74,7 @@ If you'd like to change any of these keyboard changes, you need only open and ch Actually, this should go without saying, but \fIeverything\fP here can easily be changed. .PP Additionally, while this isn't a part of i3, the default editing mode in the shell is using vi bindings. -If you want to learn more of this, run \f(CWMod+Super+E\fP and type and select the option for "vi mode in shell". +If you want to learn more of this, run \f(CWMod+Shift+E\fP and type and select the option for "vi mode in shell". This setting can be changed if you don't like it by deleting or commenting out the contents of \f(CW~/.inputrc\fP. .HEADING 2 "The Status Bar" .PP From c4de1d37b23be4908a171dbda3edf0e41307baec Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 26 Jan 2019 17:17:00 -0500 Subject: [PATCH 18/36] old readme updates --- .readme.mom | 108 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 62 insertions(+), 46 deletions(-) diff --git a/.readme.mom b/.readme.mom index 37aa7cc..c758738 100644 --- a/.readme.mom +++ b/.readme.mom @@ -13,10 +13,10 @@ Use vim keys (\f(CWh/j/k/l\fP) to navigate this document. Pressing \f(CWs\fP will fit it to window width (\f(CWa\fP to revert). \f(CWK\fP and \f(CWJ\fP zoom in and out. -\f(CWMod+f\fP to toggle fullscreen. +\f(CWSuper+f\fP to toggle fullscreen. \f(CWf\fP will highlight links to follow which are selectable by typing the number that appears plus \f(CWEnter\fP. \f(CWq\fP to quit. -(These are general zathura shortcuts.) +(These are general shortcuts of \f(CWzathura\fP, the pdf reader.) .LI .ITEM \f(CWMod+F1\fP will show this document at any time. @@ -35,8 +35,9 @@ My website: .PDF_WWW_LINK "https://lukesmith.xyz" .ITEM Donate: -.PDF_WWW_LINK "https://paypal.me/LukeMSmith/20" "https://paypal.me/LukeMSmith" +.PDF_WWW_LINK "https://lukesmith.xyz/donate" "https://lukesmith.xyz/donate" .LIST OFF +FAQs are at the end of this document. .HEADING 1 "Welcome!" .HEADING 2 "Basic goals and principles of this system:" .LI @@ -69,12 +70,11 @@ but you can also hold it down and it will act as another Windows/super/mod key. The menu button (usually between the right Alt and Ctrl) is an alternative Super/Mod button. This is to make one-handing on laptops easier. .LIST OFF -.PP If you'd like to change any of these keyboard changes, you need only open and change \f(CW~/.scripts/tools/remaps\fP. Actually, this should go without saying, but \fIeverything\fP here can easily be changed. .PP Additionally, while this isn't a part of i3, the default editing mode in the shell is using vi bindings. -If you want to learn more of this, run \f(CWMod+Super+E\fP and type and select the option for "vi mode in shell". +If you want to learn more of this, run \f(CWMod+Shift+E\fP and type and select the option for "vi mode in shell". This setting can be changed if you don't like it by deleting or commenting out the contents of \f(CW~/.inputrc\fP. .HEADING 2 "The Status Bar" .PP @@ -113,13 +113,17 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik , Be sure you play around with these. Be flexible with the basic commands and the system will grow on you quick. .LI .ITEM -\f(CWMod+Enter\fP \(en Spawn terminal +\f(CWMod+Enter\fP \(en Spawn terminal (the default terminal is \f(CWst\fP; run \f(CWman st\fP for more.) .ITEM \f(CWMod+q/Q\fP \(en Close window .ITEM \f(CWMod+d\fP \(en dmenu (For running commands or programs without shortcuts) .ITEM -\f(CWMod+t\fP \(en Toggle between spawning vertically and horizontally +\f(CWMod+t\fP \(en Toggle between spawning vertically and horizontally\c +.FOOTNOTE +You may notice that one side of your window border is a different color. +This indicates the direction that the next window will spawn. +.FOOTNOTE END .ITEM \f(CWMod+f\fP \(en Fullscreen .ITEM @@ -152,7 +156,7 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik .ITEM \f(CWMod+B\fP \(en Toggle window float in bottom left corner (good for video watched intermittently) .ITEM -\f(CWMod+N\fP \(en Same as above, but for the botttom right corner. +\f(CWMod+N\fP \(en Same as above, but for the bottom right corner. .LIST OFF .HEADING 2 "Basic Programs" .PP @@ -300,42 +304,51 @@ previous recordings as their names are based on their exact times. I've mapped those extra buttons that some keyboards have (play and pause buttons, screen brightness, email, web browsing buttons, etc.) to what you would expect. -.HEADING 1 "Special traits of this system" -.HEADING 2 "Easy config access" +.HEADING 1 "Bookmarking Files and Directories" .PP -Open a terminal and type \f(CWbf\fP. This will open a file where you will see -customizable pairs of key shortcuts and config files and other important text -files. Enter any of these shortcuts in bash or ranger to immediately open the -file in vim. +Note the files \f(CW~/.bmdirs\fP and \f(CW~/.bmfiles\fP. +These files hold bookmarked directories and files respectively, along with shortcut keys to their left. +LARBS, specfically the \f(CWshortcuts\fP script, will automatically read these files and autogenerate aliases and shortcuts for bash/zsh and ranger from them. .PP -You may add new entries here and they will be refreshed when you save the file -in vim. This will take effect immediately once you start a new instance of bash -or ranger or reload your previous sessions. -.HEADING 2 "Folder and config shortcuts" +For example, by default, the shortcut key for \f(CW~/Documents\fP is simply \f(CWd\fP. +Thus, if you type and run \f(CWd\fP in bash, you will automatically \f(CWcd\fP to \f(CW~/Documents\fP. +It also generates four ranger shortcuts using the shortcut \f(CWd\fP: +.LI +.ITEM +\f(CWgd\fP \(en +Go to \f(CW~/Documents\fP +.ITEM +\f(CWmd\fP \(en +Move (mv) selected file(s) to \f(CW~/Documents\fP +.ITEM +\f(CWtd\fP \(en +Create a new tab in \f(CW~/Documents\fP +.ITEM +\f(CWYd\fP \(en +Copy/yank (cp) a copy of the selected file(s) to \f(CWDocuments\fP +.LIST OFF +Shortcuts like these are generated for all key sequence/directory pairs in \f(CW~/.bmdirs\fP. +Additionally, you may also add editable files to \f(CW~/.bmfiles\fP. +Each key sequence you pair with a file will become an alias to edit it in either bash or ranger. .PP -Open a terminal and type \f(CWbd\fP. This opens a file when you can keep and create -directory/folder shortcuts. There are only a few here now, because I don't know -what your folder structure is going to look like, but on my machine, I have 109 -and growing. -.PP -Each line has a shortcut key/keys and its target. These can be used in several -applications. In bash, simply press \f(CWd\fP, the shortcut for \f(CW~/Documents\fP and you -will cd there (and automatically \f(CWls -a\fP). -.PP -ranger works similarly. -When in ranger, just press \f(CWg\fP then the shortcut of the folder you want to go to. -You may also press \f(CWt\fP plus the shortcut to open a new tab there. -\f(CWm\fP plus the shortcut moves the selected files to the folder and \f(CWY\fP copies them there. -\fBGet good at this. It will make management of even the most complex file system easy.\fP -.HEADING 2 "Dynamically constructed configs" -.PP -Each time you save changes to either the config shortcut file or the folder shortcut file in vim, vim will automatically run a bash script that updates your bash/ranger config, allowing you to use your new shortcuts in your next instance of bash/ranger or after resourcing your rc files. +Whenever you edit and save one of the bookmark files, vim will automatically rerun the shortcut script, thus uupdating the shortcuts that will be used in new instances of bash and ranger. +It just werks. +Note that it is your responsibility to ensure that none of the bindings you add conflict with another necessary function or command. .HEADING 1 "Frequently Asked Questions (FAQs)" +.HEADING 2 "My keyboard isn't working as expected!" +.PP +LARBS runs some custom keyboard settings in \f(CW~/.scripts/tools/remaps\fP. +These settings may override your preferred settings, so you should open this file and comment out troublesome lines if you have issues. +.HEADING 2 "My audio isn't working!" +.PP +Sometimes, PulseAudio can be finicky on initial installation and configuration. +If you have no audio output, chances are your problems will be resolved by a reboot or manually killing and restarting PulseAudio. +You may also need to set your preferred default output sink which you can do by the command line, or by selecting one with \f(CWpulsemixer\fP (\f(CWmod+A\fP). .HEADING 2 "How do I change the background/wallpaper?" .PP -The easiest way is to use ranger, navigate to the file you want as your background, and press \f(CWbg\fP. -To be specific, i3 will always be looking to the file in \f(CW~/.config/wall.png\fP for the wallpaper, this ranger command copies the given file there and reruns feh to update it. -So if you want a persistent wallpaper, move/rename it to \f(CW~/.config/wall.png\fP. +The i3 configuration will always read the file \f(CW~/.config/wall.png\fP as the wallpaper. +The script \f(CWsetbg\fP, if run on an image will set it as the persistent background. +When using the file manager, you can simply hover over an image name and type \f(CWbg\fP and this will run \f(CWsetbg\fP. .HEADING 2 "How I change the colorscheme?" .PP You can edit \f(CW~/.Xresources\fP to change the colorscheme. @@ -347,7 +360,7 @@ LARBS is also compatible with pywal, but it is not installed or used by default .HEADING 2 "How do I set up my email?" .LI .ITEM -Create a GPG private/public key pair if you haven't already. +Create a GPG private/public key pair if you haven't already. Type \f(CWmod+shift+e\fP and you can select a tutorial for how to do this. .ITEM Download the mutt-wizard repository to the mutt config directory: \f(CWgit clone https://github.com/lukesmithxyz/mutt-wizard ~/.config/mutt\fP @@ -360,7 +373,7 @@ Add an account. .ITEM Run \f(CWofflineimap -o\fP in the terminal. .ITEM -Select the "Autodetect mailboxes" option. +Then select the "Autodetect mailboxes" option. .LIST OFF .LIST OFF .PP @@ -379,6 +392,12 @@ By default, mpd, the music daemon assumes that \f(CW~/Music\fP is your music dir This can be changed in \f(CW~/.config/mpd/mpd.conf\fP. When you add music to your music folder, you may have to run \f(CWmpc up\fP in the terminal to update the database. mpd is controlled by ncmpcpp, which is accessible by \f(CWMod+m\fP. +.HEADING 2 "How do I update LARBS?" +.PP +LARBS is deployed as a git repository in your home directory. +You can use it as such to fetch, diff and merge changes from the remote repository. +If you don't want to do that or don't know how to use git, you can actually just rerun the script (as root) and reinstall LARBS and it will automatically update an existing install if you select the same username. +This will overwrite the original config files though, including changes you made for them, but this is an easier brute force approach that will also install any new dependencies. .HEADING 1 "Contact" .LI .ITEM @@ -388,15 +407,12 @@ mpd is controlled by ncmpcpp, which is accessible by \f(CWMod+m\fP. .PDF_WWW_LINK "http://lukesmith.xyz" "https://lukesmith.xyz" \(en For stalking! .ITEM -.PDF_WWW_LINK "https://paypal.me/LukeMSmith" "PayPal" -\(en For gratitude! -.ITEM -.PDF_WWW_LINK "https://patreon.com/lukesmith" "Patreon" -\(en For support! +.PDF_WWW_LINK "https://lukesmith.xyz/donate" "https://lukesmith.xyz/donate" +\(en To incentivize more development of LARBS! .ITEM .PDF_WWW_LINK "https://github.com/LukeSmithxyz" "My Github Page" \(en For the code behind it! .ITEM .PDF_WWW_LINK "http://lukesmith.xyz/rss.xml" "RSS" -\(en For even better updates! +\(en For updates! .LIST OFF From 151e47c6295f2060e5cf18253cbfae24e74359bf Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 26 Jan 2019 18:11:22 -0500 Subject: [PATCH 19/36] ifinstalled icon and bold additions --- .scripts/tools/ifinstalled | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scripts/tools/ifinstalled b/.scripts/tools/ifinstalled index bdbcbc4..bbaaf11 100755 --- a/.scripts/tools/ifinstalled +++ b/.scripts/tools/ifinstalled @@ -1,3 +1,3 @@ #!/bin/sh # If $1 command is not available, error code and notify. -command -v "$1" >/dev/null || { notify-send "$1 is not installed." && exit 1 ;} +command -v "$1" >/dev/null || { notify-send -i "$PIX/larbs.svg" "$1 must be installed for this function." && exit 1 ;} From 9ddf765a03fae63892644d11bb48112daeaf528a Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 26 Jan 2019 18:13:36 -0500 Subject: [PATCH 20/36] torrent wrap and other changes --- .config/i3/config | 2 +- .scripts/i3cmds/td-toggle | 13 ++++--------- .scripts/i3cmds/torwrap | 6 ++++++ 3 files changed, 11 insertions(+), 10 deletions(-) create mode 100755 .scripts/i3cmds/torwrap diff --git a/.config/i3/config b/.config/i3/config index c30ef9a..dfdf1e1 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -286,7 +286,7 @@ bindsym $mod+F2 restart bindsym $mod+F3 exec --no-startup-id displayselect bindsym $mod+F4 exec --no-startup-id prompt "Hibernate computer?" "$hibernate" bindsym $mod+F5 exec --no-startup-id $netrefresh -bindsym $mod+F6 exec --no-startup-id $term -e transmission-remote-cli +bindsym $mod+F6 exec --no-startup-id torwrap bindsym $mod+F7 exec --no-startup-id td-toggle bindsym $mod+F8 exec --no-startup-id ~/.config/mutt/etc/mailsync.sh bindsym $mod+F9 exec --no-startup-id dmenumount diff --git a/.scripts/i3cmds/td-toggle b/.scripts/i3cmds/td-toggle index 6489626..729e697 100755 --- a/.scripts/i3cmds/td-toggle +++ b/.scripts/i3cmds/td-toggle @@ -1,15 +1,10 @@ #!/bin/sh - # If transmission-daemon is running, will ask to kill, else will ask to start. - -[ ! -f /usr/bin/transmission-daemon ] && notify-send "Transmission daemon not installed." && exit - -if pgrep -x transmission-da >/dev/null ; +if pgrep -x transmission-da >/dev/null ; then - yn=$(printf "No\\nYes" | dmenu -i -p "Kill transmission-daemon?") - [ "$yn" = "Yes" ] && killall transmission-da + [ "$(printf "No\\nYes" | dmenu -i -p "Kill transmission-daemon?")" = "Yes" ] && killall transmission-da && notify-send -i "$PIX/torrent.svg" "transmission-daemon killed." else - yn=$(printf "No\\nYes" | dmenu -i -p "Start transmission daemon?") - [ "$yn" = "Yes" ] && transmission-daemon + ifinstalled transmission-cli || exit + [ "$(printf "No\\nYes" | dmenu -i -p "Start transmission daemon?")" = "Yes" ] && transmission-daemon && notify-send -i "$PIX/torrent.svg" "tranmission-daemon started." fi sleep 3 && pkill -RTMIN+7 i3blocks diff --git a/.scripts/i3cmds/torwrap b/.scripts/i3cmds/torwrap new file mode 100755 index 0000000..6b501cc --- /dev/null +++ b/.scripts/i3cmds/torwrap @@ -0,0 +1,6 @@ +#!/bin/sh +ifinstalled transmission-remote-cli transmission-cli || exit + +! pgrep -x transmission-da >/dev/null && transmission-daemon && notify-send -i "$PIX/torrent.svg" "Starting torrent daemon..." && sleep 3 && pkill -RTMIN+7 i3blocks + +$TERMINAL -e transmission-remote-cli From bc5b12691b56a417d9f8fe09bc189253c120bafb Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 26 Jan 2019 18:13:48 -0500 Subject: [PATCH 21/36] gtk choose sensible size --- .config/i3/config | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.config/i3/config b/.config/i3/config index dfdf1e1..1e761d7 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -267,11 +267,10 @@ bindsym $mod+Shift+0 move container to workspace $ws10 for_window [class="Pinentry"] sticky enable for_window [class="sent"] border pixel 0px -for_window [class="Blender"] move to workspace $ws6 -for_window [class="marble"] move to workspace $ws7 for_window [title="GIMP Startup"] move workspace $ws5 for_window [class="Gimp"] move workspace $ws5 -for_window [window_role="GtkFileChooserDialog"] resize shrink height 10 px +for_window [window_role="GtkFileChooserDialog"] resize set 800 600 +for_window [window_role="GtkFileChooserDialog"] move position center for_window [title="Default - Wine desktop"] floating enable # Bindings to make the webcam float and stick. From bf8809caa8fecfe9c00fcccad113a5bcbe64c3d5 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 26 Jan 2019 18:14:06 -0500 Subject: [PATCH 22/36] vimwiki uses EDITOR vim/nvim --- .config/i3/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/i3/config b/.config/i3/config index 1e761d7..fc5c724 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -198,7 +198,7 @@ bindsym $mod+Shift+x exec --no-startup-id prompt "Shutdown computer?" "$shutdow bindsym $mod+c exec --no-startup-id freealf bindsym $mod+Shift+c exec --no-startup-id camtoggle -bindsym $mod+v exec --no-startup-id st -e vim -c "VimwikiIndex" +bindsym $mod+v exec --no-startup-id $term -e $EDITOR -c "VimwikiIndex" #bindsym $mod+Shift+v bindsym $mod+b bar mode toggle From 3214b9eb9a431f7db4114fcc6223819ba7999d27 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 26 Jan 2019 18:14:28 -0500 Subject: [PATCH 23/36] rss svg --- .scripts/cron/newsup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.scripts/cron/newsup b/.scripts/cron/newsup index a760daa..32f6a37 100755 --- a/.scripts/cron/newsup +++ b/.scripts/cron/newsup @@ -4,7 +4,7 @@ ping -q -t 1 -c 1 `ip r | grep -m 1 default | cut -d ' ' -f 3` >/dev/null || exit -/usr/bin/notify-send -i "$HOME/.pix/rss.svg" "Updating RSS feeds..." +/usr/bin/notify-send -i "$PIX/rss.svg" "Updating RSS feeds..." pgrep -x newsboat >/dev/null && /usr/bin/xdotool key --window "$(/usr/bin/xdotool search --name newsboat)" R && exit @@ -13,4 +13,4 @@ pkill -RTMIN+6 i3blocks /usr/bin/newsboat -x reload rm -f ~/.config/newsboat/.update pkill -RTMIN+6 i3blocks -/usr/bin/notify-send -i "$HOME/.pix/rss.svg" "RSS feed update complete." +/usr/bin/notify-send -i "$PIX/rss.svg" "RSS feed update complete." From b82502bc7cc77d36bac02a4ed1f5eb0e1804762f Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 26 Jan 2019 18:31:14 -0500 Subject: [PATCH 24/36] mutt notes --- .readme.mom | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.readme.mom b/.readme.mom index c758738..8461617 100644 --- a/.readme.mom +++ b/.readme.mom @@ -166,7 +166,7 @@ Naturally, you can use \f(CWyay\fP to look for and install any you want to add. .ITEM \f(CWMod+r\fP \(en ranger (file browser/manager) .ITEM -\f(CWMod+e\fP \(en mutt (email) +\f(CWMod+e\fP \(en mutt (email; not installed by default, see below) .ITEM \f(CWMod+m\fP \(en ncmpcpp (music player) .ITEM @@ -360,10 +360,13 @@ LARBS is also compatible with pywal, but it is not installed or used by default .HEADING 2 "How do I set up my email?" .LI .ITEM +Install \f(CWneomutt\fP, \f(CWofflineimap\fP and \f(CWmsmtp\fP if you haven't already. +.ITEM Create a GPG private/public key pair if you haven't already. Type \f(CWmod+shift+e\fP and you can select a tutorial for how to do this. .ITEM Download the mutt-wizard repository to the mutt config directory: \f(CWgit clone https://github.com/lukesmithxyz/mutt-wizard ~/.config/mutt\fP +\fBREAD THE README.\fP .PP .ITEM There run \f(CWmutt-wizard.sh\fP and follow the directions, specifically: From f141b235b2a06d0d9f5f2f809511510d5ec91a97 Mon Sep 17 00:00:00 2001 From: Richard Thomra Date: Mon, 28 Jan 2019 19:42:00 +0100 Subject: [PATCH 25/36] Changed $mod+Shift+r shortcut to winresize --- .config/getkeys/i3 | 2 +- .config/getkeys/i3keysguide | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/getkeys/i3 b/.config/getkeys/i3 index 82be77d..cf026c5 100644 --- a/.config/getkeys/i3 +++ b/.config/getkeys/i3 @@ -15,7 +15,7 @@ This is a partial key list. q kill win kill win w browser browser e neomutt tutorials - r ranger sudo ranger + r ranger winresize t toggle hor/vert gaps=15px y calcurse resize left u dropdown term resize down diff --git a/.config/getkeys/i3keysguide b/.config/getkeys/i3keysguide index d2d49a1..40f4e0b 100644 --- a/.config/getkeys/i3keysguide +++ b/.config/getkeys/i3keysguide @@ -7,7 +7,7 @@ _ - vol -- vol q kill win kill win w browser browser e neomutt tutorials -r ranger sudo ranger +r ranger winresize t toggle hor/vert gaps=15px y calcurse resize left u dropdown term resize down From f1af46fc13ce03243a63393d9689f995558f9c10 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 29 Jan 2019 20:40:07 -0500 Subject: [PATCH 26/36] not needed --- .config/getkeys/i3keysguide | 43 ------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 .config/getkeys/i3keysguide diff --git a/.config/getkeys/i3keysguide b/.config/getkeys/i3keysguide deleted file mode 100644 index 40f4e0b..0000000 --- a/.config/getkeys/i3keysguide +++ /dev/null @@ -1,43 +0,0 @@ -esc left workspace exit i3 -tab last workspace -- - vol -- vol -_ - vol -- vol -= + vol ++ vol -+ + vol ++ vol -q kill win kill win -w browser browser -e neomutt tutorials -r ranger winresize -t toggle hor/vert gaps=15px -y calcurse resize left -u dropdown term resize down -i htop resize up -o sticky win resize right -p pause music -[ back 10 secs back 2 min -] forward 10 secs forward 2 min -\ last workspace -a calculator audio control -s + inner gaps - inner gaps -d dmenu remove gaps -f fullscreen freeze mode -g left workspace GIMP -h focus left move win left -j focus down move win down -k focus up move win up -l focus right move win right -; right workspace -' fast right win -z + outer gaps - outer gaps -x lock screen shutdown -c webcam -v visualizer projectm -b bar on/off stick/float win -n newsboat -m ncmpcpp mute audio -, previous song restart song -< previous song restart song -. next song -> next song -/ fast win below kill win -? fast win below kill win From ceb8f50b0d430a59046d4841bd8049149ce84217 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 29 Jan 2019 20:40:17 -0500 Subject: [PATCH 27/36] ncmpcpp dir moved --- .config/ncmpcpp/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/ncmpcpp/config b/.config/ncmpcpp/config index 999c6bc..6f87aab 100644 --- a/.config/ncmpcpp/config +++ b/.config/ncmpcpp/config @@ -11,7 +11,7 @@ ## ncmpcpp. ## # -#ncmpcpp_directory = ~/.ncmpcpp +ncmpcpp_directory = ~/.config/ncmpcpp # ## ## Directory for storing downloaded lyrics. It defaults to ~/.lyrics since other From 2601381237901054c2f62902f1f20fe58a554f97 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 29 Jan 2019 20:40:32 -0500 Subject: [PATCH 28/36] old junk removed --- .config/i3/config | 2 -- 1 file changed, 2 deletions(-) diff --git a/.config/i3/config b/.config/i3/config index fc5c724..e0486ce 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -412,5 +412,3 @@ bindsym XF86Documents exec $term -e $FILE ~/Documents ##bindsym XF86Battery exec ##bindsym XF86Bluetooth exec bindsym XF86WLAN exec $netrefresh - -exec --no-startup-id lukescripts From 212f6853f7d55c6f72222e634228689b34fcf24b Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Thu, 31 Jan 2019 18:23:55 -0500 Subject: [PATCH 29/36] xcqr installed feh --- .scripts/i3cmds/xcqr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scripts/i3cmds/xcqr b/.scripts/i3cmds/xcqr index 5e7b5f0..2352599 100755 --- a/.scripts/i3cmds/xcqr +++ b/.scripts/i3cmds/xcqr @@ -1,6 +1,6 @@ #!/bin/sh # Credit to Maddison Hellstrom (@b0o on Github) -qrencode -o - -s 1 \ +ifinstalled feh && qrencode -o - -s 1 \ "$(xclip -out -selection clipboard)" | feh --zoom max \ -F \ From 2f2e45cbe4ce2d9fd9a295c983fad2158574261b Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Fri, 1 Feb 2019 15:10:13 -0500 Subject: [PATCH 30/36] mpd start before mpdupdate --- .config/i3/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/i3/config b/.config/i3/config index e0486ce..d9bcefc 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -44,6 +44,8 @@ for_window [instance="dropdown_dropdowncalc"] border pixel 2 for_window [instance="dropdown_*"] move position center # #---Starting External Scripts---# # +# mpd startup +exec --no-startup-id mpd # Setting the background: exec --no-startup-id setbg # Starts dunst for notifications: @@ -56,8 +58,6 @@ exec --no-startup-id remaps exec --no-startup-id unclutter # Run the script to update the mpd i3block on change. exec_always --no-startup-id mpdupdate -# mpd startup -exec --no-startup-id mpd # Podboat automatic queue and download exec_always --no-startup-id podentr From 540c4dbb27cf3886109608de65c70e2d248474c2 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Fri, 1 Feb 2019 17:49:22 -0500 Subject: [PATCH 31/36] mpdupdate fix? --- .scripts/statusbar/mpdupdate | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.scripts/statusbar/mpdupdate b/.scripts/statusbar/mpdupdate index 84c7ab1..9a57ca4 100755 --- a/.scripts/statusbar/mpdupdate +++ b/.scripts/statusbar/mpdupdate @@ -1,8 +1,7 @@ #!/bin/sh - [ "$(pgrep -x "$(basename "$0")" | wc -l)" -gt 2 ] && exit -while : ; do +sleep 5 && while : ; do pgrep -x mpd || exit mpc idle > /dev/null pkill -RTMIN+11 i3blocks ; From a794abdf3ded322d3d18e045691dce3d6c583086 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 2 Feb 2019 07:28:34 -0500 Subject: [PATCH 32/36] vi mode cursor change in bash --- .inputrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.inputrc b/.inputrc index 862d347..f9b94dd 100644 --- a/.inputrc +++ b/.inputrc @@ -2,6 +2,10 @@ $include /etc/inputrc set editing-mode vi $if mode=vi +set show-mode-in-prompt on +set vi-ins-mode-string \1\e[6 q\2 +set vi-cmd-mode-string \1\e[2 q\2 + set keymap vi-command # these are for vi-command mode Control-l: clear-screen From 4bea307828695bce2c8b9c1fdbf48dba742c9181 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 2 Feb 2019 08:20:58 -0500 Subject: [PATCH 33/36] vimling bindings manually set --- .config/nvim/init.vim | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 63e31c4..e975d38 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -40,6 +40,13 @@ set clipboard=unnamedplus map :NERDTreeToggle autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif +" vimling: + nm d :call ToggleDeadKeys() + imap d :call ToggleDeadKeys()a + nm i :call ToggleIPA() + imap i :call ToggleIPA()a + nm q :call ToggleProse() + " Shortcutting split navigation, saving a keypress: map h map j From 4fd200501eb118796fd3efc6401c044555e6690f Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 2 Feb 2019 08:21:19 -0500 Subject: [PATCH 34/36] only one leader --- .config/nvim/init.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index e975d38..25c84ca 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -28,7 +28,7 @@ set clipboard=unnamedplus autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o " Goyo plugin makes text more readable when writing prose: - map f :Goyo \| set linebreak + map f :Goyo \| set bg=light \| set linebreak " Spell-check set to o, 'o' for 'orthography': map o :setlocal spell! spelllang=en_us @@ -104,7 +104,7 @@ set clipboard=unnamedplus """LATEX " Word count: - autocmd FileType tex map o :w !detex \| wc -w + autocmd FileType tex map w :w !detex \| wc -w " Code snippets autocmd FileType tex inoremap ,fr \begin{frame}\frametitle{}<++>\end{frame}<++>6kf}i autocmd FileType tex inoremap ,fi \begin{fitch}\end{fitch}<++>3kA From 7e8ea8e3d49a9ebef3a949dd970080a43d5ab616 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 2 Feb 2019 08:21:33 -0500 Subject: [PATCH 35/36] goyo maintains good colors --- .config/nvim/init.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 25c84ca..2833984 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -86,7 +86,7 @@ set clipboard=unnamedplus " Enable Goyo by default for mutt writting " Goyo's width will be the line limit in mutt. autocmd BufRead,BufNewFile /tmp/neomutt* let g:goyo_width=80 - autocmd BufRead,BufNewFile /tmp/neomutt* :Goyo + autocmd BufRead,BufNewFile /tmp/neomutt* :Goyo \| set bg=light " Automatically deletes all trailing whitespace on save. autocmd BufWritePre * %s/\s\+$//e From 1bffcd12c363064829682e16690430a118d962a4 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 2 Feb 2019 08:21:45 -0500 Subject: [PATCH 36/36] vim file changed --- .bmfiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bmfiles b/.bmfiles index e794fa4..863796e 100644 --- a/.bmfiles +++ b/.bmfiles @@ -2,7 +2,7 @@ bf ~/.bmfiles bd ~/.bmdirs cfb ~/.bashrc cfz ~/.zshrc -cfv ~/.vimrc +cfv ~/.config/nvim/init.vim cfr ~/.config/ranger/rc.conf cfi ~/.config/i3/config cfq ~/.config/qutebrowser/config.py