General fixes, mostly on the linux side

11 files changed, 52 insertions, 31 deletions

diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 57e9ab0d..fecb8302 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -13,6 +13,7 @@ env:
   TERM: xterm-256color
 
 window:
+  opacity: 0.75
   # Window dimensions (changes require restart)
   #
   # Specified in number of columns/lines, not pixels.
@@ -102,14 +103,14 @@ scrolling:
 # Font configuration
 font:
   # Normal (roman) font face
-  # normal:
+  normal:
     # Font family
     #
     # Default:
     #   - (macOS) Menlo
     #   - (Linux/BSD) monospace
     #   - (Windows) Consolas
-    # family: Mononoki Nerd Font
+    family: "MesloLGS NF"
 
     # The `style` can be specified to pick a specific face.
     # style: Regular
@@ -290,8 +291,7 @@ colors:
 #
 # Window opacity as a floating point number from `0.0` to `1.0`.
 # The value `0.0` is completely transparent and `1.0` is opaque.
-background_opacity: 0.75
-# background_opacity: 0.95
+# background_opacity: 0.75
 
 #selection:
   #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t"
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 7e1bc530..f5de60b1 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -20,12 +20,13 @@ alias doom='$HOME/.emacs.d/bin/doom'
 alias ls='exa -la --color=always --group-directories-first'
 alias pr='ping rogs.me'
 alias my-ip="curl ifconfig.me"
+alias emacs="emacsclient -c -a 'emacs'"
 
 source "$HOME/.config/fish/abbreviations.fish"
 
 # tabtab source for packages
 # uninstall by removing these lines
-[ -f ~/.config/tabtab/__tabtab.fish ]; and . ~/.config/tabtab/__tabtab.fish; or true
+# [ -f ~/.config/tabtab/__tabtab.fish ]; and . ~/.config/tabtab/__tabtab.fish; or true
 
 # The next line updates PATH for the Google Cloud SDK.
 if [ -f '/home/roger/.google-cloud-sdk/path.fish.inc' ]; . '/home/roger/.google-cloud-sdk/path.fish.inc'; end
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
index cc2b0983..9901f80e 100644
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@@ -5,7 +5,7 @@ SETUVAR __fish_init_1_50_0:\x1d
 SETUVAR __fish_init_2_39_8:\x1d
 SETUVAR __fish_init_2_3_0:\x1d
 SETUVAR __fish_init_3_x:\x1d
-SETUVAR __fish_initialized:3100
+SETUVAR __fish_initialized:3400
 SETUVAR _fish_abbr_cdccb:cd\x20\x7e/code/massive/cocacola/new\x2dbackend
 SETUVAR _fish_abbr_cdccf:cd\x20\x7e/code/massive/cocacola/frontend
 SETUVAR _fish_abbr_cdimb:cd\x20\x7e/code/personal/identidadMisional/backend
@@ -107,4 +107,5 @@ SETUVAR fish_pager_color_completion:normal
 SETUVAR fish_pager_color_description:B3A06D\x1eyellow
 SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
 SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
+SETUVAR fish_pager_color_selected_background:\x2dr
 SETUVAR fish_user_paths:/home/roger/\x2eserverless/bin
diff --git a/.config/fish/functions/prometeo-vpn.fish b/.config/fish/functions/prometeo-vpn.fish
index c88db78a..94174ca1 100644
--- a/.config/fish/functions/prometeo-vpn.fish
+++ b/.config/fish/functions/prometeo-vpn.fish
@@ -1,5 +1,5 @@
 function prometeo-vpn
+         sudo wg-quick down wg0 
          mullvad disconnect
-         cd ~/.vpn
-         sudo openvpn --config prometeo.ovpn
+         sudo wg-quick up wg0 
 end
diff --git a/.config/fish/functions/uft.fish b/.config/fish/functions/uft.fish
index 41e33940..afb7b111 100644
--- a/.config/fish/functions/uft.fish
+++ b/.config/fish/functions/uft.fish
@@ -1,4 +1,5 @@
 function uft
          rm -f ~/Documents/Gastos/Saved/import/import.csv
          /usr/bin/ls -tr ~/Documents/Gastos/Saved/*.csv | tail -n 2 | xargs grep -Fxvf > ~/Documents/Gastos/Saved/import/import.csv
+         cat -n ~/Documents/Gastos/Saved/import/import.csv
 end
diff --git a/.config/i3/config b/.config/i3/config
index bae31cbe..5b3dcdba 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -29,7 +29,7 @@ font pango:DejaVu Sans Mono 8
 
 # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
 # screen before suspend. Use loginctl lock-session to lock your screen.
-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
+exec --no-startup-id xss-lock --transfer-sleep-lock ~/.config/i3/i3lock_script.sh
 
 # NetworkManager is the most popular way to manage wireless networks on Linux,
 # and nm-applet is a desktop environment-independent system tray GUI for it.
@@ -82,8 +82,8 @@ bindsym $mod+Shift+q kill
 # start rofi (a program launcher)
 bindsym $mod+d exec --no-startup-id "rofi -combi-modi window,drun -show combi"
 
-# start bw-rofi (a rofi frontend for bitwarden)
-bindsym $mod+p exec --no-startup-id "bwpyro -c -1 -w logins"
+# start kpmenu (a rofi frontend for keepass)
+bindsym $mod+p exec --no-startup-id "kpmenu -d ~/Passwords/Passwords.kdbx -m rofi"
 
 # change focus
 bindsym $mod+h focus left
@@ -146,6 +146,7 @@ set $ws7 "7: all"
 set $ws8 "8"
 set $ws9 "9"
 set $ws10 "10"
+set $ws11 "11"
 
 # switch to workspace
 bindsym $mod+1 workspace number $ws1
@@ -158,6 +159,7 @@ bindsym $mod+7 workspace number $ws7
 bindsym $mod+8 workspace number $ws8
 bindsym $mod+9 workspace number $ws9
 bindsym $mod+0 workspace number $ws10
+bindsym $mod+$aux+0 workspace number $ws11
 
 # move focused container to workspace
 bindsym $mod+Shift+1 move container to workspace number $ws1
@@ -170,6 +172,7 @@ bindsym $mod+Shift+7 move container to workspace number $ws7
 bindsym $mod+Shift+8 move container to workspace number $ws8
 bindsym $mod+Shift+9 move container to workspace number $ws9
 bindsym $mod+Shift+0 move container to workspace number $ws10
+bindsym $mod+$aux+Shift+0 move container to workspace number $ws11
 
 workspace $ws1 output primary
 workspace $ws3 output primary
@@ -194,8 +197,8 @@ set $mode_system System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) re
 mode "$mode_system" {
     bindsym l exec --no-startup-id $Locker, mode "default"
     bindsym e exec --no-startup-id i3-msg exit, mode "default"
-    bindsym s exec --no-startup-id $Locker && systemctl suspend, mode "default"
-    bindsym h exec --no-startup-id $Locker && systemctl hibernate, mode "default"
+    bindsym s exec --no-startup-id systemctl suspend, mode "default"
+    bindsym h exec --no-startup-id systemctl hibernate, mode "default"
     bindsym r exec --no-startup-id systemctl reboot, mode "default"
     bindsym Shift+s exec --no-startup-id systemctl poweroff -i, mode "default"
 
@@ -219,14 +222,14 @@ bindsym $mod+Shift+b exec $auxTerminal -e 'bmenu'
 bindsym $aux+Shift+e exec setxkbmap es
 bindsym $aux+Shift+u exec setxkbmap us
 
-# Screnshots
+# Screenshots
 bindsym Print exec scrot ~/Pictures/%Y-%m-%d-%H%M%S.png
-bindsym --release Shift+Print exec scrot -s -f ~/Pictures/%Y-%m-%d-%H%M%S.png
-bindsym --release Ctrl+Shift+Print exec scrot -s -f -o "/tmp/image.png" && xclip -selection clipboard -t image/png -i /tmp/image.png
+bindsym --release Shift+F12 exec scrot -s -f ~/Pictures/%Y-%m-%d-%H%M%S.png
+bindsym --release Ctrl+Shift+F12 exec scrot -s -f -o "/tmp/image.png" && xclip -selection clipboard -t image/png -i /tmp/image.png
 
 # Shortcuts
 
-bindsym $aux+g exec loffice ~/Documents/Gastos/Gastos.xlsx
+bindsym $aux+g exec loffice ~/Documents/Gastos/Gastos.ods
 bindsym $aux+b exec loffice ~/Documents/Gastos/BTC.ods
 bindsym $aux+l exec lollypop
 
@@ -246,8 +249,10 @@ assign [class="Telegram"] $ws4
 assign [class="Keybase"] $ws4
 assign [class="Ferdi"] $ws4
 assign [class="Signal"] $ws4
+assign [class="SchildiChat"] $ws4
 assign [class="Evolution"] $ws5
 assign [class="Thunderbird"] $ws5
+assign [class="Mailspring"] $ws5
 assign [class="Liferea"] $ws5
 for_window [class = "Spotify"] move to workspace $ws6
 assign [class="Lollypop"] $ws6
@@ -267,10 +272,11 @@ for_window [urgent=latest] focus
 
 # Autostarts
 exec --no-startup-id sleep 20; exec /usr/bin/thunderbird
+# exec --no-startup-id exec /usr/bin/mailspring
 exec --no-startup-id exec /usr/bin/nextcloud --background
 # exec --no-startup-id exec /usr/bin/evolution
 # exec_always --no-startup-id .config/conky/start.sh
-exec --no-startup-id exec /usr/bin/emacs
+exec --no-startup-id exec emacsclient -c -a emacs
 exec --no-startup-id exec /usr/bin/brave
 exec --no-startup-id sleep 5; exec $terminal
 exec --no-startup-id sleep 10; exec nitrogen --restore
@@ -285,6 +291,9 @@ exec --no-startup-id /usr/lib/xfce4/notifyd/xfce4-notifyd
 exec_always --no-startup-id autotiling
 exec --no-startup-id xinput set-prop 14 345 1
 exec --no-startup-id exec /usr/bin/keepassxc
+exec --no-startup-id exec /usr/bin/joplin-desktop
+exec --no-startup-id exec /usr/bin/play-with-mpv
+exec --no-startup-id exec "~/.config/i3/connect-speakers.sh"
 
 # Random scripts
 ## Generate a random password and copy it to the clipboard
diff --git a/.config/i3/i3lock_script.sh b/.config/i3/i3lock_script.sh
index 4af57b56..c81fe68f 100755
--- a/.config/i3/i3lock_script.sh
+++ b/.config/i3/i3lock_script.sh
@@ -5,6 +5,11 @@
 # |_|  \___/ \__, |___/    https://git.rogs.me
 #            |___/
 #
+keepassxc --lock
+if pidof openvpn; then
+    notify-send "Shutting down VPN"
+    pkexec --user root killall openvpn
+fi
 scrot /tmp/screen.png
 xwobf -s 11 /tmp/screen.png
 i3lock -i /tmp/screen.png
diff --git a/.config/nitrogen/bg-saved.cfg b/.config/nitrogen/bg-saved.cfg
index 8c49b9db..4dc020f7 100644
--- a/.config/nitrogen/bg-saved.cfg
+++ b/.config/nitrogen/bg-saved.cfg
@@ -1,9 +1,14 @@
 [xin_0]
-file=/home/roger/.wallpapers/U5b0g3t.jpg
+file=/home/roger/.wallpapers/santorini2.jpg
 mode=5
 bgcolor=#000000
 
 [xin_1]
-file=/home/roger/.wallpapers/Hl3nrDB.jpg
+file=/home/roger/.wallpapers/athens.jpg
+mode=5
+bgcolor=#000000
+
+[xin_2]
+file=/home/roger/.wallpapers/santorini.jpg
 mode=5
 bgcolor=#000000
diff --git a/.config/nitrogen/nitrogen.cfg b/.config/nitrogen/nitrogen.cfg
index 3c7b66c1..4da8b677 100644
--- a/.config/nitrogen/nitrogen.cfg
+++ b/.config/nitrogen/nitrogen.cfg
@@ -1,6 +1,6 @@
 [geometry]
-posx=2035
-posy=82
+posx=115
+posy=86
 sizex=1570
 sizey=900
 
diff --git a/.config/polybar/config b/.config/polybar/config
index da63f0bf..b41fb306 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -35,8 +35,7 @@ font-4 = FontAwesome:size=10;0
 font-5 = Noto Color Emoji:scale=12;0
 modules-left = i3 music
 modules-center = xwindow
-modules-right = crypto pulseaudio xkeyboard cpu memory wireless-network mullvad-status battery clock
-; tray-position = right
+modules-right = pulseaudio xkeyboard cpu memory wireless-network mullvad-status battery clock
 
 
 [module/i3]
diff --git a/.config/rofi/theme/rogs.rasi b/.config/rofi/theme/rogs.rasi
index 17430a40..70e27e14 100644
--- a/.config/rofi/theme/rogs.rasi
+++ b/.config/rofi/theme/rogs.rasi
@@ -9,7 +9,6 @@
  * User: rogs
  * Copyright: Roger Gonzalez
  */
-
 * {
     selected-normal-foreground:  rgba ( 51, 51, 51, 100 % );
     foreground:                  #75D85A;
@@ -20,16 +19,16 @@
     blue:                        rgba ( 38, 139, 210, 100 % );
     urgent-foreground:           rgba ( 255, 153, 153, 100 % );
     alternate-urgent-background: rgba ( 255, 255, 255, 7 % );
-    active-foreground:           #498C3A;
+    active-foreground:           #118200;
     lightbg:                     rgba ( 238, 232, 213, 100 % );
     selected-active-foreground:  rgba ( 51, 51, 51, 100 % );
     alternate-active-background: rgba ( 255, 255, 255, 7 % );
-    background:                  #000000;
+    background:                  #118200;
     bordercolor:                 rgba ( 17, 170, 170, 100 % );
     alternate-normal-foreground: @foreground;
-    normal-background:           rgba ( 0, 0, 0, 0 % );
+    normal-background:           #5fb34c;
     lightfg:                     rgba ( 88, 104, 117, 100 % );
-    selected-normal-background:  #41D315;
+    selected-normal-background:  #74ff00;
     border-color:                @foreground;
     spacing:                     2;
     separatorcolor:              rgba ( 17, 170, 170, 100 % );
@@ -39,7 +38,8 @@
     background-color:            rgba ( 0, 0, 0, 0 % );
     alternate-active-foreground: @active-foreground;
     active-background:           rgba ( 0, 0, 0, 0 % );
-    selected-active-background:  #41D315;
+    active-background:           #41D315;
+    selected-active-background:  #74ff00;
 }
 #window {
     background-color: @background;
@@ -94,7 +94,7 @@
     background-color: @selected-active-background;
     text-color:       @selected-active-foreground;
 }
-#element.alternate.normal {
+#element alternate.normal {
     background-color: @alternate-normal-background;
     text-color:       @alternate-normal-foreground;
 }