diff options
author | Benjamin Chausse <benjamin@chausse.xyz> | 2021-09-14 22:45:02 -0400 |
---|---|---|
committer | Benjamin Chausse <benjamin@chausse.xyz> | 2021-09-14 22:45:02 -0400 |
commit | e5858ed9e82b3dc4279df334417305c90d5586be (patch) | |
tree | e16efc88dd1f3f00867aa3dbc766ee9afe185b93 | |
parent | 0d847937606863d2ca29bf45e88ce7a4ce35f817 (diff) |
Backup before windows install...
-rw-r--r-- | .Xresources##hostname.workstation | 10 | ||||
-rw-r--r-- | .config/Xresources/dark-1.Xresources | 2 | ||||
-rw-r--r-- | .config/aliasrc | 10 | ||||
-rw-r--r-- | .config/mimeapps.list | 10 | ||||
-rw-r--r-- | .config/newsboat/urls | 4 | ||||
-rwxr-xr-x | .config/nvim/init.vim | 72 | ||||
-rw-r--r-- | .config/shortcutrc | 12 | ||||
-rw-r--r-- | .config/sxhkd/sxhkdrc | 11 | ||||
-rw-r--r-- | .config/vifm/vifmrc | 24 | ||||
-rwxr-xr-x | .local/bin/emoji-copy | 2 | ||||
-rwxr-xr-x | .local/bin/opout | 2 | ||||
-rwxr-xr-x | .local/bin/pod-dl | 24 | ||||
-rwxr-xr-x | .local/bin/setbg | 4 | ||||
-rwxr-xr-x | .local/bin/shortcutgen | 44 | ||||
-rwxr-xr-x | .local/bin/tmux-toggle | 29 | ||||
-rwxr-xr-x | .local/bin/tmux-vlc | 19 | ||||
-rwxr-xr-x | .local/bin/toggle | 2 | ||||
-rw-r--r-- | .local/share/applications/file.desktop | 2 | ||||
-rw-r--r-- | .local/share/applications/mail.desktop | 2 | ||||
-rw-r--r-- | .local/share/applications/text.desktop | 2 | ||||
-rw-r--r-- | .mozilla/firefox/jzkuxgsr.default-release-1625619065722/chrome/userChrome.css | 14 | ||||
-rw-r--r-- | .profile | 11 | ||||
-rw-r--r-- | .tmux.conf | 4 | ||||
l--------- | .xinitrc | 2 | ||||
-rw-r--r-- | .xinitrc##hostname.workstation | 6 | ||||
-rw-r--r-- | .zshrc | 2 |
26 files changed, 182 insertions, 144 deletions
diff --git a/.Xresources##hostname.workstation b/.Xresources##hostname.workstation index d11ada1..438fd52 100644 --- a/.Xresources##hostname.workstation +++ b/.Xresources##hostname.workstation @@ -35,14 +35,6 @@ *background: #222d32 *foreground: #acb3b5 *cursorColor: #ebcb88 -! See "highlightColorMode" and "hm" options in XTerm manual page. -*highlightTextColor: #2e333c -*highlightColor: #161f2a -! No support for cursor text coloring; would be #1e232b. -! No support for bold coloring; would be #626a73. !other -*.alpha: 0.69 - -Sxiv.background: #111A1F -Sxiv.foreground: #9B9257 +*.alpha: 0.82 diff --git a/.config/Xresources/dark-1.Xresources b/.config/Xresources/dark-1.Xresources index 5478e86..d11ada1 100644 --- a/.config/Xresources/dark-1.Xresources +++ b/.config/Xresources/dark-1.Xresources @@ -42,7 +42,7 @@ ! No support for bold coloring; would be #626a73. !other -*.alpha: 0.88 +*.alpha: 0.69 Sxiv.background: #111A1F Sxiv.foreground: #9B9257 diff --git a/.config/aliasrc b/.config/aliasrc index 60ba839..65f126b 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -33,11 +33,11 @@ | 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 | +| vpn | piactl get connectionstate | +| vc | piactl connect | +| vd | piactl disconnect | +| vm | piactl set region ca-montreal | +| vs | piactl set region auto | | xx | chmod +x | | yadog | yadm log --all --decorate --oneline --graph | |---------+-----------------------------------------------------------------| diff --git a/.config/mimeapps.list b/.config/mimeapps.list index 487fece..2bc90e3 100644 --- a/.config/mimeapps.list +++ b/.config/mimeapps.list @@ -27,6 +27,11 @@ application/xhtml+xml=firefox.desktop application/x-extension-xhtml=firefox.desktop application/x-extension-xht=firefox.desktop x-scheme-handler/kite=kite-copilot.desktop +x-scheme-handler/rdp=org.remmina.Remmina.desktop +x-scheme-handler/spice=org.remmina.Remmina.desktop +x-scheme-handler/vnc=org.remmina.Remmina.desktop +x-scheme-handler/remmina=org.remmina.Remmina.desktop +application/x-remmina=org.remmina.Remmina.desktop [Added Associations] x-scheme-handler/http=firefox.desktop; @@ -41,3 +46,8 @@ application/xhtml+xml=firefox.desktop; application/x-extension-xhtml=firefox.desktop; application/x-extension-xht=firefox.desktop; text/plain=nvim.desktop; +x-scheme-handler/rdp=org.remmina.Remmina.desktop; +x-scheme-handler/spice=org.remmina.Remmina.desktop; +x-scheme-handler/vnc=org.remmina.Remmina.desktop; +x-scheme-handler/remmina=org.remmina.Remmina.desktop; +application/x-remmina=org.remmina.Remmina.desktop; diff --git a/.config/newsboat/urls b/.config/newsboat/urls index fa49789..d43d04a 100644 --- a/.config/newsboat/urls +++ b/.config/newsboat/urls @@ -13,6 +13,9 @@ https://feeds.buzzsprout.com/191338.rss "Podcast" "~Podcast: Our Ludicrous # https://anchor.fm/s/3a6f26f8/podcast/rss "Podcast" "~Podcast: Total Space" http://festivalofthespokennerd.libsyn.com/rss "Podcast" "~Podcast: A Podcast of Unnecessary Details" http://aproblemsquared.libsyn.com/rss "Podcast" "~Podcast: A Problem Squared" +https://www.spreaker.com/show/4530061/episodes/feed "Podcast" "~Podcast: Talk Nerdy" +http://sciencefriday.com/feed/podcast/podcast-episode "Podcast" "~Podcast: Science Friday" +http://feeds.feedburner.com/SkepticallySpeaking "Podcast" "~Podcast: Science for the People" # #---Youtube---# # # https://www.youtube.com/feeds/videos.xml?channel_id=UCtI0Hodo5o5dUb67FeUjDeA "Youtube" "~Youtube: SpaceX" @@ -42,6 +45,7 @@ https://chausse.xyz/bp/rss.xml "Website" # https://spacenews.com/feed/ "Website" "~Website: SpaceNews" http://www.usherbrooke.ca/genie/fil/3590/nouvelles.xml "Website" "~Website: USherbrooke Génie" https://sidneyliebrand.io/feed.xml "Website" "~Website: Sidney Liebrand's Blog" +https://artixlinux.org/feed.php "Website" "~Website: Artix Linux News" # #---Facebook---# # # https://rss-bridge.bb8.fun/?action=display&bridge=Facebook&context=User&u=LaDebarqueEscalade&media_type=all&limit=-1&format=Atom "Facebook" "~Facebook: La Debarque" diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index d7d3f0a..5f1b2df 100755 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -22,20 +22,26 @@ endif call plug#begin() " Bracket Completion Plug 'jiangmiao/auto-pairs' +" Smooth scrolling +Plug 'psliwka/vim-smoothie' " Automated vim bulletpoints Plug 'dkarter/bullets.vim' " Vim css hex highlight Plug 'chrisbra/Colorizer' +" Matlab inside neovim +Plug 'MortenStabenau/matlab-vim' +" Vim todos inside the quickfix window +Plug 'Dimercel/todo-vim' " Deoplete -Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } +" Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } " LaTeX deoplete -Plug 'hisaknown/deoplete-latex' +" 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' +Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']} " Nice markdown formatting Plug 'godlygeek/tabular', { 'for': 'markdown' } Plug 'plasticboy/vim-markdown', { 'for': 'markdown' } @@ -59,6 +65,8 @@ Plug 'tpope/vim-repeat' Plug 'lervag/vimtex', { 'for': ['tex', 'aux', 'bib'] } " Commentary Plug 'tpope/vim-commentary' +" Title comments +Plug 'cometsong/CommentFrame.vim' " Vim snippet manager/tool Plug 'sirver/UltiSnips' " Vim snippet library @@ -166,8 +174,13 @@ autocmd BufWritePre * %s/\s\+$//e " 'o'pen pdf for the current document nnoremap <silent> <leader>o :!opout <c-r>%<CR><CR> -nnoremap <silent> <leader>c :update \| :!compiler <c-r>%<CR><CR> -nnoremap <silent> <leader>r :update \| :!compiler <c-r>%<CR><CR> \| :!sage %:r.sagetex.sage && compiler %<CR><CR> +nnoremap <silent> <leader>r :update \| :!compiler <c-r>%<CR><CR> +nnoremap <silent> <leader>t :update \| :!compiler <c-r>%<CR><CR> \| :!sage %:r.sagetex.sage && compiler %<CR><CR> + +" Correct prev/next spelling error +nnoremap [c :normal! mt[s1z=`t +nnoremap ]c :normal! mt]s1z=`t + " Auto-enable Goyo for certain filetypes au filetype mail,todoist Goyo @@ -190,6 +203,9 @@ let g:vim_markdown_strikethrough = 1 let g:vim_markdown_folding_disabled = 1 set conceallevel=2 +"Matlab-vim +let g:matlab_panel_size = 50 + " Bufferize let g:bufferize_command = 'vnew' @@ -209,8 +225,7 @@ 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:vimtex_view_general_viewer = 'zathura' let g:tex_flavor = 'latex' " TOC nnoremap <C-n> :VimtexTocToggle<cr> @@ -224,6 +239,21 @@ let g:user_emmet_leader_key=',' set foldmethod=marker " Follow colorscheme let rout_follow_colorscheme = 0 +" Run in external term +let R_external_term = 'alacritty -t Nvim-R -e' " Run R in in st +" dwm automation when starting the terminal +function! s:customNvimRMappings() + nmap <buffer> <Leader>sr <Plug>RStart \| :silent exec "!sleep 0.2 && dwmc rotatestack -1 && dwmc focusstack +1"<CR> + imap <buffer> <Leader>sr <Plug>RStart \| :silent exec "!sleep 0.2 && dwmc rotatestack -1 && dwmc focusstack +1"<CR> + vmap <buffer> <Leader>sr <Plug>RStart \| :silent exec "!sleep 0.2 && dwmc rotatestack -1 && dwmc focusstack +1"<CR> +endfunction +augroup myNvimR + au! + autocmd filetype r call s:customNvimRMappings() +augroup end + +" No documentation in a separate buffer +let R_nvimpager = 'no' " Arduino let g:arduino_cmd = '/usr/bin/arduino' @@ -238,7 +268,33 @@ let g:UltiSnipsEditSplit="vertical" " Snippet directory let g:UltiSnipsSnippetDirectories=[$HOME.'/.config/nvim/UltiSnips'] +" Bullets.vim +let g:bullets_enabled_file_types = [ + \ 'markdown', + \ 'tex', + \ 'text', + \ 'gitcommit', + \ 'scratch' + \] +" Vim Todo +nnoremap <leader>d :TODOToggle<CR><C-w>jjj +let g:todo_below = 1 +let g:todo_winheight = 7 + +let g:CommentFrame_TextWidth=78 + +" }}} +" Vim Stab {{{ +let g:bTitle = map(copy(getbufinfo()), 'v:val.name') +" Initialize the number of the first preview +let cBuf = bufnr('%')+1 | if cBuf > len(g:bTitle) | let cBuf = 1 | endif +" Rotate the current buffer (1:forward, -1:backwards) +fu RotBuf(cBuf, i) + let cBuf = a:cBuf + let cBuf += a:i | if cBuf > len(g:bTitle) | let cBuf = 1 | endif + return cBuf +endf " }}} " See immediate results when edditing this file -autocmd BufWritePost ~/.config/nvim/init.vim :source % +" autocmd BufWritePost ~/.config/nvim/init.vim :source % diff --git a/.config/shortcutrc b/.config/shortcutrc index b2c54b7..ba48952 100644 --- a/.config/shortcutrc +++ b/.config/shortcutrc @@ -16,18 +16,18 @@ # (It can contain environmental variables) |----------------+-----+--------------------------------------------------| -| Bibliographies | bb | $HOME/Dropbox/A/Scholar/All/References | +| Bibliographies | bb | $HOME/Dropbox/A/scholar/All/References | | Config | cf | $HOME/.config | | Downloads | dl | $HOME/Dropbox/Downloads | | 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 | +| Personnal | ps | $HOME/Dropbox/A/personal/ | +| Wallpapers | wp | $HOME/Dropbox/A/personal/photos/wallpapers | | RSS | rss | $HOME/.config/newsboat | -| Scholar | sf | $HOME/Dropbox/A/Scholar/CEGEP/session6 | +| Scholar | sf | /home/master/Dropbox/A/scholar/sherbrooke/s1 | | Scripts | sc | $HOME/.local/bin | | Hotkeys | sx | $HOME/.config/sxhkd | -| Images | img | $HOME/Dropbox/A/Personnal/Photos/unsorted | -| Compilation | cmp | $HOME/.local/src | +| Images | im | $HOME/Dropbox/A/personal/photos/unsorted | +| Compilation | cp | $HOME/.local/src | |----------------+-----+--------------------------------------------------| diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc index 19132b2..514d1f3 100644 --- a/.config/sxhkd/sxhkdrc +++ b/.config/sxhkd/sxhkdrc @@ -124,7 +124,7 @@ super + shift + c #-# Standard Applications #-# ## Terminal window super + Return - $TERMINAL + st -t terminal ## Default Browser super + w $BROWSER @@ -150,22 +150,19 @@ super + space dropdowntoggle todoist nvim +Todoist ## Terminal Calculator super + a - dropdowntoggle calc tmux-r + tmux-toggle calc R --no-save ## Terminal Shell super + shift + a - dropdowntoggle shell tmux-shell + tmux-toggle terminal zsh ## TUI Youtube (youtube-viewer) super + v cat ~/.cache/yt-sub | dmenu -p "Query: " | ytfzf -D - -## TUI Hacker News -super + shift + v - killall hacker-news || dropdowntoggle hacker-news tmux-hn ## Webcam super + shift + w camtoggle ## Force Start VLC Podcast super + shift + p - dropdowntoggle Podcast pod-dl + tmux-toggle podcast pod-dl #-# Prompts (dmenu) #-# ## Application Launcher diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc index e419ef4..2bd7626 100644 --- a/.config/vifm/vifmrc +++ b/.config/vifm/vifmrc @@ -114,8 +114,6 @@ command! reload :write | restart " Empty the ruler. By default, it shows the number of directories+files. set rulerformat= " }}} - - " {{{ File preview & file opening " The file type is for the default programs to be used with " a file extension. @@ -180,25 +178,30 @@ fileviewer *.otf,*.ttf,*.woff \ vifmimg clear " Audios -filetype <audio/*> mpv %c %i & +filetype <audio/*> mpv --input-conf=~/.config/mpv/input.conf %c %i & fileviewer <audio/*> \ vifmimg audio %px %py %pw %ph %c \ %pc \ vifmimg clear " Videos -filetype <video/*> mpv %c %i & +filetype <video/*> mpv --input-conf=~/.config/mpv/input.conf %c %i & fileviewer <video/*> \ vifmimg video %px %py %pw %ph %c \ %pc \ vifmimg clear +" " Images +" filextype <image/*> sxiv %c %i & +" fileviewer <image/*> +" \ vifmimg draw %px %py %pw %ph %c +" \ %pc +" \ vifmimg clear + " Images -filextype <image/*> sxiv %c %i & +filextype <image/*> imv %c %i & fileviewer <image/*> - \ vifmimg draw %px %py %pw %ph %c - \ %pc - \ vifmimg clear + \ show-sixel %c %pw %ph %pd " Archives fileviewer *.zip,*.jar,*.war,*.ear,*.oxt zip -sf %c @@ -208,6 +211,7 @@ fileviewer *.tar.txz,*.txz xz --list %c fileviewer *.tar tar -tf %c fileviewer *.rar unrar v %c fileviewer *.7z 7z l %c +fileviewer *.heic imv %c %i & " Dont show preview on ../ as this confuses me at times fileview ../ echo >/dev/null @@ -224,8 +228,6 @@ fileviewer .*/ ls --color --group-directories-first filetype * xdg-open %c fileviewer * file -b %c " }}} - - "{{{ Key mappings " Easily quit vifm by hitting q nmap q :q<cr> @@ -283,8 +285,6 @@ nnoremap N :!dropbox-cli exclude add %d/%b &<cr> " Make a new directory nnoremap mkd :mkdir<space> "}}} - - "{{{ Icons " file types set classify=' :dir:/, :exe:, :reg:, :link:' diff --git a/.local/bin/emoji-copy b/.local/bin/emoji-copy index 9ddc05d..84e50df 100755 --- a/.local/bin/emoji-copy +++ b/.local/bin/emoji-copy @@ -8,7 +8,7 @@ choice=$( cat ~/.local/share/emoji | dmenu -i -p "Font Awesome & Emojis: ") icon=$(echo $choice | sed "s/^\(.\).*$/\1/") -printf "$icon" | xsel -b +printf "$icon" | wl-copy [ -z "$icon" ] && notify-send -a "Clipboard:" "Operation Cancelled" diff --git a/.local/bin/opout b/.local/bin/opout index 076bd16..7dd5d5a 100755 --- a/.local/bin/opout +++ b/.local/bin/opout @@ -8,4 +8,4 @@ case "$1" in *.tex|*.rnw|*.gd|*.md|*.rmd|*.ms|*.me|*.mom) setsid "$READER" "$basename".pdf >/dev/null 2>&1 & ;; *.html) setsid "$BROWSER" --new-window "$basename".html >/dev/null 2>&1 & ;; *.sent) setsid sent "$1" >/dev/null 2>&1 & ;; -esac && sleep 0.1 && dwmc rotatestack -1 && dwmc focusmaster & +esac && sleep 0.2 && dwmc rotatestack -1 && dwmc focusmaster & diff --git a/.local/bin/pod-dl b/.local/bin/pod-dl index ab26367..8dfd150 100755 --- a/.local/bin/pod-dl +++ b/.local/bin/pod-dl @@ -6,25 +6,5 @@ file=$(tail -n 1 $HOME/.local/share/newsboat/queue) url=$(echo $file | sed 's/."\/home.*$//') dir=$(echo $file | sed 's/^.*"\/home/\/home/; s/.$//') -$TERMINAL -c dropdown -t Podcast -e ~/.local/bin/tmux-vlc "$url" - -# notify-send -i "$HOME/.fonts/svg/rss.svg" "Download initiated" -# wget -LO $dir $url && \ -# notify-send -i "$HOME/.fonts/svg/rss.svg" "Download Complete" && \ -# st -e $HOME/.scripts/tools/tm-vlc $dir - - -#!/bin/sh - -# tmux kill-session -t tm-vlc -# killall -q vlc - -# file=$(cat $HOME/.local/share/newsboat/queue | sed 2q | tail -n 1) -# url=$(echo $file | sed 's/."\/home.*$//') -# dir=$(echo $file | sed 's/^.*"\/home/\/home/; s/.$//') - -# notify-send -i "$HOME/.fonts/svg/rss.svg" "Download initiated" -# setsid wget -LO $dir $url & sleep 2s && st -e $HOME/.scripts/tools/tm-vlc "$dir" && \ -# notify-send -i "$HOME/.fonts/svg/rss.svg" "Download Complete" - -# echo "" > $HOME/.local/share/newsboat/queue +# $TERMINAL -c dropdown -t Podcast -e ~/.local/bin/tmux-vlc "$url" +vlc -I ncurses "$url" && echo "" > $HOME/.local/share/newsboat/queue diff --git a/.local/bin/setbg b/.local/bin/setbg index b32783b..052b076 100755 --- a/.local/bin/setbg +++ b/.local/bin/setbg @@ -15,5 +15,7 @@ bgloc="${XDG_CACHE_HOME:-$HOME/.cache/}wall.png" # # If pywal is installed, use it. # wal -s -i "$(readlink -f "$bgloc")" -o "${XDG_CONFIG_HOME:-$HOME/.config}/wal/postrun" >/dev/null 2>&1 -xwallpaper --zoom "$bgloc" & +# xwallpaper --zoom "$bgloc" & +killall swaybg +setsid swaybg -i "$bgloc" -m "$fill" diff --git a/.local/bin/shortcutgen b/.local/bin/shortcutgen index e5817d9..df088e4 100755 --- a/.local/bin/shortcutgen +++ b/.local/bin/shortcutgen @@ -5,17 +5,23 @@ raw=$(cat $HOME/.config/shortcutrc | tail -n +19 "$HOME/.config/shortcutrc" | se s/\(.*\)|\(.*\)|\(.*\)|/\1|\2|\3/g; s/\s*$//g; /^$/d" | head -n -1) -# #---NERDTREE---# # + +# #---NERDTree---# # +nerdtree_gen(){ echo "$raw" | sed "s/\(.*\)\s*|.*|\s\(.*\)/\1\2/g; s/ \{1,\}/ /g; s/.HOME/~/g; s/-*+-*+-*|//g" > $HOME/.NERDTreeBookmarks +} # #---ZSH---# # +zsh_gen(){ # be sure to source $HOME/.cache/zsh-shortcuts in your .zshrc echo "$raw" | sed 's/^.*|\s\([A-Za-z0-9]*\)\s*|\s\(.*\)$/alias\ g\1="cd\ \2"/g; /^-*+-*+-*|$/d' > $HOME/.cache/zsh-shortcuts +} # #---RANGER---# # +ranger_gen(){ # Commands implemented: # g -> go # m -> move to... @@ -23,19 +29,23 @@ echo "$raw" | sed 's/^.*|\s\([A-Za-z0-9]*\)\s*|\s\(.*\)$/alias\ g\1="cd\ \2"/g; # Y -> copy to... # awk '{print "map g"$1" cd "$2"\nmap t"$1" tab_new "$2"\nmap m"$1" shell mv -v %s "$2"\nmap Y"$1" shell cp -rv %s "$2}' >> "$ranger_shortcuts" manual=$(sed -n '/Automated Shortcut Generation/q;p' $HOME/.config/ranger/shortcuts.conf) -printf '\n\n# #---Automated Shortcut Generation---#' >> $HOME/.config/ranger/shortcuts.conf +printf '\n\n# #---Automated Shortcut Generation---#\n' >> $HOME/.config/ranger/shortcuts.conf echo "$raw" | sed 's/^.*|\s\(.*\)\s|\s\(.*\)$/map\ g\1\ cd\ \2\nmap\ t\1\ tab_new\ \2\nmap\ m\1\ shell\ mv\ -v\ %s\ \2\nmap\ Y\1\ shell\ cp\ -rv\ %s\ \2\n/g; s/.HOME/~/g; - s/^-*+-*+-*|$//g' >> $HOME/.config/ranger/shortcuts.conf + s/^-*+-*+-*|$//g' > $HOME/.config/ranger/shortcuts.conf +} # #---ENVIRONMENTAL VARIABLES---# # +env_gen(){ echo "$raw" | sed 's/[A-z,a-z,0-9]*\s*|\s*/g/; s/\s*|\s*/=/; s/$/"/; s/-*+-*+.*$// s/^[A-z]*=/\U&/g s/"$//g' > ~/.cache/shell-vars +} # #---Vifm---# # +vifm_gen(){ vifm=$(echo "$raw" | sed " s/^[A-Z,a-z,0-9]*\s*|//; s/\$HOME/~/; @@ -52,10 +62,28 @@ vifmy=$( echo "$vifm" | sed " s/^\s*/nnoremap\ y/; 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*|//" -# clear -# echo "$vifmv" -# cat ~/.cache/vifm-shortcuts +args="$(getopt nzrevh $*)" +for i in $args; do + case "$i" in + -n) nerdtree_gen ;; + -z) zsh_gen ;; + -r) ranger_gen ;; + -e) env_gen ;; + -v) vifm_gen ;; + -h) printf \ +"Shortcutgen: +This is a tool to generate filepath shortcuts for common cli tools. +Here are the shortcuts it can generate: + -n : NERDTree bookmarks for vim/nvim + -z : Zsh aliases + -r : Ranger shortcuts + -e : Create ENVIRONMENT shell variables + -v : Vifm shortcuts + -h : Print this help message +" +;; + esac +done diff --git a/.local/bin/tmux-toggle b/.local/bin/tmux-toggle deleted file mode 100755 index ab1f7bc..0000000 --- a/.local/bin/tmux-toggle +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -# Create a tmux window which is floating for use as a scratchpad. -# Takes in two arguments: -# session: title of the terminal window -# software: software to run -# flags: script to run when initializing the tmux session - -session="$1" -software="$2" -shift 2 -flags="$@" - -# Check if this software is started within tmux (start it if not) -tmux has-session -t $session 2>/dev/null -if [ $? != 0 ]; then - tmux new-session -d -s $session "$software $flags" - $TERMINAL -c "dropdown" -t "$session" -e tmux attach-session -t "$session" - exit -fi - -case "$(tmux list-sessions | grep "$session" )" in - # If the session is open, close it - *"attached"*) tmux detach -s "$session" ;; - *) $TERMINAL -c "dropdown" -t "$session" -e tmux attach-session -t "$session" ;; -esac - -# # If the session is closed, open it -# check_state && tmux detach -s "$session" diff --git a/.local/bin/tmux-vlc b/.local/bin/tmux-vlc deleted file mode 100755 index dc26c49..0000000 --- a/.local/bin/tmux-vlc +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -# This script ensures that i3 will spawn a youtube tui. -session="Podcast" -url=$1 - -# 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" vlc -I ncurses "$url" - # R -q --no-save - # ([ -e /usr/bin/R ] && R -q --no-save) || python -q -fi - -# Attach to created session -tmux attach-session -t $session - diff --git a/.local/bin/toggle b/.local/bin/toggle index 71392df..7b29815 100755 --- a/.local/bin/toggle +++ b/.local/bin/toggle @@ -25,5 +25,5 @@ software="$1" shift flags="$@" -killall "$software" || $TERMINAL --class "$class" -t "$title" -e $software $flags +killall "$software" || foot -a "$class" -T "$title" sh -c $software $flags diff --git a/.local/share/applications/file.desktop b/.local/share/applications/file.desktop index 369bdc0..33e187f 100644 --- a/.local/share/applications/file.desktop +++ b/.local/share/applications/file.desktop @@ -1,4 +1,4 @@ [Desktop Entry] Type=Application Name=File Manager -Exec=/usr/local/bin/st -e lf %u +Exec=/usr/bin/alacritty -e lf %u diff --git a/.local/share/applications/mail.desktop b/.local/share/applications/mail.desktop index d24aea2..27ff82d 100644 --- a/.local/share/applications/mail.desktop +++ b/.local/share/applications/mail.desktop @@ -1,4 +1,4 @@ [Desktop Entry] Type=Application Name=Mail -Exec=/usr/local/bin/st -e neomutt %u +Exec=/usr/bin/alacritty -e neomutt %u diff --git a/.local/share/applications/text.desktop b/.local/share/applications/text.desktop index 41ee05f..812da78 100644 --- a/.local/share/applications/text.desktop +++ b/.local/share/applications/text.desktop @@ -1,4 +1,4 @@ [Desktop Entry] Type=Application Name=Text editor -Exec=/usr/local/bin/st -e nvim %u +Exec=/usr/bin/alacritty -e nvim %u diff --git a/.mozilla/firefox/jzkuxgsr.default-release-1625619065722/chrome/userChrome.css b/.mozilla/firefox/jzkuxgsr.default-release-1625619065722/chrome/userChrome.css index 7aae51a..5ba733b 100644 --- a/.mozilla/firefox/jzkuxgsr.default-release-1625619065722/chrome/userChrome.css +++ b/.mozilla/firefox/jzkuxgsr.default-release-1625619065722/chrome/userChrome.css @@ -67,7 +67,8 @@ #nav-bar { margin-bottom: 0px !important; margin-top: -27px !important; - margin-right: 60vw !important; + margin-right: 6vw !important; + /* margin-right: 60vw !important; */ border-top: 0px !important; } @@ -84,12 +85,20 @@ .tabbrowser-tab, .tab-background, .tab-content { mask-image: unset !important; margin: 0px !important; + width: 0vw !important; + height: 0vw !important; } .toolbarbutton-badge-stack { margin-left: 0px !important; } +stack.tab-stack { + display: none !important; +} + +/* Let's remove tabs... */ + /* Remove padding above tabbar in compact mode */ #main-window[sizemode=normal] > #titlebar { -moz-appearance: initial !important; @@ -176,6 +185,9 @@ ar-button, .tabbrowser tabpanels { background-color: #d4d4d4 !important; } +/* .customization-target { */ +/* display: none; */ +/* } */ @@ -10,8 +10,8 @@ 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=foot +export TERM=foot export BIB=$HOME/Dropbox/A/Scholar/All/References export REFERBIB=$HOME/Dropbox/A/Scholar/All/References/bibliography.refer export DISTRIB_ID=arch @@ -19,7 +19,8 @@ export DISTRIB_RELEASE=$(uname -r) export XDG_CONFIG_HOME=$HOME/.config export R_PROFILE_USER=$HOME/.config/R/Rprofile export TODOIST_API_KEY="$(pass Todoist/API)" -# export GOROOT=/usr/bin/go +export MOZ_ENABLE_WAYLAND=1 +eval `dbus-launch --auto-syntax` # fix "xdg-open fork-bomb" export your preferred browser from here export BROWSER=$(which firefox) @@ -36,12 +37,12 @@ export LESS_TERMCAP_ue=$'\e[0m' # end underline # Start Desktop Environment if on the main TTY if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then -startx +dwl -s ~/startup.sh > ~/.cache/dwltags fi # gh completion eval "$(gh completion -s zsh)" # Generate shortcuts and aliases -shortcutgen +shortcutgen -zer aliasgen @@ -20,8 +20,8 @@ set-option -g allow-rename off set -sg escape-time 0 # Shell naming -set-option -g set-titles on -set-option -g set-titles-string "dropdown_#S" +# set-option -g set-titles on +# set-option -g set-titles-string "dropdown_#S" # move around panes with hjkl, as one would in vim after pressing ctrl-w bind h select-pane -L @@ -1 +1 @@ -.xinitrc##hostname.battlestation
\ No newline at end of file +.xinitrc##hostname.workstation
\ No newline at end of file diff --git a/.xinitrc##hostname.workstation b/.xinitrc##hostname.workstation index 32d022b..9ce4366 100644 --- a/.xinitrc##hostname.workstation +++ b/.xinitrc##hostname.workstation @@ -1,8 +1,10 @@ -xwallpaper --zoom ~/.cache/wall.png & +xwallpaper --output "eDP1" --zoom ~/.cache/wall-0.jpg & +xwallpaper --output "HDMI1" --zoom ~/.cache/wall-1.jpg & dropbox-cli start & sxhkd & remaps & dunst & +# echo ~/.local/share/newsboat/queue | entr -npr tmux-toggle podcast pod-dl & unclutter & xautolock -time 5 -detectsleep -secure -locker locktoggle & cinnamon-screensaver & @@ -15,6 +17,8 @@ dwmblocks & newsup & nohup davmail ~/.config/davmail/properties & shairport-sync & +export _JAVA_AWT_WM_NONREPARENTING=1 & +# exec st while true; do dwm >/dev/null done @@ -87,7 +87,7 @@ source $HOME/.cache/shell-vars # Vifm with sensible cd option vicd() { - local dst="$(command vifmrun --choose-dir - "$@")" + local dst="$(command vifm --choose-dir - "$@")" [[ "$dst" == "" ]] && \ echo 'Directory picking cancelled/failed' && \ return 1 \ |