From 986996d6e1dd74c04bbf0e57d5ec8448bc9d2b6b Mon Sep 17 00:00:00 2001 From: Benjamin Chausse Date: Mon, 5 Oct 2020 06:59:14 -0400 Subject: Loads of setup maintenance (see comment) Changes to be committed: modified: ../shortcutrc updated paths for scripts modified: sxhkdrc new setmastermonitor dwm command modified: ../vifm/vifmrc vifm icons only rely on Font Awesome deleted: ../../.local/bin/slendy deleted: ../../.local/bin/test.sh deleted: ../../.local/bin/tmux-mpsyt modified: ../../.profile removed remaps script (already in in xinitrc) modified: ../../.xinitrc added remaps scrript and added flashfocus flags modified: ../../.zshrc Removed ranger stuff (no longer needed) --- .config/shortcutrc | 4 ++-- .config/sxhkd/sxhkdrc | 17 ++++++++++------- .config/vifm/vifmrc | 8 ++++---- .local/bin/slendy | 35 ----------------------------------- .local/bin/test.sh | 9 --------- .local/bin/tmux-mpsyt | 16 ---------------- .profile | 3 --- .xinitrc | 4 ++-- .zshrc | 3 --- 9 files changed, 18 insertions(+), 81 deletions(-) delete mode 100755 .local/bin/slendy delete mode 100755 .local/bin/test.sh delete mode 100755 .local/bin/tmux-mpsyt diff --git a/.config/shortcutrc b/.config/shortcutrc index 58c5364..4d850e6 100644 --- a/.config/shortcutrc +++ b/.config/shortcutrc @@ -27,8 +27,8 @@ | RSS | rss | $HOME/.config/newsboat | | Scholar | sf | $HOME/Dropbox/A/Scholar/1-CEGEP/Courses/session5 | | Workspace | ws | $HOME/Workspace | -| Scripts | sc | $HOME/.scripts | +| Scripts | sc | $HOME/.local/bin | | Hotkeys | sx | $HOME/.config/sxhkd | | Images | img | $HOME/Dropbox/A/Personnal/Photos/unsorted | -| Compilation | cmp | $HOME/Compilation | +| Compilation | cmp | $HOME/compilation | |----------------+-----+--------------------------------------------------| diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc index 9e0742d..b09ba09 100644 --- a/.config/sxhkd/sxhkdrc +++ b/.config/sxhkd/sxhkdrc @@ -70,6 +70,9 @@ super + {comma,period} ## Move current window to previous/next monitor super + shift + {comma,period} dwmc tagmon {-,+}1 +## Set the master monitor to be the previous/next monitor +super + alt + {comma,period} + dwmc setmastermon {-,+}1 ## View all tags super + 0 dwmc viewall @@ -113,10 +116,10 @@ super + Insert killall screenkey || screenkey --bg-color "#222d32" -s small -f HackGen -t 1 --font-color "#BABABA" ## Open this manual super + alt + shift + h - $SCRIPTS/generation/manualgen + manualgen ## Start colorpicker super + shift + c - $SCRIPTS/handling/colorhandler + colorhandler #-# Standard Applications #-# ## Terminal window @@ -127,13 +130,13 @@ super + w $BROWSER ## TUI Email Client (neomutt) super + e - killall neomutt || $TERMINAL -e neomutt ; $SCRIPTS/cron/dwmbar + killall neomutt || $TERMINAL -e neomutt ; dwmbar ## TUI Calendar (calcurse) super + shift + e killall calcurse || $TERMINAL -t dropdown_calendar -e calcurse ## TUI RSS Reader (newsboat) super + n - killall newsboat || $TERMINAL -e newsboat ; $SCRIPTS/cron/dwmbar + killall newsboat || $TERMINAL -e newsboat ; dwmbar #-# Floating Apps/Utilities #-# ## Network Manager @@ -159,10 +162,10 @@ super + shift + v killall hacker-news || dropdowntoggle hacker-news tmux-hn ## Webcam super + shift + w - $SCRIPTS/utilities/camtoggle + camtoggle ## Force Start VLC Podcast super + shift + p - $SCRIPTS/utilities/tmux-vlc + tmux-vlc #-# Prompts (dmenu) #-# ## Application Launcher @@ -191,7 +194,7 @@ alt + f fontpreview ## Start SSH session alt + s - $SCRIPTS/handling/pickssh + pickssh #-# PrintScreen Utilities #-# ## Entire Screen diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc index 43fb5cc..25da74f 100644 --- a/.config/vifm/vifmrc +++ b/.config/vifm/vifmrc @@ -277,10 +277,10 @@ nnoremap mkd :mkdir "{{{ Icons " file types -set classify=' :dir:/, :exe:, :reg:, :link:' +set classify=' :dir:/, :exe:, :reg:, :link:' " various file names -set classify+=' ::../::, ::*.sh::, ::*.[hc]pp::, ::*.[hc]::, ::/^copying|license$/::, ::.git/,,*.git/::, ::*.epub,,*.fb2,,*.djvu::, ::*.pdf::, ::*.htm,,*.html,,**.[sx]html,,*.xml::' -set classify+=' ::*.go::, ::*.vim,,vimrc::, ::*.tex,,*.aux,,*.toc,,*.rnw,,*.rmd::, ::*.js::, ::*.css::, ::*.log,,*.db::, ::*.py,,*.pyc,,*.pyd,,*.pyo::, ::*.md::, ::*.json::, ::*.vcf::, ::*.rss::' +set classify+=' ::../::, ::*.sh::, ::*.[hc]pp::, ::*.[hc]::, ::/^copying|license$/::, ::.git/,,*.git/::, ::*.epub,,*.fb2,,*.djvu::, ::*.pdf::, ::*.htm,,*.html,,**.[sx]html,,*.xml::' +set classify+=' ::*.go::, ::*.vim,,vimrc::, ::*.tex,,*.aux,,*.toc,,*.rnw,,*.rmd::, ::*.js::, ::*.css::, ::*.log,,*.db::, ::*.py,,*.pyc,,*.pyd,,*.pyo::, ::*.md::, ::*.json::, ::*.vcf::, ::*.rss::' " archives set classify+=' ::*.7z,,*.ace,,*.arj,,*.bz2,,*.cpio,,*.deb,,*.dz,,*.gz,,*.jar,,*.lzh,,*.lzma,,*.rar,,*.rpm,,*.rz,,*.tar,,*.taz,,*.tb2,,*.tbz,,*.tbz2,,*.tgz,,*.tlz,,*.trz,,*.txz,,*.tz,,*.tz2,,*.xz,,*.z,,*.zip,,*.zoo::' " images @@ -288,7 +288,7 @@ set classify+=' ::*.bmp,,*.gif,,*.jpeg,,*.jpg,,*.ico,,*.png,,*.ppm,,*.svg,,* " audio set classify+=' ::*.aac,,*.anx,,*.asf,,*.au,,*.axa,,*.flac,,*.m2a,,*.m4a,,*.mid,,*.midi,,*.mp3,,*.mpc,,*.oga,,*.ogg,,*.ogx,,*.ra,,*.ram,,*.rm,,*.spx,,*.wav,,*.wma,,*.ac3::' " media -set classify+=' ::*.avi,,*.ts,,*.axv,,*.divx,,*.m2v,,*.m4p,,*.m4v,,.mka,,*.mkv,,*.mov,,*.mp4,,*.flv,,*.mp4v,,*.mpeg,,*.mpg,,*.nuv,,*.ogv,,*.pbm,,*.pgm,,*.qt,,*.vob,,*.wmv,,*.xvid::' +set classify+=' ::*.avi,,*.ts,,*.axv,,*.divx,,*.m2v,,*.m4p,,*.m4v,,.mka,,*.mkv,,*.mov,,*.mp4,,*.flv,,*.mp4v,,*.mpeg,,*.mpg,,*.nuv,,*.ogv,,*.pbm,,*.pgm,,*.qt,,*.vob,,*.wmv,,*.xvid::' " office files set classify+=' ::*.doc,,*.docx::, ::*.xls,,*.xls[mx]::, ::*.pptx,,*.ppt::' " miscelleneaous files diff --git a/.local/bin/slendy b/.local/bin/slendy deleted file mode 100755 index 766e06c..0000000 --- a/.local/bin/slendy +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -initializeANSI() -{ - esc="" - - blackf="${esc}[30m"; redf="${esc}[31m"; greenf="${esc}[32m" - yellowf="${esc}[33m" bluef="${esc}[34m"; purplef="${esc}[35m" - cyanf="${esc}[36m"; whitef="${esc}[37m" - - blackb="${esc}[40m"; redb="${esc}[41m"; greenb="${esc}[42m" - yellowb="${esc}[43m" blueb="${esc}[44m"; purpleb="${esc}[45m" - cyanb="${esc}[46m"; whiteb="${esc}[47m" - - boldon="${esc}[1m"; boldoff="${esc}[22m" - italicson="${esc}[3m"; italicsoff="${esc}[23m" - ulon="${esc}[4m"; uloff="${esc}[24m" - invon="${esc}[7m"; invoff="${esc}[27m" - - reset="${esc}[0m" -} - -initializeANSI - -cat << EOF - - ${reset}${blackf}| | | | |${reset} - ${redf}█ █${reset} ${blackf}|${reset} ${greenf}█ █${reset} ${blackf}|${reset} ${yellowf}█ █${reset} ${blackf}|${reset} ${bluef}█ █${reset} ${blackf}|${reset} ${purplef}█ █${reset} ${blackf}|${reset} ${cyanf}█ █${reset} - ${redf}███████${reset} ${blackf}|${reset} ${greenf}███████${reset} ${blackf}|${reset} ${yellowf}███████${reset} ${blackf}|${reset} ${bluef}███████${reset} ${blackf}|${reset} ${purplef}███████${reset} ${blackf}|${reset} ${cyanf}███████${reset} - ${redf}███${boldon}${redb}██${reset}${redf}█${boldon}${redb}██${reset}${redf}███${reset} ${blackf}|${reset} ${greenf}███${boldon}${greenb}██${reset}${greenf}█${boldon}${greenb}██${reset}${greenf}███${reset} ${blackf}|${reset} ${yellowf}███${boldon}${yellowb}██${reset}${yellowf}█${boldon}${yellowb}██${reset}${yellowf}███${reset} ${blackf}|${reset} ${bluef}███${boldon}${blueb}██${reset}${bluef}█${boldon}${blueb}██${reset}${bluef}███${reset} ${blackf}|${reset} ${purplef}███${boldon}${purpleb}██${reset}${purplef}█${boldon}${purpleb}██${reset}${purplef}███${reset} ${blackf}|${reset} ${cyanf}███${boldon}${cyanb}██${reset}${cyanf}█${boldon}${cyanb}██${reset}${cyanf}███${reset} - ${redf}████${boldon}${redb}█${reset}${redf}████${reset} ${blackf}|${reset} ${greenf}████${boldon}${greenb}█${reset}${greenf}████${reset} ${blackf}|${reset} ${yellowf}████${boldon}${yellowb}█${reset}${yellowf}████${reset} ${blackf}|${reset} ${bluef}████${boldon}${blueb}█${reset}${bluef}████${reset} ${blackf}|${reset} ${purplef}████${boldon}${purpleb}█${reset}${purplef}████${reset} ${blackf}|${reset} ${cyanf}████${boldon}${cyanb}█${reset}${cyanf}████${reset} - ${redf}█ █ ${boldon}█${reset} ${redf}█ █${reset} ${blackf}|${reset} ${greenf}█ █ ${boldon}█${reset} ${greenf}█ █${reset} ${blackf}|${reset} ${yellowf}█ █ ${boldon}█${reset} ${yellowf}█ █${reset} ${blackf}|${reset} ${bluef}█ █ ${boldon}█${reset} ${bluef}█ █${reset} ${blackf}|${reset} ${purplef}█ █ ${boldon}█${reset} ${purplef}█ █${reset} ${blackf}|${reset} ${cyanf}█ █ ${boldon}█${reset} ${cyanf}█ █${reset} - ${redf}█ █${reset} ${blackf}|${reset} ${greenf}█ █${reset} ${blackf}|${reset} ${yellowf}█ █${reset} ${blackf}|${reset} ${bluef}█ █${reset} ${blackf}|${reset} ${purplef}█ █${reset} ${blackf}|${reset} ${cyanf}█ █${reset} - ${blackf}| | | | |${reset} -EOF \ No newline at end of file diff --git a/.local/bin/test.sh b/.local/bin/test.sh deleted file mode 100755 index a1d8a9e..0000000 --- a/.local/bin/test.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin - -for i in $(ls ~/manjaro-dotfiles/.scripts/) -do - for j in $(ls ~/manjaro-dotfiles/.scripts/$i) - do - cp ~/manjaro-dotfiles/.scripts/$i/$j ~/.local/bin/ - done -done diff --git a/.local/bin/tmux-mpsyt b/.local/bin/tmux-mpsyt deleted file mode 100755 index b929d52..0000000 --- a/.local/bin/tmux-mpsyt +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# This script ensures that i3 will spawn a youtube tui. -session="mps-YouTube" - -# Check if the session exists, discarding output -# We can check $? for the exit status (zero for success, non-zero for failure) -tmux has-session -t $session 2>/dev/null - -if [ $? != 0 ]; then - # Set up your session - tmux new-session -d -s "$session" mpsyt -fi - -# Attach to created session -tmux attach-session -t $session - diff --git a/.profile b/.profile index 8684d7c..043cc9c 100644 --- a/.profile +++ b/.profile @@ -37,9 +37,6 @@ if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then startx fi -# Map CAPS_LOCK correctly: -$SCRIPTS/remaps - # gh completion eval "$(gh completion -s zsh)" diff --git a/.xinitrc b/.xinitrc index 0be1368..467eb12 100644 --- a/.xinitrc +++ b/.xinitrc @@ -6,16 +6,16 @@ blueman-applet & pnmixer & dropbox & sxhkd & -$SCRIPTS/remaps & +remaps & dunst & protonmail-bridge --no-window & xautolock -time 5 -detectsleep -locker slock & picom -b & -flashfocus & echo "/tmp/imapsyncicon_$USER" | entr $SCRIPTS/cron/dwmbar & echo "" > $HOME/.local/share/newsboat/queue echo us > $HOME/.cache/layout xrdb -load $HOME/.Xresources $SCRIPTS/cron/dwmbar & +flashfocus -n 30 -o 0.9 -v ERROR & exec dwm # vim:filetype=sh diff --git a/.zshrc b/.zshrc index feb342c..1b80103 100644 --- a/.zshrc +++ b/.zshrc @@ -82,9 +82,6 @@ source $HOME/.cache/zsh-aliases* source $HOME/.cache/zsh-shortcuts source $HOME/.cache/shell-vars -# Making ranger useful: -alias ranger='ranger --choosedir=$HOME/.rangerdir; LASTDIR=`cat $HOME/.rangerdir`; cd "$LASTDIR"' - # Vifm with sensible cd option vicd() { -- cgit v1.2.3