From eb07eb998f7708b2224db4ed257c9369fcac33ed Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Mon, 16 Sep 2024 17:36:48 +0200
Subject: [PATCH 1/3] feat(nvim): install nvim-sops plugin

---
 modules/home-manager/cli/neovim/default.nix         | 5 +++++
 modules/home-manager/cli/neovim/files/nvim-sops.lua | 4 ++++
 2 files changed, 9 insertions(+)
 create mode 100644 modules/home-manager/cli/neovim/files/nvim-sops.lua

diff --git a/modules/home-manager/cli/neovim/default.nix b/modules/home-manager/cli/neovim/default.nix
index 19d8962..808762b 100644
--- a/modules/home-manager/cli/neovim/default.nix
+++ b/modules/home-manager/cli/neovim/default.nix
@@ -111,6 +111,11 @@ in
           type = "lua";
           config = ( builtins.readFile ./files/nvim-lint.lua);
         }
+        {
+          plugin = nvim-sops;
+          type = "lua";
+          config = (builtins.readFile ./files/nvim-sops.lua);
+        }
         plenary-nvim
         {
           plugin = (nvim-treesitter.withPlugins (p: [
diff --git a/modules/home-manager/cli/neovim/files/nvim-sops.lua b/modules/home-manager/cli/neovim/files/nvim-sops.lua
new file mode 100644
index 0000000..93153a3
--- /dev/null
+++ b/modules/home-manager/cli/neovim/files/nvim-sops.lua
@@ -0,0 +1,4 @@
+require('nvim_sops').setup {}
+
+vim.keymap.set("n", "<leader>se", vim.cmd.SopsEncrypt, { desc = "Sops: [E]ncrypt file" })
+vim.keymap.set("n", "<leader>sd", vim.cmd.SopsDecrypt, { desc = "Sops: [D]ecrypt file" })

From fd44fc5f509900f04547b61e38ea6df5c22601a8 Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Mon, 16 Sep 2024 18:04:39 +0200
Subject: [PATCH 2/3] feat(neovim): update neotree configuration

---
 .../home-manager/cli/neovim/files/neotree.lua | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/modules/home-manager/cli/neovim/files/neotree.lua b/modules/home-manager/cli/neovim/files/neotree.lua
index c1a587f..f1d1728 100644
--- a/modules/home-manager/cli/neovim/files/neotree.lua
+++ b/modules/home-manager/cli/neovim/files/neotree.lua
@@ -1,18 +1,25 @@
 local neotree = require 'neo-tree'
 neotree.setup({
-    event_handlers = {
-        {
-            event = "file_opened",
-            handler = function(file_path)
-                -- auto close
-                require("neo-tree.command").execute({action = "close"})
-            end
+    filesystem = {
+        filtered_items = {
+            -- when true, they will just be displayed differently 
+            -- than normal items
+            visible = false,
+            hide_dotfiles = false,
+            hide_gitignored = true,
+        },
+        follow_current_file = {
+            -- follow file in current buffer even iof the file is 
+            -- loaded while tree is open
+            enabled = true,
+            -- do not autoclose expanded dirs
+            leave_dirs_open = true,
         },
     }
 })
-vim.api.nvim_set_keymap(
-    'n',
-    '<leader>nt',
-    ':Neotree toggle<CR>',
-    { table.unpack(opts), desc = 'Toggle NeoTree' }
-)
+
+vim.keymap.set('n', '<leader>ns', ':Neotree show<cr>', {desc='Neotree [S]how'})
+vim.keymap.set('n', '<leader>nc', ':Neotree close<cr>', {desc='Neotree [C]lose'})
+vim.keymap.set('n', '<leader>nf', ':Neotree focus<cr>', {desc='Neotree [F]ocus'})
+vim.keymap.set('n', '<leader>nb', ':Neotree show buffers<cr>', {desc='Neotree Nvim [B]uffers'})
+vim.keymap.set('n', '<leader>ng', ':Neotree show git_status<cr>', {desc='Neotree [G]it status'})

From d4e6c583b3f8102c396600056e18bab0a3167d86 Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Mon, 9 Sep 2024 21:34:19 +0200
Subject: [PATCH 3/3] fix(mako): escape newline properly in conf file

---
 modules/home-manager/desktop/sway/includes/mako.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/home-manager/desktop/sway/includes/mako.nix b/modules/home-manager/desktop/sway/includes/mako.nix
index 7f4de74..d3e293e 100644
--- a/modules/home-manager/desktop/sway/includes/mako.nix
+++ b/modules/home-manager/desktop/sway/includes/mako.nix
@@ -26,7 +26,9 @@ with lib;
       maxIconSize = 64;
       layer = "overlay";
       anchor = "top-right";
-      format = ''<span font_scale="small-caps">%a</span>\n<b>%s</b>\n%b'';
+      format = ''
+        <span font_scale='small-caps'>%a</span>\n<b>%s</b>\n%b
+        '';
       extraConfig = ''
         [urgency="high"]
         border-color=#F268b3