Compare commits
No commits in common. "4cd51917fc52ffc61cfdf9d168d83775f608d4b5" and "b2262310025026bc05481cac679ab8f7f7422f1c" have entirely different histories.
4cd51917fc
...
b226231002
10 changed files with 94 additions and 40 deletions
|
@ -66,7 +66,13 @@
|
|||
}
|
||||
];
|
||||
};
|
||||
networkmanager.enable = true;
|
||||
networkmanager = {
|
||||
enable = true;
|
||||
dns = "none";
|
||||
};
|
||||
dhcpcd.extraConfig = ''
|
||||
nohook resolv.conf
|
||||
'';
|
||||
};
|
||||
hardware.nvidia.modesetting.enable = true;
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
|
|
|
@ -106,7 +106,6 @@ in
|
|||
};
|
||||
services = {
|
||||
illum.enable = true;
|
||||
resolved.enable = true;
|
||||
gnome.gnome-keyring.enable = true;
|
||||
pipewire = {
|
||||
enable = true;
|
||||
|
|
|
@ -38,6 +38,7 @@ in
|
|||
wallpaper.enable = true;
|
||||
kitty.enable = true;
|
||||
rofi.enable = true;
|
||||
|
||||
};
|
||||
wallpapers.enable = true;
|
||||
services.dunst.enable = true;
|
||||
|
|
|
@ -50,7 +50,7 @@ let
|
|||
"dir = ${quote plugin}"
|
||||
"name = ${quote (getName plugin)}"
|
||||
]
|
||||
++ (optional (lazy != null) "lazy = ${boolToString lazy}")
|
||||
++ (optional (!lazy) "lazy = ${boolToString lazy}")
|
||||
++ (optional (!enabled) "enabled = ${boolToString enabled}")
|
||||
++ (optional (dependencies != [ ]) "dependencies = ${listToStringMultiLine id (map lazySpecFromPlugin dependencies)}")
|
||||
++ (optional (init != null) "init = function(plugin)\n${toString init}\nend")
|
||||
|
@ -59,7 +59,7 @@ let
|
|||
++ (optional (event != [ ]) "event = ${listToStringOneLine quote event}")
|
||||
++ (optional (cmd != [ ]) "cmd = ${listToStringOneLine quote cmd}")
|
||||
++ (optional (ft != [ ]) "ft = ${listToStringOneLine quote ft}")
|
||||
++ (optional (priority != null) "priority = ${toString priority}")
|
||||
++ (optional (priority != 50) "priority = ${toString priority}")
|
||||
);
|
||||
lazySpecs = listToStringMultiLine id (map lazySpecFromPlugin cfg.plugins);
|
||||
lazy = ''
|
||||
|
@ -86,7 +86,7 @@ in
|
|||
type = nullOr str;
|
||||
default = null;
|
||||
description = ''
|
||||
Lua function to be executed when the plugin is loaded.
|
||||
Lua code to be executed when the plugin is loaded.
|
||||
'';
|
||||
};
|
||||
dependencies = mkOption {
|
||||
|
@ -111,8 +111,8 @@ in
|
|||
'';
|
||||
};
|
||||
lazy = mkOption {
|
||||
type = nullOr bool;
|
||||
default = null;
|
||||
type = bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to load the plugin lazily.
|
||||
'';
|
||||
|
@ -145,8 +145,8 @@ in
|
|||
'';
|
||||
};
|
||||
priority = mkOption {
|
||||
type = nullOr int;
|
||||
default = null;
|
||||
type = int;
|
||||
default = 50;
|
||||
description = ''
|
||||
Priority to load the plugin.
|
||||
'';
|
||||
|
|
|
@ -31,6 +31,7 @@ with builtins;
|
|||
{ plugin = nvim-web-devicons; }
|
||||
];
|
||||
}
|
||||
{ plugin = nvim-ts-context-commentstring; }
|
||||
{
|
||||
plugin = mini-nvim;
|
||||
lazy = false;
|
||||
|
@ -179,7 +180,6 @@ with builtins;
|
|||
{
|
||||
plugin = telescope-nvim;
|
||||
cmd = [ "Telescope" ];
|
||||
conf = builtins.readFile ./telescope.lua;
|
||||
keys = [
|
||||
{ key = "<leader>ff"; cmd = "<cmd>Telescope find_files<cr>"; desc = "Find files"; }
|
||||
{ key = "<leader>fb"; cmd = "<cmd>Telescope buffers<cr>"; desc = "Find buffers"; }
|
||||
|
@ -199,7 +199,13 @@ with builtins;
|
|||
dependencies = [
|
||||
{ plugin = plenary-nvim; }
|
||||
{ plugin = which-key-nvim; }
|
||||
{ plugin = telescope-fzf-native-nvim; }
|
||||
];
|
||||
}
|
||||
{
|
||||
plugin = telescope-fzf-native-nvim;
|
||||
conf = readFile ./telescope-fzf-native-nvim.lua;
|
||||
dependencies = [
|
||||
{ plugin = telescope-nvim; }
|
||||
];
|
||||
}
|
||||
{
|
||||
|
@ -218,6 +224,25 @@ with builtins;
|
|||
require("Comment").setup()
|
||||
'';
|
||||
}
|
||||
{
|
||||
plugin = leap-nvim;
|
||||
lazy = false;
|
||||
conf = ''
|
||||
require("leap").add_default_mappings()
|
||||
'';
|
||||
}
|
||||
{
|
||||
plugin = leap-spooky-nvim;
|
||||
lazy = false;
|
||||
conf = ''
|
||||
require("leap-spooky").setup()
|
||||
'';
|
||||
dependencies = [
|
||||
{
|
||||
plugin = leap-nvim;
|
||||
}
|
||||
];
|
||||
}
|
||||
{
|
||||
plugin = telekasten-nvim;
|
||||
dependencies = [
|
||||
|
@ -236,7 +261,7 @@ with builtins;
|
|||
}
|
||||
{
|
||||
plugin = coq_nvim;
|
||||
event = [ "BufReadPost" "BufNewFile" ];
|
||||
lazy = false;
|
||||
init = builtins.readFile ./coq-nvim.lua;
|
||||
dependencies = [
|
||||
{
|
||||
|
@ -254,19 +279,5 @@ with builtins;
|
|||
}
|
||||
];
|
||||
}
|
||||
{
|
||||
plugin = nvim-surround;
|
||||
event = [ "BufReadPost" "BufNewFile" ];
|
||||
conf = ''
|
||||
require("nvim-surround").setup({})
|
||||
'';
|
||||
}
|
||||
{
|
||||
plugin = nvim-treesitter-context;
|
||||
event = [ "BufReadPost" "BufNewFile" ];
|
||||
conf = ''
|
||||
require("treesitter-context").setup({})
|
||||
'';
|
||||
}
|
||||
];
|
||||
}
|
||||
|
|
|
@ -6,9 +6,6 @@ require("formatter").setup({
|
|||
log_level = vim.log.levels.WARN,
|
||||
-- All formatter configurations are opt-in
|
||||
filetype = {
|
||||
go = {
|
||||
require("formatter.filetypes.go").gofmt,
|
||||
},
|
||||
json = {
|
||||
require("formatter.filetypes.json").jq,
|
||||
},
|
||||
|
|
|
@ -3,6 +3,55 @@ require("mini.move").setup()
|
|||
require("mini.pairs").setup()
|
||||
require("mini.starter").setup()
|
||||
|
||||
require("mini.surround").setup({
|
||||
-- Add custom surroundings to be used on top of builtin ones. For more
|
||||
-- information with examples, see `:h MiniSurround.config`.
|
||||
custom_surroundings = nil,
|
||||
|
||||
-- Duration (in ms) of highlight when calling `MiniSurround.highlight()`
|
||||
highlight_duration = 500,
|
||||
|
||||
-- Module mappings. Use `''` (empty string) to disable one.
|
||||
mappings = {
|
||||
add = "gSa", -- Add surrounding in Normal and Visual modes
|
||||
delete = "gSd", -- Delete surrounding
|
||||
find = "gSf", -- Find surrounding (to the right)
|
||||
find_left = "gSF", -- Find surrounding (to the left)
|
||||
highlight = "gSh", -- Highlight surrounding
|
||||
replace = "gSr", -- Replace surrounding
|
||||
update_n_lines = "gSn", -- Update `n_lines`
|
||||
|
||||
suffix_last = "l", -- Suffix to search with "prev" method
|
||||
suffix_next = "n", -- Suffix to search with "next" method
|
||||
},
|
||||
|
||||
-- Number of lines within which surrounding is searched
|
||||
n_lines = 20,
|
||||
|
||||
-- Whether to respect selection type:
|
||||
-- - Place surroundings on separate lines in linewise mode.
|
||||
-- - Place surroundings on each line in blockwise mode.
|
||||
respect_selection_type = false,
|
||||
|
||||
-- How to search for surrounding (first inside current line, then inside
|
||||
-- neighborhood). One of 'cover', 'cover_or_next', 'cover_or_prev',
|
||||
-- 'cover_or_nearest', 'next', 'prev', 'nearest'. For more details,
|
||||
-- see `:h MiniSurround.config`.
|
||||
search_method = "cover",
|
||||
|
||||
-- Whether to disable showing non-error feedback
|
||||
silent = false,
|
||||
})
|
||||
|
||||
require("mini.tabline").setup()
|
||||
local tabline_current = vim.api.nvim_get_hl(0, { name = "MiniTablineCurrent" })
|
||||
vim.api.nvim_set_hl(0, "MiniTablineCurrent", {
|
||||
fg = tabline_current.fg,
|
||||
bg = tabline_current.bg,
|
||||
bold = true,
|
||||
italic = true,
|
||||
})
|
||||
|
||||
require("mini.statusline").setup({
|
||||
content = {
|
||||
active = function()
|
||||
|
|
|
@ -122,23 +122,13 @@ local servers = {
|
|||
"nil_ls",
|
||||
"pylsp",
|
||||
"ruff_lsp",
|
||||
"rust_analyzer",
|
||||
"typst_lsp",
|
||||
"gopls",
|
||||
}
|
||||
for _, lsp in ipairs(servers) do
|
||||
lspconfig_setup(lsp, {})
|
||||
end
|
||||
|
||||
lspconfig_setup("rust_analyzer", {
|
||||
settings = {
|
||||
["rust-analyzer"] = {
|
||||
checkOnSave = {
|
||||
command = "clippy",
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
lspconfig_setup("lua_ls", {
|
||||
settings = {
|
||||
Lua = {
|
||||
|
|
|
@ -25,4 +25,5 @@ final: prev:
|
|||
echo "$selected"
|
||||
'';
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue