From 20808b19e17be10d0ca18ea313dae1019a6e19bd Mon Sep 17 00:00:00 2001
From: tristan <tristan@tristans.cloud>
Date: Sun, 7 Jan 2024 20:36:33 +0000
Subject: [PATCH] vimwiki and better neovim plugins

---
 home/programs/browser.nix        |  2 --
 home/programs/graphical.nix      |  2 --
 home/programs/hyprland.nix       | 15 +++++++--------
 home/programs/neovim/default.nix | 23 ++++++++++++++++++++---
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/home/programs/browser.nix b/home/programs/browser.nix
index ed7e4df..4ec2cf3 100644
--- a/home/programs/browser.nix
+++ b/home/programs/browser.nix
@@ -38,6 +38,4 @@
       }
     '';
   };
-
-
 }
diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix
index 02f2e88..268ae17 100644
--- a/home/programs/graphical.nix
+++ b/home/programs/graphical.nix
@@ -1,5 +1,4 @@
 {pkgs, ...}: {
-
   imports = [
     ./browser.nix
   ];
@@ -66,5 +65,4 @@
   ];
 
   programs.librewolf.enable = true;
-
 }
diff --git a/home/programs/hyprland.nix b/home/programs/hyprland.nix
index 677ecf4..f34cd0f 100644
--- a/home/programs/hyprland.nix
+++ b/home/programs/hyprland.nix
@@ -54,39 +54,38 @@ in {
         ];
       };
       bind = [
-
-# movement
+        # movement
         "${modifier}, h, movefocus, l"
         "${modifier}, l, movefocus, r"
         "${modifier}, j, layoutmsg, cyclenext"
         "${modifier}, k, layoutmsg, cycleprev"
 
-# window management
+        # window management
         "${modifier}, F,       fullscreen,"
         "${modifier}, V,       togglefloating,"
         "${modifier}_SHIFT, X, killactive"
 
-# master layout
+        # master layout
         "${modifier}, space,   layoutmsg,swapwithmaster master"
         "${modifier}, W,       layoutmsg, orientationprev"
         "${modifier}_SHIFT, W, layoutmsg, orientationnext"
 
-# window grouping
+        # window grouping
         "${modifier}_SHIFT, V, togglegroup,"
         "${modifier}_SHIFT, j, changegroupactive,b"
         "${modifier}_SHIFT, k, changegroupactive,f"
         "${modifier}_SHIFT, h, moveintogroup,l"
         "${modifier}_SHIFT, l, moveintogroup,r"
 
-# scratch buffer
+        # scratch buffer
         "${modifier}, Y,       togglespecialworkspace"
         "${modifier}_SHIFT, Y, movetoworkspace, special"
 
-# applications
+        # applications
         "${modifier}, slash, focuswindow, brave-browser"
         "${modifier}, n,     focuswindow, Logseq"
 
-# workspaces
+        # workspaces
         "${modifier}, 1,        workspace,1"
         "${modifier}, 2,        workspace,2"
         "${modifier}, 3,        workspace,3"
diff --git a/home/programs/neovim/default.nix b/home/programs/neovim/default.nix
index 3ecd70c..42fc888 100644
--- a/home/programs/neovim/default.nix
+++ b/home/programs/neovim/default.nix
@@ -13,8 +13,26 @@
       rust-analyzer
     ];
     plugins = with pkgs.vimPlugins; [
-      vim-surround
-      vim-commentary
+      {
+        plugin = nvim-surround;
+        type = "lua";
+        config = ''
+          require("nvim-surround").setup()
+        '';
+      }
+      {
+        plugin = comment-nvim;
+        type = "lua";
+        config = ''
+          require("Comment").setup()
+        '';
+      }
+      {
+        plugin = vimwiki;
+        config = ''
+          let g:vimwiki_list = [{'path': '~/Documents/vimwiki/', 'syntax': 'markdown', 'ext': '.md'}]
+        '';
+      }
       {
         plugin = telescope-nvim;
         type = "lua";
@@ -31,7 +49,6 @@
         type = "lua";
         config = builtins.readFile ./lspconfig.lua;
       }
-      firenvim
     ];
   };