added most recent dotfiles changes, switched back to vivaldi

17 files changed, 90 insertions, 35 deletions

diff --git a/.bashrc b/.bashrc
index b10576d..4bc3ca0 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,9 +1,12 @@
 #basics
 stty -ixon
-export BROWSER="firefox-developer-edition"
+#export BROWSER="firefox-developer-edition"
 export MOZ_DBUS_REMOTE=1
 #export BROWSER="qutebrowser"
-#export BROWSER="vivaldi-stable"
+alias vivaldi-snapshot="vivaldi-snapshot --use-gl=egl"
+alias chromium="GDK_BACKEND=x11 && chromium"
+export BROWSER="vivaldi-snapshot"
+#export BROWSER="chromium"
 export EDITOR="nvim"
 export NOTES_DIR="$HOME/notes"
 export TERM="screen-256color"
@@ -15,8 +18,8 @@ export PATH=$PATH:$HOME/bin/bash-scripts
 export PATH=$PATH:$HOME/.gem/ruby/2.6.0/bin
 export QT_QPA_PLATFORM=wayland
 export QT_QPA_PLATFORMTHEME=qt5ct
-export XDG_SESSION_TYPE=wayland 
-export GDK_BACKEND=wayland
+#export XDG_SESSION_TYPE=wayland 
+#export GDK_BACKEND=wayland
 
 # Alias definitions
 if [ -f ~/.aliases ]; then
@@ -151,6 +154,9 @@ function tolux() {
     scp $3 $1 lxf:/home/lxf/$2
 }
 
+function todis() {
+    scp $3 $1 dis:/home/lxf/$2
+}
 function frlux() {
     scp $3 lxf:/home/lxf/$1 $2
 }
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index e21548b..b4bbe03 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -21,6 +21,8 @@ window:
     columns: 0
     lines: 0
 
+# Allow terminal applications to change Alacritty's window title.
+  dynamic_title: true
   # Window position (changes require restart)
   #
   # Specified in number of pixels.
@@ -230,7 +232,7 @@ colors:
 #   - Linear
 #
 # Specifying a `duration` of `0` will disable the visual bell.
-visual_bell:
+bell:
   animation: EaseOutExpo
   duration: 0
   color: '0xffffff'
@@ -299,8 +301,6 @@ selection:
   # When set to `true`, selected text will be copied to the primary clipboard.
   save_to_clipboard: false
 
-# Allow terminal applications to change Alacritty's window title.
-dynamic_title: true
 
 cursor:
   # Cursor style
diff --git a/.config/nvim/.netrwhist b/.config/nvim/.netrwhist
index 5ec24b9..78b0009 100644
--- a/.config/nvim/.netrwhist
+++ b/.config/nvim/.netrwhist
@@ -1,4 +1,12 @@
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhistcnt =2
-let g:netrw_dirhist_2='/home/lxf/.config/autokey/data/My Phrases'
-let g:netrw_dirhist_1='/home/lxf'
+let g:netrw_dirhistcnt =5
+let g:netrw_dirhist_5='/home/lxf/.local/share/applications'
+let g:netrw_dirhist_4='/home/lxf/sites/corrinne-site/app'
+let g:netrw_dirhist_3='/home/lxf/sites/corrinne-site/app/clients'
+let g:netrw_dirhist_2='/home/lxf/sites/corrinne-site/app'
+let g:netrw_dirhist_1='/home/lxf/sites/corrinne-site/app/utils'
+let g:netrw_dirhist_0='/home/lxf/sites/corrinne-site/app/pages'
+let g:netrw_dirhist_9='/home/lxf/sites/corrinne-site/app/lib'
+let g:netrw_dirhist_8='/home/lxf/sites/corrinne-site/app/builder'
+let g:netrw_dirhist_7='/home/lxf/sites/corrinne-site/design'
+let g:netrw_dirhist_6='/home/lxf/sites/corrinne-site/config'
diff --git a/.config/qutebrowser/bookmarks/urls b/.config/qutebrowser/bookmarks/urls
index 6a06095..7e2dd76 100644
--- a/.config/qutebrowser/bookmarks/urls
+++ b/.config/qutebrowser/bookmarks/urls
@@ -135,3 +135,4 @@ https://reviewmeta.com/ ReviewMeta.com - Amazon Review Checker
 https://www.theenergyblueprint.com/causes-of-mitochondrial-dysfunction/ The Most Common Causes of Mitochondrial Dysfunction and 9 Tips to Improve Mitochondrial Health with Michael Chang, MD - The Energy Blueprint
 https://amazingribs.com/tested-recipes/vegetables-and-salads/simple-creamy-southern-coleslaw-recipe The Best Basic Creamy Southern Coleslaw Ever
 https://amazingribs.com/tested-recipes/spice-rubs-and-pastes/meatheads-memphis-dust-rub-recipe Meathead's World Famous Memphis Dust Rub
+https://www.elliotoracle.com/blog/2017/9/15/the-card-of-the-day-the-eight-of-wands The Card of the Day: The Eight of Wands — Elliot Oracle - Tarot Card Readings
diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py
index 613ede0..9181c43 100644
--- a/.config/qutebrowser/config.py
+++ b/.config/qutebrowser/config.py
@@ -28,11 +28,10 @@ c.url.searchengines['s'] = 'https://www.startpage.com/rvd/search?query={}&langua
 c.url.searchengines['g'] = 'http://www.google.com/search?hl=en&source=hp&ie=ISO-8859-l&q={}'
 c.url.searchengines['a'] = 'https://wiki.archlinux.org/?search={}'
 c.url.searchengines['y'] = 'https://www.youtube.com/results?search_query={}'
-c.url.searchengines['w'] = 'https://secure.wikimedia.org/wikipedia/en/w/index.php?title=Special%%3ASearch&search={}'
 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={}'
+c.url.searchengines['e'] = 'https://duckduckgo.com/?q={}+site%3Ahttps%3A%2F%2Fwww.elliotoracle.com%2Fblog%2F&t=fpas&ia=web'
 
 # aliases
 c.aliases['lux'] = 'open -t https://live.luxagraf.net/admin/'
@@ -58,6 +57,7 @@ js_whitelist = [
     "*://*.youtube.com/*",
     "*://*.luxagraf.net/*"
     "*://translate.google.com/*",
+    "*://schoolsfirst.com/*",
 ]
 private_whitelist = os.path.expanduser("~/.config/qutebrowser/private-whitelist")
 if os.path.exists(private_whitelist):
@@ -72,6 +72,7 @@ for site in js_whitelist:
 # keybinds
 config.unbind('J', mode='normal')
 config.unbind('K', mode='normal')
+config.unbind('<Ctrl+v>')
 config.bind('J', 'tab-prev', mode='normal')
 config.bind('K', 'tab-next', mode='normal')
 
@@ -105,22 +106,30 @@ 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/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.set(
+    "content.host_blocking.whitelist",
+    [
+        "duckduckgo.com",
+        "github.com",
+        "stackoverflow.com",
+        "seekingalpha.com",
+    ],
+)
 
 solarized = {
     'base03': '#002b36',
diff --git a/.config/ranger/bookmarks b/.config/ranger/bookmarks
index 459a76b..155c305 100644
--- a/.config/ranger/bookmarks
+++ b/.config/ranger/bookmarks
@@ -1,4 +1,4 @@
-':/home/lxf/sites/discursive/design/sass
+':/home/lxf/writing/conde/wired
 d:/home/lxf/documents
 l:/home/lxf/writing/luxagraf
 b:/home/lxf/writing/lbh
diff --git a/.config/ranger/tagged b/.config/ranger/tagged
index 62d1f03..9233c4a 100644
--- a/.config/ranger/tagged
+++ b/.config/ranger/tagged
@@ -3,3 +3,4 @@
 /home/lxf/sites/vanlife.tools/app/accounts/migrations
 /home/lxf/writing/opera/opera-for-android-best-features.txt
 /home/lxf/writing/conde/wired/docs
+r:/home/lxf/sites/corrinne-site/app/clients_
diff --git a/.config/sway/config b/.config/sway/config
index eacbd05..f1f518d 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -29,6 +29,8 @@ output * bg $background fill
 
 input "1739:0:Synaptics_TM3075-002" {
     natural_scroll enabled
+    tap enabled
+    drag enabled
 }
 # change focus
 #bindsym $mod+j focus left
@@ -134,6 +136,7 @@ for_window [class="feh"] floating enable
 for_window [class="QtPass"] floating enable
 for_window [class="hangouts.google.com"] floating disable
 for_window [class="hangouts.google.com"] border normal
+for_window [app_id="gedit"] floating enable
 
 assign [class="qutebrowser"] $ws2
 assign [app_id="org.qutebrowser.qutebrowser"] $ws2
@@ -199,7 +202,7 @@ input "1:1:AT_Translated_Set_2_keyboard" {
 }
 #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 vivaldi-snapshot &
 #exec --no-startup-id urxvt &
 exec --no-startup-id alacritty &
 exec --no-startup-id nextcloud &
diff --git a/.gitignore_global b/.gitignore_global
index 26f2255..d3fa0a9 100644
--- a/.gitignore_global
+++ b/.gitignore_global
@@ -40,3 +40,4 @@ Thumbs.db
 bin/venv/
 bin/venv3/
 !mail/*
+.vimtmp/
diff --git a/.newsboat/config b/.newsboat/config
index bfd5936..ea42dd5 100644
--- a/.newsboat/config
+++ b/.newsboat/config
@@ -22,7 +22,7 @@ confirm-exit yes
 #browser "~/bin/open-in-pane"
 browser "$BROWSER"
 #browser "qutebrowser -l critical "
-#browser "vivaldi-stable"
+#browser "xvivaldi-snap %u"
 #browser "firefox-developer-edition"
 bind-key v open-in-browser-and-mark-read 
 #bind-key o open-in-browser-and-mark-read 
diff --git a/.panocopyrc b/.panocopyrc
index 4569512..8cd577b 100644
--- a/.panocopyrc
+++ b/.panocopyrc
@@ -1 +1 @@
-P1270015.RW2
\ No newline at end of file
+P1270059.RW2
\ No newline at end of file
diff --git a/.photocopyrc b/.photocopyrc
index e17cbb6..3848697 100644
--- a/.photocopyrc
+++ b/.photocopyrc
@@ -1 +1 @@
-DSC02378.ARW
\ No newline at end of file
+DSC02838.ARW
\ No newline at end of file
diff --git a/.ssh/config b/.ssh/config
index fd18e01..5104dd7 100755
--- a/.ssh/config
+++ b/.ssh/config
@@ -32,3 +32,10 @@ Host wlp
   TCPKeepAlive yes
   #IdentityFile ~/.ssh/id_ed25519
 
+Host dis
+  Hostname 155.138.214.118
+  User lxf
+  Port 24597
+  CheckHostIP yes
+  TCPKeepAlive yes
+  IdentityFile ~/.ssh/id_ed25519
diff --git a/.vim/dict.add b/.vim/dict.add
index 686f047..16325a8 100644
--- a/.vim/dict.add
+++ b/.vim/dict.add
@@ -85,3 +85,20 @@ S
 DJI
 megapixel
 HDR
+ZFS
+Ubuntu's
+Chromebook
+ChromeOS
+Google's
+Airtable
+NextCloud
+i3
+x11
+Autokey
+app
+apps
+keybindings
+fzf
+RVers
+lockdown
+homeschool
diff --git a/.vim/dict.add.spl b/.vim/dict.add.spl
index 15f84de..bf9363e 100644
--- a/.vim/dict.add.spl
+++ b/.vim/dict.add.spl
diff --git a/.vimrc b/.vimrc
index 87bb5bb..a4fae72 100644
--- a/.vimrc
+++ b/.vimrc
@@ -34,6 +34,10 @@ Bundle 'junegunn/limelight.vim'
 call vundle#end()
 filetype plugin indent on
 "}}}
+"
+xnoremap "+y y:call system("wl-copy", @")<cr>
+nnoremap "+p :let @"=substitute(system("wl-paste --no-newline"), '<C-v><C-m>', '', 'g')<cr>p
+nnoremap "*p :let @"=substitute(system("wl-paste --no-newline --primary"), '<C-v><C-m>', '', 'g')<cr>p
 " Basic stuff {{{
 set encoding=utf-8
 set scrolloff=3
diff --git a/bin/xvivaldi b/bin/xvivaldi
deleted file mode 100755
index 283cf06..0000000
--- a/bin/xvivaldi
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/sh
-GDK_BACKEND=x11 vivaldi-stable