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 ={ colorschemes.gruvbox = {
enable = true; enable = true;
}; };
} }

View file

@ -4,10 +4,10 @@
}; };
extraConfigLua = '' extraConfigLua = ''
---------------------------------- ----------------------------------
-- START custom setup for onedark -- START custom setup for onedark
---------------------------------- ----------------------------------
-- https://github.com/navarasu/onedark.nvim -- https://github.com/navarasu/onedark.nvim
require('onedark').setup { require('onedark').setup {
-- Main options -- -- Main options --
style = 'darker', -- Default theme style. Choose between 'dark', 'darker', 'cool', 'deep', 'warm', 'warmer' and 'light' style = 'darker', -- Default theme style. Choose between 'dark', 'darker', 'cool', 'deep', 'warm', 'warmer' and 'light'
transparent = true, -- Show/hide background transparent = true, -- Show/hide background
@ -47,13 +47,12 @@ require('onedark').setup {
undercurl = true, -- use undercurl instead of underline for diagnostics undercurl = true, -- use undercurl instead of underline for diagnostics
background = true, -- use background color for virtual text background = true, -- use background color for virtual text
}, },
} }
require('onedark').load() require('onedark').load()
---------------------------------- ----------------------------------
-- END custom setup for onedark -- END custom setup for onedark
---------------------------------- ----------------------------------
''; '';
} }

View file

@ -1,5 +1,3 @@
# 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 # Import all your configuration modules here
imports = [ imports = [

View file

@ -1,10 +1,11 @@
# The line beneath this is called `modeline`. See `:help modeline`
# vim: ts=4:sts=0:sw=0:tw=78:noet
{ {
keymaps = [ keymaps = [
{ {
# vim.keymap.set({ "n", "v" }, "\\y", '"+y', {noremap=true, silent=true}) # vim.keymap.set({ "n", "v" }, "\\y", '"+y', {noremap=true, silent=true})
mode = [ "n" "v" ]; mode = [
"n"
"v"
];
key = "\\y"; key = "\\y";
action = "\"+y"; action = "\"+y";
options = { options = {

View file

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

View file

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

View file

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

View file

@ -59,7 +59,9 @@
# }; # };
# }; # };
}; };
clangd = {enable = true;}; clangd = {
enable = true;
};
lua-ls = { lua-ls = {
enable = true; enable = true;
extraOptions = { extraOptions = {
@ -71,15 +73,24 @@
telemetry = { telemetry = {
enabled = false; enabled = false;
}; };
hint = {enable = true;}; hint = {
enable = true;
}; };
}; };
}; };
}; };
nil_ls = {enable = true;}; };
nil_ls = {
enable = true;
};
tsserver = { tsserver = {
enable = false; enable = false;
filetypes = ["javascript" "javascriptreact" "typescript" "typescriptreact"]; filetypes = [
"javascript"
"javascriptreact"
"typescript"
"typescriptreact"
];
extraOptions = { extraOptions = {
settings = { settings = {
javascript = { javascript = {
@ -107,9 +118,15 @@
}; };
}; };
}; };
eslint = {enable = true;}; eslint = {
pyright = {enable = true;}; enable = true;
ruff-lsp = {enable = true;}; };
pyright = {
enable = true;
};
ruff-lsp = {
enable = true;
};
rust-analyzer = { rust-analyzer = {
enable = true; enable = true;
@ -224,13 +241,13 @@
------------------------------ ------------------------------
-- START texmagic, texlab -- START texmagic, texlab
------------------------------ ------------------------------
-- Below this one line is for texmagic only -- Below this one line is for texmagic only
-- vim.g['tex_flavor'] = 'latex' -- vim.g['tex_flavor'] = 'latex'
require('lspconfig').texlab.setup{ require('lspconfig').texlab.setup{
cmd = {"texlab"}, cmd = {"texlab"},
filetypes = {"tex", "plaintex", "bib"}, filetypes = {"tex", "plaintex", "bib"},
single_file_support = true, single_file_support = true,
@ -294,18 +311,18 @@ require('lspconfig').texlab.setup{
diagnosticsDelay = 300, diagnosticsDelay = 300,
} }
} }
} }
-- compile laTeX keymap -- compile laTeX keymap
vim.keymap.set('n', '<leader>l', ':TexlabBuild<CR>' ) vim.keymap.set('n', '<leader>l', ':TexlabBuild<CR>' )
-- forwardSearch -- forwardSearch
vim.keymap.set('n', '<leader>k', ':TexlabForward<CR>' ) vim.keymap.set('n', '<leader>k', ':TexlabForward<CR>' )
-- if lsp failed to start, start manually -- if lsp failed to start, start manually
vim.keymap.set('n', '<leader>j', ':LspStart<CR>' ) vim.keymap.set('n', '<leader>j', ':LspStart<CR>' )
------------------------------ ------------------------------
-- END texmagic, texlab -- END texmagic, texlab
------------------------------ ------------------------------
''; '';
} }

View file

@ -1,8 +1,4 @@
# vim: ts=4:sts=0:sw=0:noet { pkgs, pkgs-stable, ... }:
{
pkgs
, pkgs-stable
, ... }:
{ {
plugins = { plugins = {
neorg = { neorg = {
@ -10,15 +6,15 @@ pkgs
# package = pkgs-stable.vimPlugins.neorg; # package = pkgs-stable.vimPlugins.neorg;
package = pkgs.vimPlugins.neorg; package = pkgs.vimPlugins.neorg;
modules = { modules = {
"core.defaults" = {}; # -- Loads default behaviour "core.defaults" = { }; # -- Loads default behaviour
"core.summary" = {}; "core.summary" = { };
"core.export" = {}; "core.export" = { };
"core.export.markdown" = {}; "core.export.markdown" = { };
"core.concealer" = { "core.concealer" = {
config = { config = {
folds = false; folds = false;
}; };
}; #-- Adds pretty icons to your documents }; # -- Adds pretty icons to your documents
"core.dirman" = { "core.dirman" = {
config = { config = {
workspaces = { workspaces = {

View file

@ -1,5 +1,3 @@
# The line beneath this is called `modeline`. See `:help modeline`
# vim: ts=4:sts=0:sw=0:noet
{ {
config = { config = {
globals = { globals = {
@ -25,7 +23,7 @@
smartindent = false; smartindent = false;
# length to use when shifting text (eg. <<, >> and == commands) # length to use when shifting text (eg. <<, >> and == commands)
tabstop=4; tabstop = 4;
shiftwidth = 0; shiftwidth = 0;
expandtab = false; expandtab = false;