Merge branch 'gentoo-sway' of git.darkou.fr:dbroqua/home into gentoo-sway

config/sway/config

@@ -124,6 +124,7 @@ exec $term
 exec firefox
 exec spotify
 exec signal-desktop --use-tray-icon
+exec teams
 exec mpd
 
 
@@ -134,6 +135,7 @@ for_window [app_id=".*"] border pixel 4
 
 # Auto move on Workspace
 for_window [class="Signal"] move container to workspace $wksp3
+for_window [class="Teams"] move container to workspace $wksp3
 for_window [class="Slack"] move container to workspace $wksp3
 for_window [class="Spotify"] move container to workspace $wksp4
 

config/waybar/config

@@ -20,9 +20,6 @@
     "temperature#2",
     "temperature#3",
     "pulseaudio",
-    //    "custom/multimedia_previous",
-    //    "custom/multimedia_current",
-    //    "custom/multimedia_next",
     "mpd",
     "clock",
     "tray"
@@ -107,7 +104,6 @@
     },
     "mpd": {
       "format": "{stateIcon}{randomIcon}{repeatIcon}{singleIcon} {artist} - {title} ",
-//      "format": "{stateIcon}{randomIcon}{repeatIcon}{singleIcon} {artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ",
       "format-disconnected": "Disconnected ",
       "format-stopped": "{randomIcon}{repeatIcon}{singleIcon} Stopped ",
       "interval": 10,
@@ -148,22 +144,20 @@
   "sway/mode",
   ],
   "modules-center": [
-  "clock"
   ],
   "modules-right": [
     "disk#1",
   "disk#2",
+  "network#openvpn",
   "network",
   "cpu",
   "memory",
-  "temperature#1",
-  "temperature#3",
+  "temperature",
   "battery",
   "backlight",
   "pulseaudio",
-//  "custom/multimedia_previous",
-//  "custom/multimedia_current",
-//  "custom/multimedia_next",
+  "mpd",
+  "clock",
   "tray"
   ],
   "sway/workspaces": {
@@ -205,6 +199,13 @@
     "max-length": 50,
     "tooltip": false
   },
+  "network#openvpn": {
+    "interface": "tun0",
+    "format": "🔒",
+    "format-disconnected": "🔓", //An empty format will hide the module.
+    "max-length": 50,
+    "tooltip": false
+  },
   "cpu": {
     "format": " {load}%",
     "tooltip": false
@@ -213,16 +214,11 @@
     "format": " {percentage}%",
     "tooltip": false
   },
-  "temperature#1": {
+  "temperature": {
     "thermal-zone": 1,
-    "hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
+    "hwmon-path": "/sys/class/hwmon/hwmon0/temp1_input",
     "format": " {temperatureC}°C"
   },
-  "temperature#3": {
-    "thermal-zone": 1,
-    "hwmon-path": "/sys/class/hwmon/hwmon7/temp1_input",
-    "format": "{temperatureC}°C"
-  },
   "backlight": {
     "device": "intel_backlight",
     "format": "{percent}% {icon}",
@@ -245,19 +241,6 @@
     "on-click": "pavucontrol",
     "tooltip": false
   },
-  "custom/multimedia_previous": {
-    "format": "",
-    "on-click": "~/bin/music.sh Previous"
-  },
-  "custom/multimedia_current": {
-    "interval": 10,
-    "exec": "~/bin/nowPlaying.sh",
-    "on-click": "~/bin/music.sh PlayPause"
-  },
-  "custom/multimedia_next": {
-    "format": "",
-    "on-click": "~/bin/music.sh Next"
-  },
   "mpd": {
     "format": "{stateIcon}{randomIcon}{repeatIcon}{singleIcon} {artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ",
     "format-disconnected": "Disconnected ",

dotfiles/.vimrc

@@ -33,6 +33,7 @@ call plug#begin('~/.vim/plugged')
   Plug 'airblade/vim-gitgutter'
   Plug 'yuezk/vim-js'
   Plug 'maxmellon/vim-jsx-pretty'
+  Plug 'briancollins/vim-jst'
   Plug 'dpelle/vim-grammalecte'
 " Initialize plugin system
 call plug#end()