From 698acd4687a01a57c5fb977322b1fc6ec32dcb75 Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Thu, 20 Jul 2023 14:09:01 -0400 Subject: [PATCH] datasette and some tab hotkeys --- nix/base-system/flake.nix | 1 + nix/base-system/init.lua | 11 +++++++---- nix/darwin/flake.lock | 6 +++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix index c742f2d..4ef44a2 100644 --- a/nix/base-system/flake.nix +++ b/nix/base-system/flake.nix @@ -142,6 +142,7 @@ dotnet-sdk_7 powershell rust-analyzer + datasette # TODO add sonic-pi here if it supports the arch ]) ++ [ sile diff --git a/nix/base-system/init.lua b/nix/base-system/init.lua index eac8da8..55aa8f1 100644 --- a/nix/base-system/init.lua +++ b/nix/base-system/init.lua @@ -20,7 +20,7 @@ lspconfig.omnisharp.setup { cmd = omnisharp_cmd, enable_roslyn_analyzers = true, enable_editorconfig_support = true, - organize_imports_on_format = true, + enable_import_completion = true, -- Omnisharp has issues with the semanticTokens feature. disable it for this language server. on_attach = function(client, bufnr) client.server_capabilities.semanticTokensProvider = nil @@ -199,9 +199,12 @@ vim.keymap.set("n", "", function() require("nvim-tree.api").tree.toggle() end) -vim.keymap.set("i", "", function() - print("Handling C-J") - vim.notify("Handling C-J") +vim.keymap.set("n", "tc", function() + vim.cmd("tabclose") +end) + +vim.keymap.set("n", "ts", function() + vim.cmd("tabs") end) -- Show whatever errors we have in our trouble pane diff --git a/nix/darwin/flake.lock b/nix/darwin/flake.lock index b165a09..345c66d 100644 --- a/nix/darwin/flake.lock +++ b/nix/darwin/flake.lock @@ -34,12 +34,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-HD18bp7KhmwBmkiSS4g6MgdMbxh19lL0o7xJKGh1V7I=", - "path": "/nix/store/a063h2b1fhppg1xc39ccclmlxnalxmk5-source/nix/base-system", + "narHash": "sha256-/S0TVdjeCyul3+b4v5AszuG9kUfGPo2RSTlj1JmezMQ=", + "path": "/nix/store/s99kh7fqw7g98w7c22jrcjx94via429x-source/nix/base-system", "type": "path" }, "original": { - "path": "/nix/store/a063h2b1fhppg1xc39ccclmlxnalxmk5-source/nix/base-system", + "path": "/nix/store/s99kh7fqw7g98w7c22jrcjx94via429x-source/nix/base-system", "type": "path" } },