diff --git a/home/homemodules/neovim/default.nix b/home/homemodules/neovim/default.nix
index ba6ceae..504ad49 100644
--- a/home/homemodules/neovim/default.nix
+++ b/home/homemodules/neovim/default.nix
@@ -1969,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;
-                height = 80;
+                width.__raw = "function() return math.floor(vim.o.columns * 0.95) end";
+                height.__raw = "function() return math.floor(vim.o.lines * 0.85) end";
                 winblend = 0;
               };
             };
diff --git a/home/homemodules/neovim/extraConfigLua.lua b/home/homemodules/neovim/extraConfigLua.lua
index ad81a53..300701d 100644
--- a/home/homemodules/neovim/extraConfigLua.lua
+++ b/home/homemodules/neovim/extraConfigLua.lua
@@ -60,8 +60,13 @@ end, {
 
 -- Toggle Rmpc
 local Terminal = require("toggleterm.terminal").Terminal
-local rmpc =
-	Terminal:new({ cmd = "rmpc", hidden = true, close_on_exit = true, auto_scroll = false, direction = "float" })
+local rmpc = Terminal:new({
+	cmd = "rmpc",
+	hidden = true,
+	close_on_exit = true,
+	auto_scroll = false,
+	direction = "float",
+})
 
 vim.g.toggle_rmpc = function()
 	rmpc:toggle()
diff --git a/home/homemodules/neovim/mappings.nix b/home/homemodules/neovim/mappings.nix
index 3767e71..450dd53 100644
--- a/home/homemodules/neovim/mappings.nix
+++ b/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";
-    #   key = "<leader>.";
-    #   action = "<cmd>lua vim.g.toggle_failnix()<cr>"; # Defined in extraConfigLua.lua
-    #   options.desc = "Show FailNix";
-    # }
+    {
+      mode = "n";
+      key = "<leader>.";
+      action = "<cmd>lua vim.g.toggle_failnix()<cr>"; # Defined in extraConfigLua.lua
+      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";