From 3c1f935f20c3d9f4ed6066aa085ca34cbbcc2e0a Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Mon, 11 Mar 2019 16:40:30 -0400 Subject: [PATCH 1/9] no pix in crontog --- .scripts/cron/crontog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scripts/cron/crontog b/.scripts/cron/crontog index e6ffd6a2..b5694b31 100755 --- a/.scripts/cron/crontog +++ b/.scripts/cron/crontog @@ -2,4 +2,4 @@ # Toggles all cronjobs off/on. # Stores disabled crontabs in ~/.consaved until restored. -([ -f ~/.cronsaved ] && crontab - < ~/.cronsaved && rm ~/.cronsaved && note "Cronjobs re-enabled." "$PIX/clock.gif" ) || ( crontab -l > ~/.cronsaved && crontab -r && note "Cronjobs saved and disabled." "$PIX/clock.gif") +([ -f ~/.cronsaved ] && crontab - < ~/.cronsaved && rm ~/.cronsaved && notify-send "🕓 Cronjobs re-enabled.") || ( crontab -l > ~/.cronsaved && crontab -r && notify-send "🕓 Cronjobs saved and disabled.") From 13fccbe54506ddddb50812e240de47263062a965 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Mon, 11 Mar 2019 16:42:15 -0400 Subject: [PATCH 2/9] init.vim updated for movement to ~/.config/ --- .config/nvim/init.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 28339844..09896a7d 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -37,7 +37,7 @@ set clipboard=unnamedplus set splitbelow splitright " Nerd tree - map :NERDTreeToggle + map n :NERDTreeToggle autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif " vimling: @@ -92,10 +92,10 @@ set clipboard=unnamedplus autocmd BufWritePre * %s/\s\+$//e " When shortcut files are updated, renew bash and ranger configs with new material: - autocmd BufWritePost ~/.bmdirs,~/.bmfiles !shortcuts + autocmd BufWritePost ~/.config/bmdirs,~/.config/bmfiles !shortcuts " Run xrdb whenever Xdefaults or Xresources are updated. - autocmd BufWritePost ~/.Xresources,~/.Xdefaults !xrdb % + autocmd BufWritePost *Xresources,*Xdefaults !xrdb % " Navigating with guides inoremap /<++>"_c4l From 5bef414ec1e94ca82f59e35451681a8da69f7ad3 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Mon, 11 Mar 2019 16:44:20 -0400 Subject: [PATCH 3/9] vifm syntax highlighting --- .config/nvim/init.vim | 2 ++ .config/vifm/vifmrc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 09896a7d..08402863 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -10,12 +10,14 @@ Plug 'LukeSmithxyz/vimling' Plug 'vimwiki/vimwiki' Plug 'bling/vim-airline' Plug 'tpope/vim-commentary' +Plug 'vifm/vifm.vim' call plug#end() set bg=light set mouse=a set nohlsearch set clipboard=unnamedplus + " Some basics: set nocompatible filetype plugin on diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc index b05f818f..ecf145aa 100644 --- a/.config/vifm/vifmrc +++ b/.config/vifm/vifmrc @@ -1,4 +1,4 @@ -" vim: filetype=vim +" vim: filetype=vifm source ~/.config/vifm/vifmshortcuts map h From 316b01f1b0f0fdbe34c6f010a1b05caa440d05f4 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Mon, 11 Mar 2019 16:44:47 -0400 Subject: [PATCH 4/9] c doesn't copy deleted text --- .config/nvim/init.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 08402863..d282fbf9 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -19,6 +19,7 @@ set nohlsearch set clipboard=unnamedplus " Some basics: + nnoremap c "_c set nocompatible filetype plugin on syntax on From 9524786a864ee3614e37ab260e413c3eaadf78fd Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 12 Mar 2019 00:02:14 -0400 Subject: [PATCH 5/9] emojis file moved to config --- .emoji => .config/emoji | 0 .scripts/i3cmds/dmenuunicode | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename .emoji => .config/emoji (100%) diff --git a/.emoji b/.config/emoji similarity index 100% rename from .emoji rename to .config/emoji diff --git a/.scripts/i3cmds/dmenuunicode b/.scripts/i3cmds/dmenuunicode index e9efa0cb..4abf2028 100755 --- a/.scripts/i3cmds/dmenuunicode +++ b/.scripts/i3cmds/dmenuunicode @@ -5,7 +5,7 @@ # Must have xclip installed to even show menu. xclip -h >/dev/null || exit -chosen=$(grep -v "#" ~/.emoji | dmenu -i -l 20 -fn Monospace-18) +chosen=$(grep -v "#" ~/.config/emoji | dmenu -i -l 20 -fn Monospace-18) [ "$chosen" != "" ] || exit From e20aa23d4d0a32394567b079af8fa7214c02465f Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 12 Mar 2019 00:14:27 -0400 Subject: [PATCH 6/9] just form --- .config/i3/config | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.config/i3/config b/.config/i3/config index 6c0b83e5..feddf213 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -1,15 +1,5 @@ # vim: filetype=i3 -# _ _ ____ ____ ____ -# | | / \ | _ \| __ ) ___| -# | | / _ \ | |_) | _ \___ \ -# | |___ / ___ \| _ <| |_) |__) | -# |_____/_/ \_\_| \_\____/____/ -# -# File originally by Luke Smith -# Website: http://lukesmith.xyz -# Email: luke@lukesmith.xyz -# YouTube: https://youtube.com/c/LukeSmithxyz -# Github: https://github.com/LukeSmithxyz +# File originally by Luke Smith # This config file will use environmental variables such as $BROWSER and $TERMINAL. # You can set these variables in ~/.profile or ~/.bash_profile if you have it as below: @@ -18,7 +8,6 @@ # export TERMINAL="st" # #---Basic Definitions---# # -# Needed for i3-gaps for_window [class="^.*"] border pixel 2 gaps inner 15 gaps outer 15 @@ -31,7 +20,6 @@ set $netrefresh --no-startup-id sudo -A systemctl restart NetworkManager set $hibernate sudo -A systemctl suspend # #---Dropdown Windows---# # - # General dropdown window traits. The order can matter. for_window [instance="dropdown_*"] floating enable for_window [instance="dropdown_*"] move scratchpad @@ -269,7 +257,6 @@ bindsym $mod+Shift+Up move up bindsym $mod+Shift+Right move right # #---Media Keys---# # - # Volume keys bindsym $mod+plus exec --no-startup-id lmc up 5 bindsym $mod+Shift+plus exec --no-startup-id lmc up 15 @@ -295,7 +282,6 @@ bindsym $mod+Delete exec $stoprec bindsym XF86Launch1 exec --no-startup-id xset dpms force off # #---Extra XF86 Keys---# # -# These are the extra media keys that some keyboards have. bindsym XF86AudioMute exec --no-startup-id lmc mute bindsym XF86AudioLowerVolume exec --no-startup-id lmc down 5 bindsym Shift+XF86AudioLowerVolume exec --no-startup-id lmc down 10 From f413c5f82bad86f76782c9dea19ed2c0708f7125 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 12 Mar 2019 00:15:19 -0400 Subject: [PATCH 7/9] xcqr removed (replaced by mod+c) --- .config/i3/config | 2 +- .scripts/i3cmds/xcqr | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100755 .scripts/i3cmds/xcqr diff --git a/.config/i3/config b/.config/i3/config index feddf213..fed2942f 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -78,7 +78,7 @@ bindsym $mod+Shift+Delete exec --no-startup-id lmc truemute ; exec --no-startup- # Show selection: bindsym $mod+Insert exec --no-startup-id showclip -bindsym $mod+Pause exec --no-startup-id xcqr +##bindsym $mod+Pause # #---Letter Key Bindings---# # bindsym $mod+q [con_id="__focused__" instance="^(?!dropdown_).*$"] kill diff --git a/.scripts/i3cmds/xcqr b/.scripts/i3cmds/xcqr deleted file mode 100755 index 23525997..00000000 --- a/.scripts/i3cmds/xcqr +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# Credit to Maddison Hellstrom (@b0o on Github) -ifinstalled feh && qrencode -o - -s 1 \ - "$(xclip -out -selection clipboard)" | - feh --zoom max \ - -F \ - --force-aliasing \ - --image-bg white \ - - From d9b568cb74a68a9ae25f1e140517bc13a6bbf086 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 12 Mar 2019 21:20:17 -0400 Subject: [PATCH 8/9] mimeapps cleanup; rss added --- .local/share/applications/feh.desktop | 4 ---- .local/share/applications/gif.desktop | 4 ---- .local/share/applications/{sxiv.desktop => img.desktop} | 2 +- .local/share/applications/{mutt.desktop => mail.desktop} | 2 +- .../share/applications/{zathura.desktop => pdf.desktop} | 2 +- .local/share/applications/rss.desktop | 4 ++++ .local/share/applications/{vim.desktop => text.desktop} | 2 +- .../{transmission-remote.desktop => torrent.desktop} | 2 +- .scripts/tools/rssadd | 9 +++++++++ 9 files changed, 18 insertions(+), 13 deletions(-) delete mode 100644 .local/share/applications/feh.desktop delete mode 100644 .local/share/applications/gif.desktop rename .local/share/applications/{sxiv.desktop => img.desktop} (71%) rename .local/share/applications/{mutt.desktop => mail.desktop} (79%) rename .local/share/applications/{zathura.desktop => pdf.desktop} (70%) create mode 100644 .local/share/applications/rss.desktop rename .local/share/applications/{vim.desktop => text.desktop} (79%) rename .local/share/applications/{transmission-remote.desktop => torrent.desktop} (70%) create mode 100755 .scripts/tools/rssadd diff --git a/.local/share/applications/feh.desktop b/.local/share/applications/feh.desktop deleted file mode 100644 index be3de36a..00000000 --- a/.local/share/applications/feh.desktop +++ /dev/null @@ -1,4 +0,0 @@ -[Desktop Entry] -Type=Application -Name=feh image viewer -Exec=/usr/bin/feh %u diff --git a/.local/share/applications/gif.desktop b/.local/share/applications/gif.desktop deleted file mode 100644 index 366fd948..00000000 --- a/.local/share/applications/gif.desktop +++ /dev/null @@ -1,4 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Animated gif handler -Exec=/usr/bin/mpv --loop %u diff --git a/.local/share/applications/sxiv.desktop b/.local/share/applications/img.desktop similarity index 71% rename from .local/share/applications/sxiv.desktop rename to .local/share/applications/img.desktop index a9ae0b69..d1582a5e 100644 --- a/.local/share/applications/sxiv.desktop +++ b/.local/share/applications/img.desktop @@ -1,4 +1,4 @@ [Desktop Entry] Type=Application -Name=sxiv image viewer +Name=Image viewer Exec=/usr/bin/sxiv -a %u diff --git a/.local/share/applications/mutt.desktop b/.local/share/applications/mail.desktop similarity index 79% rename from .local/share/applications/mutt.desktop rename to .local/share/applications/mail.desktop index b30466e3..d24aea20 100644 --- a/.local/share/applications/mutt.desktop +++ b/.local/share/applications/mail.desktop @@ -1,4 +1,4 @@ [Desktop Entry] Type=Application -Name=Neomutt Mail +Name=Mail Exec=/usr/local/bin/st -e neomutt %u diff --git a/.local/share/applications/zathura.desktop b/.local/share/applications/pdf.desktop similarity index 70% rename from .local/share/applications/zathura.desktop rename to .local/share/applications/pdf.desktop index 21e8c2bf..8c386774 100644 --- a/.local/share/applications/zathura.desktop +++ b/.local/share/applications/pdf.desktop @@ -1,4 +1,4 @@ [Desktop Entry] Type=Application -Name=Zathura PDF reader +Name=PDF reader Exec=/usr/bin/zathura %u diff --git a/.local/share/applications/rss.desktop b/.local/share/applications/rss.desktop new file mode 100644 index 00000000..6fafc4f4 --- /dev/null +++ b/.local/share/applications/rss.desktop @@ -0,0 +1,4 @@ +[Desktop Entry] +Type=Application +Name=RSS feed addition +Exec=/usr/bin/env rssadd %U diff --git a/.local/share/applications/vim.desktop b/.local/share/applications/text.desktop similarity index 79% rename from .local/share/applications/vim.desktop rename to .local/share/applications/text.desktop index aa2284e2..41ee05f8 100644 --- a/.local/share/applications/vim.desktop +++ b/.local/share/applications/text.desktop @@ -1,4 +1,4 @@ [Desktop Entry] Type=Application -Name=Neovim +Name=Text editor Exec=/usr/local/bin/st -e nvim %u diff --git a/.local/share/applications/transmission-remote.desktop b/.local/share/applications/torrent.desktop similarity index 70% rename from .local/share/applications/transmission-remote.desktop rename to .local/share/applications/torrent.desktop index b48e73be..f6d28d9b 100644 --- a/.local/share/applications/transmission-remote.desktop +++ b/.local/share/applications/torrent.desktop @@ -1,4 +1,4 @@ [Desktop Entry] Type=Application -Name=Transmission Addition +Name=Torrent Exec=/usr/bin/env transadd %U diff --git a/.scripts/tools/rssadd b/.scripts/tools/rssadd new file mode 100755 index 00000000..e90dcf2a --- /dev/null +++ b/.scripts/tools/rssadd @@ -0,0 +1,9 @@ +#!/bin/sh +! echo "$1" | grep "https*://\S\+\.[A-Za-z]\+\S*" >/dev/null && + notify-send -i "$PIX/rss.svg" "That doesn't look like a full URL." && exit +RSSFILE="$HOME/.config/newsboat/urls" +if awk '{print $1}' "$RSSFILE" | grep "^$1$" >/dev/null; then + notify-send -i "$PIX/rss.svg" "You already have this RSS feed." +else + echo "$1" >> "$RSSFILE" && notify-send -i "$PIX/rss.svg" "RSS feed added." +fi From 434e848c5daf78ed8567d03a0b44f7ae34519da7 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 12 Mar 2019 21:21:04 -0400 Subject: [PATCH 9/9] actual mimeapps fix --- .config/mimeapps.list | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.config/mimeapps.list b/.config/mimeapps.list index 85224313..84bf43bf 100644 --- a/.config/mimeapps.list +++ b/.config/mimeapps.list @@ -1,8 +1,10 @@ [Default Applications] -x-scheme-handler/magnet=transmission-remote.desktop; -x-scheme-handler/mailto=mutt.desktop; -text/plain=vim.desktop; -application/pdf=zathura.desktop; -image/png=sxiv.desktop; -image/jpeg=sxiv.desktop; -image/gif=sxiv.desktop; +x-scheme-handler/magnet=torrent.desktop; +x-scheme-handler/mailto=mail.desktop; +text/plain=text.desktop; +text/x-shellscript=text.desktop; +application/pdf=pdf.desktop; +image/png=img.desktop; +image/jpeg=img.desktop; +image/gif=img.desktop; +application/rss+xml=rss.desktop