Skip to content

Commit ec77b24

Browse files
author
Prime Again
committed
automated dev commit
1 parent ec8b0d1 commit ec77b24

File tree

4 files changed

+39
-33
lines changed

4 files changed

+39
-33
lines changed

lua/theprimeagen/lazy/conform.lua

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
return {
2+
'stevearc/conform.nvim',
3+
opts = {},
4+
config = function()
5+
require("conform").setup({
6+
formatters_by_ft = {
7+
lua = { "stylua" },
8+
}
9+
})
10+
end
11+
}
12+

lua/theprimeagen/lazy/copilot.lua

Lines changed: 0 additions & 25 deletions
This file was deleted.

lua/theprimeagen/lazy/lsp.lua

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
local root_files = {
2+
'.luarc.json',
3+
'.luarc.jsonc',
4+
'.luacheckrc',
5+
'.stylua.toml',
6+
'stylua.toml',
7+
'selene.toml',
8+
'selene.yml',
9+
'.git',
10+
}
11+
112
return {
213
"neovim/nvim-lspconfig",
314
dependencies = {
@@ -64,10 +75,15 @@ return {
6475
capabilities = capabilities,
6576
settings = {
6677
Lua = {
67-
runtime = { version = "Lua 5.1" },
68-
diagnostics = {
69-
globals = { "bit", "vim", "it", "describe", "before_each", "after_each" },
70-
}
78+
format = {
79+
enable = true,
80+
-- Put format options here
81+
-- NOTE: the value should be STRING!!
82+
defaultConfig = {
83+
indent_style = "space",
84+
indent_size = "2",
85+
}
86+
},
7187
}
7288
}
7389
}

lua/theprimeagen/remap.lua

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
21
vim.g.mapleader = " "
32
vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
43

54
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
65
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
76

7+
vim.api.nvim_set_keymap("n", "<leader>tf", "<Plug>PlenaryTestFile", { noremap = false, silent = false })
8+
89
vim.keymap.set("n", "J", "mzJ`z")
910
vim.keymap.set("n", "<C-d>", "<C-d>zz")
1011
vim.keymap.set("n", "<C-u>", "<C-u>zz")
@@ -24,17 +25,19 @@ end)
2425
vim.keymap.set("x", "<leader>p", [["_dP]])
2526

2627
-- next greatest remap ever : asbjornHaland
27-
vim.keymap.set({"n", "v"}, "<leader>y", [["+y]])
28+
vim.keymap.set({ "n", "v" }, "<leader>y", [["+y]])
2829
vim.keymap.set("n", "<leader>Y", [["+Y]])
2930

30-
vim.keymap.set({"n", "v"}, "<leader>d", "\"_d")
31+
vim.keymap.set({ "n", "v" }, "<leader>d", "\"_d")
3132

3233
-- This is going to get me cancelled
3334
vim.keymap.set("i", "<C-c>", "<Esc>")
3435

3536
vim.keymap.set("n", "Q", "<nop>")
3637
vim.keymap.set("n", "<C-f>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
37-
vim.keymap.set("n", "<leader>f", vim.lsp.buf.format)
38+
vim.keymap.set("n", "<leader>f", function()
39+
require("conform").format({ bufnr = 0 })
40+
end)
3841

3942
vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
4043
vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")

0 commit comments

Comments
 (0)