latest sway changes from HP

12 files changed, 29 insertions, 27 deletions

diff --git a/.aliases b/.aliases
index e91a330..3a1dcb1 100644
--- a/.aliases
+++ b/.aliases
@@ -61,6 +61,8 @@ alias remts="~/./bin/rename_mts_files.sh"
 alias remp4="~/./bin/rename_mp4_files.sh"
 alias mtsconvert="~/./bin/mts-convert.sh"
 alias findname='find . -name $1'
+# convert GPR to DNG
+alias gprtodng="~/./bin/gprtodng.sh"
 
 #Django web dev
 alias virt='source venv/bin/activate'
diff --git a/.bashrc b/.bashrc
index 04aa24f..a20ae61 100644
--- a/.bashrc
+++ b/.bashrc
@@ -163,9 +163,6 @@ 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/ranger/bookmarks b/.config/ranger/bookmarks
index 021b1df..ac984ed 100644
--- a/.config/ranger/bookmarks
+++ b/.config/ranger/bookmarks
@@ -10,5 +10,5 @@ c:/home/lxf/pictures/nextcloud-ccg-phone
 t:/home/lxf/temp
 p:/home/lxf/temp/wired
 k:/home/lxf/exported
-':/home/lxf/.dotfiles
+':/home/lxf/sites/cumuluslearning.net
 m:/home/lxf
diff --git a/.config/ranger/rifle.conf b/.config/ranger/rifle.conf
index cac8768..f7c9c53 100644
--- a/.config/ranger/rifle.conf
+++ b/.config/ranger/rifle.conf
@@ -175,6 +175,7 @@ mime ^image, has mirage,    X, flag f = mirage -- "$@"
 mime ^image, has ristretto, X, flag f = ristretto "$@"
 mime ^image, has eog,       X, flag f = eog -- "$@"
 mime ^image, has eom,       X, flag f = eom -- "$@"
+mime ^image, has imv,       X, flag f = imv -- "$@"
 mime ^image, has gimp,      X, flag f = gimp -- "$@"
 ext xcf,                    X, flag f = gimp -- "$@"
 
diff --git a/.config/ranger/tagged b/.config/ranger/tagged
index aceadd9..3b9aa71 100644
--- a/.config/ranger/tagged
+++ b/.config/ranger/tagged
@@ -85,3 +85,4 @@ r:/home/lxf/sites/corrinne-site/app/clients_
 /home/lxf/pictures/2022ccgphone/IMG_20220120_084612.jpg
 /home/lxf/pictures/2022ccgphone/IMG_20220120_084617.jpg
 /home/lxf/pictures/2022ccgphone/IMG_20220120_084851.jpg
+/home/lxf/TO BE AT HOME IN THE WORLD： feat. Charles Eisenstein [_1VfYPUdwTE].webm
diff --git a/.config/sway/config b/.config/sway/config
index aa06ce1..5aa6e8d 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -120,40 +120,32 @@ for_window [class="tasty.javafx.launcher.LauncherFxApp"] border none
 for_window [title="Confirmation"] floating enable 
 for_window [app_id="com.nextcloud.desktopclient.nextcloud"] floating enable 
 for_window [app_id="com.nextcloud.desktopclient.nextcloud"] border none 
-for_window [title="Oracle VM VirtualBox Manager"]  floating enable 
 for_window [app_id="thunar"] floating enable 
 for_window [app_id="null"] floating enable 
 for_window [app_id="soffice"] floating enable 
 for_window [class="^lxf$"] floating enable 
 for_window [app_id="system-config-printer"] floating enable 
-for_window [app_id="darktable"] border none
+for_window [app_id="darktable"] border none fullscreen
 for_window [class="Darktable"] border none
 for_window [app_id="python3"] border none, floating enable
-for_window [class="^URxvt"] border none
-for_window [app_id="firefoxdeveloperedition"] border none
-for_window [class="firefoxdeveloperedition"] border none
 for_window [app_id="vivaldi-snapshot"] border none
 for_window [app_id="vivaldi-stable"] border none
-for_window [class="^qutebrowser"] border none
 for_window [app_id="org.qutebrowser.qutebrowser"] border none
 for_window [app_id="^Alacritty"] border none
 for_window [app_id="^foot"] border none
 for_window [class="Pavucontrol"] floating enable
 for_window [window_role="pop-up"] floating enable
 for_window [class="feh"] floating enable
-for_window [app_id="mpv"] floating enable
+for_window [app_id="imv"] floating enable
 for_window [app_id="gedit"] floating enable
 for_window [app_id="org.kde.kdenlive"] border none
 
 
 assign [class="qutebrowser"] $ws2
 assign [app_id="org.qutebrowser.qutebrowser"] $ws2
-assign [class="Firefox Developer"] $ws4
-assign [class="Slack"] $ws6
-assign [class="Vivaldi"] $ws2
+assign [class="vivaldi-snapshot"] $ws2
 assign [class="Darktable"] $ws3
 assign [app_id="darktable"] $ws3
-assign [title="Oracle VM VirtualBox Manager"] $ws4
 
 #workspace switching
 bindsym $mod+k workspace next
diff --git a/.config/vdirsyncer/config b/.config/vdirsyncer/config
index 930dbc3..3077026 100644
--- a/.config/vdirsyncer/config
+++ b/.config/vdirsyncer/config
@@ -32,7 +32,7 @@ metadata = ["displayname"]
 #   `null` - abort when collisions occur (default)
 #   `"a wins"` - assume a's items to be more up-to-date
 #   `"b wins"` - assume b's items to be more up-to-date
-#conflict_resolution = null
+conflict_resolution = "b wins"
 
 [storage lxf_contacts_local]
 # A storage references actual data on a remote server or on the local disk.
diff --git a/.config/waybar/config b/.config/waybar/config
index bcfe561..b2e8750 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -3,10 +3,10 @@
     "ipc": true,
     "layer": "bottom",
     "position": "bottom",
-    "height": 24,
+    "height": 22,
     "modules-left": ["sway/workspaces", "sway/mode"],
     "modules-center": [""],
-    "modules-right": ["mpd", "network", "idle_inhibitor", "battery", "custom/storage", "custom/storagehome", "cpu", "memory", "custom/weather", "tray", "clock"],
+    "modules-right": ["mpd", "network", "idle_inhibitor", "custom/storage", "custom/storagehome", "cpu", "memory", "custom/weather", "tray", "battery", "clock"],
     "sway/mode": {
         "format": " {}"
     },
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 417b92e..87526f9 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -2,7 +2,7 @@
     border:        none;
     border-radius: 0;
     font-family:   Sans;
-    font-size:     15px;
+    font-size:     14px;
     box-shadow:    none;
     text-shadow:   none;
     transition-duration: 0s;
@@ -19,16 +19,17 @@ window#waybar.solo {
 }
 
 #workspaces {
-    margin: 0 5px;
+    margin: 0;
 }
 
 #workspaces button {
-    padding:    0 5px;
+    padding:    0;
     color:      rgba(217, 216, 216, 0.4);
 }
 
 #workspaces button.visible {
     color:      rgba(217, 216, 216, 1);
+    padding:    0;
 }
 
 #workspaces button.focused {
@@ -40,14 +41,20 @@ window#waybar.solo {
     color:      rgba(238, 46, 36, 1);
 }
 
-#mode, #battery, #cpu, #memory, #network, #pulseaudio, #idle_inhibitor, #backlight, #custom-storage, #custom-spotify, #custom-weather, #custom-mail {
-    margin:     0px 6px 0px 10px;
-    min-width:  25px;
+#mode, #mpd, #battery, #cpu, #memory, #network, #pulseaudio, #idle_inhibitor, #backlight, #custom-storage, #custom-storagehome, #custom-spotify, #custom-weather, #custom-mail {
+    margin:     0 4px;
+    min-width:  15px;
+    color:      rgba(217, 216, 216, 1);
+    background: rgba(35, 31, 32, 0.85);
+    padding:    0 3px;
 }
 
+
 #clock {
-    margin:     0px 4px 0px 6px;
+    margin:     0px 4px 0px 2px;
     min-width:  140px;
+    color:      rgba(217, 216, 216, 1);
+    background: rgba(35, 31, 32, 0.85);
 }
 
 #battery.warning {
diff --git a/.gitconfig b/.gitconfig
index 13c549f..357500b 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,3 +3,5 @@
 	name = luxagraf
 [gpg]
 	program = gpg2
+[pull]
+	rebase = false
diff --git a/.tmux/write-wire b/.tmux/write-wire
index 43e383f..47d31b6 100644
--- a/.tmux/write-wire
+++ b/.tmux/write-wire
@@ -3,4 +3,4 @@ rename-window "wir"
 splitw -h -p 22
 selectp -t 1 # select the original pane
 splitw -h -p 69
-send "cd ~/writing/ && v wired.txt" enter #open vim
+send "cd ~/work/ && v wired.txt" enter #open vim
diff --git a/.vimrc b/.vimrc
index 011cb86..2dae5a1 100644
--- a/.vimrc
+++ b/.vimrc
@@ -76,7 +76,7 @@ let @s ='Sr%a(){: rel=nofollow isAffiliateLink="true"}40h'
 
 " email signature:
 let @c ='icheers 
Scott Gilbertson 
sng@luxagraf.net '
-let @w ='i

cheers 
Scott Gilbertson
--
<wired@scottgilbertson.net>
<scott_gilbertson@wired.com>
<https://www.wired.com/author/scott-gilbertson/>'
+let @w ='i

cheers 
Scott Gilbertson
--
<sng@luxagraf.net>
<scott_gilbertson@wired.com>
<https://www.wired.com/author/scott-gilbertson/>'
 
 
 let @t ='iThank you for your help.

'