From 77ea34c58193f5138934a18e70aa55eb912ade5e Mon Sep 17 00:00:00 2001
From: AngeD <ange.duhayon@epitech.eu>
Date: Tue, 28 Mar 2023 01:04:38 +0200
Subject: [PATCH 1/3] feat: desktop picom, sbar and .xinitrc

---
 .config/nvim/pack/plugins/opt/lspconfig  | 2 +-
 .config/nvim/pack/plugins/opt/treesitter | 2 +-
 .config/picom.conf                       | 2 +-
 .config/redshift.conf                    | 2 --
 .xinitrc                                 | 6 ++----
 bin/sbar                                 | 6 +++---
 6 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.config/nvim/pack/plugins/opt/lspconfig b/.config/nvim/pack/plugins/opt/lspconfig
index e99d159..c5505c7 160000
--- a/.config/nvim/pack/plugins/opt/lspconfig
+++ b/.config/nvim/pack/plugins/opt/lspconfig
@@ -1 +1 @@
-Subproject commit e99d1590c7dc4c97b7dbc6a9c7e2dd830e204eea
+Subproject commit c5505c70571b094663745167d40388edd40f6450
diff --git a/.config/nvim/pack/plugins/opt/treesitter b/.config/nvim/pack/plugins/opt/treesitter
index c9ef5e5..63e4a3a 160000
--- a/.config/nvim/pack/plugins/opt/treesitter
+++ b/.config/nvim/pack/plugins/opt/treesitter
@@ -1 +1 @@
-Subproject commit c9ef5e58f7d59aba875324825ff47900d0be61f2
+Subproject commit 63e4a3a40a494e76ef7613f127b31919eebd47d1
diff --git a/.config/picom.conf b/.config/picom.conf
index ed507be..14a1425 100644
--- a/.config/picom.conf
+++ b/.config/picom.conf
@@ -212,7 +212,7 @@ blur-background-exclude = [
 # Specify the backend to use: `xrender`, `glx`, or `xr_glx_hybrid`.
 # `xrender` is the default one.
 #
-backend = "glx"
+backend = "xrender"
 
 # Enable/disable VSync.
 # vsync = false
diff --git a/.config/redshift.conf b/.config/redshift.conf
index 58366d8..59840ed 100644
--- a/.config/redshift.conf
+++ b/.config/redshift.conf
@@ -1,6 +1,4 @@
 [redshift]
-temp-day=5000
-temp-night=3500
 location-provider=manual
 
 [manual]
diff --git a/.xinitrc b/.xinitrc
index 1122861..87559eb 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -4,10 +4,8 @@
 numlockx
 
 # display
-xrandr                                           \
-    --output eDP-1           --auto  --primary   \
-    --output DisplayPort-1-1 --auto --pos 1920x0 \
-    --output DisplayPort-1-2 --auto --pos 3840x0
+xrandr \
+    --output HDMI1 --auto --primary
 feh --bg-tile "$XDG_CONFIG_HOME/wallpapers/landscape.png" --no-fehbg
 
 # startup
diff --git a/bin/sbar b/bin/sbar
index 8aab519..513c564 100755
--- a/bin/sbar
+++ b/bin/sbar
@@ -54,10 +54,10 @@ update_time() {
 
 # modules that don't update on their own need to be run at the start for getting their initial value
 update_vol
-update_backlight
+#update_backlight
 
 display() {
-    xsetroot -name "$crypto | $cpu | $memory | $vol | $backlight | $bat | $time"
+    xsetroot -name "$crypto | $cpu | $memory | $vol | $time"
 }
 
 # SIGNALING
@@ -76,7 +76,7 @@ while true; do
         [ $((sec % 5   )) -eq 0 ] && update_time
         [ $((sec % 5   )) -eq 0 ] && update_cpu
         [ $((sec % 5   )) -eq 0 ] && update_memory
-        [ $((sec % 5   )) -eq 0 ] && update_bat
+        #[ $((sec % 5   )) -eq 0 ] && update_bat
         [ $((sec % 5   )) -eq 0 ] && display
 
         sec="$((sec + 1))"

From dfa2a9b47708b2b151fd12b542c0743322464e66 Mon Sep 17 00:00:00 2001
From: AngeD <ange.duhayon@epitech.eu>
Date: Wed, 29 Mar 2023 20:09:24 +0200
Subject: [PATCH 2/3] fix: am nvim syntax highlight

---
 bin/am | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bin/am b/bin/am
index a68c8f1..96b1040 100755
--- a/bin/am
+++ b/bin/am
@@ -1,5 +1,4 @@
-#!/bin/bash
-set -e
+#!/bin/bash -e
 
 # TODO
 # mount all partitions by selecting disk
@@ -12,7 +11,7 @@ function get_row() {
     printf '\e[6n' >&2
     read -sdRr pos
     pos="${pos#*[}"
-    row="${pos%;*}"
+    row="${pos%\;*}"
     echo "$row"
 }
 

From 832c0093d7ab7405299876618e7761d73b4c43e3 Mon Sep 17 00:00:00 2001
From: AngeD <ange.duhayon@epitech.eu>
Date: Wed, 29 Mar 2023 20:09:37 +0200
Subject: [PATCH 3/3] feat: dksys -> docker system

---
 .config/nvim/pack/plugins/opt/treesitter | 2 +-
 .config/zsh/.docker_aliases              | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.config/nvim/pack/plugins/opt/treesitter b/.config/nvim/pack/plugins/opt/treesitter
index 63e4a3a..9850baa 160000
--- a/.config/nvim/pack/plugins/opt/treesitter
+++ b/.config/nvim/pack/plugins/opt/treesitter
@@ -1 +1 @@
-Subproject commit 63e4a3a40a494e76ef7613f127b31919eebd47d1
+Subproject commit 9850baa958d6a1edd6586d77e354d89249f97a88
diff --git a/.config/zsh/.docker_aliases b/.config/zsh/.docker_aliases
index c5116d4..439359a 100644
--- a/.config/zsh/.docker_aliases
+++ b/.config/zsh/.docker_aliases
@@ -57,10 +57,10 @@ alias dknrm!='docker network rm -f'
 alias dknrm='docker network rm'
 
 ## system
-alias dks='docker system'
-alias dksdf='docker system df'
-alias dksp!='docker system prune -f'
-alias dksp='docker system prune'
+alias dksys='docker system'
+alias dksysdf='docker system df'
+alias dksysp!='docker system prune -f'
+alias dksysp='docker system prune'
 
 # compose
 alias dc='docker-compose'