summaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
authorVito G. Graffagnino <vito@graffagnino.xyz>2022-06-06 20:08:18 +0100
committerVito G. Graffagnino <vito@graffagnino.xyz>2022-06-06 20:08:18 +0100
commit6f6e018915ffec09e034cca2d7ca05e3ccd567c1 (patch)
tree4fbc12c9b0fb7055e220ac70065b06be085a7eea /lua
parentfcb8d1ea64a6b55c20b3b528e51cdd7160290b54 (diff)
Added a few keymaps (leader v to edit init.lua)
Reintroduced impatient plugin and added a few more lsp language settings
Diffstat (limited to 'lua')
-rw-r--r--lua/user/keymaps.lua3
-rw-r--r--lua/user/lsp/lsp-installer.lua10
-rw-r--r--lua/user/lsp/settings/fortls.lua9
-rw-r--r--lua/user/plugins.lua2
4 files changed, 16 insertions, 8 deletions
diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua
index 027d526..5b94186 100644
--- a/lua/user/keymaps.lua
+++ b/lua/user/keymaps.lua
@@ -36,7 +36,7 @@ keymap("n", "<S-l>", ":bnext<CR>", opts)
keymap("n", "<S-h>", ":bprevious<CR>", opts)
-- Insert --
--- Press jk fast to enter
+-- Press jk fast to enter normal mode
keymap("i", "jk", "<ESC>", opts)
-- Visual --
@@ -67,7 +67,6 @@ keymap("t", "<C-l>", "<C-\\><C-N><C-w>l", term_opts)
keymap("n", "<leader>e", ":NvimTreeToggle<cr>", opts)
keymap("n", "<leader>v", ":edit $MYVIMRC<cr>", opts)
keymap("n", "<leader>f", ":Format<cr>", opts)
--- keymap("n", "<leader>f", "<cmd>Telescope find_files<cr>", opts)
keymap("n", "<leader>f", "<cmd>lua require'telescope.builtin'.find_files(require('telescope.themes').get_dropdown({ previewer = false }))<cr>", opts)
keymap("n", "<c-t>", "<cmd>Telescope live_grep<cr>", opts)
diff --git a/lua/user/lsp/lsp-installer.lua b/lua/user/lsp/lsp-installer.lua
index facc124..4fac4ff 100644
--- a/lua/user/lsp/lsp-installer.lua
+++ b/lua/user/lsp/lsp-installer.lua
@@ -46,6 +46,11 @@ lsp_installer.on_server_ready(function(server)
opts = vim.tbl_deep_extend("force", cmake_opts, opts)
end
+ if server.name == "fortls" then
+ local fortls_opts = require("user.lsp.settings.fortls")
+ opts = vim.tbl_deep_extend("force", fortls_opts, opts)
+ end
+
if server.name == "html" then
local html_opts = require("user.lsp.settings.html")
opts = vim.tbl_deep_extend("force", html_opts, opts)
@@ -61,11 +66,6 @@ lsp_installer.on_server_ready(function(server)
opts = vim.tbl_deep_extend("force", perlnavigator_opts, opts)
end
- if server.name == "perlls" then
- local perlls_opts = require("user.lsp.settings.perlls")
- opts = vim.tbl_deep_extend("force", perlls_opts, opts)
- end
-
if server.name == "r_language_server" then
local r_language_server_opts = require("user.lsp.settings.r_language_server")
opts = vim.tbl_deep_extend("force", r_language_server_opts, opts)
diff --git a/lua/user/lsp/settings/fortls.lua b/lua/user/lsp/settings/fortls.lua
new file mode 100644
index 0000000..e6fbad6
--- /dev/null
+++ b/lua/user/lsp/settings/fortls.lua
@@ -0,0 +1,9 @@
+return {
+ settings = {
+
+ fortran = {
+
+ }
+ }
+}
+
diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua
index c528f95..75a2561 100644
--- a/lua/user/plugins.lua
+++ b/lua/user/plugins.lua
@@ -57,7 +57,7 @@ return packer.startup(function(use)
use "nvim-lualine/lualine.nvim"
use "windwp/nvim-autopairs" -- Autopairs, integrates with both cmp and treesitter
use "vimwiki/vimwiki"
-
+ --
-- Colorschemes
use "lunarvim/colorschemes" -- A bunch of colorschemes you can try out
use "lunarvim/darkplus.nvim"