modules/home-manager/cli/neovim/default.nix

@@ -111,11 +111,6 @@ 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: [

modules/home-manager/cli/neovim/files/neotree.lua

@@ -1,25 +1,18 @@
 local neotree = require 'neo-tree'
 neotree.setup({
-    filesystem = {
+    event_handlers = {
-        filtered_items = {
+        {
-            -- when true, they will just be displayed differently 
+            event = "file_opened",
-            -- than normal items
+            handler = function(file_path)
-            visible = false,
+                -- auto close
-            hide_dotfiles = false,
+                require("neo-tree.command").execute({action = "close"})
-            hide_gitignored = true,
+            end
-        },
-        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(
-vim.keymap.set('n', '<leader>ns', ':Neotree show<cr>', {desc='Neotree [S]how'})
+    'n',
-vim.keymap.set('n', '<leader>nc', ':Neotree close<cr>', {desc='Neotree [C]lose'})
+    '<leader>nt',
-vim.keymap.set('n', '<leader>nf', ':Neotree focus<cr>', {desc='Neotree [F]ocus'})
+    ':Neotree toggle<CR>',
-vim.keymap.set('n', '<leader>nb', ':Neotree show buffers<cr>', {desc='Neotree Nvim [B]uffers'})
+    { table.unpack(opts), desc = 'Toggle NeoTree' }
-vim.keymap.set('n', '<leader>ng', ':Neotree show git_status<cr>', {desc='Neotree [G]it status'})
+)

modules/home-manager/cli/neovim/files/nvim-sops.lua

@@ -1,4 +0,0 @@
-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" })

modules/home-manager/desktop/sway/includes/mako.nix

@@ -26,9 +26,7 @@ with lib;
       maxIconSize = 64;
       layer = "overlay";
       anchor = "top-right";
-      format = ''
+      format = ''<span font_scale="small-caps">%a</span>\n<b>%s</b>\n%b'';
-        <span font_scale='small-caps'>%a</span>\n<b>%s</b>\n%b
-        '';
       extraConfig = ''
         [urgency="high"]
         border-color=#F268b3