feat: lotta shit

nix/sources.json

@@ -455,6 +455,12 @@
         "rev": "89968a1f8c72427691088e6d09d26a52c2ddc6f4",
         "type": "git"
     },
+    "twilight.nvim": {
+        "branch": "main",
+        "repo": "git@github.com:folke/twilight.nvim",
+        "rev": "a4843e6e67092a1e6fa9666f02bf0ab59174c1df",
+        "type": "git"
+    },
     "vim-dadbod": {
         "branch": "master",
         "repo": "git@github.com:tpope/vim-dadbod",

pkgs/sql-language-server/default.nix

@@ -0,0 +1,28 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+# FIXME: Uses yarn :sigh:
+buildNpmPackage rec {
+  pname = "sql-language-server";
+  version = "1.6.0";
+
+  src = fetchFromGitHub {
+    owner = "joe-re";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-XPySDZwnAGSPrNXG6mzgnUy24BF9inaiKeJVPpjRnRE=";
+  };
+
+  npmDepsHash = "";
+
+  # The prepack script runs the build script, which we'd rather do in the build phase.
+  npmPackFlags = ["--ignore-scripts"];
+
+  meta = with lib; {
+    description = "SQL Language Server";
+    homepage = "https://github.com/joe-re/sql-language-server";
+    license = licenses.gpl3Only;
+  };
+}

plugins/bombadil/after/ftplugin/lir.lua

@@ -1,3 +1 @@
-vim.opt_local.number = false
-vim.opt_local.relativenumber = false
 vim.opt_local.signcolumn = "no"

plugins/bombadil/plugin/options.lua

@@ -1,7 +1,7 @@
-vim.opt.autoindent = false
+vim.opt.autoindent = true
 vim.opt.belloff = "all"
 vim.opt.breakindent = true
-vim.opt.cindent = false
+vim.opt.cindent = true
 vim.opt.clipboard = "unnamedplus"
 vim.opt.cmdheight = 0
 vim.opt.conceallevel = 3

plugins/cmp.lua

@@ -72,15 +72,15 @@ return function()
       { name = "nvim_lsp" },
       { name = "nvim_lsp_signature_help" },
       { name = "snippy" },
-      { name = "copilot" },
+      -- { name = "copilot" },
     }, {
       { name = "path" },
       { name = "buffer" },
     }),
     sorting = {
       priority_weight = 2,
       comparators = {
-        require("copilot_cmp.comparators").prioritize,
+        -- require("copilot_cmp.comparators").prioritize,
         cmp_buffer_locality_comparator,
         cmp_fuzzy_path_comparator,
         cmp.config.compare.offset,

plugins/dap.lua

@@ -108,29 +108,48 @@ return function()
 
   local dapui = require "dapui"
   dapui.setup {
-    sidebar = {
-      elements = {
-        { id = "scopes", size = 0.25 },
-        { id = "breakpoints", size = 0.25 },
-        { id = "stacks", size = 0.25 },
-        { id = "watches", size = 00.25 },
-      },
-      size = 50,
-      position = "left",
-    },
-    tray = {
-      elements = { "repl" },
-      size = 15,
-      position = "bottom",
+    controls = {
+      element = "repl",
+      enabled = false,
     },
-    floating = {
-      max_height = nil,
-      max_width = nil,
-      mappings = {
-        close = { "q", "<Esc>" },
+    layouts = {
+      {
+        elements = {
+          {
+            id = "scopes",
+            size = 0.25,
+          },
+          {
+            id = "breakpoints",
+            size = 0.25,
+          },
+          {
+            id = "stacks",
+            size = 0.25,
+          },
+          {
+            id = "watches",
+            size = 0.25,
+          },
+        },
+        position = "left",
+        size = 40,
+      },
+      {
+        elements = {
+          -- {
+          --   id = "repl",
+          --   size = 0.5,
+          -- },
+          {
+            id = "console",
+            size = 1,
+          },
+        },
+        position = "bottom",
+        size = 10,
       },
     },
-    windows = { indent = 1 },
   }
 
   dap.listeners.after.event_initialized["dapui_config"] = function()

plugins/lsp.lua

@@ -341,6 +341,12 @@ return function()
     }
   end
 
+  lspconfig.sqlls.setup {
+    on_init = on_init,
+    on_attach = on_attach,
+    capabilities = updated_capabilities,
+  }
+
   lspconfig.tsserver.setup {
     on_init = on_init,
     on_attach = on_attach,

plugins/spec.nix

@@ -44,20 +44,20 @@ in rec {
       cmp-buffer = {
         src = sources.cmp-buffer;
       };
-      cmp_copilot = {
-        src = sources.copilot-cmp;
-        config = true;
-        dependencies = {
-          copilot = {
-            src = sources."copilot.lua";
-            config = {
-              suggestion.enabled = false;
-              panel.enabled = false;
-            };
-            event = "InsertEnter";
-          };
-        };
-      };
+      # cmp_copilot = {
+      #   src = sources.copilot-cmp;
+      #   config = true;
+      #   dependencies = {
+      #     copilot = {
+      #       src = sources."copilot.lua";
+      #       config = {
+      #         suggestion.enabled = false;
+      #         panel.enabled = false;
+      #       };
+      #       event = "InsertEnter";
+      #     };
+      #   };
+      # };
       cmp-fuzzy-path = {
         src = sources.cmp-fuzzy-path;
         dependencies = {
@@ -283,6 +283,7 @@ in rec {
         };
         paths = with pkgs; [
           (pkgs.callPackage ../pkgs/languagetool-rs {})
+          # (pkgs.callPackage ../pkgs/sql-language-server {})
           actionlint
           alejandra
           cmake-format
@@ -535,6 +536,11 @@ in rec {
     config = ./toggleterm.lua;
   };
 
+  twilight = {
+    src = sources."twilight.nvim";
+    config = true;
+  };
+
   which-key = {
     src = sources."which-key.nvim";
     config = true;

plugins/treesitter.lua

@@ -16,6 +16,12 @@ return function()
     return n, p
   end)()
 
+  local use_ts_indent = false
+  if use_ts_indent then
+    vim.opt.autoindent = false
+    vim.opt.cindent = false
+  end
+
   ---@diagnostic disable-next-line: missing-fields
   require("nvim-treesitter.configs").setup {
     -- NOTE: Parsers are installed by nix.
@@ -26,7 +32,7 @@ return function()
     },
 
     indent = {
-      enable = true,
+      enable = use_ts_indent,
     },
 
     query_linter = {