brought dell branch up to date

9 files changed, 31 insertions, 20 deletions

diff --git a/.aliases b/.aliases
index 2b3e446..3e4f924 100644
--- a/.aliases
+++ b/.aliases
@@ -70,7 +70,7 @@ alias serve='python -m http.server'
 alias servenet="python -c 'import BaseHTTPServer as bhs, SimpleHTTPServer as shs; bhs.HTTPServer(('\''192.168.1.10'\'', 8080), shs.SimpleHTTPRequestHandler).serve_forever()'"
 
 # download movies
-alias yt='yt-dlp $1 --format best'
+alias yt='yt-dlp -S "height:1080" $1'
 alias yt-audio='youtube-dl --no-check-certificate --ignore-errors --output "%(title)s.%(ext)s" --extract-audio --audio-format mp3'
 
 alias @less="fc -s | less"
diff --git a/.bashrc b/.bashrc
index 899f00d..7dbc903 100644
--- a/.bashrc
+++ b/.bashrc
@@ -2,7 +2,7 @@
 stty -ixon
 export MOZ_DBUS_REMOTE=1
 #alias vivaldi-snapshot="vivaldi-snapshot --use-gl=egl"
-export BROWSER="vivaldi-stable"
+export BROWSER="vivaldi-snapshot"
 export EDITOR="vim"
 # keep dictionaries in ~/bin/
 export STARDICT_DATA_DIR="$HOME/bin/dict/"
diff --git a/.newsboat/config b/.config/newsboat/config
index 3507a3e..078ce52 100644
--- a/.newsboat/config
+++ b/.config/newsboat/config
@@ -23,8 +23,8 @@ confirm-mark-feed-read no
 download-full-page yes 
 confirm-exit yes
 #browser "~/bin/open-in-pane"
-browser ~/bin/newsboat-browser.sh
-#browser "$BROWSER"
+#browser ~/bin/newsboat-browser.sh
+browser "$BROWSER"
 #browser "xvivaldi-stable & >> /dev/null "
 #browser "firefox-developer-edition"
 bind-key v open-in-browser-and-mark-read 
diff --git a/.config/openbox/autostart b/.config/openbox/autostart
index ddf9b66..6ee039e 100644
--- a/.config/openbox/autostart
+++ b/.config/openbox/autostart
@@ -10,4 +10,4 @@ xset -b
 xcape -e 'Control_L=Escape'
 xinput --set-prop "DELL07E6:00 06CB:76AF Touchpad" "libinput Click Method Enabled" 0 1
 xinput set-prop 14 "libinput Natural Scrolling Enabled" 1
-feh --bg-fill ~/pictures/desktops/delos.png
+feh --bg-fill ~/pictures/desktops/boat2.jpg
diff --git a/.config/openbox/rc.xml b/.config/openbox/rc.xml
index 55dff8a..af5594e 100644
--- a/.config/openbox/rc.xml
+++ b/.config/openbox/rc.xml
@@ -120,15 +120,16 @@
 
        use obconf if you want to change these without having to log out
        and back in -->
-    <number>3</number>
+    <number>5</number>
     <firstdesk>1</firstdesk>
     <names>
       <name>1</name>
       <name>2</name>
       <name>3</name>
       <name>4</name>
+      <name>5</name>
     </names>
-    <popupTime>875</popupTime>
+    <popupTime>400</popupTime>
     <!-- The number of milliseconds to show the popup for when switching
        desktops.  Set this to 0 to disable the popup. -->
   </desktops>
@@ -196,7 +197,7 @@
     <keybind key="A-K">
       <action name="GoToDesktop">
         <to>right</to>
-        <wrap>no</wrap>
+        <wrap>yes</wrap>
       </action>
     </keybind>
     <keybind key="C-A-Up">
@@ -211,21 +212,33 @@
         <wrap>no</wrap>
       </action>
     </keybind>
-    <keybind key="S-A-Left">
+    <keybind key="S-A-1">
       <action name="SendToDesktop">
-        <to>left</to>
+        <to>1</to>
         <wrap>no</wrap>
       </action>
     </keybind>
-    <keybind key="S-A-Right">
+    <keybind key="S-A-2">
       <action name="SendToDesktop">
-        <to>right</to>
+        <to>2</to>
         <wrap>no</wrap>
       </action>
     </keybind>
-    <keybind key="S-A-Up">
+    <keybind key="S-A-3">
       <action name="SendToDesktop">
-        <to>up</to>
+        <to>3</to>
+        <wrap>no</wrap>
+      </action>
+    </keybind>
+    <keybind key="S-A-4">
+      <action name="SendToDesktop">
+        <to>4</to>
+        <wrap>no</wrap>
+      </action>
+    </keybind>
+    <keybind key="S-A-5">
+      <action name="SendToDesktop">
+        <to>5</to>
         <wrap>no</wrap>
       </action>
     </keybind>
diff --git a/.darktablerc b/.darktablerc
index b88dd71..1d9068d 100644
--- a/.darktablerc
+++ b/.darktablerc
@@ -83,7 +83,7 @@ opencl_synch_cache=active module
 opencl_use_cpu_devices=false
 opencl_use_pinned_memory=false
 panel_scrollbars_always_visible=TRUE
-panel_width=350
+panel_width=550
 performance_configuration_version_completed=1
 pixelpipe_synchronization_timeout=200
 plugins/collection/descending=FALSE
diff --git a/.fehbg b/.fehbg
index 80a554e..99c6409 100755
--- a/.fehbg
+++ b/.fehbg
@@ -1,2 +1,2 @@
 #!/bin/sh
-feh --no-fehbg --bg-fill '/home/lxf/pictures/desktops/delos.png' 
+feh --no-fehbg --bg-fill '/home/lxf/pictures/desktops/boat2.jpg' 
diff --git a/.newsboat/history.cmdline b/.newsboat/history.cmdline
deleted file mode 100644
index 2935811..0000000
--- a/.newsboat/history.cmdline
+++ /dev/null
@@ -1,2 +0,0 @@
-q
-q
diff --git a/.tmux.conf b/.tmux.conf
index 045f701..24e0947 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -43,8 +43,8 @@ bind ^A select-pane -t :.+
 
 # smart pane switching with awareness of vim splits
 bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-h) || tmux select-pane -L"
-bind -n C-n run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-j) || tmux select-pane -D"
-bind -n C-p run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-k) || tmux select-pane -U"
+bind -n C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-j) || tmux select-pane -D"
+bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-k) || tmux select-pane -U"
 bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-l) || tmux select-pane -R"
 
 #alternative for ctrl-l