Merge remote-tracking branch 'origin/nixos' into nixos

modules/programs/nvim/plugins/coding.nix

@@ -236,8 +236,32 @@ with builtins;
       keys = [
         { key = "<leader>tz"; cmd = "<cmd>ZenMode<cr>"; desc = "Zen mode"; }
       ];
+      conf = /* lua */ ''
+        require("zen-mode").setup({
+          plugins = {
+            tmux = {
+              enabled = true,
+            },
+          },
+        })
+      '';
       dependencies = [
-        { plugin = twilight-nvim; }
+        {
+          plugin = twilight-nvim;
+          conf = /* lua */ ''
+            require("twilight").setup({
+              context = 20,
+              expand = { -- for treesitter, we we always try to expand to the top-most ancestor with these types
+                  "function",
+                  "function_definition",
+                  "if_statement",
+                  "method",
+                  "method_definition",
+                  "table",
+                },
+            })
+          '';
+        }
       ];
     }
     {

modules/programs/nvim/plugins/lua/nvim-lspconfig.lua

@@ -52,7 +52,17 @@ local on_attach_def = function(client, bufnr)
         },
       },
       t = {
-        l = { lsp_lines.toggle, "LSP lines" },
+        l = {
+          function()
+            lsp_lines.toggle()
+            if vim.diagnostic.is_disabled() then
+              vim.diagnostic.enable()
+            else
+              vim.diagnostic.disable()
+            end
+          end,
+          "LSP lines",
+        },
         i = {
           function()
             vim.lsp.inlay_hint(bufnr, nil)