Skip to content

Commit fceb9c8

Browse files
committed
feat: more updates, some of it for steram
1 parent a184d58 commit fceb9c8

File tree

4 files changed

+28
-16
lines changed

4 files changed

+28
-16
lines changed

after/plugin/lsp.lua

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ lsp.preset("recommended")
44

55
lsp.ensure_installed({
66
'tsserver',
7-
'eslint',
87
'sumneko_lua',
98
'rust_analyzer',
109
})
@@ -52,21 +51,16 @@ lsp.set_preferences({
5251
lsp.on_attach(function(client, bufnr)
5352
local opts = {buffer = bufnr, remap = false}
5453

55-
if client.name == "eslint" then
56-
vim.cmd.LspStop('eslint')
57-
return
58-
end
59-
60-
vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts)
61-
vim.keymap.set("n", "K", vim.lsp.buf.hover, opts)
62-
vim.keymap.set("n", "<leader>vws", vim.lsp.buf.workspace_symbol, opts)
63-
vim.keymap.set("n", "<leader>vd", vim.diagnostic.open_float, opts)
64-
vim.keymap.set("n", "[d", vim.diagnostic.goto_next, opts)
65-
vim.keymap.set("n", "]d", vim.diagnostic.goto_prev, opts)
66-
vim.keymap.set("n", "<leader>vca", vim.lsp.buf.code_action, opts)
67-
vim.keymap.set("n", "<leader>vrr", vim.lsp.buf.references, opts)
68-
vim.keymap.set("n", "<leader>vrn", vim.lsp.buf.rename, opts)
69-
vim.keymap.set("i", "<C-h>", vim.lsp.buf.signature_help, opts)
54+
vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
55+
vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
56+
vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
57+
vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
58+
vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
59+
vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
60+
vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
61+
vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
62+
vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
63+
vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
7064
end)
7165

7266
lsp.setup()

lua/theprimeagen/packer.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ return require('packer').startup(function(use)
5151

5252
use("folke/zen-mode.nvim")
5353
use("github/copilot.vim")
54+
use("eandrju/cellular-automaton.nvim")
5455

5556
end)
5657

lua/theprimeagen/remap.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,5 @@ vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
4242
vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
4343
vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true })
4444

45+
vim.keymap.set("n", "<leader>vpp", "<cmd>e ~/.dotfiles/nvim/.config/nvim/lua/theprimeagen/packer.lua<CR>");
46+
vim.keymap.set("n", "<leader>mr", "<cmd>CellularAutomaton make_it_rain<CR>");

plugin/packer_compiled.lua

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@ _G.packer_plugins = {
7979
path = "/home/mpaulson/.local/share/nvim/site/pack/packer/start/LuaSnip",
8080
url = "https://github.com/L3MON4D3/LuaSnip"
8181
},
82+
["cellular-automaton.nvim"] = {
83+
loaded = true,
84+
path = "/home/mpaulson/.local/share/nvim/site/pack/packer/start/cellular-automaton.nvim",
85+
url = "https://github.com/eandrju/cellular-automaton.nvim"
86+
},
8287
["cmp-buffer"] = {
8388
loaded = true,
8489
path = "/home/mpaulson/.local/share/nvim/site/pack/packer/start/cmp-buffer",
@@ -104,6 +109,11 @@ _G.packer_plugins = {
104109
path = "/home/mpaulson/.local/share/nvim/site/pack/packer/start/cmp_luasnip",
105110
url = "https://github.com/saadparwaiz1/cmp_luasnip"
106111
},
112+
["copilot.vim"] = {
113+
loaded = true,
114+
path = "/home/mpaulson/.local/share/nvim/site/pack/packer/start/copilot.vim",
115+
url = "https://github.com/github/copilot.vim"
116+
},
107117
["friendly-snippets"] = {
108118
loaded = true,
109119
path = "/home/mpaulson/.local/share/nvim/site/pack/packer/start/friendly-snippets",
@@ -179,6 +189,11 @@ _G.packer_plugins = {
179189
loaded = true,
180190
path = "/home/mpaulson/.local/share/nvim/site/pack/packer/start/vim-fugitive",
181191
url = "https://github.com/tpope/vim-fugitive"
192+
},
193+
["zen-mode.nvim"] = {
194+
loaded = true,
195+
path = "/home/mpaulson/.local/share/nvim/site/pack/packer/start/zen-mode.nvim",
196+
url = "https://github.com/folke/zen-mode.nvim"
182197
}
183198
}
184199

0 commit comments

Comments
 (0)