rolled in sway changes

15 files changed, 125 insertions, 24 deletions

diff --git a/.Xresources b/.Xresources
index 95b2d82..5aafa92 100644
--- a/.Xresources
+++ b/.Xresources
@@ -11,13 +11,13 @@ xft.rgba: rgb
 URxvt*buffered: true
 URxvt*cursorBlink: true
 URxvt*underlineColor: #808080
-URxvt*font:xft:Inconsolata:size=15:style=Regular:antialias=true
-URxvt.boldFont: xft:Inconsolata:Bold:size=14
-URxvt.letterSpace: -1
+URxvt.boldFont: xft:hack:bold:size=13
+URxvt*font: xft:hack:medium:size=13
+!URxvt.letterSpace: -1
 URxvt*depth: 32
-urxvt*transparent: true
+Urxvt*transparent: true
 URxvt*background: rgba:0000/0000/0200/c800
-urxvt*shading: 37
+Urxvt*shading: 37
 URxvt*borderless: 1
 URxvt*scrollBar: false
 URxvt*loginShell: true
@@ -25,7 +25,7 @@ Urxvt*secondaryScroll:  true    # Enable Shift-PageUp/Down in screen
 URxvt*saveLines: 8000
 URxvt*termName: rxvt-unicode
 URxvt.perl-ext-common: default,matcher,fullscreen 
-URxvt.urlLauncher: firefox-aurora
+!URxvt.urlLauncher: firefox-aurora
 URxvt.matcher.button: 1
 URxvt.keysym.F11: perl:fullscreen:switch
 
diff --git a/.aliases b/.aliases
index 73fc62e..066e55f 100644
--- a/.aliases
+++ b/.aliases
@@ -5,6 +5,7 @@ alias tmux="tmux -2"
 alias v="vim "
 #alias vim="nvim "
 alias dmenu="dmenu_run "
+alias thunar="pcmanfm-qt"
 
 # I like feedback
 alias cp='cp -v'
diff --git a/.bashrc b/.bashrc
index 1192adf..ca1a4cc 100644
--- a/.bashrc
+++ b/.bashrc
@@ -13,7 +13,7 @@ export PATH=$PATH:$HOME/bin
 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=gtk3
+export QT_QPA_PLATFORMTHEME=qt5ct
 export XDG_SESSION_TYPE=wayland 
 export GDK_BACKEND=wayland
 
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 4dc90e5..a7b4413 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -87,7 +87,6 @@ scrolling:
   #faux_multiplier: 3
 
   # Scroll to the bottom when new text is written to the terminal.
-  auto_scroll: false
 
 # Spaces per Tab (changes require restart)
 #
@@ -96,7 +95,6 @@ scrolling:
 # Some applications, like Emacs, rely on knowing about the width of a tab.
 # To prevent unexpected behavior in these applications, it's also required to
 # change the `it` value in terminfo when altering this setting.
-tabspaces: 4
 
 # Font configuration (changes require restart)
 font:
diff --git a/.config/ranger/bookmarks b/.config/ranger/bookmarks
index 8015749..f3ad05b 100644
--- a/.config/ranger/bookmarks
+++ b/.config/ranger/bookmarks
@@ -1,4 +1,4 @@
-':/home/lxf
+':/home/lxf/writing/luxagraf/src/published
 d:/home/lxf/documents
 p:/home/lxf/business/freelance writing
 u:/home/lxf/sites/usedbarcode.net
@@ -11,5 +11,6 @@ n:/home/lxf/notes
 r:/home/lxf/documents/recipes
 a:/home/lxf/writing/ars-technica
 s:/home/lxf/sites/luxagraf.net
-i:/home/lxf/temp/darktable_exported
+i:/home/lxf
 c:/home/lxf/pictures/nextcloud-ccg-phone
+t:/home/lxf/temp
diff --git a/.config/ranger/history b/.config/ranger/history
new file mode 100644
index 0000000..ef63e15
--- /dev/null
+++ b/.config/ranger/history
@@ -0,0 +1,50 @@
+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/ranger/rc.conf b/.config/ranger/rc.conf
index 330ba3b..1a30441 100644
--- a/.config/ranger/rc.conf
+++ b/.config/ranger/rc.conf
@@ -34,7 +34,7 @@ set hidden_filter ^\.|\.(?:pyc|pyo|bak|swp)$|^lost\+found$|^__(py)?cache__$
 
 # Show hidden files? You can toggle this by typing 'zh'
 set show_hidden false
-
+set wrap_plaintext_previews true
 # Ask for a confirmation when running the "delete" command?
 # Valid values are "always", "never", "multiple" (default)
 # With "multiple", ranger will ask only if you delete multiple files at once.
@@ -87,7 +87,7 @@ set preview_images true
 # * urxvt-full:
 #   The same as urxvt but utilizing not only the preview pane but the
 #   whole terminal window.
-set preview_images_method kitty
+set preview_images_method w3m
 
 # Use a unicode "..." character to mark cut-off filenames?
 set unicode_ellipsis false
@@ -210,7 +210,7 @@ set metadata_deep_search false
 set clear_filters_on_dir_change false
 
 # Disable displaying line numbers in main column
-set line_numbers false
+set line_numbers absolute
 
 # ===================================================================
 # == Local Options
@@ -219,6 +219,8 @@ set line_numbers false
 
 # Examples:
 # setlocal path=~/downloads sort mtime
+setlocal path=~/notes sort mtime
+setlocal path=~/notes/reading sort mtime
 
 # ===================================================================
 # == Command Aliases in the Console
@@ -267,7 +269,7 @@ map !  console shell%space
 map @  console -p6 shell  %%s
 map #  console shell -p%space
 map s  console shell%space
-map r  chain draw_possible_programs; console open_with%%space
+map r  chain draw_possible_programs; console open_with%space
 map f  console find%space
 map cd console cd%space
 
@@ -613,4 +615,12 @@ copytmap <ESC> q Q w <C-c>
 
 map DD shell mv -t /home/${USER}/.Trash %s
 
+##### files ##########
 
+map fl   less %f #view file with less. q to quit (ranger i doesn't show full file)
+# create dir
+map ff   console mkdir%space 
+ # create file
+map ft   console touch%space
+# open in gimp
+map og   shell -f gimp %s 
diff --git a/.config/sway/config b/.config/sway/config
index c335024..3d0d7c6 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -1,6 +1,6 @@
 set $mod Mod1
 set $term alacritty
-set $background /mnt/storage/pictures/desktops/aspens1.jpg
+set $background /mnt/storage/pictures/desktops/mountains_night_sky_dark.jpg
 set $screenshot grim ~/pictures/screenshots/scrn-$(date +"%Y-%m-%d-%H-%M-%S").png
 set $screenclip slurp | grim -g - ~/pictures/screenshots/scrn-$(date +"%Y-%m-%d-%H-%M-%S").png
 
@@ -124,6 +124,7 @@ for_window [app_id="firefoxdeveloperedition"] border none
 for_window [class="^Vivaldi"] border none
 for_window [class="^qutebrowser"] border none
 for_window [app_id="^Alacritty"] border none
+for_window [class="Slack"] border none
 for_window [class="Pavucontrol"] floating enable
 for_window [window_role="pop-up"] floating enable
 for_window [class="Yad"] floating enable
diff --git a/.newsboat/config b/.newsboat/config
index 43d1e50..963f19e 100644
--- a/.newsboat/config
+++ b/.newsboat/config
@@ -19,7 +19,7 @@ download-full-page yes
 confirm-exit yes
 #browser "~/bin/open-in-pane"
 #browser "$BROWSER"
-browser "qutebrowser"
+browser "qutebrowser -l critical "
 #browser "vivaldi-stable"
 #browser "firefox-developer-edition"
 bind-key v open-in-browser-and-mark-read 
diff --git a/.photocopyrc b/.photocopyrc
index b943708..d5a4a00 100644
--- a/.photocopyrc
+++ b/.photocopyrc
@@ -1 +1 @@
-DSC02176.ARW
\ No newline at end of file
+DSC02342.ARW
\ No newline at end of file
diff --git a/.vim/dict.add b/.vim/dict.add
index 592d012..e6efb53 100644
--- a/.vim/dict.add
+++ b/.vim/dict.add
@@ -70,3 +70,8 @@ webcam
 iPad
 DJI's
 Insta360
+Mullvad
+NordVPN
+X100
+X100V
+Fujifilm's
diff --git a/.vim/dict.add.spl b/.vim/dict.add.spl
index 111df87..df513ef 100644
--- a/.vim/dict.add.spl
+++ b/.vim/dict.add.spl
diff --git a/.vimrc b/.vimrc
index b9da7fe..c46ba09 100644
--- a/.vimrc
+++ b/.vimrc
@@ -27,6 +27,7 @@ Bundle 'vim-scripts/utl.vim'
 Bundle 'tmhedberg/SimpylFold'
 Bundle 'nvie/vim-flake8'
 Bundle 'majutsushi/tagbar'
+Bundle 'junegunn/fzf.vim'
 call vundle#end()
 filetype plugin indent on
 "}}}
@@ -374,13 +375,13 @@ noremap zE <Nop>
 " }}}
 " Plugins {{{
 "Ctrl P {{{
-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>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>d  :CtrlP $HOME/notes/<cr>
-nnoremap <leader>l  :CtrlP $HOME/writing/luxagraf/<cr>
+nnoremap <leader>l  :Files $HOME/writing/luxagraf/<cr>
 let g:ctrlp_custom_ignore = {
   \ 'dir':  '\v[\/]\.(git|hg|svn|venv|site|static)$',
   \ 'file': '\v\.(pyc|so|dll)$',
diff --git a/bin/download-images-pano.py b/bin/download-images-pano.py
new file mode 100755
index 0000000..fcbf472
--- /dev/null
+++ b/bin/download-images-pano.py
@@ -0,0 +1,32 @@
+#! /bin/python
+import os
+from shutil import copyfile
+import sys
+
+
+if os.path.exists(sys.argv[1]):
+    path = os.path.abspath(sys.argv[1])
+else:
+    print("Cannot find " + sys.argv[1])
+    exit()
+with open('/home/lxf/.panocopyrc', 'r') as f:
+    lastfile = str(f.readline().rstrip())
+sorter = []
+for (dirname, dirs, files) in os.walk(path):
+    dirn = os.path.abspath(dirname)
+    for filename in files:
+        if filename.endswith('.RW2'):
+            if int(filename.split('P')[1].split(".RW2")[0]) > int(lastfile.split('P')[1].split(".RW2")[0]):
+                sorter.append([int(filename.split('P')[1].split(".RW2")[0]), filename])
+for f in sorted(sorter):
+    dest = '/home/lxf/pictures/inbox/'
+    if not os.path.exists(dest):
+        os.makedirs(dest)
+    print("copying:", dirn+'/'+f[1], "--->", dest+f[1])
+    copyfile(dirn+'/'+f[1], dest+f[1])
+    try:
+        out = sorted(sorter)[-1]
+        with open('/home/lxf/.panocopyrc', 'w') as f:
+            f.write(out[1])
+    except IndexError:
+        pass
diff --git a/bin/download-images.py b/bin/download-images.py
index 5ad7e73..4ff583a 100755
--- a/bin/download-images.py
+++ b/bin/download-images.py
@@ -2,6 +2,8 @@
 import os
 from shutil import copyfile
 import sys
+
+
 if os.path.exists(sys.argv[1]):
     path = os.path.abspath(sys.argv[1])
 else: