Modules/Neovim: Fix toggleterm floating terminal size + update toggleterm mappings

home/homemodules/neovim/default.nix

@@ -225,6 +225,16 @@ in {
         #   fg = "#${color.hex.dark.text}";
         #   bold = false;
         # };
+        # NeoTreeNormal = {bg = "#${color.hex.base}";};
+        # NeoTreeNormalNC = {bg = "#${color.hex.base}";};
+        # NeoTreeWinSeparator = {
+        #   fg = "#${color.hex.crust}";
+        #   bg = "#${color.hex.base}";
+        # };
+        # NeoTreeVertSplit = {
+        #   fg = "#${color.hex.crust}";
+        #   bg = "#${color.hex.base}";
+        # };
       };
 
       # extraLuaPackages = with pkgs.lua51Packages; [];
@@ -242,7 +252,7 @@ in {
         #       local renderer = require("neo-tree.ui.renderer")
         #       local state = manager.get_state("filesystem")
         #       local window_exists = renderer.window_exists(state)
-
+        #
         #       if window_exists then
         #         require("neo-tree.sources.filesystem.commands").refresh(state)
         #       end
@@ -425,6 +435,15 @@ in {
                 };
                 which_key = true;
               };
+
+              highlight_overrides.mocha.__raw = ''
+                function(colors)
+                  return {
+                    NeoTreeWinSeparator = { fg = colors.crust, bg = colors.base, },
+                    NeoTreeVertSplit = { fg = colors.crust, bg = colors.base, },
+                  }
+                end
+              '';
             };
           };
 
@@ -1808,6 +1827,7 @@ in {
                 function(line)
                   local base = { fg = "#${color.hex.base}", bg = "#${color.hex.base}" }
                   local crust = { fg = "#${color.hex.crust}", bg = "#${color.hex.crust}" }
+                  local mantle = { fg = "#${color.hex.mantle}", bg = "#${color.hex.mantle}" }
                   local text = { fg = "#${color.hex.text}", bg = "#${color.hex.crust}" }
                   local accent = { fg = "#${color.hex.accent}", bg = "#${color.hex.accent}" }
 
@@ -1833,14 +1853,14 @@ in {
                         line.sep(sep_start, accent, crust),
                         tab.number(),
                         tab.name(),
-                        line.sep(sep_end, crust, base),
+                        line.sep(sep_end, crust, mantle),
                         hl = hl,
                         margin = " ",
                       }
                     end),
 
                     -- Background
-                    hl = bg,
+                    hl = mantle,
                   }
                 end
               '';
@@ -1949,12 +1969,12 @@ in {
               shell = "fish";
               direction = "horizontal"; # 'vertical' | 'horizontal' | 'window' | 'float'
               auto_scroll = true;
-              clear_env = false;
+              # clear_env = false;
 
               float_opts = {
                 border = "curved"; # 'single' | 'double' | 'shadow' | 'curved'
-                width = 80;
+                width.__raw = "function() return math.floor(vim.o.columns * 0.95) end";
-                height = 80;
+                height.__raw = "function() return math.floor(vim.o.lines * 0.85) end";
                 winblend = 0;
               };
             };

home/homemodules/neovim/extraConfigLua.lua

@@ -60,8 +60,13 @@ end, {
 
 -- Toggle Rmpc
 local Terminal = require("toggleterm.terminal").Terminal
-local rmpc =
+local rmpc = Terminal:new({
-	Terminal:new({ cmd = "rmpc", hidden = true, close_on_exit = true, auto_scroll = false, direction = "float" })
+	cmd = "rmpc",
+	hidden = true,
+	close_on_exit = true,
+	auto_scroll = false,
+	direction = "float",
+})
 
 vim.g.toggle_rmpc = function()
 	rmpc:toggle()

home/homemodules/neovim/mappings.nix

@@ -340,13 +340,12 @@ _: let
       action = "<cmd>lua vim.g.toggle_rmpc()<cr>"; # Defined in extraConfigLua.lua
       options.desc = "Show Rmpc";
     }
-    # TODO: Something with the environment activation doesn't work
+    {
-    # {
+      mode = "n";
-    #   mode = "n";
+      key = "<leader>.";
-    #   key = "<leader>.";
+      action = "<cmd>lua vim.g.toggle_failnix()<cr>"; # Defined in extraConfigLua.lua
-    #   action = "<cmd>lua vim.g.toggle_failnix()<cr>"; # Defined in extraConfigLua.lua
+      options.desc = "Show FailNix";
-    #   options.desc = "Show FailNix";
+    }
-    # }
     {
       mode = "n";
       key = "<leader>i";
@@ -938,6 +937,12 @@ _: let
       action = "<cmd>Trouble diagnostics toggle focus=false win.position=bottom<cr>";
       options.desc = "Trouble Diagnostics";
     }
+    {
+      mode = "n";
+      key = "<leader>tT";
+      action = "<cmd>ToggleTerm direction=float<cr>";
+      options.desc = "Floating Terminal";
+    }
     {
       mode = "n";
       key = "<leader>tD";