summaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
Diffstat (limited to 'lua')
-rw-r--r--lua/default-config.lua133
-rw-r--r--lua/keymappings.lua18
-rw-r--r--lua/lv-telescope/init.lua2
-rw-r--r--lua/lv-utils/init.lua10
-rw-r--r--lua/lv-which-key/init.lua9
-rw-r--r--lua/settings.lua13
6 files changed, 101 insertions, 84 deletions
diff --git a/lua/default-config.lua b/lua/default-config.lua
index 45e93302..ea2642c2 100644
--- a/lua/default-config.lua
+++ b/lua/default-config.lua
@@ -8,6 +8,7 @@ O = {
auto_close_tree = 0,
auto_complete = true,
colorscheme = "lunar",
+ clipboard = "unnamedplus",
hidden_files = true,
wrap_lines = false,
number = true,
@@ -16,6 +17,7 @@ O = {
cmdheight = 2,
cursorline = true,
shell = "bash",
+ scrolloff = 0,
timeoutlen = 100,
nvim_tree_disable_netrw = 0,
ignore_case = true,
@@ -99,76 +101,76 @@ O = {
},
lang = {
- python = {
- linter = "",
- isort = false,
+ cmake = {},
+ clang = {
diagnostics = {
virtual_text = { spacing = 0, prefix = "ï„‘" },
signs = true,
underline = true,
},
- analysis = {
- type_checking = "basic",
- auto_search_paths = true,
- use_library_code_types = true,
- },
+ cross_file_rename = true,
+ header_insertion = "never",
+ },
+ css = {
+ virtual_text = true,
},
dart = {
sdk_path = "/usr/lib/dart/bin/snapshots/analysis_server.dart.snapshot",
},
- lua = {
+ docker = {},
+ efm = {},
+ elm = {},
+ emmet = { active = true },
+ elixir = {},
+ graphql = {},
+ go = {},
+ html = {},
+ java = {},
+ json = {
diagnostics = {
virtual_text = { spacing = 0, prefix = "ï„‘" },
signs = true,
underline = true,
},
},
- sh = {
- -- @usage can be 'shellcheck'
- linter = "",
- -- @usage can be 'shfmt'
+ kotlin = {},
+ latex = {},
+ lua = {
diagnostics = {
virtual_text = { spacing = 0, prefix = "ï„‘" },
signs = true,
underline = true,
},
},
- tsserver = {
- -- @usage can be 'eslint'
- linter = "",
- diagnostics = {
- virtual_text = { spacing = 0, prefix = "ï„‘" },
- signs = true,
- underline = true,
+ php = {
+ format = {
+ format = {
+ default = "psr12",
+ },
+ },
+ environment = {
+ php_version = "7.4",
},
- },
- json = {
diagnostics = {
virtual_text = { spacing = 0, prefix = "ï„‘" },
signs = true,
underline = true,
},
+ filetypes = { "php", "phtml" },
},
- tailwindcss = {
- active = false,
- filetypes = {
- "html",
- "css",
- "scss",
- "javascript",
- "javascriptreact",
- "typescript",
- "typescriptreact",
- },
- },
- clang = {
+ python = {
+ linter = "",
+ isort = false,
diagnostics = {
virtual_text = { spacing = 0, prefix = "ï„‘" },
signs = true,
underline = true,
},
- cross_file_rename = true,
- header_insertion = "never",
+ analysis = {
+ type_checking = "basic",
+ auto_search_paths = true,
+ use_library_code_types = true,
+ },
},
ruby = {
diagnostics = {
@@ -178,14 +180,11 @@ O = {
},
filetypes = { "rb", "erb", "rakefile", "ruby" },
},
- go = {},
- elixir = {},
- vim = {},
- yaml = {},
- terraform = {},
rust = {
rust_tools = {
active = false,
+ parameter_hints_prefix = "<-",
+ other_hints_prefix = "=>", -- prefix for all the other hints (type, chaining)
},
linter = "",
diagnostics = {
@@ -194,37 +193,41 @@ O = {
underline = true,
},
},
- svelte = {},
-
- php = {
- format = {
- format = {
- default = "psr12",
- },
+ sh = {
+ -- @usage can be 'shellcheck'
+ linter = "",
+ -- @usage can be 'shfmt'
+ diagnostics = {
+ virtual_text = { spacing = 0, prefix = "ï„‘" },
+ signs = true,
+ underline = true,
},
- environment = {
- php_version = "7.4",
+ },
+ svelte = {},
+ tailwindcss = {
+ active = false,
+ filetypes = {
+ "html",
+ "css",
+ "scss",
+ "javascript",
+ "javascriptreact",
+ "typescript",
+ "typescriptreact",
},
+ },
+ terraform = {},
+ tsserver = {
+ -- @usage can be 'eslint'
+ linter = "",
diagnostics = {
virtual_text = { spacing = 0, prefix = "ï„‘" },
signs = true,
underline = true,
},
- filetypes = { "php", "phtml" },
- },
- latex = {},
- kotlin = {},
- html = {},
- elm = {},
- emmet = { active = true },
- graphql = {},
- efm = {},
- docker = {},
- cmake = {},
- java = {},
- css = {
- virtual_text = true,
},
+ vim = {},
+ yaml = {},
},
dashboard = {
diff --git a/lua/keymappings.lua b/lua/keymappings.lua
index 46247c4c..580595ee 100644
--- a/lua/keymappings.lua
+++ b/lua/keymappings.lua
@@ -5,15 +5,15 @@ vim.api.nvim_set_keymap("n", "<C-k>", "<C-w>k", { silent = true })
vim.api.nvim_set_keymap("n", "<C-l>", "<C-w>l", { silent = true })
-- Terminal window navigation
-vim.api.nvim_set_keymap("t", "<C-h>", "<C-\\<C-N><C-w>h", {silent = true, noremap = true})
-vim.api.nvim_set_keymap("t", "<C-j>", "<C-\\<C-N><C-w>j", {silent = true, noremap = true})
-vim.api.nvim_set_keymap("t", "<C-k>", "<C-\\<C-N><C-w>k", {silent = true, noremap = true})
-vim.api.nvim_set_keymap("t", "<C-l>", "<C-\\<C-N><C-w>l", {silent = true, noremap = true})
-vim.api.nvim_set_keymap("i", "<C-h>", "<C-\\<C-N><C-w>h", {silent = true, noremap = true})
-vim.api.nvim_set_keymap("i", "<C-j>", "<C-\\<C-N><C-w>j", {silent = true, noremap = true})
-vim.api.nvim_set_keymap("i", "<C-k>", "<C-\\<C-N><C-w>k", {silent = true, noremap = true})
-vim.api.nvim_set_keymap("i", "<C-l>", "<C-\\<C-N><C-w>l", {silent = true, noremap = true})
-vim.api.nvim_set_keymap("t", "<Esc>", "<C-\\<C-n>", {silent = true, noremap = true})
+vim.api.nvim_set_keymap("t", "<C-h>", "<C-\\><C-N><C-w>h", {silent = true, noremap = true})
+vim.api.nvim_set_keymap("t", "<C-j>", "<C-\\><C-N><C-w>j", {silent = true, noremap = true})
+vim.api.nvim_set_keymap("t", "<C-k>", "<C-\\><C-N><C-w>k", {silent = true, noremap = true})
+vim.api.nvim_set_keymap("t", "<C-l>", "<C-\\><C-N><C-w>l", {silent = true, noremap = true})
+vim.api.nvim_set_keymap("i", "<C-h>", "<C-\\><C-N><C-w>h", {silent = true, noremap = true})
+vim.api.nvim_set_keymap("i", "<C-j>", "<C-\\><C-N><C-w>j", {silent = true, noremap = true})
+vim.api.nvim_set_keymap("i", "<C-k>", "<C-\\><C-N><C-w>k", {silent = true, noremap = true})
+vim.api.nvim_set_keymap("i", "<C-l>", "<C-\\><C-N><C-w>l", {silent = true, noremap = true})
+vim.api.nvim_set_keymap("t", "<Esc>", "<C-\\><C-n>", {silent = true, noremap = true})
-- TODO fix this
-- resize with arrows
diff --git a/lua/lv-telescope/init.lua b/lua/lv-telescope/init.lua
index 8175a7ed..51fc24e5 100644
--- a/lua/lv-telescope/init.lua
+++ b/lua/lv-telescope/init.lua
@@ -36,7 +36,7 @@ telescope.setup {
file_sorter = require("telescope.sorters").get_fzy_sorter,
file_ignore_patterns = {},
generic_sorter = require("telescope.sorters").get_generic_fuzzy_sorter,
- shorten_path = true,
+ path_display = {"shorten"},
winblend = 0,
border = {},
borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" },
diff --git a/lua/lv-utils/init.lua b/lua/lv-utils/init.lua
index 3546d13c..e22524d7 100644
--- a/lua/lv-utils/init.lua
+++ b/lua/lv-utils/init.lua
@@ -8,6 +8,16 @@ function lv_utils.reload_lv_config()
vim.cmd ":PackerInstall"
end
+function lv_utils.check_lsp_client_active(name)
+ local clients = vim.lsp.get_active_clients()
+ for _, client in pairs(clients) do
+ if client.name == name then
+ return true
+ end
+ end
+ return false
+end
+
function lv_utils.define_augroups(definitions) -- {{{1
-- Create autocommand groups based on the passed definitions
--
diff --git a/lua/lv-which-key/init.lua b/lua/lv-which-key/init.lua
index dbcbb9ae..ee664e4b 100644
--- a/lua/lv-which-key/init.lua
+++ b/lua/lv-which-key/init.lua
@@ -84,6 +84,12 @@ vim.api.nvim_set_keymap("v", "<leader>/", ":CommentToggle<CR>", { noremap = true
-- close buffer
vim.api.nvim_set_keymap("n", "<leader>c", ":BufferClose<CR>", { noremap = true, silent = true })
+-- Save
+vim.api.nvim_set_keymap("n", "<leader>w", ":w!<CR>", { noremap = true, silent = true })
+
+-- Quit
+vim.api.nvim_set_keymap("n", "<leader>q", ":q!<CR>", { noremap = true, silent = true })
+
-- open lv-config
vim.api.nvim_set_keymap(
"n",
@@ -93,7 +99,8 @@ vim.api.nvim_set_keymap(
)
local mappings = {
-
+ ["w"] = "Save",
+ ["q"] = "Quit",
["."] = "LunarConfig",
["/"] = "Comment",
["c"] = "Close Buffer",
diff --git a/lua/settings.lua b/lua/settings.lua
index 3bf5d338..78e9e777 100644
--- a/lua/settings.lua
+++ b/lua/settings.lua
@@ -11,21 +11,17 @@ cmd "set inccommand=split"
cmd "set iskeyword+=-"
cmd "set whichwrap+=<,>,[,],h,l"
if O.transparent_window then
- cmd "au ColorScheme * hi Normal ctermbg=none guibg=none"
- cmd "au ColorScheme * hi SignColumn ctermbg=none guibg=none"
+ cmd "au ColorScheme * hi Normal ctermbg=none guibg=none"
+ cmd "au ColorScheme * hi SignColumn ctermbg=none guibg=none"
end
---- COLORSCHEME ---
-
-vim.g.colors_name = O.colorscheme
-
--- SETTINGS ---
opt.backup = false -- creates a backup file
-opt.clipboard = "unnamedplus" -- allows neovim to access the system clipboard
+opt.clipboard = O.clipboard -- allows neovim to access the system clipboard
opt.cmdheight = O.cmdheight -- more space in the neovim command line for displaying messages
opt.colorcolumn = "99999" -- fix indentline for now
-opt.completeopt = { "menuone", "noselect" }
+opt.completeopt = {"menuone", "noselect"}
opt.conceallevel = 0 -- so that `` is visible in markdown files
opt.fileencoding = "utf-8" -- the encoding written to a file
opt.guifont = "monospace:h17" -- the font used in graphical neovim applications
@@ -34,6 +30,7 @@ opt.hlsearch = O.hl_search -- highlight all matches on previous search pattern
opt.ignorecase = O.ignore_case -- ignore case in search patterns
opt.mouse = "a" -- allow the mouse to be used in neovim
opt.pumheight = 10 -- pop up menu height
+opt.scrolloff = O.scrolloff -- minimal number of screen lines to keep above and below the cursor
opt.showmode = false -- we don't need to see things like -- INSERT -- anymore
opt.showtabline = 2 -- always show tabs
opt.smartcase = O.smart_case -- smart case
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 04:35:32 +0000