Merged options.lua into app.nix

hmModules/apps/neovim/app.nix

@@ -39,11 +39,53 @@
       viAlias = true;
       vimAlias = true;
       vimdiffAlias = true;
+
+      globals = {
+        mapleader = " ";
+        maplocalleader = " ";
+        rust_recommended_style = 0;
+      };
+
+      options = {
+        list = true;
+        updatetime = 750;
+
+        tabstop = 2;
+        softtabstop = 0;
+        shiftwidth = 2;
+        smarttab = true;
+        expandtab = true;
+
+        colorcolumn = "81";
+        showmatch = true;
+        number = true;
+        relativenumber = true;
+
+        swapfile = false;
+        backup = false;
+        undofile = true;
+        undodir = "${config.xdg.configHome}/nvim/undodir";
+
+        smartcase = true;
+      };
+
+      keymaps = [
+        {
+          key = "<leader>d";
+          mode = "n";
+          action = "vim.diagnostic.open_float()";
+        }
+        # -- Easy Split Navigation
+        # -- nnoremap <C-J> <C-W><C-J>
+        # -- nnoremap <C-K> <C-W><C-K>
+        # -- nnoremap <C-L> <C-W><C-L>
+        # -- nnoremap <C-H> <C-W><C-H>
+        #
+        # -- Easy copy and pasting to external programs
+        # -- map <C-y> "+yy
+        # -- map <C-p> "+P
+      ];
     };
-  #     extraLuaConfig = ''
-  #       ${builtins.readFile ./options.lua}
-  #     '';
-  #             vim.g.rust_recommended_style = 0
 
     programs.nixvim.colorschemes = with config.neovim.themes; {
       catppuccin = lib.mkIf catppuccin.enable {