Skip to content

Commit a60bc97

Browse files
shricodevshricodev
committed
feat(nvim): add more luasnips and mod some options
1 parent 56a3c9f commit a60bc97

File tree

11 files changed

+169
-94
lines changed

11 files changed

+169
-94
lines changed

‎roles/fish/files/config.fish‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ end
2222
set fish_greeting
2323

2424
# use the default terminal color
25-
set TERM xterm-256color
25+
set TERM screen-256color
2626

2727
# set -gx BAT_THEME "tokyonight_night"
2828

‎roles/fish/files/fish_variables‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ SETUVAR fish_pager_color_selected_background:\x2d\x2dreverse
5252
SETUVAR fish_pager_color_selected_completion:\x1d
5353
SETUVAR fish_pager_color_selected_description:\x1d
5454
SETUVAR fish_pager_color_selected_prefix:\x1d
55-
SETUVAR fish_user_paths:/var/lib/flatpak/exports/bin\x1e/home/shricodev/\x2ebin\x1e/home/shricodev/\x2elocal/bin\x1e/home/shricodev/local/bin\x1e/home/shricodev/\x2econfig/emacs/bin\x1e/home/shricodev/Applications\x1e/var/lib/flatpak/exports/bin/\x1e/home/shricodev/go/bin\x1e/home/shricodev/\x2efzf/bin
55+
SETUVAR fish_user_paths:/home/shricodev/\x2elocal/share/pnpm\x1e/var/lib/flatpak/exports/bin\x1e/home/shricodev/\x2ebin\x1e/home/shricodev/\x2elocal/bin\x1e/home/shricodev/local/bin\x1e/home/shricodev/\x2econfig/emacs/bin\x1e/home/shricodev/Applications\x1e/var/lib/flatpak/exports/bin/\x1e/home/shricodev/go/bin\x1e/home/shricodev/\x2efzf/bin

‎roles/nvim/files/lazy-lock.json‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,29 @@
11
{
2-
"LuaSnip": { "branch": "master", "commit": "eda5be8f0ce9816278671f0b578cdbb8b762c701" },
2+
"LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" },
33
"blink-emoji.nvim": { "branch": "master", "commit": "f22ce8cac02a6ece05368220f1e38bd34fe376f9" },
4-
"blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" },
5-
"codeium.vim": { "branch": "main", "commit": "272c6e2755e8faa90e26bcdcd9fde6b9e61751ea" },
4+
"blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
5+
"codeium.vim": { "branch": "main", "commit": "a8d47ec54fe82df920b2545559f767003e8a7f8d" },
66
"conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" },
77
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
8-
"fzf-lua": { "branch": "main", "commit": "797e87a11905cb231a24b7d9baed837451b94723" },
9-
"gitsigns.nvim": { "branch": "main", "commit": "aa49c9675433d3751b7afd198c9f5d2e03252af1" },
8+
"fzf-lua": { "branch": "main", "commit": "5c40d45bb37ad6355b1e028daa127dfe22be6857" },
9+
"gitsigns.nvim": { "branch": "main", "commit": "8270378ab83540b03d09c0194ba3e208f9d0cb72" },
1010
"gopher.nvim": { "branch": "main", "commit": "de585144ebde9f0516fb9b542dd42e90c7835b59" },
1111
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
12-
"mason-lspconfig.nvim": { "branch": "main", "commit": "73e0143385d8a2185944b42ed44d728b94ee19a3" },
12+
"mason-lspconfig.nvim": { "branch": "main", "commit": "844d247d998c2f9a6a3baad8bb9748edc55ce69f" },
1313
"mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
14-
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
15-
"mini.files": { "branch": "main", "commit": "a92ba6f1bf9e1e0b9c6de50db1f5df7ca89cb9e4" },
16-
"mini.icons": { "branch": "main", "commit": "94848dad1589a199f876539bd79befb0c5e3abf0" },
17-
"mini.statusline": { "branch": "main", "commit": "452d27d764720cddcb9909b786598bb9e80c1ce8" },
18-
"mini.surround": { "branch": "main", "commit": "1a2b59c77a0c4713a5bd8972da322f842f4821b1" },
19-
"nvim-lint": { "branch": "master", "commit": "3c5e34c24834a67b1cb37600ab7663eefd2b0390" },
14+
"mason.nvim": { "branch": "main", "commit": "9e25c98d4826998460926f8c5c2284848d80ae89" },
15+
"mini.icons": { "branch": "main", "commit": "b8f6fa6f5a3fd0c56936252edcd691184e5aac0c" },
16+
"mini.statusline": { "branch": "main", "commit": "f6917f4da995d64edf3728b1302dbd5d4561c912" },
17+
"mini.surround": { "branch": "main", "commit": "b12fcfefd6b9b7c9e9a773bc0e3e07ae20c03351" },
18+
"nvim-lint": { "branch": "master", "commit": "7ef127aaede2a4d5ad8df8321e2eb4e567f29594" },
2019
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
21-
"nvim-treesitter-textobjects": { "branch": "master", "commit": "89ebe73cd2836db80a22d9748999ace0241917a5" },
20+
"nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
2221
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
2322
"oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" },
24-
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
25-
"rose-pine": { "branch": "main", "commit": "f93360149e9ed4df8677fbb07c7231ea0fd03b97" },
23+
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
2624
"tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
27-
"undotree": { "branch": "master", "commit": "15d91b0afe04ea9ba5cd53e30190d1602af9a925" },
28-
"vim-fugitive": { "branch": "master", "commit": "593f831d6f6d779cbabb70a4d1e6b1b1936a88af" },
25+
"undotree": { "branch": "master", "commit": "28f2f54a34baff90ea6f4a735ef1813ad875c743" },
26+
"vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
2927
"vim-maximizer": { "branch": "master", "commit": "2e54952fe91e140a2e69f35f22131219fcd9c5f1" },
30-
"vim-tmux-navigator": { "branch": "master", "commit": "412c474e97468e7934b9c217064025ea7a69e05e" }
28+
"vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" }
3129
}

‎roles/nvim/files/lsp/cssls.lua‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
return {
2+
cmd = { 'vscode-css-language-server' },
3+
filetypes = { 'css' },
4+
root_markers = { '.git' },
5+
}

roles/nvim/files/lsp/luals.lua renamed to roles/nvim/files/lsp/lua_ls.lua

File renamed without changes.

‎roles/nvim/files/lua/shricodev/core/options.lua‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,12 @@ vim.cmd [[
5959

6060
opt.colorcolumn = '80' -- highlight column 80
6161
-- highlight matching brackets
62-
opt.showmatch = true
63-
-- time to show the match of brackets
64-
opt.matchtime = 2 -- Don't hide markup
6562
opt.conceallevel = 0
6663
opt.concealcursor = '' -- Don't hide cursor line markup
6764

6865
-- Set completeopt to have a better completion experience
69-
opt.completeopt = 'menu,noinsert,menuone,noselect'
70-
opt.pumheight = 10 -- Popup menu height
66+
opt.completeopt = 'menuone,noinsert,noselect'
67+
-- opt.pumheight = 10 -- Popup menu height
7168

7269
-- Sets how neovim will display certain whitespace in the editor.
7370
-- See `:help 'list'`

‎roles/nvim/files/lua/shricodev/plugins/blink-cmp.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ return {
2020
-- See the full "keymap" documentation for information on defining your own keymap.
2121
keymap = {
2222
preset = 'none',
23+
['<C-space>'] = { 'show', 'show_documentation', 'hide_documentation' },
2324
['<C-p>'] = { 'select_prev', 'fallback' },
2425
['<C-n>'] = { 'select_next', 'fallback' },
2526
['<Up>'] = { 'select_prev', 'fallback' },
@@ -39,7 +40,7 @@ return {
3940
documentation = { auto_show = true, auto_show_delay_ms = 400 },
4041
},
4142
-- use ctrl-s in insert mode instead.
42-
-- signature = { enabled = true },
43+
signature = { enabled = true },
4344

4445
appearance = {
4546
nerd_font_variant = 'mono',

‎roles/nvim/files/lua/shricodev/plugins/color-scheme.lua‎

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -14,67 +14,67 @@ return {
1414
vim.cmd 'colorscheme tokyonight-night'
1515
end,
1616
},
17-
{
18-
'rose-pine/neovim',
19-
name = 'rose-pine',
20-
config = function()
21-
require('rose-pine').setup {
22-
variant = 'main', -- auto, main, moon, or dawn
23-
dark_variant = 'main', -- main, moon, or dawn
24-
dim_inactive_windows = false,
25-
extend_background_behind_borders = true,
26-
27-
enable = {
28-
terminal = true,
29-
migrations = true, -- Handle deprecated options automatically
30-
},
31-
32-
styles = {
33-
bold = true,
34-
italic = false,
35-
transparency = true,
36-
},
37-
38-
groups = {
39-
border = 'muted',
40-
link = 'iris',
41-
panel = 'surface',
42-
43-
error = 'love',
44-
hint = 'iris',
45-
info = 'foam',
46-
note = 'pine',
47-
todo = 'rose',
48-
warn = 'gold',
49-
50-
git_add = 'foam',
51-
git_change = 'rose',
52-
git_delete = 'love',
53-
git_dirty = 'rose',
54-
git_ignore = 'muted',
55-
git_merge = 'iris',
56-
git_rename = 'pine',
57-
git_stage = 'iris',
58-
git_text = 'rose',
59-
git_untracked = 'subtle',
60-
61-
h1 = 'iris',
62-
h2 = 'foam',
63-
h3 = 'rose',
64-
h4 = 'gold',
65-
h5 = 'pine',
66-
h6 = 'foam',
67-
},
68-
palette = {},
69-
before_highlight = function() end,
70-
71-
highlight_groups = {
72-
-- Change the vertical line color
73-
ColorColumn = { bg = '#232334' },
74-
},
75-
}
76-
77-
-- vim.cmd 'colorscheme rose-pine-moon'
78-
end,
79-
},
17+
-- {
18+
-- 'rose-pine/neovim',
19+
-- name = 'rose-pine',
20+
-- config = function()
21+
-- require('rose-pine').setup {
22+
-- variant = 'main', -- auto, main, moon, or dawn
23+
-- dark_variant = 'main', -- main, moon, or dawn
24+
-- dim_inactive_windows = false,
25+
-- extend_background_behind_borders = true,
26+
--
27+
-- enable = {
28+
-- terminal = true,
29+
-- migrations = true, -- Handle deprecated options automatically
30+
-- },
31+
--
32+
-- styles = {
33+
-- bold = true,
34+
-- italic = false,
35+
-- transparency = true,
36+
-- },
37+
--
38+
-- groups = {
39+
-- border = 'muted',
40+
-- link = 'iris',
41+
-- panel = 'surface',
42+
--
43+
-- error = 'love',
44+
-- hint = 'iris',
45+
-- info = 'foam',
46+
-- note = 'pine',
47+
-- todo = 'rose',
48+
-- warn = 'gold',
49+
--
50+
-- git_add = 'foam',
51+
-- git_change = 'rose',
52+
-- git_delete = 'love',
53+
-- git_dirty = 'rose',
54+
-- git_ignore = 'muted',
55+
-- git_merge = 'iris',
56+
-- git_rename = 'pine',
57+
-- git_stage = 'iris',
58+
-- git_text = 'rose',
59+
-- git_untracked = 'subtle',
60+
--
61+
-- h1 = 'iris',
62+
-- h2 = 'foam',
63+
-- h3 = 'rose',
64+
-- h4 = 'gold',
65+
-- h5 = 'pine',
66+
-- h6 = 'foam',
67+
-- },
68+
-- palette = {},
69+
-- before_highlight = function() end,
70+
--
71+
-- highlight_groups = {
72+
-- -- Change the vertical line color
73+
-- ColorColumn = { bg = '#232334' },
74+
-- },
75+
-- }
76+
--
77+
-- -- vim.cmd 'colorscheme rose-pine-moon'
78+
-- end,
79+
-- },
8080
}

‎roles/nvim/files/lua/shricodev/plugins/luasnip.lua‎

Lines changed: 70 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,29 +35,96 @@ return {
3535
})
3636
end
3737

38-
-- Define languages for code blocks
3938
local languages = {
39+
-- Common languages
4040
'txt',
41+
'plaintext',
4142
'lua',
4243
'sql',
4344
'go',
4445
'regex',
4546
'bash',
47+
'sh',
48+
'zsh',
49+
'fish',
4650
'markdown',
4751
'markdown_inline',
4852
'yaml',
4953
'json',
5054
'jsonc',
5155
'cpp',
56+
'c',
5257
'csv',
5358
'java',
5459
'javascript',
60+
'typescript',
61+
'typescriptreact',
62+
'javascriptreact',
5563
'python',
56-
'dockerfile',
64+
'ruby',
65+
'php',
66+
'rust',
67+
'dart',
68+
'kotlin',
69+
'swift',
70+
'scala',
5771
'html',
5872
'css',
73+
'scss',
74+
'less',
5975
'templ',
60-
'php',
76+
77+
-- Frontend frameworks & templating
78+
'vue',
79+
'svelte',
80+
'astro',
81+
'ejs',
82+
'hbs',
83+
'mustache',
84+
'pug',
85+
'jade',
86+
87+
-- Infra / DevOps / Configuration
88+
'dockerfile',
89+
'docker-compose',
90+
'ini',
91+
'toml',
92+
'make',
93+
'cmake',
94+
'nix',
95+
'terraform',
96+
'hcl',
97+
'helm',
98+
'yaml.ansible',
99+
'gitignore',
100+
101+
-- Scripting / CLI
102+
'powershell',
103+
'awk',
104+
'sed',
105+
'jq',
106+
107+
-- Data / Analytics / Scientific
108+
'r',
109+
'matlab',
110+
'stata',
111+
'graphql',
112+
'xml',
113+
114+
-- Other languages
115+
'elixir',
116+
'erlang',
117+
'clojure',
118+
'groovy',
119+
'gradle',
120+
'perl',
121+
122+
-- Non-code formats (useful in docs)
123+
'diff',
124+
'log',
125+
'output',
126+
'tsv',
127+
'http',
61128
}
62129

63130
-- Generate snippets for all languages

‎roles/nvim/files/lua/shricodev/plugins/treesitter.lua‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,21 @@ return {
1818
auto_install = true,
1919
highlight = {
2020
enable = true,
21-
-- disable slow treesitter highlight for large files
21+
22+
-- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files
2223
disable = function(lang, buf)
2324
local max_filesize = 100 * 1024 -- 100 KB
2425
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
2526
if ok and stats and stats.size > max_filesize then
2627
return true
2728
end
2829
end,
30+
31+
-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
32+
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
33+
-- Using this option may slow down your editor, and you may see some duplicate highlights.
34+
-- Instead of true it can also be a list of languages
35+
additional_vim_regex_highlighting = false,
2936
},
3037
indent = { enable = true },
3138

0 commit comments

Comments
 (0)