From 747ab315f820c1c8f1149823da5324e27f214cde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Gremaud?= <loic.gremaud@arcanite.ch>
Date: Fri, 21 Jul 2023 22:29:21 +0200
Subject: [PATCH] Update 21.07.23

---
 config/i3/config                             |  2 ++
 config/i3/config.d/05_rules.conf             |  4 ++++
 config/i3/scripts/i3_autostart               |  9 ++++++---
 config/i3/themes/gruvbox/polybar/config.ini  |  2 +-
 config/i3/themes/gruvbox/polybar/modules.ini |  9 +++++----
 config/i3/themes/system.ini                  |  2 +-
 config/polybar/config                        |  6 +++---
 gitconfig                                    | 15 ---------------
 gitignore_global                             |  5 +++++
 monitors.py                                  |  6 ++++--
 tmux.conf                                    |  3 +++
 11 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/config/i3/config b/config/i3/config
index c4446ca..e00b7a0 100644
--- a/config/i3/config
+++ b/config/i3/config
@@ -320,6 +320,8 @@ tiling_drag modifier titlebar
 ## Syntax:
 #exec [--no-startup-id] <command>
 #exec_always [--no-startup-id] <command>
+exec_always --no-startup-id setxkbmap -option caps:swapescape
+exec_always --no-startup-id ~/.screenlayout/default.sh
 exec_always --no-startup-id ~/.config/i3/scripts/i3_autostart
 
 ## The --no-startup-id parameter disables startup-notification support for this particular exec command.
diff --git a/config/i3/config.d/05_rules.conf b/config/i3/config.d/05_rules.conf
index e8a9abd..8582e9e 100644
--- a/config/i3/config.d/05_rules.conf
+++ b/config/i3/config.d/05_rules.conf
@@ -4,6 +4,10 @@
 
 ##-- Workspace Rules ------------------------
 
+workspace 1 output HDMI-A-0
+workspace 2 output HDMI-A-0
+workspace 3 output DisplayPort-0
+
 ## Automatically putting clients on specific workspaces
 ##
 ## To automatically make a specific window show up on a specific workspace, 
diff --git a/config/i3/scripts/i3_autostart b/config/i3/scripts/i3_autostart
index c863014..f07fe30 100755
--- a/config/i3/scripts/i3_autostart
+++ b/config/i3/scripts/i3_autostart
@@ -26,6 +26,9 @@ fi
 # Enable power management
 xfce4-power-manager &
 
+# Enable wireguard tray
+conda activate base && wg-tray &
+
 # Enable Super Keys For Menu
 ksuperkey -e 'Super_L=Alt_L|F1' &
 ksuperkey -e 'Super_R=Alt_L|F1' &
@@ -36,13 +39,13 @@ xsetroot -cursor_name left_ptr
 # Restore wallpaper
 "$idir"/themes/wallpaper.sh
 
-# Lauch notification daemon
+# Launch notification daemon
 "$idir"/scripts/i3_dunst
 
-# Lauch polybar
+# Launch polybar
 "$idir"/scripts/i3_bar
 
-# Lauch compositor
+# Launch compositor
 "$idir"/scripts/i3_comp
 
 # Start mpd
diff --git a/config/i3/themes/gruvbox/polybar/config.ini b/config/i3/themes/gruvbox/polybar/config.ini
index 8c4a78a..89dc9e1 100644
--- a/config/i3/themes/gruvbox/polybar/config.ini
+++ b/config/i3/themes/gruvbox/polybar/config.ini
@@ -144,7 +144,7 @@ font-5 = "archcraft:size=12;3"
 # Default
 modules-left = LD menu RD dot-alt LD i3 RD
 modules-center = LD mpd RD mpdsep song
-modules-right = LD volume sep backlight sep network sep battery RD dot LD sysmenu RD dot-alt LD date RD
+modules-right = LD volume sep ethernet RD dot LD sysmenu RD dot-alt LD date RD
 
 # Alternate
 ;modules-left = openbox 2LD cpu 3LD memory 4LD filesystem 5LD
diff --git a/config/i3/themes/gruvbox/polybar/modules.ini b/config/i3/themes/gruvbox/polybar/modules.ini
index 280627c..12902be 100644
--- a/config/i3/themes/gruvbox/polybar/modules.ini
+++ b/config/i3/themes/gruvbox/polybar/modules.ini
@@ -55,8 +55,8 @@ ws-icon-4 = 5;
 ws-icon-5 = 6;漣
 ws-icon-6 = 7;
 ws-icon-7 = 8;
-ws-icon-8 = 9;
-ws-icon-9 = 10;ﳴ
+ws-icon-8 = 9;ﳴ
+ws-icon-9 = 10;
 ws-icon-default = 
 ; NOTE: You cannot skip icons, e.g. to get a ws-icon-6
 ; you must also define a ws-icon-5.
@@ -434,10 +434,11 @@ interval = 1.0
 
 ; See "http://en.cppreference.com/w/cpp/io/manip/put_time" for details on how to format the date string
 ; NOTE: if you want to use syntax tags here you need to use %%{...}
-;;date = %Y-%m-%d%
+; date = %Y-%m-%d%
 
 ; Optional time format
-time = %I:%M %p
+; time = %I:%M %p
+time = %k:%M (%a %j/%V) %d/%m/%Y
 
 ; if `date-alt` or `time-alt` is defined, clicking
 ; the module will toggle between formats
diff --git a/config/i3/themes/system.ini b/config/i3/themes/system.ini
index 3d6fe6b..f6b1dc2 100644
--- a/config/i3/themes/system.ini
+++ b/config/i3/themes/system.ini
@@ -21,6 +21,6 @@
 sys_adapter = AC0
 sys_battery = BAT0
 sys_graphics_card = intel_backlight
-sys_network_interface = wlan0
+sys_network_interface = eno1
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
diff --git a/config/polybar/config b/config/polybar/config
index 9ab83ff..5164a6e 100644
--- a/config/polybar/config
+++ b/config/polybar/config
@@ -47,7 +47,7 @@ font-1 = unifont:fontformat=truetype:size=6:antialias=false;4
 font-2 = Wuncon Siji:pixelsize=4;0
 
 modules-left = i3
-modules-right = wlan battery date
+modules-right = pulseaudio date
 
 
 tray-position = right
@@ -105,8 +105,8 @@ font-1 = unifont:fontformat=truetype:size=6:antialias=false;4
 font-2 = Wuncon Siji:pixelsize=4;0
 
 modules-left = i3
-modules-center = backlight pulseaudio
-modules-right = wlan battery date
+modules-center = network
+modules-right = pulseaudio date
 
 tray-position = right
 tray-padding = 2
diff --git a/gitconfig b/gitconfig
index e8c5b1a..3e1ff5e 100644
--- a/gitconfig
+++ b/gitconfig
@@ -25,19 +25,4 @@
 	default = current
 [core]
     editor = nvim
-    pager = delta
 	excludesfile = /home/legrems/.gitignore_global
-[pager]
-    diff = delta
-    log = delta
-    reflog = delta
-    show = delta
-[delta]
-    plus-style = "syntax #012800"
-    minus-style = "syntax #340001"
-    syntax-theme = Monokai Extended
-    ;syntax-theme = gruvbox-dark
-    navigate = true
-    side-by-side = true
-[interactive]
-    diffFilter = delta --color-only
diff --git a/gitignore_global b/gitignore_global
index 9cbb660..7f4880a 100644
--- a/gitignore_global
+++ b/gitignore_global
@@ -3,3 +3,8 @@
 tags
 Session.vim
 *.rest
+cert.crt
+cert.key
+local_gestion_ssh_key
+local_gestion_ssh_key.pub
+start_vms.sh
diff --git a/monitors.py b/monitors.py
index 138e9e8..ae95912 100644
--- a/monitors.py
+++ b/monitors.py
@@ -12,9 +12,11 @@ def i3_command(command, *args, **kwargs):
 def get_workspaces():
     return i3_command("-t", "get_workspaces")
 
-def get_outputs():
+def get_output():
     return i3_command("-t", "get_outputs")
 
+def test():
+    pass
 
 print(get_workspaces())
-print(get_outputs())
+print(get_output())
diff --git a/tmux.conf b/tmux.conf
index 8f2262f..36b6772 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -23,6 +23,9 @@ set-window-option -g mode-keys vi
 bind -T copy-mode-vi v send-keys -X begin-selection
 bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
 
+set -g default-terminal "tmux-256color"
+set -ag terminal-overrides ",*:RGB"
+
 # change color
 #set -g pane-border-style 'fg=#660033'
 #set -g pane-active-border-style 'fg=#990033 bg=default'