update
This commit is contained in:
parent
8bb68610dd
commit
632d3111de
118
flake.lock
118
flake.lock
|
|
@ -156,7 +156,9 @@
|
|||
},
|
||||
"home-manager_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1703113038,
|
||||
|
|
@ -176,7 +178,7 @@
|
|||
"hyprland": {
|
||||
"inputs": {
|
||||
"hyprland-protocols": "hyprland-protocols",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"systems": "systems_2",
|
||||
"wlroots": "wlroots",
|
||||
"xdph": "xdph"
|
||||
|
|
@ -197,7 +199,7 @@
|
|||
},
|
||||
"hyprland-contrib": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1702242899,
|
||||
|
|
@ -240,7 +242,7 @@
|
|||
},
|
||||
"hyprpicker": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1698684516,
|
||||
|
|
@ -256,26 +258,11 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"mygui-git": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1691358308,
|
||||
"narHash": "sha256-qif9trHgtWpYiDVXY3cjRsXypjjjgStX8tSWCnXhXlk=",
|
||||
"owner": "mygui",
|
||||
"repo": "MyGUI",
|
||||
"rev": "dae9ac4be5a09e672bec509b1a8552b107c40214",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "mygui",
|
||||
"repo": "MyGUI",
|
||||
"rev": "dae9ac4be5a09e672bec509b1a8552b107c40214",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-index-database": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1702864432,
|
||||
|
|
@ -293,11 +280,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1693471703,
|
||||
"narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=",
|
||||
"lastModified": 1703013332,
|
||||
"narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85",
|
||||
"rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -338,11 +325,11 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1701718080,
|
||||
"narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=",
|
||||
"lastModified": 1703013332,
|
||||
"narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335",
|
||||
"rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -353,22 +340,6 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1702312524,
|
||||
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a9bf124c46ef298113270b1f84a164865987a91c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1658161305,
|
||||
"narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=",
|
||||
|
|
@ -384,7 +355,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1683014792,
|
||||
"narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=",
|
||||
|
|
@ -400,23 +371,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1702312524,
|
||||
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a9bf124c46ef298113270b1f84a164865987a91c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1703068421,
|
||||
"narHash": "sha256-WSw5Faqlw75McIflnl5v7qVD/B3S2sLh+968bpOGrWA=",
|
||||
|
|
@ -431,38 +386,6 @@
|
|||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nvim-hmts": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1693226725,
|
||||
"narHash": "sha256-jUuztOqNBltC3axa7s3CPJz9Cmukfwkf846+Z/gAxCU=",
|
||||
"owner": "calops",
|
||||
"repo": "hmts.nvim",
|
||||
"rev": "14fd941d7ec2bb98314a1aacaa2573d97f1629ab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "calops",
|
||||
"repo": "hmts.nvim",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"openmw-git": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1703142516,
|
||||
"narHash": "sha256-t/pB/MpTZZ/7BJY2pw21UgW2+MWd8OKFpqaKPoITtyA=",
|
||||
"owner": "OpenMW",
|
||||
"repo": "openmw",
|
||||
"rev": "51cb3b08cb194decd92132b81f7776f2779afa57",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"owner": "OpenMW",
|
||||
"repo": "openmw",
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"ags": "ags",
|
||||
|
|
@ -475,12 +398,9 @@
|
|||
"hyprland": "hyprland",
|
||||
"hyprland-contrib": "hyprland-contrib",
|
||||
"hyprpicker": "hyprpicker",
|
||||
"mygui-git": "mygui-git",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"nvim-hmts": "nvim-hmts",
|
||||
"openmw-git": "openmw-git"
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
|
|
|
|||
46
flake.nix
46
flake.nix
|
|
@ -3,51 +3,33 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs.url = "nixpkgs/nixos-23.11";
|
||||
home-manager.url = "github:nix-community/home-manager/release-23.11";
|
||||
nixpkgs-unstable.url = "nixpkgs/nixpkgs-unstable";
|
||||
|
||||
home-manager.url = "github:nix-community/home-manager/release-23.11";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
chaotic-nyx.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
|
||||
|
||||
nix-index-database.url = "github:Mic92/nix-index-database";
|
||||
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
hyprland.url = "github:hyprwm/hyprland";
|
||||
hyprland-contrib.url = "github:hyprwm/contrib";
|
||||
hyprpicker.url = "github:hyprwm/hyprpicker";
|
||||
|
||||
ags.url = "github:Aylur/ags";
|
||||
|
||||
gruvbox-kvantum = {
|
||||
url = "github:thefallnn/Gruvbox-Kvantum";
|
||||
flake = false;
|
||||
};
|
||||
gruvbox-kvantum.url = "github:thefallnn/Gruvbox-Kvantum";
|
||||
gruvbox-kvantum.flake = false;
|
||||
|
||||
fish-plugin-bobthefish = {
|
||||
url = "github:oh-my-fish/theme-bobthefish";
|
||||
flake = false;
|
||||
};
|
||||
fish-plugin-bobthefish.url = "github:oh-my-fish/theme-bobthefish";
|
||||
fish-plugin-bobthefish.flake = false;
|
||||
|
||||
fish-plugin-gruvbox-theme = {
|
||||
url = "github:Jomik/fish-gruvbox";
|
||||
flake = false;
|
||||
};
|
||||
fish-plugin-gruvbox-theme.url = "github:Jomik/fish-gruvbox";
|
||||
fish-plugin-gruvbox-theme.flake = false;
|
||||
|
||||
nvim-hmts = {
|
||||
url = "github:calops/hmts.nvim";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
gruvbox-plus-icon-pack = {
|
||||
url = "github:SylEleuth/gruvbox-plus-icon-pack";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
openmw-git = {
|
||||
url = "gitlab:OpenMW/openmw";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
mygui-git = {
|
||||
url = "github:mygui/MyGUI/dae9ac4be5a09e672bec509b1a8552b107c40214";
|
||||
flake = false;
|
||||
};
|
||||
gruvbox-plus-icon-pack.url = "github:SylEleuth/gruvbox-plus-icon-pack";
|
||||
gruvbox-plus-icon-pack.flake = false;
|
||||
};
|
||||
|
||||
outputs = {
|
||||
|
|
|
|||
22
overlay.nix
22
overlay.nix
|
|
@ -10,22 +10,6 @@
|
|||
fonts = ["JetBrainsMono"];
|
||||
};
|
||||
|
||||
# mygui = prev.mygui.overrideAttrs (old: {
|
||||
# version = "3.4.3";
|
||||
# src = inputs.mygui-git;
|
||||
# patches = [];
|
||||
# });
|
||||
#
|
||||
# openmw = prev.openmw.overrideAttrs (old: {
|
||||
# version = "9999";
|
||||
# src = inputs.openmw-git;
|
||||
#
|
||||
# buildInputs = old.buildInputs ++ [prev.libyamlcpp prev.luajit prev.collada-dom];
|
||||
#
|
||||
# patches = [];
|
||||
# dontWrapQtApps = false;
|
||||
# });
|
||||
|
||||
kitty = prev.kitty.overrideAttrs (old: {
|
||||
patches = [./pkgs/kitty/0011-fix-test_fish_integration.patch];
|
||||
});
|
||||
|
|
@ -42,11 +26,5 @@
|
|||
prev.mpg123
|
||||
];
|
||||
};
|
||||
|
||||
nvim-hmts = prev.vimUtils.buildVimPlugin {
|
||||
pname = "nvim-hmts";
|
||||
version = "1";
|
||||
src = inputs.nvim-hmts;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
require("bufferline").setup({
|
||||
options = {
|
||||
show_tab_indicators = true,
|
||||
-- separator_style = { "", "" },
|
||||
indicator = { style = "icon", icon = "" },
|
||||
color_icons = true,
|
||||
offsets = {
|
||||
{
|
||||
filetype = "neo-tree",
|
||||
text = "File Explorer",
|
||||
text_align = "center",
|
||||
separator = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
options = {
|
||||
show_tab_indicators = true,
|
||||
-- separator_style = { "", "" },
|
||||
indicator = { style = "icon", icon = "" },
|
||||
color_icons = true,
|
||||
offsets = {
|
||||
{
|
||||
filetype = "neo-tree",
|
||||
text = "File Explorer",
|
||||
text_align = "center",
|
||||
separator = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
|
|
|||
|
|
@ -6,116 +6,112 @@ local luasnip = require("luasnip")
|
|||
require("luasnip.loaders.from_vscode").lazy_load()
|
||||
|
||||
local has_words_before = function()
|
||||
unpack = unpack or table.unpack
|
||||
local line, col = unpack(vim.api.nvim_win_get_cursor(0))
|
||||
return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
|
||||
unpack = unpack or table.unpack
|
||||
local line, col = unpack(vim.api.nvim_win_get_cursor(0))
|
||||
return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
|
||||
end
|
||||
|
||||
|
||||
cmp.setup({
|
||||
preselect = cmp.PreselectMode.None,
|
||||
formatting = {
|
||||
format = lspkind.cmp_format({
|
||||
mode = "symbol_text",
|
||||
preselect = cmp.PreselectMode.None,
|
||||
formatting = {
|
||||
format = lspkind.cmp_format({
|
||||
mode = "symbol_text",
|
||||
|
||||
symbol_map = {
|
||||
Text = "",
|
||||
Method = "",
|
||||
Function = "",
|
||||
Constructor = "",
|
||||
Field = "",
|
||||
Variable = "",
|
||||
Class = "",
|
||||
Interface = "",
|
||||
Module = "",
|
||||
Property = "",
|
||||
Unit = "",
|
||||
Value = "",
|
||||
Enum = "",
|
||||
Keyword = "",
|
||||
Snippet = "",
|
||||
Color = "",
|
||||
File = "",
|
||||
Reference = "",
|
||||
Folder = "",
|
||||
EnumMember = "",
|
||||
Constant = "",
|
||||
Struct = "",
|
||||
Event = "",
|
||||
Operator = "",
|
||||
TypeParameter = ""
|
||||
},
|
||||
}),
|
||||
},
|
||||
symbol_map = {
|
||||
Text = "",
|
||||
Method = "",
|
||||
Function = "",
|
||||
Constructor = "",
|
||||
Field = "",
|
||||
Variable = "",
|
||||
Class = "",
|
||||
Interface = "",
|
||||
Module = "",
|
||||
Property = "",
|
||||
Unit = "",
|
||||
Value = "",
|
||||
Enum = "",
|
||||
Keyword = "",
|
||||
Snippet = "",
|
||||
Color = "",
|
||||
File = "",
|
||||
Reference = "",
|
||||
Folder = "",
|
||||
EnumMember = "",
|
||||
Constant = "",
|
||||
Struct = "",
|
||||
Event = "",
|
||||
Operator = "",
|
||||
TypeParameter = "",
|
||||
},
|
||||
}),
|
||||
},
|
||||
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
require('luasnip').lsp_expand(args.body)
|
||||
end,
|
||||
},
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
require("luasnip").lsp_expand(args.body)
|
||||
end,
|
||||
},
|
||||
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
|
||||
sources = cmp.config.sources({
|
||||
{ name = "buffer" },
|
||||
{ name = "path" },
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "luasnip" },
|
||||
}),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "buffer" },
|
||||
{ name = "path" },
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "luasnip" },
|
||||
}),
|
||||
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
['<C-b>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-f>'] = cmp.mapping.scroll_docs(4),
|
||||
['<C-Space>'] = cmp.mapping.complete(),
|
||||
['<C-e>'] = cmp.mapping.abort(),
|
||||
['<CR>'] = cmp.mapping.confirm({ select = false }),
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
["<C-b>"] = cmp.mapping.scroll_docs(-4),
|
||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
["<C-e>"] = cmp.mapping.abort(),
|
||||
["<CR>"] = cmp.mapping.confirm({ select = false }),
|
||||
|
||||
["<Tab>"] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_next_item()
|
||||
-- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
|
||||
-- they way you will only jump inside the snippet region
|
||||
elseif luasnip.expand_or_locally_jumpable() then
|
||||
luasnip.expand_or_jump()
|
||||
elseif has_words_before() then
|
||||
cmp.complete()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { "i", "s" }),
|
||||
["<Tab>"] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_next_item()
|
||||
-- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
|
||||
-- they way you will only jump inside the snippet region
|
||||
elseif luasnip.expand_or_locally_jumpable() then
|
||||
luasnip.expand_or_jump()
|
||||
elseif has_words_before() then
|
||||
cmp.complete()
|
||||
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" }),
|
||||
}),
|
||||
["<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" }),
|
||||
}),
|
||||
})
|
||||
|
||||
local cmp_autopairs = require('nvim-autopairs.completion.cmp')
|
||||
cmp.event:on(
|
||||
'confirm_done',
|
||||
cmp_autopairs.on_confirm_done()
|
||||
)
|
||||
local cmp_autopairs = require("nvim-autopairs.completion.cmp")
|
||||
cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done())
|
||||
|
||||
cmp.setup.cmdline(":", {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "path" },
|
||||
{ name = "cmdline" },
|
||||
})
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "path" },
|
||||
{ name = "cmdline" },
|
||||
}),
|
||||
})
|
||||
|
||||
cmp.setup.cmdline("/", {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "buffer" },
|
||||
})
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "buffer" },
|
||||
}),
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
require("gruvbox").setup({
|
||||
transparent_mode = true
|
||||
transparent_mode = true,
|
||||
})
|
||||
vim.cmd("colorscheme gruvbox")
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
vim.opt.list = true
|
||||
vim.opt.listchars:append "eol:↴"
|
||||
vim.opt.listchars:append("eol:↴")
|
||||
|
||||
require("ibl").setup {
|
||||
}
|
||||
require("ibl").setup({})
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
||||
capabilities.textDocument.completion.completionItem.snippetSupport = true
|
||||
capabilities.textDocument.foldingRange = {
|
||||
dynamicRegistration = false,
|
||||
lineFoldingOnly = true,
|
||||
dynamicRegistration = false,
|
||||
lineFoldingOnly = true,
|
||||
}
|
||||
|
||||
local lspconfig = require("lspconfig")
|
||||
|
|
@ -10,42 +10,41 @@ local lspconfig = require("lspconfig")
|
|||
local null_ls = require("null-ls")
|
||||
local null_ls_formatting = null_ls.builtins.formatting
|
||||
|
||||
|
||||
null_ls.setup({
|
||||
sources = {
|
||||
null_ls_formatting.prettier,
|
||||
null_ls_formatting.nixpkgs_fmt,
|
||||
},
|
||||
sources = {
|
||||
null_ls_formatting.prettier,
|
||||
null_ls_formatting.nixpkgs_fmt,
|
||||
},
|
||||
})
|
||||
|
||||
lspconfig.nixd.setup { capabilities = capabilities }
|
||||
lspconfig.nixd.setup({ capabilities = capabilities })
|
||||
|
||||
lspconfig.lua_ls.setup {
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
Lua = {
|
||||
runtime = { version = "LuaJIT" },
|
||||
diagnostics = { globals = { "vim" } },
|
||||
workspace = {
|
||||
library = vim.api.nvim_get_runtime_file("", true),
|
||||
checkThirdParty = false
|
||||
},
|
||||
telemetry = { enable = false },
|
||||
},
|
||||
},
|
||||
}
|
||||
lspconfig.lua_ls.setup({
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
Lua = {
|
||||
runtime = { version = "LuaJIT" },
|
||||
diagnostics = { globals = { "vim" } },
|
||||
workspace = {
|
||||
library = vim.api.nvim_get_runtime_file("", true),
|
||||
checkThirdParty = false,
|
||||
},
|
||||
telemetry = { enable = false },
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
lspconfig.clangd.setup { capabilities = capabilities }
|
||||
lspconfig.rust_analyzer.setup { capabilities = capabilities }
|
||||
lspconfig.zls.setup { capabilities = capabilities }
|
||||
lspconfig.jedi_language_server.setup { capabilities = capabilities }
|
||||
lspconfig.bashls.setup { capabilities = capabilities }
|
||||
lspconfig.tsserver.setup { capabilities = capabilities }
|
||||
lspconfig.clangd.setup({ capabilities = capabilities })
|
||||
lspconfig.rust_analyzer.setup({ capabilities = capabilities })
|
||||
lspconfig.zls.setup({ capabilities = capabilities })
|
||||
lspconfig.jedi_language_server.setup({ capabilities = capabilities })
|
||||
lspconfig.bashls.setup({ capabilities = capabilities })
|
||||
lspconfig.tsserver.setup({ capabilities = capabilities })
|
||||
|
||||
lspconfig.cssls.setup {
|
||||
capabilities = capabilities,
|
||||
cmd = { "css-languageserver", "--stdio" },
|
||||
settings = {
|
||||
css = { validate = false },
|
||||
}
|
||||
}
|
||||
lspconfig.cssls.setup({
|
||||
capabilities = capabilities,
|
||||
cmd = { "css-languageserver", "--stdio" },
|
||||
settings = {
|
||||
css = { validate = false },
|
||||
},
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
require("lualine").setup({
|
||||
options = {
|
||||
theme = "gruvbox_dark",
|
||||
}
|
||||
options = {
|
||||
theme = "gruvbox_dark",
|
||||
},
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,36 +1,35 @@
|
|||
require("neo-tree").setup({
|
||||
default_component_configs = {
|
||||
icon = {
|
||||
folder_empty = "",
|
||||
folder_empty_open = "",
|
||||
},
|
||||
git_status = {
|
||||
symbols = {
|
||||
renamed = "",
|
||||
unstaged = "",
|
||||
},
|
||||
},
|
||||
},
|
||||
default_component_configs = {
|
||||
icon = {
|
||||
folder_empty = "",
|
||||
folder_empty_open = "",
|
||||
},
|
||||
git_status = {
|
||||
symbols = {
|
||||
renamed = "",
|
||||
unstaged = "",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
document_symbols = {
|
||||
kinds = {
|
||||
File = { icon = "", hl = "Tag" },
|
||||
Namespace = { icon = "", hl = "Include" },
|
||||
Package = { icon = "", hl = "Label" },
|
||||
Class = { icon = "", hl = "Include" },
|
||||
Property = { icon = "", hl = "@property" },
|
||||
Enum = { icon = "", hl = "@number" },
|
||||
Function = { icon = "", hl = "Function" },
|
||||
String = { icon = "", hl = "String" },
|
||||
Number = { icon = "", hl = "Number" },
|
||||
Array = { icon = "", hl = "Type" },
|
||||
Object = { icon = "", hl = "Type" },
|
||||
Key = { icon = "", hl = "" },
|
||||
Struct = { icon = "", hl = "Type" },
|
||||
Operator = { icon = "", hl = "Operator" },
|
||||
TypeParameter = { icon = "", hl = "Type" },
|
||||
StaticMethod = { icon = ' ', hl = 'Function' },
|
||||
}
|
||||
},
|
||||
document_symbols = {
|
||||
kinds = {
|
||||
File = { icon = "", hl = "Tag" },
|
||||
Namespace = { icon = "", hl = "Include" },
|
||||
Package = { icon = "", hl = "Label" },
|
||||
Class = { icon = "", hl = "Include" },
|
||||
Property = { icon = "", hl = "@property" },
|
||||
Enum = { icon = "", hl = "@number" },
|
||||
Function = { icon = "", hl = "Function" },
|
||||
String = { icon = "", hl = "String" },
|
||||
Number = { icon = "", hl = "Number" },
|
||||
Array = { icon = "", hl = "Type" },
|
||||
Object = { icon = "", hl = "Type" },
|
||||
Key = { icon = "", hl = "" },
|
||||
Struct = { icon = "", hl = "Type" },
|
||||
Operator = { icon = "", hl = "Operator" },
|
||||
TypeParameter = { icon = "", hl = "Type" },
|
||||
StaticMethod = { icon = " ", hl = "Function" },
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
require("noice").setup({
|
||||
lsp = {
|
||||
-- override markdown rendering so that **cmp** and other plugins use **Treesitter**
|
||||
override = {
|
||||
["vim.lsp.util.convert_input_to_markdown_lines"] = true,
|
||||
["vim.lsp.util.stylize_markdown"] = true,
|
||||
["cmp.entry.get_documentation"] = true,
|
||||
},
|
||||
},
|
||||
-- you can enable a preset for easier configuration
|
||||
presets = {
|
||||
bottom_search = false, -- use a classic bottom cmdline for search
|
||||
command_palette = false, -- position the cmdline and popupmenu together
|
||||
long_message_to_split = false, -- long messages will be sent to a split
|
||||
inc_rename = false, -- enables an input dialog for inc-rename.nvim
|
||||
lsp_doc_border = false, -- add a border to hover docs and signature help
|
||||
},
|
||||
lsp = {
|
||||
-- override markdown rendering so that **cmp** and other plugins use **Treesitter**
|
||||
override = {
|
||||
["vim.lsp.util.convert_input_to_markdown_lines"] = true,
|
||||
["vim.lsp.util.stylize_markdown"] = true,
|
||||
["cmp.entry.get_documentation"] = true,
|
||||
},
|
||||
},
|
||||
-- you can enable a preset for easier configuration
|
||||
presets = {
|
||||
bottom_search = false, -- use a classic bottom cmdline for search
|
||||
command_palette = false, -- position the cmdline and popupmenu together
|
||||
long_message_to_split = false, -- long messages will be sent to a split
|
||||
inc_rename = false, -- enables an input dialog for inc-rename.nvim
|
||||
lsp_doc_border = false, -- add a border to hover docs and signature help
|
||||
},
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
require("notify").setup({
|
||||
background_colour = "#282828"
|
||||
background_colour = "#282828",
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
require("smart-splits").setup({
|
||||
ignored_filetypes = {
|
||||
"neo-tree",
|
||||
"nofile",
|
||||
"quickfix",
|
||||
"prompt",
|
||||
}
|
||||
ignored_filetypes = {
|
||||
"neo-tree",
|
||||
"nofile",
|
||||
"quickfix",
|
||||
"prompt",
|
||||
},
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
require('nvim-surround').setup()
|
||||
require("nvim-surround").setup()
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
local telescope = require("telescope")
|
||||
telescope.setup({
|
||||
extensions = {
|
||||
["ui-select"] = {
|
||||
require("telescope.themes").get_dropdown {}
|
||||
},
|
||||
},
|
||||
extensions = {
|
||||
["ui-select"] = {
|
||||
require("telescope.themes").get_dropdown({}),
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
telescope.load_extension("fzf")
|
||||
telescope.load_extension("ui-select")
|
||||
telescope.load_extension("undo")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
require("nvim-treesitter.configs").setup {
|
||||
highlight = { enable = true },
|
||||
indent = { enable = true },
|
||||
}
|
||||
require("nvim-treesitter.configs").setup({
|
||||
highlight = { enable = true },
|
||||
indent = { enable = true },
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
vim.o.timeoutlen = 100
|
||||
|
||||
require("which-key").setup({
|
||||
window = {
|
||||
padding = { 1, 5, 1, 5}
|
||||
},
|
||||
window = {
|
||||
padding = { 1, 5, 1, 5 },
|
||||
},
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,36 +2,36 @@ local map = vim.keymap.set
|
|||
local telescope_builtin = require("telescope.builtin")
|
||||
local smart_splits = require("smart-splits")
|
||||
|
||||
map( "n", "<S-h>", "<cmd>BufferLineCyclePrev<CR>", { desc = "Prev buffer" })
|
||||
map( "n", "<S-l>", "<cmd>BufferLineCycleNext<CR>", { desc = "Next buffer" })
|
||||
map( { "n", "i" }, "<ESC>", "<cmd>noh<CR><ESC>",{ desc = "Escape and clear hlsearch"})
|
||||
map( "n", "<Leader>ff", telescope_builtin.find_files, { desc = "Find Files" })
|
||||
map( "n", "<Leader>fb", telescope_builtin.buffers, { desc = "List Buffers" })
|
||||
map( "n", "<Leader>fh", telescope_builtin.help_tags, { desc = "Help Tags" })
|
||||
map( "n", "<Leader>fp", telescope_builtin.git_files, { desc = "Find Files (Git)" })
|
||||
map( "n", "<Leader>fc", function()
|
||||
telescope_builtin.git_files({ cwd = "~/.dotfiles"})
|
||||
end, { desc = "Edit Dotfiles" })
|
||||
map( "n", "<C-n>", "<cmd>Neotree toggle<CR>", { desc = "Open NeoTree" })
|
||||
map( {"n", "x"}, "ga", ":EasyAlign", { desc = "Align text" })
|
||||
map("n", "<S-h>", "<cmd>BufferLineCyclePrev<CR>", { desc = "Prev buffer" })
|
||||
map("n", "<S-l>", "<cmd>BufferLineCycleNext<CR>", { desc = "Next buffer" })
|
||||
map({ "n", "i" }, "<ESC>", "<cmd>noh<CR><ESC>", { desc = "Escape and clear hlsearch" })
|
||||
map("n", "<Leader>ff", telescope_builtin.find_files, { desc = "Find Files" })
|
||||
map("n", "<Leader>fb", telescope_builtin.buffers, { desc = "List Buffers" })
|
||||
map("n", "<Leader>fh", telescope_builtin.help_tags, { desc = "Help Tags" })
|
||||
map("n", "<Leader>fp", telescope_builtin.git_files, { desc = "Find Files (Git)" })
|
||||
map("n", "<Leader>fc", function()
|
||||
telescope_builtin.git_files({ cwd = "~/.dotfiles" })
|
||||
end, { desc = "Edit Dotfiles" })
|
||||
map("n", "<C-n>", "<cmd>Neotree toggle<CR>", { desc = "Open NeoTree" })
|
||||
map({ "n", "x" }, "ga", ":EasyAlign", { desc = "Align text" })
|
||||
|
||||
-- resizing splits
|
||||
map('n', '<A-h>', smart_splits.resize_left)
|
||||
map('n', '<A-j>', smart_splits.resize_down)
|
||||
map('n', '<A-k>', smart_splits.resize_up)
|
||||
map('n', '<A-l>', smart_splits.resize_right)
|
||||
map("n", "<A-h>", smart_splits.resize_left)
|
||||
map("n", "<A-j>", smart_splits.resize_down)
|
||||
map("n", "<A-k>", smart_splits.resize_up)
|
||||
map("n", "<A-l>", smart_splits.resize_right)
|
||||
|
||||
-- moving between splits
|
||||
map('n', '<C-h>', smart_splits.move_cursor_left)
|
||||
map('n', '<C-j>', smart_splits.move_cursor_down)
|
||||
map('n', '<C-k>', smart_splits.move_cursor_up)
|
||||
map('n', '<C-l>', smart_splits.move_cursor_right)
|
||||
map("n", "<C-h>", smart_splits.move_cursor_left)
|
||||
map("n", "<C-j>", smart_splits.move_cursor_down)
|
||||
map("n", "<C-k>", smart_splits.move_cursor_up)
|
||||
map("n", "<C-l>", smart_splits.move_cursor_right)
|
||||
|
||||
-- swapping buffers between windows
|
||||
map('n', '<leader><leader>h', smart_splits.swap_buf_left)
|
||||
map('n', '<leader><leader>j', smart_splits.swap_buf_down)
|
||||
map('n', '<leader><leader>k', smart_splits.swap_buf_up)
|
||||
map('n', '<leader><leader>l', smart_splits.swap_buf_right)
|
||||
map("n", "<leader><leader>h", smart_splits.swap_buf_left)
|
||||
map("n", "<leader><leader>j", smart_splits.swap_buf_down)
|
||||
map("n", "<leader><leader>k", smart_splits.swap_buf_up)
|
||||
map("n", "<leader><leader>l", smart_splits.swap_buf_right)
|
||||
|
||||
-- null-ls
|
||||
map( 'n', "<Leader>lf", vim.lsp.buf.format, { desc = "Format file"})
|
||||
map("n", "<Leader>lf", vim.lsp.buf.format, { desc = "Format file" })
|
||||
|
|
|
|||
|
|
@ -24,3 +24,11 @@ vim.o.scrolloff = 8
|
|||
|
||||
vim.wo.number = true
|
||||
vim.wo.relativenumber = true
|
||||
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
pattern = "nix",
|
||||
callback = function()
|
||||
vim.opt_local.shiftwidth = 2
|
||||
vim.opt_local.tabstop = 2
|
||||
end,
|
||||
})
|
||||
|
|
|
|||
|
|
@ -4,24 +4,25 @@
|
|||
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
bufferline-nvim
|
||||
gruvbox-nvim
|
||||
comment-nvim
|
||||
dressing-nvim
|
||||
gruvbox-nvim
|
||||
hmts-nvim
|
||||
indent-blankline-nvim
|
||||
lualine-nvim
|
||||
luasnip
|
||||
mini-nvim
|
||||
neo-tree-nvim
|
||||
noice-nvim
|
||||
nui-nvim
|
||||
nvim-autopairs
|
||||
nvim-colorizer-lua
|
||||
nvim-notify
|
||||
nvim-surround
|
||||
nvim-web-devicons
|
||||
which-key-nvim
|
||||
smart-splits-nvim
|
||||
vim-easy-align
|
||||
mini-nvim
|
||||
nui-nvim
|
||||
noice-nvim
|
||||
which-key-nvim
|
||||
|
||||
vim-fugitive
|
||||
|
||||
|
|
@ -46,23 +47,19 @@
|
|||
lspkind-nvim
|
||||
];
|
||||
|
||||
extraPackages = with pkgs;
|
||||
[
|
||||
nodePackages.bash-language-server
|
||||
clang-tools
|
||||
lua-language-server
|
||||
python3Packages.jedi-language-server
|
||||
nixpkgs-fmt
|
||||
nixd
|
||||
rust-analyzer
|
||||
stylua
|
||||
nodePackages.typescript-language-server
|
||||
nodePackages.vscode-css-languageserver-bin
|
||||
zls
|
||||
]
|
||||
++ [
|
||||
pkgs.nvim-hmts
|
||||
];
|
||||
extraPackages = with pkgs; [
|
||||
nodePackages.bash-language-server
|
||||
clang-tools
|
||||
lua-language-server
|
||||
python3Packages.jedi-language-server
|
||||
nixpkgs-fmt
|
||||
nixd
|
||||
rust-analyzer
|
||||
stylua
|
||||
nodePackages.typescript-language-server
|
||||
nodePackages.vscode-css-languageserver-bin
|
||||
zls
|
||||
];
|
||||
};
|
||||
|
||||
xdg.configFile.nvim = {
|
||||
|
|
|
|||
Reference in New Issue