From e777bb54bb71f8d19900703d94e775cac6f7efe1 Mon Sep 17 00:00:00 2001 From: lxf Date: Mon, 21 Nov 2022 11:22:18 -0600 Subject: brought dell branch up to date --- .aliases | 2 +- .bashrc | 2 +- .config/newsboat/config | 50 +++++++++++++++++++++++++++++++++++++++++++++++ .config/openbox/autostart | 2 +- .config/openbox/rc.xml | 31 ++++++++++++++++++++--------- .darktablerc | 2 +- .fehbg | 2 +- .newsboat/config | 50 ----------------------------------------------- .newsboat/history.cmdline | 2 -- .tmux.conf | 4 ++-- 10 files changed, 79 insertions(+), 68 deletions(-) create mode 100644 .config/newsboat/config delete mode 100644 .newsboat/config delete mode 100644 .newsboat/history.cmdline 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/.config/newsboat/config b/.config/newsboat/config new file mode 100644 index 0000000..078ce52 --- /dev/null +++ b/.config/newsboat/config @@ -0,0 +1,50 @@ +auto-reload "yes" +reload-time 360 +text-width 80 +urls-source "ttrss" +ttrss-flag-star "s" +ttrss-flag-publish "p" +ttrss-mode "multi" +ttrss-login "admin" +ttrss-password "hyperrealtranslinguis@34zaq" +ttrss-url "https://rss.luxagraf.net/" + +# vim-like navigation +bind-key j down +bind-key k up +bind-key g home +bind-key G end + +#macro y set browser "mpv %u" ; open-in-browser ; set browser "browser %u" +macro y set browser "tsp yt-dlp %u"; open-in-browser ; set browser "$BROWSER %u" +macro d set browser "yt-dlp %u &"; open-in-browser-noninteractively; set browser $BROWSER +confirm-mark-all-feeds-read no +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 "xvivaldi-stable & >> /dev/null " +#browser "firefox-developer-edition" +bind-key v open-in-browser-and-mark-read +#bind-key o open-in-browser-and-mark-read +save-path ~/documents/articles +bind-key S save +reload-threads 4 + +articlelist-format "%4i %f %D %?T?|%-17T| ?%t" + +#Solarized colors +color background default default +color listnormal default default +color listfocus black yellow +color info default black +color article default default + +highlight feedlist "^.* N .*$" cyan default +highlight articlelist "^.* N .*$" black yellow +# highlights +highlight article "^(Title):.*$" yellow default +highlight article "https?://[^ ]+" blue default +highlight article "\\[image\\ [0-9]+\\]" green default 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 --> - 3 + 5 1 1 2 3 4 + 5 - 875 + 400 @@ -196,7 +197,7 @@ right - no + yes @@ -211,21 +212,33 @@ no - + - left + 1 no - + - right + 2 no - + - up + 3 + no + + + + + 4 + no + + + + + 5 no 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/config b/.newsboat/config deleted file mode 100644 index 3507a3e..0000000 --- a/.newsboat/config +++ /dev/null @@ -1,50 +0,0 @@ -auto-reload "yes" -reload-time 360 -text-width 80 -urls-source "ttrss" -ttrss-flag-star "s" -ttrss-flag-publish "p" -ttrss-mode "multi" -ttrss-login "admin" -ttrss-password "hyperrealtranslinguis@34zaq" -ttrss-url "https://rss.luxagraf.net/" - -# vim-like navigation -bind-key j down -bind-key k up -bind-key g home -bind-key G end - -#macro y set browser "mpv %u" ; open-in-browser ; set browser "browser %u" -macro y set browser "tsp yt-dlp %u"; open-in-browser ; set browser "$BROWSER %u" -macro d set browser "yt-dlp %u &"; open-in-browser-noninteractively; set browser $BROWSER -confirm-mark-all-feeds-read no -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 "xvivaldi-stable & >> /dev/null " -#browser "firefox-developer-edition" -bind-key v open-in-browser-and-mark-read -#bind-key o open-in-browser-and-mark-read -save-path ~/documents/articles -bind-key S save -reload-threads 4 - -articlelist-format "%4i %f %D %?T?|%-17T| ?%t" - -#Solarized colors -color background default default -color listnormal default default -color listfocus black yellow -color info default black -color article default default - -highlight feedlist "^.* N .*$" cyan default -highlight articlelist "^.* N .*$" black yellow -# highlights -highlight article "^(Title):.*$" yellow default -highlight article "https?://[^ ]+" blue default -highlight article "\\[image\\ [0-9]+\\]" green default 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 -- cgit v1.2.3-70-g09d2