mirror of
https://github.com/Nickiel12/nicks-nix-config.git
synced 2024-11-24 21:55:28 -08:00
Compare commits
No commits in common. "4d4e59a4300e7e02f89ffc889510942c1b59c49a" and "4c415ebe5107afdcd0f11100bde76d61a78f5be6" have entirely different histories.
4d4e59a430
...
4c415ebe51
2 changed files with 24 additions and 128 deletions
|
@ -12,7 +12,7 @@
|
||||||
tls = true;
|
tls = true;
|
||||||
tls_starttls = true;
|
tls_starttls = true;
|
||||||
auth = true;
|
auth = true;
|
||||||
from = "nickiel.is.a.dev@gmail.com";
|
from = "noreply@nickiel.net";
|
||||||
user = "nickiel.is.a.dev";
|
user = "nickiel.is.a.dev";
|
||||||
passwordeval = "cat /Aurora/mail.password";
|
passwordeval = "cat /Aurora/mail.password";
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,21 +1,16 @@
|
||||||
-- Put in ~/AppData/Local/nvim
|
-- Put in ~/AppData/Local/nvim
|
||||||
|
|
||||||
vim.opt.signcolumn = 'yes';
|
vim.opt.signcolumn = 'yes';
|
||||||
vim.opt.scrolloff = 8;
|
vim.opt.scrolloff = 8;
|
||||||
vim.opt.autoindent = true;
|
vim.opt.autoindent = true;
|
||||||
vim.opt.expandtab = true;
|
vim.opt.expandtab = true;
|
||||||
vim.opt.foldlevel = 20;
|
vim.opt.foldlevel = 20;
|
||||||
vim.opt.foldmethod = "expr";
|
|
||||||
vim.opt.foldexpr = "nvim_treesitter#foldexpr()";
|
|
||||||
vim.opt.foldenable = true; -- Disable folding at startup.
|
|
||||||
vim.opt.number = true;
|
vim.opt.number = true;
|
||||||
vim.opt.shiftwidth = 4;
|
vim.opt.shiftwidth = 4;
|
||||||
vim.opt.tabstop = 4;
|
vim.opt.tabstop = 4;
|
||||||
|
|
||||||
vim.g.mapleader = ' ';
|
vim.g.mapleader = ' ';
|
||||||
|
|
||||||
vim.keymap.set("v", ">", ">gv");
|
|
||||||
vim.keymap.set("v", "<", "<gv");
|
|
||||||
|
|
||||||
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv");
|
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv");
|
||||||
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv");
|
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv");
|
||||||
|
|
||||||
|
@ -30,14 +25,12 @@ vim.keymap.set("n", "<leader>y", "\"+y");
|
||||||
vim.keymap.set("v", "<leader>y", "\"+y");
|
vim.keymap.set("v", "<leader>y", "\"+y");
|
||||||
vim.keymap.set("n", "<leader>Y", "\"+Y");
|
vim.keymap.set("n", "<leader>Y", "\"+Y");
|
||||||
|
|
||||||
|
vim.keymap.set("v", ">", ">gv");
|
||||||
|
vim.keymap.set("v", "<", "<gv");
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>d", "\"_d");
|
vim.keymap.set("n", "<leader>d", "\"_d");
|
||||||
vim.keymap.set("v", "<leader>d", "\"_d");
|
vim.keymap.set("v", "<leader>d", "\"_d");
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>.", "<cmd>Telescope find_files<cr>")
|
|
||||||
vim.keymap.set("n", "<leader>o.", "<cmd>Telescope file_browser<cr>")
|
|
||||||
vim.keymap.set("n", "<leader>of", "<cmd>Telescope live_grep<cr>")
|
|
||||||
|
|
||||||
|
|
||||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||||
if not vim.loop.fs_stat(lazypath) then
|
if not vim.loop.fs_stat(lazypath) then
|
||||||
vim.fn.system({
|
vim.fn.system({
|
||||||
|
@ -50,6 +43,7 @@ if not vim.loop.fs_stat(lazypath) then
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
vim.opt.rtp:prepend(lazypath)
|
vim.opt.rtp:prepend(lazypath)
|
||||||
|
|
||||||
-- Use a protected call so we don't error out on first use
|
-- Use a protected call so we don't error out on first use
|
||||||
local status_ok, lazy = pcall(require, 'lazy')
|
local status_ok, lazy = pcall(require, 'lazy')
|
||||||
if not status_ok then
|
if not status_ok then
|
||||||
|
@ -82,7 +76,7 @@ lazy.setup({
|
||||||
'nvim-telescope/telescope.nvim', tag = '0.1.5',
|
'nvim-telescope/telescope.nvim', tag = '0.1.5',
|
||||||
-- or , branch = '0.1.x',
|
-- or , branch = '0.1.x',
|
||||||
dependencies = { 'nvim-lua/plenary.nvim' }
|
dependencies = { 'nvim-lua/plenary.nvim' }
|
||||||
},
|
}
|
||||||
|
|
||||||
-- LSP
|
-- LSP
|
||||||
{ 'neovim/nvim-lspconfig' },
|
{ 'neovim/nvim-lspconfig' },
|
||||||
|
@ -106,105 +100,7 @@ lazy.setup({
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
vim.cmd([[colorscheme monokai_pro]])
|
vim.cmd([[colorscheme monokai_pro]])
|
||||||
|
|
||||||
require("luasnip/loaders/from_vscode").lazy_load()
|
|
||||||
vim.opt.completeopt = "menu,menuone,noselect"
|
|
||||||
|
|
||||||
local cmp = require 'cmp'
|
|
||||||
cmp.setup {
|
|
||||||
snippet = {
|
|
||||||
expand = function(args)
|
|
||||||
luasnip.lsp_expand(args.body)
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
mapping = cmp.mapping.preset.insert({
|
|
||||||
['<C-u>'] = cmp.mapping.scroll_docs(-4), -- Up
|
|
||||||
['<C-d>'] = cmp.mapping.scroll_docs(4), -- Down
|
|
||||||
-- C-b (back) C-f (forward) for snippet placeholder navigation.
|
|
||||||
['<C-Space>'] = cmp.mapping.complete(),
|
|
||||||
['<CR>'] = cmp.mapping.confirm {
|
|
||||||
behavior = cmp.ConfirmBehavior.Replace,
|
|
||||||
select = true,
|
|
||||||
},
|
|
||||||
['<Tab>'] = cmp.mapping(function(fallback)
|
|
||||||
if cmp.visible() then
|
|
||||||
cmp.select_next_item()
|
|
||||||
elseif luasnip.expand_or_jumpable() then
|
|
||||||
luasnip.expand_or_jump()
|
|
||||||
else
|
|
||||||
fallback()
|
|
||||||
end
|
|
||||||
end, { 'i', 's' }),
|
|
||||||
['<S-Tab>'] = cmp.mapping(function(fallback)
|
|
||||||
if cmp.visible() then
|
|
||||||
cmp.select_prev_item()
|
|
||||||
elseif luasnip.jumpable(-1) then
|
|
||||||
luasnip.jump(-1)
|
|
||||||
else
|
|
||||||
fallback()
|
|
||||||
end
|
|
||||||
end, { 'i', 's' }),
|
|
||||||
}),
|
|
||||||
sources = {
|
|
||||||
{ name = 'nvim_lsp' },
|
|
||||||
{ name = 'luasnip' },
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
-- require("autoclose").setup()
|
|
||||||
require 'nvim-treesitter.install'.compilers = { 'zig' }
|
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd('BufWinEnter', {
|
|
||||||
pattern = '?*',
|
|
||||||
callback = function()
|
|
||||||
vim.cmd('normal! zX')
|
|
||||||
vim.cmd('silent! loadview')
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
-- Setup language servers.
|
|
||||||
local lspconfig = require('lspconfig')
|
|
||||||
lspconfig.pyright.setup {}
|
|
||||||
lspconfig.html.setup {}
|
|
||||||
lspconfig.cssls.setup {}
|
|
||||||
lspconfig.eslint.setup {}
|
|
||||||
lspconfig.tsserver.setup {}
|
|
||||||
lspconfig.rust_analyzer.setup {
|
|
||||||
-- Server-specific settings. See `:help lspconfig-setup`
|
|
||||||
settings = {
|
|
||||||
['rust-analyzer'] = {},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
--Enable (broadcasting) snippet capability for completion
|
|
||||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
|
||||||
capabilities.textDocument.completion.completionItem.snippetSupport = true
|
|
||||||
|
|
||||||
require'lspconfig'.cssls.setup {
|
|
||||||
}
|
|
||||||
|
|
||||||
require'nvim-treesitter.configs'.setup {
|
|
||||||
-- A list of parser names, or "all" (the five listed parsers should always be installed)
|
|
||||||
ensure_installed = { "cpp", "lua", "vim", "html", "javascript", "rust", "go", "sql", "c_sharp" },
|
|
||||||
|
|
||||||
-- Install parsers synchronously (only applied to `ensure_installed`)
|
|
||||||
sync_install = false,
|
|
||||||
|
|
||||||
-- Automatically install missing parsers when entering buffer
|
|
||||||
-- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
|
|
||||||
auto_install = false,
|
|
||||||
|
|
||||||
---- If you need to change the installation directory of the parsers (see -> Advanced Setup)
|
|
||||||
-- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")!
|
|
||||||
|
|
||||||
highlight = {
|
|
||||||
enable = true,
|
|
||||||
|
|
||||||
-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
|
|
||||||
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
|
|
||||||
-- Using this option may slow down your editor, and you may see some duplicate highlights.
|
|
||||||
-- Instead of true it can also be a list of languages
|
|
||||||
additional_vim_regex_highlighting = false,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in a new issue