Update nixvim config

home/home.nix

@@ -8,7 +8,6 @@ top @ { config
     inputs.nixvim.homeModules.nixvim
     inputs.catppuccin.homeModules.catppuccin
     inputs.spicetify-nix.homeManagerModules.default
-    ./nixvim
     ./borgmatic.nix
     ./ssh.nix
   ];
@@ -37,6 +36,10 @@ top @ { config
     gdb
   ];
 
+  home.sessionVariables = {
+    EDITOR = "nvim";
+  };
+
   home.pointerCursor =
     let
       size = 24;
@@ -73,6 +76,11 @@ top @ { config
 
   #TODO: GDB configuration
 
+  programs.nixvim = {
+    enable = true;
+    imports = [ ./nixvim ];
+  };
+
   programs.thunderbird = {
     enable = true;
     profiles.default.isDefault = true;

home/nixvim/default.nix

@@ -5,9 +5,6 @@
     ./plugins
   ];
 
-  programs.nixvim = {
-    enable = true;
-
   clipboard.register = "unnamedplus";
 
   colorschemes.catppuccin = {
@@ -19,5 +16,4 @@
       cmp = true;
     };
   };
-  };
 }

home/nixvim/keymaps.nix

@@ -1,7 +1,7 @@
 { ... }: {
-  programs.nixvim.globals.mapleader = " ";
+  globals.mapleader = " ";
 
-  programs.nixvim.keymaps = [
+  keymaps = [
     {
       key = "<esc>";
       action = ":noh<CR>";

home/nixvim/options.nix

@@ -1,5 +1,5 @@
 { ... }: {
-  programs.nixvim.opts = {
+  opts = {
     # Expand tabs to 4 spaces
     shiftwidth = 4;
     softtabstop = 4;

home/nixvim/plugins/cmp/default.nix

@@ -1,9 +1,9 @@
-{...}: {
+{ ... }: {
   imports = [
     ./keymaps.nix
   ];
 
-  programs.nixvim.plugins = {
+  plugins = {
     lspkind.enable = true;
 
     cmp-nvim-lsp-signature-help.enable = true;
@@ -14,9 +14,9 @@
       autoLoad = true;
 
       settings.sources = [
-        {name = "nvim_lsp";}
+        { name = "nvim_lsp"; }
-        {name = "nvim_lsp_signature_help";}
+        { name = "nvim_lsp_signature_help"; }
-        {name = "path";}
+        { name = "path"; }
       ];
 
       settings.mapping = {

home/nixvim/plugins/cmp/keymaps.nix

@@ -1,5 +1,5 @@
-{...}: {
+{ ... }: {
-  programs.nixvim.keymaps = [
+  keymaps = [
     {
       key = "grd";
       action = "<cmd>Telescope lsp_definitions<CR>";

home/nixvim/plugins/default.nix

@@ -5,14 +5,13 @@
     ./cmp
   ];
 
-  programs.nixvim.plugins = {
+  plugins = {
     lualine.enable = true;
 
     web-devicons.enable = true;
 
     treesitter = {
       enable = true;
-      folding = true;
       autoLoad = true;
     };
 

home/nixvim/plugins/lsp.nix

@@ -1,5 +1,4 @@
 { ... }: {
-  programs.nixvim = {
   dependencies.rust-analyzer.enable = true;
 
   lsp = {
@@ -34,5 +33,4 @@
 
   plugins.lspconfig.enable = true;
   plugins.clangd-extensions.enable = true;
-  };
 }

home/nixvim/plugins/telescope/default.nix

@@ -1,10 +1,10 @@
-{...}: {
+{ ... }: {
   imports = [
     ./keymaps.nix
   ];
-  programs.nixvim.dependencies.ripgrep.enable = true;
+  dependencies.ripgrep.enable = true;
 
-  programs.nixvim.plugins.telescope = {
+  plugins.telescope = {
     enable = true;
     extensions.file-browser = {
       enable = true;

home/nixvim/plugins/telescope/keymaps.nix

@@ -1,5 +1,5 @@
-{...}: {
+{ ... }: {
-  programs.nixvim.keymaps = [
+  keymaps = [
     {
       key = "<leader>sf";
       action = "<cmd>Telescope find_files<CR>";