load gtk settings on sway start, vpn shortcut and waybar indicator

4 files changed, 27 insertions, 8 deletions

diff --git a/dotfiles/.config/ranger/rc.conf b/dotfiles/.config/ranger/rc.conf
index 5a56a0e..e775dfb 100644
--- a/dotfiles/.config/ranger/rc.conf
+++ b/dotfiles/.config/ranger/rc.conf
@@ -441,7 +441,7 @@ map om cd ~/Music
 map opp cd ~/Pictures
 map opw cd ~/Pictures/wallpapers
 map ops cd ~/Pictures/screenshots
-map ovv cd ~/Video
+map ovv cd ~/Videos
 map or cd ~/Repositories
 map os cd ~/.local/bin
 map ocf cd ~/.config
@@ -456,7 +456,7 @@ map Omm tab_new ~/Music
 map Opp tab_new ~/Pictures
 map Opw tab_new ~/Pictures/wallpapers
 map Ops tab_new ~/Pictures/screenshots
-map Ovv tab_new ~/Video
+map Ovv tab_new ~/Videos
 map Or tab_new ~/Repositories
 map Os tab_new ~/.local/bin
 map Ocf tab_new ~/.config
diff --git a/dotfiles/.config/sway/config b/dotfiles/.config/sway/config
index 1cf4d43..94b0de9 100644
--- a/dotfiles/.config/sway/config
+++ b/dotfiles/.config/sway/config
@@ -24,6 +24,12 @@ font pango:BlexMono Nerd Font Mono 10
 # Use Mouse+$mod to drag floating windows
 floating_modifier $mod
 
+# GTK theme and icons
+set $gnome-schema org.gnome.desktop.interface
+exec_always {
+  gsettings set $gnome-schema gtk-theme 'oomox-materia-dark'
+  gsettings set $gnome-schema icon-theme 'Papirus-Dark'
+}
 
 ##### Startup scripts and programs #####
 # Waybar
@@ -31,7 +37,6 @@ exec --no-startup-id waybar_launch
 # KDE Connect
 exec --no-startup-id kdeconnect-indicator
 # music daemon
-# exec_always --no-startup-id ~/.scripts/mopidy_launch
 exec --no-startup-id mpd
 # Bluetooth adapter applet
 exec_always --no-startup-id blueman-applet
@@ -113,7 +118,7 @@ input 2:10:TPPS/2_IBM_TrackPoint pointer_accel 1
 # Outputs
 output "*" background ~/.config/wall1.png fill
 # Laptop display
-output "eDP-1" scale 1.53 pos 0 0
+output "eDP-1" scale 1.6 pos 0 0 scale_filter smart
 
 # Keymaps
 input * xkb_layout "us,es,ru"
@@ -186,6 +191,10 @@ bindsym --to-code {
     $mod+grave exec --no-startup-id menuducksearch
     $mod+Shift+grave exec --no-startup-id menuemoji
     $mod+F1 exec --no-startup-id zathura ~/.config/i3/i3guide.pdf
+
+    # Network management
+    $mod+Shift+c exec togglevpn
+    # Network management
     $mod+Shift+n exec $term -e 'nmtui'
 
     # Screenshot and recording
diff --git a/dotfiles/.config/waybar/config b/dotfiles/.config/waybar/config
index c543e94..a0aa3a6 100644
--- a/dotfiles/.config/waybar/config
+++ b/dotfiles/.config/waybar/config
@@ -14,8 +14,10 @@
         "custom/weather"
     ],
     "modules-right": [
+        "custom/rec-status",
         "custom/swaykbd",
         "backlight",
+        "custom/vpn-status",
         "network",
         "battery#bat0",
         "battery#bat1",
@@ -159,14 +161,21 @@
         "on-click": "termite -e ncpamixer"
     },
     "custom/rec-status": {
-        "format": "{}",
+        "format": "<span color=\"#b73030\">{}</span>",
         "signal": 5,
-        "exec": "i3barrecstatus"
+        "interval": "once",
+        "exec": "barrecstatus"
+    },
+    "custom/vpn-status": {
+        "format": "<span color=\"#5b8277\">{}</span>",
+        "signal": 6,
+        "interval": "once",
+        "exec": "barvpnstatus"
     },
     "custom/weather": {
         "format": "{}",
         "interval": 900,
-        "exec": "i3barweather"
+        "exec": "barweather"
     },
     "custom/swaykbd": {
         "format": "<span color=\"#5b8277\"></span> {}",
diff --git a/dotfiles/.config/waybar/style.css b/dotfiles/.config/waybar/style.css
index 44bae1e..e066c6a 100644
--- a/dotfiles/.config/waybar/style.css
+++ b/dotfiles/.config/waybar/style.css
@@ -63,8 +63,9 @@ window#waybar {
 #temperature,
 #custom-weather,
 #custom-rec-status,
+#custom-vpn-status,
 #custom-swaykbd {
-    padding: 0 8px;
+    padding: 0 6px;
 }
 #custom-weather {
     color: #5b8277;