diff options
| -rw-r--r-- | .config/alacritty/alacritty.yml | 29 | ||||
| -rw-r--r-- | .config/qutebrowser/config.py | 36 | ||||
| -rw-r--r-- | .config/ranger/bookmarks | 10 | ||||
| -rw-r--r-- | .config/ranger/history | 50 | ||||
| -rw-r--r-- | .config/sway/config | 18 | ||||
| -rw-r--r-- | .config/waybar/config | 13 | ||||
| -rwxr-xr-x[-rw-r--r--] | .config/waybar/modules/storage.sh | 0 | ||||
| -rwxr-xr-x | .config/waybar/modules/weather.sh | 6 | ||||
| -rw-r--r-- | .newsboat/config | 4 | ||||
| -rw-r--r-- | .panocopyrc | 2 | ||||
| -rw-r--r-- | .photocopyrc | 2 | ||||
| -rw-r--r-- | .vim/dict.add | 10 | ||||
| -rw-r--r-- | .vim/dict.add.spl | bin | 1172 -> 1304 bytes | |||
| -rw-r--r-- | .vimrc | 82 | ||||
| -rwxr-xr-x | bin/facebook.sh | 3 | ||||
| -rwxr-xr-x | bin/gmail.sh | 3 | ||||
| -rwxr-xr-x | bin/hangouts.sh | 3 |
17 files changed, 138 insertions, 133 deletions
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index a7b4413..e21548b 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -153,7 +153,6 @@ font: draw_bold_text_with_bright_colors: true # Colors (Solarized Dark) -# Colors (Solarized Dark) colors: # Default colors primary: @@ -182,6 +181,34 @@ colors: cyan: '0x93a1a1' white: '0xfdf6e3' + # Colors (Solarized Light) + #colors: + # # Default colors + # primary: + # background: '0xfdf6e3' + # foreground: '0x586e75' + # + # # Normal colors + # normal: + # black: '0x073642' + # red: '0xdc322f' + # green: '0x859900' + # yellow: '0xb58900' + # blue: '0x268bd2' + # magenta: '0xd33682' + # cyan: '0x2aa198' + # white: '0xeee8d5' + # + # # Bright colors + # bright: + # black: '0x002b36' + # red: '0xcb4b16' + # green: '0x586e75' + # yellow: '0x657b83' + # blue: '0x839496' + # magenta: '0x6c71c4' + # cyan: '0x93a1a1' + # white: '0xfdf6e3' # Visual Bell # # Any time the BEL code is received, Alacritty "rings" the visual bell. Once diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py index 4877e36..613ede0 100644 --- a/.config/qutebrowser/config.py +++ b/.config/qutebrowser/config.py @@ -32,6 +32,7 @@ c.url.searchengines['w'] = 'https://secure.wikimedia.org/wikipedia/en/w/index.ph c.url.searchengines['ap'] = 'https://www.archlinux.org/packages/?sort=&q={}' c.url.searchengines['aw'] = 'https://www.amazon.com/s?k={}' c.url.searchengines['w'] = 'https://www.google.com/search?q={}+site%3Awired.com' +c.url.searchengines['gp'] = 'https://podcasts.google.com/?q={}' # aliases c.aliases['lux'] = 'open -t https://live.luxagraf.net/admin/' @@ -90,6 +91,7 @@ config.bind(';yh', 'hint links --userscript youtube-dl') # watch current or hinted video config.bind(',yl', 'hint links spawn --detach mpv --force-window yes {hint-url}') config.bind(',yv', 'spawn --detach mpv --force-window yes {url}') +config.bind(',ys', 'spawn --userscript youtube-dl') # open selected text in tab config.bind (',f', 'open {primary}') @@ -103,22 +105,22 @@ config.bind(',s', "jseval --quiet if(document.getSelection){s=document.getSelect import sys, os sys.path.append(os.path.join(sys.path[0], "jblock")) -config.source("jblock/jblock/integrations/qutebrowser.py") -config.set( - "content.host_blocking.lists", - [ - "https://easylist.to/easylist/easylist.txt", - "https://easylist.to/easylist/easyprivacy.txt", - "https://easylist.to/easylist/fanboy-annoyance.txt", - "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt", - "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/annoyances.txt", - "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badware.txt", - "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/privacy.txt", - "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/resource-abuse.txt", - "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/unbreak.txt", - "https://www.malwaredomainlist.com/hostslist/hosts.txt", - ], -) +#config.source("jblock/jblock/integrations/qutebrowser.py") +#config.set( +# "content.host_blocking.lists", +# [ +# "https://easylist.to/easylist/easylist.txt", +# "https://easylist.to/easylist/easyprivacy.txt", +# "https://easylist.to/easylist/fanboy-annoyance.txt", +# "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt", +# "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/annoyances.txt", +# "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badware.txt", +# "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/privacy.txt", +# "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/resource-abuse.txt", +# "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/unbreak.txt", +# "https://www.malwaredomainlist.com/hostslist/hosts.txt", +# ], +#) solarized = { 'base03': '#002b36', @@ -405,7 +407,7 @@ c.colors.statusbar.url.hover.fg = solarized['base2'] ## Foreground color of the URL in the statusbar on successful load ## (http). ## Type: QssColor -c.colors.statusbar.url.success.http.fg = solarized['base1'] +c.colors.statusbar.url.success.http.fg = solarized['violet'] ## Foreground color of the URL in the statusbar on successful load ## (https). diff --git a/.config/ranger/bookmarks b/.config/ranger/bookmarks index f3ad05b..1415410 100644 --- a/.config/ranger/bookmarks +++ b/.config/ranger/bookmarks @@ -1,16 +1,14 @@ -':/home/lxf/writing/luxagraf/src/published +':/home/lxf/writing/conde/wired d:/home/lxf/documents -p:/home/lxf/business/freelance writing -u:/home/lxf/sites/usedbarcode.net l:/home/lxf/writing/luxagraf k:/home/lxf/pictures/inbox e:/home/lxf/documents/recipes -w:/home/lxf/writing/wired -q:/home/lxf/sites/libregraf.net +w:/home/lxf/writing/conde/wired n:/home/lxf/notes r:/home/lxf/documents/recipes -a:/home/lxf/writing/ars-technica +a:/home/lxf/writing/conde/ars-technica s:/home/lxf/sites/luxagraf.net i:/home/lxf c:/home/lxf/pictures/nextcloud-ccg-phone t:/home/lxf/temp +p:/home/lxf/temp/wired diff --git a/.config/ranger/history b/.config/ranger/history deleted file mode 100644 index ef63e15..0000000 --- a/.config/ranger/history +++ /dev/null @@ -1,50 +0,0 @@ -open_with vim -rename README -rename DSC_1288_.JPG -rename Frozen.2.2019.DVDScr.XVID.AC3.HQ.Hive-CM8.torrent -rename X-100V Top Silver SOURCE Fujifilm.jpg -rename X-100V Front Silver2 SOURCE Fujifilm.jpg -rename X-100V Front Silver 2 SOURCE Fujifilm.jpg -rename X-100V Front Silver SOURCE Fujifilm.jpg -rename X100V Sample Image 01 SOURCE Scott Gilbertson.jpg -rename 2 Stretches To Heal Plantar Fasciitis.mp4 -rename DSC_1288.JPG -rename DSC_1488.JPG -search store -search olive -rename export2.jpg -rename export1.jpg -rename Animal Jam SOURCE Animal Jam.svg -rename DragonBox Math Kit SOURCE iOS App Store Screenshot.png -rename PBS Apps SOURCE PBS Site Screenshot.png -rename Starfall SOURCE Scott Gilbertson screenshot.png -search thai -search tif -rename Polaroid Sample Images SOURCE Scott Gilbertson.jpg -rename Planet Storytime SOURCE Planet Storytime.jpg -search green -search black -search peas -open_with%space1 -rename darktable-editing-moments-ep28-quick-edits.mkv -rename Unbreakable - The Western States 100.mp4 -rename darktable ep 059 - Denoise (Profiled) in dt 3.0.mp4 -rename .rtorrent.rc -search rtorrent -search torrent -mkdir reading -search gluten -open_with%space -cd recipes/ -set line_numbers false -set line_numbers relative -set line_numbers absolute -shell cat %s -search cong -mkdir test - -delete -rename Proud Grill Skewers SOURCE Proud Grill.jpg -rename Proud Grill Scrubber SOURCE Proud Grill.jpg -rename desktop042020.png -open_with 1 diff --git a/.config/sway/config b/.config/sway/config index 3d0d7c6..804d73f 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -115,12 +115,14 @@ for_window [title="Oracle VM VirtualBox Manager"] floating enable for_window [class="^Pcmanfm"] floating enable for_window [class="^lxf$"] floating enable for_window [app_id="darktable"] border none +for_window [class="darktable"] border none for_window [app_id="python3"] border none, floating enable for_window [app_id="org.qutebrowser.qutebrowser"] border none for_window [app_id="kitty"] border none for_window [app_id="qutebrowser"] border none for_window [class="^URxvt"] border none for_window [app_id="firefoxdeveloperedition"] border none +for_window [class="firefoxdeveloperedition"] border none for_window [class="^Vivaldi"] border none for_window [class="^qutebrowser"] border none for_window [app_id="^Alacritty"] border none @@ -137,7 +139,7 @@ assign [class="qutebrowser"] $ws2 assign [app_id="org.qutebrowser.qutebrowser"] $ws2 assign [class="Firefox Developer"] $ws4 assign [class="Slack"] $ws6 -assign [class="Vivaldi"] $ws4 +assign [class="Vivaldi"] $ws2 assign [class="Darktable"] $ws3 assign [app_id="darktable"] $ws3 assign [title="Oracle VM VirtualBox Manager"] $ws4 @@ -195,11 +197,11 @@ input "1:1:AT_Translated_Set_2_keyboard" { repeat_delay 250 repeat_rate 25 } -exec xrdb ~/.Xresources -#exec --no-startup-id redshift-gtk -l 35.052234:-118.243685 -m randr -t 5700:3600 & -exec --no-startup-id qutebrowser & -exec --no-startup-id urxvt & -#exec --no-startup-id alacritty & +#exec xrdb ~/.Xresources +exec --no-startup-id redshift-gtk -l 35.052234:-118.243685 -m randr -t 5700:3600 & +exec --no-startup-id firefox-developer-edition & +#exec --no-startup-id urxvt & +exec --no-startup-id alacritty & exec --no-startup-id nextcloud & #exec --no-startup-id xset r rate 250 25 & #exec --no-startup-id xset -b @@ -207,12 +209,16 @@ exec --no-startup-id nextcloud & # clipboard manager exec wl-paste -t text --watch clipman store --max-items=60 --histpath="~/.local/share/clipman-primary.json" +# exec wl-paste -w 'wl-paste >> ~/.clipboard' bindsym $mod+h exec clipman pick --tool="wofi" --max-items=30 --histpath="~/.local/share/clipman-primary.json" +# app launcher bindsym $mod+Space exec alacritty --class 'launcher' --command bash -c 'compgen -c | sort -u | fzf | xargs -r swaymsg -t command exec' +# pass chooser bindsym $mod+p exec alacritty --class 'launcher' --command bash -c 'pass clip --fzf | xargs -r swaymsg -t command exec' +#snippet manager bindsym $mod+s exec alacritty --class 'launcher' --command bash -c 'pet exec | wl-copy | xargs -r swaymsg -t command exec' for_window [app_id="^launcher$"] floating enable, border none, resize set width 25 ppt height 20 ppt, move position 0 px 0 px diff --git a/.config/waybar/config b/.config/waybar/config index 7fc5a76..49be1fd 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -4,7 +4,7 @@ "height": 24, "modules-left": ["sway/workspaces", "sway/mode"], "modules-center": [""], - "modules-right": ["mpd", "network", "idle_inhibitor", "battery", "memory", "tray", "clock"], + "modules-right": ["mpd", "network", "idle_inhibitor", "battery", "custom/storage", "cpu", "memory", "custom/weather", "tray", "clock"], "sway/mode": { "format": " {}" }, @@ -18,7 +18,7 @@ "on-click": "~/./bin/cal.sh" }, "battery": { - "format": "{capacity}% {icon} | ", + "format": "| {capacity}% {icon} | ", "format-alt": "{time} {icon}", "format-icons": ["", "", "", "", ""], "format-charging": "{capacity}% CHR", @@ -39,7 +39,6 @@ "tooltip-format-wifi": "{essid} ({signalStrength}%) ", "tooltip-format-ethernet": "{ifname} ", "tooltip-format-disconnected": "Disconnected", - "max-length": 50, "on-click": "alacritty -e nmtui", "tooltip": false }, @@ -70,12 +69,12 @@ "on-click-right": "mpc next" }, "custom/storage": { - "format": "{} ", + "format": "{} |", "format-alt": "{percentage}% ", "format-alt-click": "click-right", "return-type": "json", "interval": 60, - "exec": "~/.config/waybar/modules/storage.sh" + "exec": "$HOME/.config/waybar/modules/storage.sh" }, "backlight": { "format": "{icon}", @@ -86,12 +85,12 @@ "on-scroll-up": "light -U 1" }, "custom/weather": { - "format": "{}", + "format": "{} |", "format-alt": "{alt}: {}", "format-alt-click": "click-right", "interval": 1800, "return-type": "json", - "exec": "~/.config/waybar/modules/weather.sh", + "exec": "$HOME/.config/waybar/modules/weather.sh", "exec-if": "ping wttr.in -c1" }, "idle_inhibitor": { diff --git a/.config/waybar/modules/storage.sh b/.config/waybar/modules/storage.sh index d495da4..d495da4 100644..100755 --- a/.config/waybar/modules/storage.sh +++ b/.config/waybar/modules/storage.sh diff --git a/.config/waybar/modules/weather.sh b/.config/waybar/modules/weather.sh new file mode 100755 index 0000000..d64acd0 --- /dev/null +++ b/.config/waybar/modules/weather.sh @@ -0,0 +1,6 @@ +#!/bin/sh +w=$(curl -s wttr.in/ahn?format="%l:+%c+%t+%C+%w+%h+%m") +w=${w:7} +w="$(echo -e "${w}" | sed -e 's/^[[:space:]]*//')" +m=$(python ~/bin/moonphase-waybar.py) +echo "{\"text\":\""$w ""$m"\", \"tooltip\":\""tooltip"\", \"class\":\""lxf-weather"\"}" diff --git a/.newsboat/config b/.newsboat/config index 963f19e..3b9dced 100644 --- a/.newsboat/config +++ b/.newsboat/config @@ -18,8 +18,8 @@ bind-key G end download-full-page yes confirm-exit yes #browser "~/bin/open-in-pane" -#browser "$BROWSER" -browser "qutebrowser -l critical " +browser "$BROWSER" +#browser "qutebrowser -l critical " #browser "vivaldi-stable" #browser "firefox-developer-edition" bind-key v open-in-browser-and-mark-read diff --git a/.panocopyrc b/.panocopyrc index 4aa2968..4569512 100644 --- a/.panocopyrc +++ b/.panocopyrc @@ -1 +1 @@ -P1260988.RW2
\ No newline at end of file +P1270015.RW2
\ No newline at end of file diff --git a/.photocopyrc b/.photocopyrc index d5a4a00..e17cbb6 100644 --- a/.photocopyrc +++ b/.photocopyrc @@ -1 +1 @@ -DSC02342.ARW
\ No newline at end of file +DSC02378.ARW
\ No newline at end of file diff --git a/.vim/dict.add b/.vim/dict.add index e6efb53..686f047 100644 --- a/.vim/dict.add +++ b/.vim/dict.add @@ -75,3 +75,13 @@ NordVPN X100 X100V Fujifilm's +Celestron's +StarSense +refractor +Celestron +Adorama +quadcopter +S +DJI +megapixel +HDR diff --git a/.vim/dict.add.spl b/.vim/dict.add.spl Binary files differindex df513ef..15f84de 100644 --- a/.vim/dict.add.spl +++ b/.vim/dict.add.spl @@ -27,7 +27,8 @@ Bundle 'vim-scripts/utl.vim' Bundle 'tmhedberg/SimpylFold' Bundle 'nvie/vim-flake8' Bundle 'majutsushi/tagbar' -Bundle 'junegunn/fzf.vim' +Bundle 'francoiscabrol/ranger.vim' +Bundle 'rbgrouleff/bclose.vim' call vundle#end() filetype plugin indent on "}}} @@ -213,37 +214,38 @@ set wildignore+=*.o,*.obj,.git,*.rbc,*.class,.svn,vendor/gems/* "Trying ranger -function! RangeChooser() - let temp = tempname() - " The option "--choosefiles" was added in ranger 1.5.1. Use the next line - " with ranger 1.4.2 through 1.5.0 instead. - "exec 'silent !ranger --choosefile=' . shellescape(temp) - if has("gui_running") - exec 'silent !xterm -e ranger --choosefiles=' . shellescape(temp) - else - exec 'silent !ranger --choosefiles=' . shellescape(temp) - endif - if !filereadable(temp) - redraw! - " Nothing to read. - return - endif - let names = readfile(temp) - if empty(names) - redraw! - " Nothing to open. - return - endif - " Edit the first item. - exec 'edit ' . fnameescape(names[0]) - " Add any remaning items to the arg list/buffer list. - for name in names[1:] - exec 'argadd ' . fnameescape(name) - endfor - redraw! -endfunction -command! -bar RangerChooser call RangeChooser() -nnoremap <leader>nt :<C-U>RangerChooser<CR> +"function! RangeChooser() +" let temp = tempname() +" " The option "--choosefiles" was added in ranger 1.5.1. Use the next line +" " with ranger 1.4.2 through 1.5.0 instead. +" "exec 'silent !ranger --choosefile=' . shellescape(temp) +" if has("gui_running") +" exec 'silent !xterm -e ranger --choosefiles=' . shellescape(temp) +" else +" exec 'silent !ranger --choosefiles=' . shellescape(temp) +" endif +" if !filereadable(temp) +" redraw! +" " Nothing to read. +" return +" endif +" let names = readfile(temp) +" if empty(names) +" redraw! +" " Nothing to open. +" return +" endif +" " Edit the first item. +" exec 'edit ' . fnameescape(names[0]) +" " Add any remaning items to the arg list/buffer list. +" for name in names[1:] +" exec 'argadd ' . fnameescape(name) +" endfor +" redraw! +"endfunction +"command! -bar RangerChooser call RangeChooser() + +nnoremap <leader>nt :<C-U>Ranger<CR> " Backups ----------------------------------------------------------------------{{{ @@ -375,13 +377,13 @@ noremap zE <Nop> " }}} " Plugins {{{ "Ctrl P {{{ -nnoremap <leader>r :History<cr> -nnoremap <leader>m :Buffers<cr> -nnoremap <leader>. :Files<cr> -nnoremap <leader>w :Files ~/writing/wired/<cr> -nnoremap <leader>a :Files app/<cr> +nnoremap <leader>r :CtrlPMRU<cr> +nnoremap <leader>m :CtrlPBuffer<cr> +nnoremap <leader>. :CtrlP<cr> +nnoremap <leader>w :CtrlP ~/writing/wired/<cr> +nnoremap <leader>a :CtrlP app/<cr> nnoremap <leader>d :CtrlP $HOME/notes/<cr> -nnoremap <leader>l :Files $HOME/writing/luxagraf/<cr> +nnoremap <leader>l :CtrlP $HOME/writing/luxagraf/<cr> let g:ctrlp_custom_ignore = { \ 'dir': '\v[\/]\.(git|hg|svn|venv|site|static)$', \ 'file': '\v\.(pyc|so|dll)$', @@ -401,8 +403,10 @@ let g:SuperTabDefaultCompletionType = '<C-n>' nnoremap <silent> <c-s> :NV<CR> let g:markdown_fold_style = 'nested' -nmap <Leader>o :Utl openLink underCursor edit<CR> +nmap <leader>i :%s/
//g +nmap <Leader>o :Utl openLink underCursor edit<CR> +imap jj <Esc> vmap <silent> <leader>r <esc>:'<,'>:w !espeak &> /dev/null <CR> "wayland hack: diff --git a/bin/facebook.sh b/bin/facebook.sh index 8baae86..4cfe54f 100755 --- a/bin/facebook.sh +++ b/bin/facebook.sh @@ -1,2 +1,3 @@ #!/usr/bin/env bash -GDK_BACKEND=x11 exo-open ~/bin/apps/book.desktop +#GDK_BACKEND=x11 exo-open ~/bin/apps/book.desktop +firefox-developer-edition -P facebook --no-remote & diff --git a/bin/gmail.sh b/bin/gmail.sh index 1684967..a93f3ac 100755 --- a/bin/gmail.sh +++ b/bin/gmail.sh @@ -1,2 +1,3 @@ #!/usr/bin/env bash -GDK_BACKEND=x11 exo-open ~/bin/apps/gmailer.desktop +#GDK_BACKEND=x11 exo-open ~/bin/apps/gmailer.desktop +firefox-developer-edition -P gmail --no-remote & diff --git a/bin/hangouts.sh b/bin/hangouts.sh index 5579dca..9a1c6b1 100755 --- a/bin/hangouts.sh +++ b/bin/hangouts.sh @@ -1,2 +1,3 @@ #!/usr/bin/env bash -GDK_BACKEND=x11 exo-open ~/bin/apps/outs.desktop +#GDK_BACKEND=x11 exo-open ~/bin/apps/outs.desktop +firefox-developer-edition -P hangouts --no-remote & |