From 3fae4e0d222f315b437037e2e2d3f6589072fbd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be>
Date: Fri, 8 Dec 2023 14:13:57 +0100
Subject: [PATCH 1/4] No longer pin neogit commit

---
 nvim/lazy-lock.json  | 8 ++++----
 nvim/lua/plugins.lua | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index f3339f8..0053ca0 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -14,15 +14,15 @@
   "lush.nvim": { "branch": "main", "commit": "f76741886b356586f9dfe8e312fbd1ab0fd1084f" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" },
   "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
-  "neogit": { "branch": "master", "commit": "ec9aa050790301d92ae1f588652f8577bdd31082" },
+  "neogit": { "branch": "master", "commit": "6d445e4272635ba7eff1346693148aa41b2b99de" },
   "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" },
   "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" },
-  "nvim-lspconfig": { "branch": "master", "commit": "6c797ff9324094e333e2ace9526ca4a62ad9d1ca" },
+  "nvim-lspconfig": { "branch": "master", "commit": "511609ae0311abfcfaed3c398429a147e895ce2c" },
   "nvim-snippy": { "branch": "master", "commit": "7c8f18e90cad4f56c4e22a49101668735639f286" },
   "nvim-tree.lua": { "branch": "master", "commit": "59e65d88db177ad1e6a8cffaafd4738420ad20b6" },
-  "nvim-treesitter": { "branch": "master", "commit": "f861bc6148e7bc715f6a09bd34bb1f577b62a248" },
+  "nvim-treesitter": { "branch": "master", "commit": "180e1ca385442e35e1d18420221a148c5e045671" },
   "nvim-web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" },
-  "oil.nvim": { "branch": "master", "commit": "b3c24f4b3b2d38483241292a330cd6eb00734dac" },
+  "oil.nvim": { "branch": "master", "commit": "a173b5776c66a31ce08552677c1eae7ab015835f" },
   "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
   "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" },
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index 6e131fe..d9949c3 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -45,7 +45,7 @@ require('lazy').setup({
     }, dependencies = { "nvim-tree/nvim-web-devicons" }, lazy = true},
     {'windwp/nvim-autopairs', event = "InsertEnter", opts = {}},
     {"folke/flash.nvim", event = "VeryLazy", opts = {highlight = {backdrop=false}, modes = {char = {highlight = {backdrop = false}}, search = {enabled = false}}, prompt = {enabled = false}}, keys = {{"s", mode = {"n","x","o"}, function() require("flash").jump() end}}},
-    {'NeogitOrg/neogit', dependencies = {"nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim", "sindrets/diffview.nvim"}, config = true, lazy = true, commit = "ec9aa050790301d92ae1f588652f8577bdd31082"},
+    {'NeogitOrg/neogit', dependencies = {"nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim", "sindrets/diffview.nvim"}, config = true, lazy = true},
     {'akinsho/bufferline.nvim', version = "*", dependencies = 'nvim-tree/nvim-web-devicons'},
     {'cappyzawa/trim.nvim', config = function () require("trim").setup({ ft_blocklist= {"markdown", "vimwiki"}, patterns = { [[%s/\s\+$//e]], [[%s/\($\n\s*\)\+\%$//]], [[%s/\%^\n\+//]], }, }) end},
     {'folke/trouble.nvim', dependencies = {"nvim-tree/nvim-web-devicons"}, config = function () require('trouble').setup() end, lazy = true},

From 369625b965150fad516027925e9486ca1eb70ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be>
Date: Fri, 8 Dec 2023 18:07:06 +0100
Subject: [PATCH 2/4] reorder window rules

---
 hypr/hyprland.conf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index f5c388d..9e24fd8 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -46,14 +46,14 @@ workspace=27,monitor:DP-2
 workspace=28,monitor:DP-2
 workspace=29,monitor:DP-2
 
-windowrule = float,title:^(rofi)(.*)$
-windowrule = center,title:^(rofi)(.*)$
-windowrule = noborder,title:^(rofi)(.*)$
+windowrulev2 = tile, class:.*
+windowrulev2 = float, title:^(rofi)(.*)$
+windowrulev2 = center,title:^(rofi)(.*)$
+windowrulev2 = noborder,title:^(rofi)(.*)$
 windowrulev2 = stayfocused, title:^()$,class:^(steam)$
 windowrulev2 = minsize 1 1, title:^()$,class:^(steam)$
-windowrule = noanim,waybar
 windowrulev2 = stayfocused, title:^()$,class:^(steam)$
-windowrulev2 = tile, class:.*
+windowrule = noanim,waybar
 
 exec-once=waybar
 

From a2cfb6637d250bb19d1fc4cba46352bc354984c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be>
Date: Tue, 12 Dec 2023 19:46:42 +0100
Subject: [PATCH 3/4] Fix launch_alacritty script

---
 scripts/launch_alacritty.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/launch_alacritty.sh b/scripts/launch_alacritty.sh
index 28cfa4d..0708db9 100755
--- a/scripts/launch_alacritty.sh
+++ b/scripts/launch_alacritty.sh
@@ -14,9 +14,9 @@ if [ $RUNNING_SSH == true ]; then
     PORT=$(ss -tnpa | grep ssh | grep "pid=$CHILD_PID" | awk '{ print $4 }' | grep -o '[0-9]*$')
     alacritty -e ssh $CLIENT -t "cd \"\$(readlink -e /proc/\$(cat /tmp/ssh_session_$PORT)/cwd)\"; zsh --login"
 else
-    if [ $(ps -p $1 -o comm=) == "alacritty" ]; then
+    if [ "$(ps -p $1 -o comm=)" == "alacritty" ]; then
         CWD=$(readlink -e /proc/$CHILD_PID/cwd)
-        if [ $CWD != "" ]; then
+        if [ "$CWD" != "" ]; then
             alacritty --working-directory "$CWD"
         else
             alacritty

From f9116ec80f43919ca698ae7939d7b14e9d9252e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be>
Date: Tue, 12 Dec 2023 19:57:24 +0100
Subject: [PATCH 4/4] Add polkit agent and better date/time in waybar

---
 hypr/hyprland.conf | 1 +
 waybar/config      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 9e24fd8..9ad70ce 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -11,6 +11,7 @@ monitor=HDMI-A-1,preferred,5760x550,1
 exec-once=wl-paste --type text --watch cliphist store
 exec-once=wl-paste --type image --watch cliphist store
 exec-once=sleep 2 && hyprctl dispatch workspace 11
+exec-once=/usr/lib/polkit-kde-authentication-agent-1
 
 workspace=DP-1,11
 workspace=DP-2,21
diff --git a/waybar/config b/waybar/config
index 9a108fc..6891b8d 100644
--- a/waybar/config
+++ b/waybar/config
@@ -29,7 +29,7 @@
         "timezone": "Europe/Brussels",
         "format": "{:%H:%M:%S}",
         "interval": 1,
-        "format-alt": "{:%Y-%m-%d}"
+        "format-alt": "{:%Y-%m-%d %H:%M:%S}"
 
     },
     "cpu": {