format with nixfmt

This commit is contained in:
megit 2024-08-07 09:08:11 +08:00
parent 89382ce25e
commit 9c77d8a217
22 changed files with 847 additions and 826 deletions

View file

@ -1,5 +1,5 @@
{
colorschemes.gruvbox ={
enable = true;
};
colorschemes.gruvbox = {
enable = true;
};
}

View file

@ -1,59 +1,58 @@
{
colorschemes.onedark = {
enable = true;
};
extraConfigLua = ''
----------------------------------
-- START custom setup for onedark
----------------------------------
-- https://github.com/navarasu/onedark.nvim
require('onedark').setup {
-- Main options --
style = 'darker', -- Default theme style. Choose between 'dark', 'darker', 'cool', 'deep', 'warm', 'warmer' and 'light'
transparent = true, -- Show/hide background
term_colors = true, -- Change terminal color as per the selected theme style
ending_tildes = false, -- Show the end-of-buffer tildes. By default they are hidden
cmp_itemkind_reverse = false, -- reverse item kind highlights in cmp menu
colorschemes.onedark = {
enable = true;
};
extraConfigLua = ''
----------------------------------
-- START custom setup for onedark
----------------------------------
-- https://github.com/navarasu/onedark.nvim
require('onedark').setup {
-- Main options --
style = 'darker', -- Default theme style. Choose between 'dark', 'darker', 'cool', 'deep', 'warm', 'warmer' and 'light'
transparent = true, -- Show/hide background
term_colors = true, -- Change terminal color as per the selected theme style
ending_tildes = false, -- Show the end-of-buffer tildes. By default they are hidden
cmp_itemkind_reverse = false, -- reverse item kind highlights in cmp menu
-- toggle theme style ---
-- toggle_style_key = nil, -- keybind to toggle theme style. Leave it nil to disable it, or set it to a string, for example "<leader>ts"
toggle_style_key = "<leader>ts", -- keybind to toggle theme style. Leave it nil to disable it, or set it to a string, for example "<leader>ts"
-- toggle_style_list = {'dark', 'darker', 'cool', 'deep', 'warm', 'warmer', 'light'}, -- List of styles to toggle between
toggle_style_list = {'dark', 'darker', 'cool', 'deep', 'warm', 'warmer'}, -- List of styles to toggle between
-- toggle theme style ---
-- toggle_style_key = nil, -- keybind to toggle theme style. Leave it nil to disable it, or set it to a string, for example "<leader>ts"
toggle_style_key = "<leader>ts", -- keybind to toggle theme style. Leave it nil to disable it, or set it to a string, for example "<leader>ts"
-- toggle_style_list = {'dark', 'darker', 'cool', 'deep', 'warm', 'warmer', 'light'}, -- List of styles to toggle between
toggle_style_list = {'dark', 'darker', 'cool', 'deep', 'warm', 'warmer'}, -- List of styles to toggle between
-- Change code style ---
-- Options are italic, bold, underline, none
-- You can configure multiple style with comma seperated, For e.g., keywords = 'italic,bold'
code_style = {
comments = 'italic',
keywords = 'none',
functions = 'none',
strings = 'none',
variables = 'none'
},
-- Change code style ---
-- Options are italic, bold, underline, none
-- You can configure multiple style with comma seperated, For e.g., keywords = 'italic,bold'
code_style = {
comments = 'italic',
keywords = 'none',
functions = 'none',
strings = 'none',
variables = 'none'
},
-- Lualine options --
-- lualine = {
-- transparent = true, -- lualine center bar transparency
-- },
-- Lualine options --
-- lualine = {
-- transparent = true, -- lualine center bar transparency
-- },
-- Custom Highlights --
colors = {}, -- Override default colors
highlights = {}, -- Override highlight groups
-- Plugins Config --
diagnostics = {
darker = true, -- darker colors for diagnostic
undercurl = true, -- use undercurl instead of underline for diagnostics
background = true, -- use background color for virtual text
},
}
require('onedark').load()
----------------------------------
-- END custom setup for onedark
----------------------------------
'';
-- Custom Highlights --
colors = {}, -- Override default colors
highlights = {}, -- Override highlight groups
-- Plugins Config --
diagnostics = {
darker = true, -- darker colors for diagnostic
undercurl = true, -- use undercurl instead of underline for diagnostics
background = true, -- use background color for virtual text
},
}
require('onedark').load()
----------------------------------
-- END custom setup for onedark
----------------------------------
'';
}

View file

@ -1,30 +1,28 @@
# The line beneath this is called `modeline`. See `:help modeline`
# vim: ts=4:sts=0:sw=0:tw=78:noet
{
# Import all your configuration modules here
imports = [
./colorscheme/onedark.nix
# ./colorscheme/gruvbox.nix
./colorscheme/onedark.nix
# ./colorscheme/gruvbox.nix
./sets.nix
./keymaps.nix
./sets.nix
./keymaps.nix
./plugins/bufferline.nix
./plugins/comment.nix
./plugins/fugitive.nix
./plugins/indent-blankline.nix
./plugins/leap.nix
./plugins/lualine.nix
./plugins/nvim-tree.nix
./plugins/sleuth.nix
./plugins/gitsigns.nix
./plugins/which-key.nix
./plugins/telescope.nix
./plugins/neorg.nix
./plugins/treesitter.nix
./plugins/bufferline.nix
./plugins/comment.nix
./plugins/fugitive.nix
./plugins/indent-blankline.nix
./plugins/leap.nix
./plugins/lualine.nix
./plugins/nvim-tree.nix
./plugins/sleuth.nix
./plugins/gitsigns.nix
./plugins/which-key.nix
./plugins/telescope.nix
./plugins/neorg.nix
./plugins/treesitter.nix
./plugins/lsp/lsp.nix
./plugins/lsp/lsp.nix
./plugins/extra/vim-rhubarb.nix
./plugins/extra/vim-rhubarb.nix
];
}

View file

@ -1,21 +1,22 @@
# The line beneath this is called `modeline`. See `:help modeline`
# vim: ts=4:sts=0:sw=0:tw=78:noet
{
keymaps = [
{
# vim.keymap.set({ "n", "v" }, "\\y", '"+y', {noremap=true, silent=true})
mode = [ "n" "v" ];
key = "\\y";
action = "\"+y";
options = {
silent = true;
remap = false;
};
}
];
extraConfigLua = ''
-- see ":help default-mapping"
-- vim.cmd[[unmap Y]]
vim.keymap.del( "n", "Y" )
'';
keymaps = [
{
# vim.keymap.set({ "n", "v" }, "\\y", '"+y', {noremap=true, silent=true})
mode = [
"n"
"v"
];
key = "\\y";
action = "\"+y";
options = {
silent = true;
remap = false;
};
}
];
extraConfigLua = ''
-- see ":help default-mapping"
-- vim.cmd[[unmap Y]]
vim.keymap.del( "n", "Y" )
'';
}

View file

@ -1,7 +1,7 @@
{
plugins = {
bufferline = {
enable = true;
};
};
plugins = {
bufferline = {
enable = true;
};
};
}

View file

@ -1,7 +1,7 @@
{
plugins = {
comment = {
enable = true;
};
};
plugins = {
comment = {
enable = true;
};
};
}

View file

@ -1,6 +1,4 @@
{ pkgs
, ...}:{
extraPlugins = with pkgs.vimPlugins; [
vim-rhubarb
];
{ pkgs, ... }:
{
extraPlugins = with pkgs.vimPlugins; [ vim-rhubarb ];
}

View file

@ -1,6 +1,4 @@
{ pkgs
, ...}:{
extraPlugins = with pkgs.vimPlugins; [
vim-sleuth
];
{ pkgs, ... }:
{
extraPlugins = with pkgs.vimPlugins; [ vim-sleuth ];
}

View file

@ -1,7 +1,7 @@
{
plugins = {
fugitive = {
enable = true;
};
};
plugins = {
fugitive = {
enable = true;
};
};
}

View file

@ -1,7 +1,7 @@
{
plugins = {
gitsigns = {
enable = true;
};
};
plugins = {
gitsigns = {
enable = true;
};
};
}

View file

@ -1,11 +1,11 @@
{
plugins = {
indent-blankline = {
enable = true;
settings.indent = {
char = "";
tab_char = "";
};
};
};
plugins = {
indent-blankline = {
enable = true;
settings.indent = {
char = "";
tab_char = "";
};
};
};
}

View file

@ -1,30 +1,46 @@
{
plugins.leap = {
enable = true;
addDefaultMappings = false;
};
keymaps = [
{
mode = [ "n" "x" "o" ];
key = "<leader>ss";
action = "function() require('leap').leap {} end";
lua = true;
# action = "require('leap').leap";
}
{
mode = [ "n" "x" "o" ];
key = "<leader>sS";
action = "<Plug>(leap-backward-to)";
}
{
mode = [ "n" "x" "o" ];
key = "<leader>sx";
action = "<Plug>(leap-forward-till)";
}
{
mode = [ "n" "x" "o" ];
key = "<leader>sX";
action = "<Plug>(leap-backward-till)";
}
];
plugins.leap = {
enable = true;
addDefaultMappings = false;
};
keymaps = [
{
mode = [
"n"
"x"
"o"
];
key = "<leader>ss";
action = "function() require('leap').leap {} end";
lua = true;
# action = "require('leap').leap";
}
{
mode = [
"n"
"x"
"o"
];
key = "<leader>sS";
action = "<Plug>(leap-backward-to)";
}
{
mode = [
"n"
"x"
"o"
];
key = "<leader>sx";
action = "<Plug>(leap-forward-till)";
}
{
mode = [
"n"
"x"
"o"
];
key = "<leader>sX";
action = "<Plug>(leap-backward-till)";
}
];
}

View file

@ -1,16 +1,16 @@
{
lsp = {
enable = true;
servers = {
tsserver.enable = true;
lsp = {
enable = true;
servers = {
tsserver.enable = true;
lua-ls.enable = true;
lua-ls.enable = true;
rust-analyzer = {
enable = true;
installCargo = true;
installRustc = true;
};
};
};
rust-analyzer = {
enable = true;
installCargo = true;
installRustc = true;
};
};
};
}

View file

@ -1,220 +1,237 @@
{
plugins = {
lsp-format = {
enable = false; # Enable it if you want lsp-format integration for none-ls
};
lsp = {
enable = true;
capabilities = "offsetEncoding = 'utf-16'";
servers = {
texlab = {
enable = true;
# cmd = ["texlab"];
# filetypes = ["tex" "plaintex" "bib"];
# extraOptions = {
# settings = {
# texlab = {
# auxDirectory = "tex_aux_output";
# rootDirectory = nil;
# build = {
# # -- forwardSearchAfter = true,
# executable = "latexmk";
# args = [
# "-xelatex"
# "-verbose"
# # -- "-outdir=%f_output",
# # -- "-auxdir=%f_aux",
# "-outdir=tex_aux_output"
# "-file-line-error"
# "-synctex=1"
# "-interaction=nonstopmode"
# "-pv"
# "%f"
# ];
# isContinuous = false;
# # -- "onSave = true" failed to work properly with large files like moderncv
# # -- it would not build properly until you delete all the intermediate files
# # -- onSave = true
# };
# # --------------------------------
# # -- END texlab main config
# # -- if used with texmagic, disable this
# # --------------------------------
# # --https://github.com/latex-lsp/texlab/wiki/Previewing
# # -- https://github.com/f3fora/nvim-texlabconfig
# forwardSearch = {
# executable = "zathura";
# args = [
# # -- This is for moving lines in nvim
# "--synctex-editor-command"
# # -- I don't know why but after switching to lazy.vim, need %%% to escape the % character, so "pgrep zathura -a" can see the % sign
# "[[nvim-texlabconfig -file '%%%{input}' -line %%%{line} -server ]] .. vim.v.servername"
# "--synctex-forward"
# "%l:1:%f"
# "%p"
# ];
# };
# diagnosticsDelay = 300;
# };
# };
# };
};
clangd = {enable = true;};
lua-ls = {
enable = true;
extraOptions = {
settings = {
Lua = {
completion = {
callSnippet = "Replace";
};
telemetry = {
enabled = false;
};
hint = {enable = true;};
};
};
};
};
nil_ls = {enable = true;};
tsserver = {
enable = false;
filetypes = ["javascript" "javascriptreact" "typescript" "typescriptreact"];
extraOptions = {
settings = {
javascript = {
inlayHints = {
includeInlayEnumMemberValueHints = true;
includeInlayFunctionLikeReturnTypeHints = true;
includeInlayFunctionParameterTypeHints = true;
includeInlayParameterNameHints = "all";
includeInlayParameterNameHintsWhenArgumentMatchesName = true;
includeInlayPropertyDeclarationTypeHints = true;
includeInlayVariableTypeHints = true;
};
};
typescript = {
inlayHints = {
includeInlayEnumMemberValueHints = true;
includeInlayFunctionLikeReturnTypeHints = true;
includeInlayFunctionParameterTypeHints = true;
includeInlayParameterNameHints = "all";
includeInlayParameterNameHintsWhenArgumentMatchesName = true;
includeInlayPropertyDeclarationTypeHints = true;
includeInlayVariableTypeHints = true;
};
};
};
};
};
eslint = {enable = true;};
pyright = {enable = true;};
ruff-lsp = {enable = true;};
rust-analyzer = {
enable = true;
installCargo = true;
installRustc = true;
plugins = {
lsp-format = {
enable = false; # Enable it if you want lsp-format integration for none-ls
};
lsp = {
enable = true;
capabilities = "offsetEncoding = 'utf-16'";
servers = {
texlab = {
enable = true;
# cmd = ["texlab"];
# filetypes = ["tex" "plaintex" "bib"];
# extraOptions = {
# settings = {
# texlab = {
# auxDirectory = "tex_aux_output";
# rootDirectory = nil;
# build = {
# # -- forwardSearchAfter = true,
# executable = "latexmk";
# args = [
# "-xelatex"
# "-verbose"
# # -- "-outdir=%f_output",
# # -- "-auxdir=%f_aux",
# "-outdir=tex_aux_output"
# "-file-line-error"
# "-synctex=1"
# "-interaction=nonstopmode"
# "-pv"
# "%f"
# ];
# isContinuous = false;
# # -- "onSave = true" failed to work properly with large files like moderncv
# # -- it would not build properly until you delete all the intermediate files
# # -- onSave = true
# };
# # --------------------------------
# # -- END texlab main config
# # -- if used with texmagic, disable this
# # --------------------------------
# # --https://github.com/latex-lsp/texlab/wiki/Previewing
# # -- https://github.com/f3fora/nvim-texlabconfig
# forwardSearch = {
# executable = "zathura";
# args = [
# # -- This is for moving lines in nvim
# "--synctex-editor-command"
# # -- I don't know why but after switching to lazy.vim, need %%% to escape the % character, so "pgrep zathura -a" can see the % sign
# "[[nvim-texlabconfig -file '%%%{input}' -line %%%{line} -server ]] .. vim.v.servername"
# "--synctex-forward"
# "%l:1:%f"
# "%p"
# ];
# };
# diagnosticsDelay = 300;
# };
# };
# };
};
clangd = {
enable = true;
};
lua-ls = {
enable = true;
extraOptions = {
settings = {
checkOnSave = true;
check = {
command = "clippy";
};
# inlayHints = {
# enable = true;
# showParameterNames = true;
# parameterHintsPrefix = "<- ";
# otherHintsPrefix = "=> ";
# };
procMacro = {
enable = true;
Lua = {
completion = {
callSnippet = "Replace";
};
telemetry = {
enabled = false;
};
hint = {
enable = true;
};
};
};
};
};
# keymaps = {
# silent = true;
# lspBuf = {
# gd = {
# action = "definition";
# desc = "Goto Definition";
# };
# gr = {
# action = "references";
# desc = "Goto References";
# };
# gD = {
# action = "declaration";
# desc = "Goto Declaration";
# };
# gI = {
# action = "implementation";
# desc = "Goto Implementation";
# };
# gT = {
# action = "type_definition";
# desc = "Type Definition";
# };
# K = {
# action = "hover";
# desc = "Hover";
# };
# "<leader>cw" = {
# action = "workspace_symbol";
# desc = "Workspace Symbol";
# };
# "<leader>cr" = {
# action = "rename";
# desc = "Rename";
# };
# "<leader>ca" = {
# action = "code_action";
# desc = "Code Action";
# };
# "<C-k>" = {
# action = "signature_help";
# desc = "Signature Help";
# };
# };
# diagnostic = {
# "<leader>cd" = {
# action = "open_float";
# desc = "Line Diagnostics";
# };
# "[d" = {
# action = "goto_next";
# desc = "Next Diagnostic";
# };
# "]d" = {
# action = "goto_prev";
# desc = "Previous Diagnostic";
# };
# };
# };
nil_ls = {
enable = true;
};
tsserver = {
enable = false;
filetypes = [
"javascript"
"javascriptreact"
"typescript"
"typescriptreact"
];
extraOptions = {
settings = {
javascript = {
inlayHints = {
includeInlayEnumMemberValueHints = true;
includeInlayFunctionLikeReturnTypeHints = true;
includeInlayFunctionParameterTypeHints = true;
includeInlayParameterNameHints = "all";
includeInlayParameterNameHintsWhenArgumentMatchesName = true;
includeInlayPropertyDeclarationTypeHints = true;
includeInlayVariableTypeHints = true;
};
};
typescript = {
inlayHints = {
includeInlayEnumMemberValueHints = true;
includeInlayFunctionLikeReturnTypeHints = true;
includeInlayFunctionParameterTypeHints = true;
includeInlayParameterNameHints = "all";
includeInlayParameterNameHintsWhenArgumentMatchesName = true;
includeInlayPropertyDeclarationTypeHints = true;
includeInlayVariableTypeHints = true;
};
};
};
};
};
eslint = {
enable = true;
};
pyright = {
enable = true;
};
ruff-lsp = {
enable = true;
};
rust-analyzer = {
enable = true;
installCargo = true;
installRustc = true;
settings = {
checkOnSave = true;
check = {
command = "clippy";
};
# inlayHints = {
# enable = true;
# showParameterNames = true;
# parameterHintsPrefix = "<- ";
# otherHintsPrefix = "=> ";
# };
procMacro = {
enable = true;
};
};
};
};
# keymaps = {
# silent = true;
# lspBuf = {
# gd = {
# action = "definition";
# desc = "Goto Definition";
# };
# gr = {
# action = "references";
# desc = "Goto References";
# };
# gD = {
# action = "declaration";
# desc = "Goto Declaration";
# };
# gI = {
# action = "implementation";
# desc = "Goto Implementation";
# };
# gT = {
# action = "type_definition";
# desc = "Type Definition";
# };
# K = {
# action = "hover";
# desc = "Hover";
# };
# "<leader>cw" = {
# action = "workspace_symbol";
# desc = "Workspace Symbol";
# };
# "<leader>cr" = {
# action = "rename";
# desc = "Rename";
# };
# "<leader>ca" = {
# action = "code_action";
# desc = "Code Action";
# };
# "<C-k>" = {
# action = "signature_help";
# desc = "Signature Help";
# };
# };
# diagnostic = {
# "<leader>cd" = {
# action = "open_float";
# desc = "Line Diagnostics";
# };
# "[d" = {
# action = "goto_next";
# desc = "Next Diagnostic";
# };
# "]d" = {
# action = "goto_prev";
# desc = "Previous Diagnostic";
# };
# };
# };
};
extraConfigLua = ''
local _border = "rounded"
};
extraConfigLua = ''
local _border = "rounded"
vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(
vim.lsp.handlers.hover, {
border = _border
}
)
vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(
vim.lsp.handlers.hover, {
border = _border
}
)
vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
vim.lsp.handlers.signature_help, {
border = _border
}
)
vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
vim.lsp.handlers.signature_help, {
border = _border
}
)
vim.diagnostic.config{
float={border=_border}
};
vim.diagnostic.config{
float={border=_border}
};
require('lspconfig.ui.windows').default_options = {
border = _border
}
require('lspconfig.ui.windows').default_options = {
border = _border
}
@ -224,88 +241,88 @@
------------------------------
-- START texmagic, texlab
------------------------------
-- Below this one line is for texmagic only
-- vim.g['tex_flavor'] = 'latex'
------------------------------
-- START texmagic, texlab
------------------------------
-- Below this one line is for texmagic only
-- vim.g['tex_flavor'] = 'latex'
require('lspconfig').texlab.setup{
cmd = {"texlab"},
filetypes = {"tex", "plaintex", "bib"},
single_file_support = true,
settings = {
-- https://github.com/latex-lsp/texlab/wiki/Configuration
texlab = {
----------------------------------
-- START for texmagic only
----------------------------------
--
-- build = _G.TeXMagicBuildConfig,
--
----------------------------------
-- END for texmagic only
----------------------------------
require('lspconfig').texlab.setup{
cmd = {"texlab"},
filetypes = {"tex", "plaintex", "bib"},
single_file_support = true,
settings = {
-- https://github.com/latex-lsp/texlab/wiki/Configuration
texlab = {
----------------------------------
-- START for texmagic only
----------------------------------
--
-- build = _G.TeXMagicBuildConfig,
--
----------------------------------
-- END for texmagic only
----------------------------------
--------------------------------
-- START texlab main config
-- if used with texmagic, disable this
--------------------------------
auxDirectory = "tex_aux_output",
rootDirectory = nil,
build = {
-- forwardSearchAfter = true,
executable = "latexmk",
args = {
"-xelatex",
"-verbose",
-- "-outdir=%f_output",
-- "-auxdir=%f_aux",
"-outdir=tex_aux_output",
"-file-line-error",
"-synctex=1",
"-interaction=nonstopmode",
"-pv",
"%f",
},
isContinuous = false,
-- "onSave = true" failed to work properly with large files like moderncv
-- it would not build properly until you delete all the intermediate files
-- onSave = true
},
--------------------------------
-- END texlab main config
-- if used with texmagic, disable this
--------------------------------
--https://github.com/latex-lsp/texlab/wiki/Previewing
-- https://github.com/f3fora/nvim-texlabconfig
forwardSearch = {
executable = "zathura",
args = {
-- This is for moving lines in nvim
'--synctex-editor-command',
-- I don't know why but after switching to lazy.vim, need %%% to escape the % character, so "pgrep zathura -a" can see the % sign
[[nvim-texlabconfig -file '%%%{input}' -line %%%{line} -server ]] .. vim.v.servername,
'--synctex-forward',
'%l:1:%f',
'%p',
},
},
diagnosticsDelay = 300,
}
}
}
-- compile laTeX keymap
vim.keymap.set('n', '<leader>l', ':TexlabBuild<CR>' )
-- forwardSearch
vim.keymap.set('n', '<leader>k', ':TexlabForward<CR>' )
-- if lsp failed to start, start manually
vim.keymap.set('n', '<leader>j', ':LspStart<CR>' )
------------------------------
-- END texmagic, texlab
------------------------------
'';
--------------------------------
-- START texlab main config
-- if used with texmagic, disable this
--------------------------------
auxDirectory = "tex_aux_output",
rootDirectory = nil,
build = {
-- forwardSearchAfter = true,
executable = "latexmk",
args = {
"-xelatex",
"-verbose",
-- "-outdir=%f_output",
-- "-auxdir=%f_aux",
"-outdir=tex_aux_output",
"-file-line-error",
"-synctex=1",
"-interaction=nonstopmode",
"-pv",
"%f",
},
isContinuous = false,
-- "onSave = true" failed to work properly with large files like moderncv
-- it would not build properly until you delete all the intermediate files
-- onSave = true
},
--------------------------------
-- END texlab main config
-- if used with texmagic, disable this
--------------------------------
--https://github.com/latex-lsp/texlab/wiki/Previewing
-- https://github.com/f3fora/nvim-texlabconfig
forwardSearch = {
executable = "zathura",
args = {
-- This is for moving lines in nvim
'--synctex-editor-command',
-- I don't know why but after switching to lazy.vim, need %%% to escape the % character, so "pgrep zathura -a" can see the % sign
[[nvim-texlabconfig -file '%%%{input}' -line %%%{line} -server ]] .. vim.v.servername,
'--synctex-forward',
'%l:1:%f',
'%p',
},
},
diagnosticsDelay = 300,
}
}
}
-- compile laTeX keymap
vim.keymap.set('n', '<leader>l', ':TexlabBuild<CR>' )
-- forwardSearch
vim.keymap.set('n', '<leader>k', ':TexlabForward<CR>' )
-- if lsp failed to start, start manually
vim.keymap.set('n', '<leader>j', ':LspStart<CR>' )
------------------------------
-- END texmagic, texlab
------------------------------
'';
}

View file

@ -1,7 +1,7 @@
{
plugins = {
lualine = {
enable = true;
};
};
plugins = {
lualine = {
enable = true;
};
};
}

View file

@ -1,86 +1,82 @@
# vim: ts=4:sts=0:sw=0:noet
{ pkgs, pkgs-stable, ... }:
{
pkgs
, pkgs-stable
, ... }:
{
plugins = {
neorg = {
enable = true;
# package = pkgs-stable.vimPlugins.neorg;
package = pkgs.vimPlugins.neorg;
modules = {
"core.defaults" = {}; # -- Loads default behaviour
"core.summary" = {};
"core.export" = {};
"core.export.markdown" = {};
"core.concealer" = {
config = {
folds = false;
};
}; #-- Adds pretty icons to your documents
"core.dirman" = {
config = {
workspaces = {
n = "~/neorg/notes";
e = "~/neorg/english";
l = "~/neorg/letter";
g = "~/neorg/grammar";
p = "~/neorg/perl";
m = "~/neorg/misc";
# nvim = "~/.config/nvim/NeorgNvimNotes";
};
default_workspace = "m";
};
};
"core.keybinds" = {
config = {
default_keybinds = true;
hook.__raw = ''
function(keybinds)
keybinds.unmap("norg", "i", "<M-CR>")
keybinds.remap_event("norg", "i", "<S-CR>", "core.itero.next-iteration", "<CR>")
end
'';
};
};
};
};
};
extraConfigLua = ''
----------------------------------------------------
-- START Neorg config
----------------------------------------------------
-- vim.api.nvim_create_autocmd({'BufEnter', 'BufWinEnter'}, {
-- pattern = '*.norg',
vim.api.nvim_create_autocmd('FileType', {
pattern = 'norg',
callback = function()
vim.opt.formatoptions:remove('r')
vim.opt.formatoptions:remove('o')
-- https://github.com/nvim-neorg/neorg/discussions/1066
vim.opt.conceallevel = 2
vim.keymap.set( 'n', '<leader>Nt', function()
if vim.opt.conceallevel:get() == 2 then
vim.opt.conceallevel = 0
elseif vim.opt.conceallevel:get() == 0 then
vim.opt.conceallevel = 2
end
vim.cmd('Neorg toggle-concealer')
end, { desc = 'Neorg toggle-concealer and conceallevel' })
-- use this insteand: ['core.concealer'] = { config = { folds = false }, },
-- vim.opt.foldlevelstart = 99
vim.keymap.set( 'n', '<leader>Ng', function() vim.cmd.Neorg('generate-workspace-summary') end, { desc = 'generate-workspace-summary' })
vim.keymap.set( 'n', '<leader>NT', function() vim.cmd.Neorg('toc') end, { desc = 'Table of Content' })
end,
})
vim.keymap.set( 'n', '<leader>Nw', function() vim.api.nvim_feedkeys(':Neorg workspace ', 'n', true) end, { desc = 'Neorg workspace <fill>' })
vim.keymap.set( 'n', '<leader>Ni', function() vim.cmd('Neorg index') end, { desc = 'Neorg index' })
vim.keymap.set( 'n', '<leader>Nr', function() vim.cmd('Neorg return') end, { desc = 'Neorg return' })
vim.keymap.set( 'n', '<leader>Ne', function() vim.cmd('Neorg workspace e') end, { desc = 'Neorg workspace e (neorg-english)' })
----------------------------------------------------
-- END Neorg config
----------------------------------------------------
'';
plugins = {
neorg = {
enable = true;
# package = pkgs-stable.vimPlugins.neorg;
package = pkgs.vimPlugins.neorg;
modules = {
"core.defaults" = { }; # -- Loads default behaviour
"core.summary" = { };
"core.export" = { };
"core.export.markdown" = { };
"core.concealer" = {
config = {
folds = false;
};
}; # -- Adds pretty icons to your documents
"core.dirman" = {
config = {
workspaces = {
n = "~/neorg/notes";
e = "~/neorg/english";
l = "~/neorg/letter";
g = "~/neorg/grammar";
p = "~/neorg/perl";
m = "~/neorg/misc";
# nvim = "~/.config/nvim/NeorgNvimNotes";
};
default_workspace = "m";
};
};
"core.keybinds" = {
config = {
default_keybinds = true;
hook.__raw = ''
function(keybinds)
keybinds.unmap("norg", "i", "<M-CR>")
keybinds.remap_event("norg", "i", "<S-CR>", "core.itero.next-iteration", "<CR>")
end
'';
};
};
};
};
};
extraConfigLua = ''
----------------------------------------------------
-- START Neorg config
----------------------------------------------------
-- vim.api.nvim_create_autocmd({'BufEnter', 'BufWinEnter'}, {
-- pattern = '*.norg',
vim.api.nvim_create_autocmd('FileType', {
pattern = 'norg',
callback = function()
vim.opt.formatoptions:remove('r')
vim.opt.formatoptions:remove('o')
-- https://github.com/nvim-neorg/neorg/discussions/1066
vim.opt.conceallevel = 2
vim.keymap.set( 'n', '<leader>Nt', function()
if vim.opt.conceallevel:get() == 2 then
vim.opt.conceallevel = 0
elseif vim.opt.conceallevel:get() == 0 then
vim.opt.conceallevel = 2
end
vim.cmd('Neorg toggle-concealer')
end, { desc = 'Neorg toggle-concealer and conceallevel' })
-- use this insteand: ['core.concealer'] = { config = { folds = false }, },
-- vim.opt.foldlevelstart = 99
vim.keymap.set( 'n', '<leader>Ng', function() vim.cmd.Neorg('generate-workspace-summary') end, { desc = 'generate-workspace-summary' })
vim.keymap.set( 'n', '<leader>NT', function() vim.cmd.Neorg('toc') end, { desc = 'Table of Content' })
end,
})
vim.keymap.set( 'n', '<leader>Nw', function() vim.api.nvim_feedkeys(':Neorg workspace ', 'n', true) end, { desc = 'Neorg workspace <fill>' })
vim.keymap.set( 'n', '<leader>Ni', function() vim.cmd('Neorg index') end, { desc = 'Neorg index' })
vim.keymap.set( 'n', '<leader>Nr', function() vim.cmd('Neorg return') end, { desc = 'Neorg return' })
vim.keymap.set( 'n', '<leader>Ne', function() vim.cmd('Neorg workspace e') end, { desc = 'Neorg workspace e (neorg-english)' })
----------------------------------------------------
-- END Neorg config
----------------------------------------------------
'';
}

View file

@ -1,7 +1,7 @@
{
plugins = {
nvim-tree = {
enable = true;
};
};
plugins = {
nvim-tree = {
enable = true;
};
};
}

View file

@ -1,7 +1,7 @@
{
plugins = {
sleuth = {
enable = true;
};
};
plugins = {
sleuth = {
enable = true;
};
};
}

View file

@ -1,190 +1,190 @@
{
plugins.telescope = {
enable = true;
extensions = {
fzf-native = {
enable = true;
};
# project-nvim = {
# enable = true;
# };
# ui-select = {
# settings = {
# specific_opts = {
# codeactions = true;
# };
# };
# };
undo = {
enable = true;
mappings = {
i = {
"<cr>" = "yank_additions";
"<s-cr>" = "yank_deletions";
"<c-cr>" = "restore";
};
n = {
"y" = "yank_additions";
"Y" = "yank_deletions";
"u" = "restore";
};
};
};
plugins.telescope = {
enable = true;
extensions = {
fzf-native = {
enable = true;
};
# If you'd prefer Telescope not to enter a normal-like mode when hitting escape (and instead exiting), you can map <Esc> to do so via:
defaults = {
# project-nvim = {
# enable = true;
# };
# ui-select = {
# settings = {
# specific_opts = {
# codeactions = true;
# };
# };
# };
undo = {
enable = true;
mappings = {
i = {
"<esc>" = {
__raw = ''
function(...)
return require("telescope.actions").close(...)
end'';
};
"<cr>" = "yank_additions";
"<s-cr>" = "yank_deletions";
"<c-cr>" = "restore";
};
n = {
"y" = "yank_additions";
"Y" = "yank_deletions";
"u" = "restore";
};
};
};
keymaps = {
"<leader><space>" = {
action = "find_files, {}";
desc = "Find project files";
};
"<leader>/" = {
action = "live_grep";
desc = "Grep (root dir)";
};
"<leader>:" = {
action = "command_history, {}";
desc = "Command History";
};
"<leader>b" = {
action = "buffers, {}";
desc = "+buffer";
};
"<leader>ff" = {
action = "find_files, {}";
desc = "Find project files";
};
"<leader>fr" = {
action = "oldfiles, {}";
desc = "Recent";
};
"<leader>fb" = {
action = "buffers, {}";
desc = "Buffers";
};
"<C-p>" = {
action = "git_files, {}";
desc = "Search git files";
};
"<leader>gc" = {
action = "git_commits, {}";
desc = "Commits";
};
"<leader>gs" = {
action = "git_status, {}";
desc = "Status";
};
"<leader>sa" = {
action = "autocommands, {}";
desc = "Auto Commands";
};
"<leader>sb" = {
action = "current_buffer_fuzzy_find, {}";
desc = "Buffer";
};
"<leader>sc" = {
action = "command_history, {}";
desc = "Command History";
};
"<leader>sC" = {
action = "commands, {}";
desc = "Commands";
};
"<leader>sD" = {
action = "diagnostics, {}";
desc = "Workspace diagnostics";
};
"<leader>sh" = {
action = "help_tags, {}";
desc = "Help pages";
};
"<leader>sH" = {
action = "highlights, {}";
desc = "Search Highlight Groups";
};
"<leader>sk" = {
action = "keymaps, {}";
desc = "Keymaps";
};
"<leader>sM" = {
action = "man_pages, {}";
desc = "Man pages";
};
"<leader>sm" = {
action = "marks, {}";
desc = "Jump to Mark";
};
"<leader>so" = {
action = "vim_options, {}";
desc = "Options";
};
"<leader>sR" = {
action = "resume, {}";
desc = "Resume";
};
"<leader>uC" = {
action = "colorscheme, {}";
desc = "Colorscheme preview";
};
};
};
keymaps = [
{
mode = "n";
key = "<leader>fp";
action = "<cmd>Telescope projects<CR>";
options = {
desc = "Projects";
# If you'd prefer Telescope not to enter a normal-like mode when hitting escape (and instead exiting), you can map <Esc> to do so via:
defaults = {
mappings = {
i = {
"<esc>" = {
__raw = ''
function(...)
return require("telescope.actions").close(...)
end'';
};
};
}
};
};
keymaps = {
"<leader><space>" = {
action = "find_files, {}";
desc = "Find project files";
};
"<leader>/" = {
action = "live_grep";
desc = "Grep (root dir)";
};
"<leader>:" = {
action = "command_history, {}";
desc = "Command History";
};
"<leader>b" = {
action = "buffers, {}";
desc = "+buffer";
};
"<leader>ff" = {
action = "find_files, {}";
desc = "Find project files";
};
"<leader>fr" = {
action = "oldfiles, {}";
desc = "Recent";
};
"<leader>fb" = {
action = "buffers, {}";
desc = "Buffers";
};
"<C-p>" = {
action = "git_files, {}";
desc = "Search git files";
};
"<leader>gc" = {
action = "git_commits, {}";
desc = "Commits";
};
"<leader>gs" = {
action = "git_status, {}";
desc = "Status";
};
"<leader>sa" = {
action = "autocommands, {}";
desc = "Auto Commands";
};
"<leader>sb" = {
action = "current_buffer_fuzzy_find, {}";
desc = "Buffer";
};
"<leader>sc" = {
action = "command_history, {}";
desc = "Command History";
};
"<leader>sC" = {
action = "commands, {}";
desc = "Commands";
};
"<leader>sD" = {
action = "diagnostics, {}";
desc = "Workspace diagnostics";
};
"<leader>sh" = {
action = "help_tags, {}";
desc = "Help pages";
};
"<leader>sH" = {
action = "highlights, {}";
desc = "Search Highlight Groups";
};
"<leader>sk" = {
action = "keymaps, {}";
desc = "Keymaps";
};
"<leader>sM" = {
action = "man_pages, {}";
desc = "Man pages";
};
"<leader>sm" = {
action = "marks, {}";
desc = "Jump to Mark";
};
"<leader>so" = {
action = "vim_options, {}";
desc = "Options";
};
"<leader>sR" = {
action = "resume, {}";
desc = "Resume";
};
"<leader>uC" = {
action = "colorscheme, {}";
desc = "Colorscheme preview";
};
};
};
keymaps = [
{
mode = "n";
key = "<leader>fp";
action = "<cmd>Telescope projects<CR>";
options = {
desc = "Projects";
};
}
{
mode = "n";
key = "<leader>sd";
action = "<cmd>Telescope diagnostics bufnr=0<cr>";
options = {
desc = "Document diagnostics";
};
}
{
mode = "n";
key = "<leader>sd";
action = "<cmd>Telescope diagnostics bufnr=0<cr>";
options = {
desc = "Document diagnostics";
};
}
{
mode = "n";
key = "<leader>st";
action = "<cmd>TodoTelescope<cr>";
options = {
silent = true;
desc = "Todo (Telescope)";
};
}
{
mode = "n";
key = "<leader>st";
action = "<cmd>TodoTelescope<cr>";
options = {
silent = true;
desc = "Todo (Telescope)";
};
}
# {
# mode = "n";
# key = "<leader>,";
# action = "<cmd>Telescope buffers sort_mru=true sort_lastused=true<cr>";
# options = {
# desc = "Switch Buffer";
# };
# }
];
extraConfigLua = ''
local telescope = require('telescope')
telescope.setup{
pickers = {
colorscheme = {
enable_preview = true
}
# {
# mode = "n";
# key = "<leader>,";
# action = "<cmd>Telescope buffers sort_mru=true sort_lastused=true<cr>";
# options = {
# desc = "Switch Buffer";
# };
# }
];
extraConfigLua = ''
local telescope = require('telescope')
telescope.setup{
pickers = {
colorscheme = {
enable_preview = true
}
}
'';
}
}
'';
}

View file

@ -1,16 +1,16 @@
{
plugins = {
treesitter = {
enable = true;
incrementalSelection = {
enable = true;
keymaps = {
initSelection = "g<space><space>";
nodeIncremental = "g<space><space>";
scopeIncremental = "<c-s>";
nodeDecremental = "g<space>m";
};
};
};
};
plugins = {
treesitter = {
enable = true;
incrementalSelection = {
enable = true;
keymaps = {
initSelection = "g<space><space>";
nodeIncremental = "g<space><space>";
scopeIncremental = "<c-s>";
nodeDecremental = "g<space>m";
};
};
};
};
}

View file

@ -1,7 +1,7 @@
{
plugins = {
which-key = {
enable = true;
};
};
plugins = {
which-key = {
enable = true;
};
};
}

View file

@ -1,73 +1,71 @@
# The line beneath this is called `modeline`. See `:help modeline`
# vim: ts=4:sts=0:sw=0:noet
{
config = {
globals = {
mapleader = " ";
maplocalleader = " ";
};
options = {
relativenumber = true;
splitbelow = true;
redrawtime = 5000;
# new split to the right
splitright = true;
# show hidden characters
list = true;
# don't break words on the edge
linebreak = true;
wrap = true;
# length of an actual \t character:
# https://stackoverflow.com/questions/191201/indenting-comments-to-match-code-in-vim
smartindent = false;
# length to use when shifting text (eg. <<, >> and == commands)
tabstop=4;
shiftwidth = 0;
expandtab = false;
autoindent = true;
# Set highlight on search
hlsearch = false;
# Make line numbers default
number = true;
# Enable mouse mode
mouse = "a";
# Sync clipboard between OS and Neovim.
# Remove this option if you want your OS clipboard to remain independent.
# See `:help 'clipboard'`
# vim.o.clipboard = 'unnamedplus' -- REMOVED BY ME
# Enable break indent
breakindent = true;
# Save undo history
# vim.o.undofile = true -- REMOVED BY ME
# Case insensitive searching UNLESS /C or capital in search
ignorecase = true;
smartcase = true;
# Keep signcolumn on by default
signcolumn = "yes";
# Decrease update time
updatetime = 250;
timeout = true;
# timeoutlen = 1000; # time of valid keypress like for leader key in millisecond
timeoutlen = 300; # lower to 300 in favor of which-key plugins
# Set completeopt to have a better completion experience
completeopt = "menuone,noselect";
# NOTE: You should make sure your terminal supports this
termguicolors = true;
};
};
config = {
globals = {
mapleader = " ";
maplocalleader = " ";
};
options = {
relativenumber = true;
splitbelow = true;
redrawtime = 5000;
# new split to the right
splitright = true;
# show hidden characters
list = true;
# don't break words on the edge
linebreak = true;
wrap = true;
# length of an actual \t character:
# https://stackoverflow.com/questions/191201/indenting-comments-to-match-code-in-vim
smartindent = false;
# length to use when shifting text (eg. <<, >> and == commands)
tabstop = 4;
shiftwidth = 0;
expandtab = false;
autoindent = true;
# Set highlight on search
hlsearch = false;
# Make line numbers default
number = true;
# Enable mouse mode
mouse = "a";
# Sync clipboard between OS and Neovim.
# Remove this option if you want your OS clipboard to remain independent.
# See `:help 'clipboard'`
# vim.o.clipboard = 'unnamedplus' -- REMOVED BY ME
# Enable break indent
breakindent = true;
# Save undo history
# vim.o.undofile = true -- REMOVED BY ME
# Case insensitive searching UNLESS /C or capital in search
ignorecase = true;
smartcase = true;
# Keep signcolumn on by default
signcolumn = "yes";
# Decrease update time
updatetime = 250;
timeout = true;
# timeoutlen = 1000; # time of valid keypress like for leader key in millisecond
timeoutlen = 300; # lower to 300 in favor of which-key plugins
# Set completeopt to have a better completion experience
completeopt = "menuone,noselect";
# NOTE: You should make sure your terminal supports this
termguicolors = true;
};
};
}