Update flake.lock

jlesquembre · Jun 4, 2024 · 93cc435 · 93cc435
1 parent dbca5f7
commit 93cc435
Show file tree

Hide file tree

Showing 9 changed files with 206 additions and 71 deletions.
diff --git a/dotfiles/neovim/conjure.lua b/dotfiles/neovim/conjure.lua
@@ -23,6 +23,8 @@ vim.g["conjure#mapping#eval_buf"] = "pb"
 vim.g["conjure#mapping#eval_visual"] = "p"
 vim.g["conjure#mapping#eval_motion"] = "m"
 -- vim.g['conjure#mapping#doc_word'] = ["K"]
+-- Rebind it from K to <prefix>k
+vim.g["conjure#mapping#doc_word"] = "k"
 -- vim.g['conjure#mapping#def_word'] = ["gd"]
 vim.g["conjure#mapping#eval_comment_current_form"] = "pcc"
 vim.g["conjure#mapping#eval_comment_root_form"] = "pcr"

diff --git a/dotfiles/neovim/formatter.lua b/dotfiles/neovim/formatter.lua
@@ -64,7 +64,7 @@ require("formatter").setup({
     typescriptreact = { pConf },
     ["markdown.mdx"] = { pConf },
 
-    terraform = { hclConf },
+    -- terraform = { hclConf },
 
     -- lua = { require("formatter.filetypes.lua").stylua },
     lua = { luaConf },
@@ -73,11 +73,11 @@ require("formatter").setup({
 
     nix = {
       function()
-        if vim.fn.executable("nixfmt") == 1 then
-          return {
-            exe = "nixfmt",
-          }
-        end
+        -- if vim.fn.executable("nixfmt") == 1 then
+        --   return {
+        --     exe = "nixfmt",
+        --   }
+        -- end
         if vim.fn.executable("alejandra") == 1 then
           return {
             exe = "alejandra",

diff --git a/dotfiles/neovim/init.vim b/dotfiles/neovim/init.vim
@@ -273,7 +273,7 @@ xnoremap c, q:
 nnoremap <leader>w <C-w>
 
 " un-join (split) the current line at the cursor position
-nnoremap gj i<c-j><esc>k$
+nnoremap gj a<c-j><esc>k$
 " nnoremap gJ i<c-j><esc>k$
 nnoremap x  "_d
 xnoremap x  "_d
@@ -352,8 +352,8 @@ inoremap <F11> <nop>
 inoremap <F12> <nop>
 
 " move vertically by visual line
-nnoremap j gj
-nnoremap k gk
+" nnoremap j gj
+" nnoremap k gk
 
 " tab map
 nnoremap <leader>gn :tabnew<cr>

diff --git a/dotfiles/neovim/lspconfig.lua b/dotfiles/neovim/lspconfig.lua
@@ -43,7 +43,9 @@ local function custom_attach(client, bufnr)
   end
   local opts = { noremap = true, silent = false }
 
-  set_keymap("n", "K", "<cmd>lua vim.lsp.buf.hover()<cr>", opts)
+  -- NEW in 0.10
+  -- vim.lsp.inlay_hint.enable()
+
   set_keymap("n", "<c-k>", "<cmd>lua vim.lsp.buf.signature_help()<cr>", opts)
 
   -- set_keymap('n', 'gdd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
@@ -59,9 +61,11 @@ local function custom_attach(client, bufnr)
   set_keymap("n", "g0", "<cmd>lua vim.lsp.buf.document_symbol()<CR>", opts)
   set_keymap("n", "gW", "<cmd>lua vim.lsp.buf.workspace_symbol()<CR>", opts)
 
+  -- builtin: <c-w>d
   set_keymap("n", "<leader>dd", [[<cmd>lua vim.diagnostic.open_float({border = "single"})<CR>]], opts)
-  set_keymap("n", "[w", [[<cmd>lua vim.diagnostic.goto_prev({float={border="single"}})<CR>]], opts)
-  set_keymap("n", "]w", [[<cmd>lua vim.diagnostic.goto_next({float={border="single"}})<CR>]], opts)
+
+  set_keymap("n", "[d", [[<cmd>lua vim.diagnostic.goto_prev({float={border="single"}})<CR>]], opts)
+  set_keymap("n", "]d", [[<cmd>lua vim.diagnostic.goto_next({float={border="single"}})<CR>]], opts)
 
   set_keymap("n", "<leader>rn", "<cmd>lua vim.lsp.buf.rename()<CR>", opts)
   set_keymap("n", "<leader>cl", "<cmd>lua vim.lsp.codelens.run()<CR>", opts)