mirror of
https://github.com/Dichgrem/DCGOS.git
synced 2026-02-04 21:31:57 -05:00
feat:lazyvim-nix
add:opencode Version 451 -> 452: dart: 3.10.3 → ∅ dbeaver-bin: 25.3.0 → 25.3.1, -2025.8 KiB deno: 2.5.6 → 2.6.3, +909.8 KiB firefox-unwrapped: -68.5 KiB firmware: +20.7 KiB flutter: 3.38.4 → 3.38.5 flutter-tools: 3.38.4 → 3.38.5 flutter-wrapped: 3.38.4, 3.38.4-sdk → 3.38.5, 3.38.5-sdk golines: -3157.3 KiB gpsd: 3.27 → 3.27.2, -14.5 KiB initrd-linux-zen: 6.18.1 → 6.18.2 ipxe: 1.21.1-unstable-2025-12-15 → 1.21.1-unstable-2025-12-22, +19.4 KiB just: 1.43.1 → 1.45.0, +84.2 KiB libvlc: 3.0.23 → 3.0.23-2, +8.8 KiB linux-firmware: 20251125 → 20251125-unstable-2025-12-18, +7566.1 KiB linux-zen: 6.18.1, 6.18.1-modules → 6.18.2, 6.18.2-modules, +31.2 KiB mpv: 0.40.0 → 0.41.0, +165.6 KiB mpv-with-scripts: 0.40.0 → 0.41.0 nixd: 2.7.0 → 2.8.0 nixf: 2.7.0 → 2.8.0, +125.9 KiB nixos-system-dos: 26.05.20251221.a653104 → 26.05.20251225.3e2499d nixt: 2.7.0 → 2.8.0 opencode: 1.0.180 → 1.0.184, +26.3 KiB pnpm: 10.25.0 → 10.26.1 python3.13-curl-cffi: 0.14.0b2 → 0.14.0, +106.2 KiB source: +160.8 KiB strawberry: 1.2.13 → 1.2.16, +174.0 KiB wireplumber: 0.5.12 → 0.5.13, +40.7 KiB Version 452 -> 453: X-Restart-Triggers-wpa_supplicant: ∅ → ε btop: 1.4.5 → 1.4.6, +44.9 KiB curl-impersonate: ∅ → 1.2.0, +6647.2 KiB curl-impersonate-chrome: 1.2.0 → ∅, -6647.2 KiB etc-wpa_supplicant-nixos.conf: ∅ → ε fcitx5-configtool: 5.1.11 → 5.1.12 fcitx5-gtk: 5.1.4 → 5.1.5 fcitx5-qt5: 5.1.11 → 5.1.12 fcitx5-qt6: 5.1.11 → 5.1.12 gemini-cli: 0.21.1 → 0.22.4, +596.2 KiB ktlint: 1.7.1 → 1.8.0, +1185.7 KiB libgsf: 1.14.53 → 1.14.54 libvpl: 2.15.0 → 2.16.0 luajit: -49.5 KiB maven: 3.9.11 → 3.9.12, +74.3 KiB nixd: 2.8.0 → 2.8.1 nixf: 2.8.0 → 2.8.1 nixos-system-dos: 26.05.20251225.3e2499d → 26.05.20251228.c0b0e0f nixt: 2.8.0 → 2.8.1 onefetch: 2.25.0 → 2.26.1, -205.3 KiB rust-analyzer: 2025-12-15 → 2025-12-22 rust-analyzer-unwrapped: 2025-12-15 → 2025-12-22, +519.9 KiB sing-box: 1.12.13 → 1.12.14 sleuthkit: 4.12.1 → 4.14.0, +120.6 KiB source: +262.8 KiB svox: 2018-02-14 → 0-unstable-2021-05-06 unit-script-wpa_supplicant: ∅ → ε unit-wpa_supplicant.service: ∅ → ε vimplugin-mini.nvim: 0.17.0-unstable-2025-12-19 → 0.17.0-unstable-2025-12-23 wireless-tools: ∅ → 30.pre9, +548.3 KiB xapp-symbolic-icons: 1.0.6 → 1.0.7
This commit is contained in:
dichgrem
@@ -1,233 +1,81 @@
|
||||
{ config
|
||||
, lib
|
||||
, pkgs
|
||||
, ...
|
||||
}: {
|
||||
programs.neovim = {
|
||||
{ inputs, config, lib, pkgs, ... }:
|
||||
{
|
||||
imports = [ inputs.lazyvim.homeManagerModules.default ];
|
||||
programs.lazyvim = {
|
||||
enable = true;
|
||||
|
||||
configFiles = ./lua;
|
||||
|
||||
extras = {
|
||||
lang = {
|
||||
go.enable = true;
|
||||
clangd.enable = true;
|
||||
rust.enable = true;
|
||||
typescript.enable = true;
|
||||
python.enable = true;
|
||||
tailwind.enable = true;
|
||||
java.enable = true;
|
||||
json.enable = true;
|
||||
yaml.enable = true;
|
||||
toml.enable = true;
|
||||
docker.enable = true;
|
||||
kotlin.enable = true;
|
||||
dart.enable = true;
|
||||
nix.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
extraPackages = with pkgs; [
|
||||
#Go
|
||||
# All
|
||||
tree-sitter
|
||||
|
||||
# Go
|
||||
gopls
|
||||
gofumpt
|
||||
golines
|
||||
|
||||
#Lua
|
||||
# Lua
|
||||
stylua
|
||||
lua-language-server
|
||||
|
||||
#Nix
|
||||
# Nix
|
||||
nixd
|
||||
nixpkgs-fmt
|
||||
|
||||
#Java
|
||||
# Java
|
||||
google-java-format
|
||||
jdt-language-server
|
||||
|
||||
#Rust
|
||||
# Rust
|
||||
clippy
|
||||
rustfmt
|
||||
rust-analyzer
|
||||
|
||||
#Shell
|
||||
# Shell
|
||||
shfmt
|
||||
bash-language-server
|
||||
|
||||
#C/C++
|
||||
# C/C++
|
||||
clang-tools
|
||||
|
||||
#Kotlin
|
||||
# Kotlin
|
||||
ktlint
|
||||
kotlin-language-server
|
||||
|
||||
#Python
|
||||
# Python
|
||||
ruff
|
||||
black
|
||||
python312Packages.python-lsp-server
|
||||
|
||||
#JS/TS/Web
|
||||
# JS/TS/Web
|
||||
biome
|
||||
prettierd
|
||||
nodePackages.prettier
|
||||
|
||||
# Data formats
|
||||
jq #JSON
|
||||
taplo #TOML
|
||||
yamlfmt #YAML
|
||||
];
|
||||
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
lazy-nvim
|
||||
];
|
||||
|
||||
extraLuaConfig =
|
||||
let
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
LazyVim
|
||||
bufferline-nvim
|
||||
cmp_luasnip
|
||||
conform-nvim
|
||||
dashboard-nvim
|
||||
flash-nvim
|
||||
friendly-snippets
|
||||
gitsigns-nvim
|
||||
lualine-nvim
|
||||
neo-tree-nvim
|
||||
neoconf-nvim
|
||||
neodev-nvim
|
||||
noice-nvim
|
||||
nui-nvim
|
||||
nvim-lint
|
||||
nvim-lspconfig
|
||||
nvim-notify
|
||||
nvim-spectre
|
||||
nvim-treesitter
|
||||
nvim-treesitter-context
|
||||
nvim-ts-autotag
|
||||
nvim-ts-context-commentstring
|
||||
nvim-web-devicons
|
||||
persistence-nvim
|
||||
plenary-nvim
|
||||
todo-comments-nvim
|
||||
tokyonight-nvim
|
||||
trouble-nvim
|
||||
vim-illuminate
|
||||
vim-startuptime
|
||||
which-key-nvim
|
||||
fzf-lua
|
||||
snacks-nvim
|
||||
{
|
||||
name = "lazydev.nvim";
|
||||
path = lazydev-nvim;
|
||||
}
|
||||
{
|
||||
name = "blink.cmp";
|
||||
path = blink-cmp;
|
||||
}
|
||||
{
|
||||
name = "LuaSnip";
|
||||
path = luasnip;
|
||||
}
|
||||
{
|
||||
name = "mini.ai";
|
||||
path = mini-nvim;
|
||||
}
|
||||
{
|
||||
name = "mini.bufremove";
|
||||
path = mini-nvim;
|
||||
}
|
||||
{
|
||||
name = "mini.comment";
|
||||
path = mini-nvim;
|
||||
}
|
||||
{
|
||||
name = "mini.indentscope";
|
||||
path = mini-nvim;
|
||||
}
|
||||
{
|
||||
name = "mini.pairs";
|
||||
path = mini-nvim;
|
||||
}
|
||||
{
|
||||
name = "mini.surround";
|
||||
path = mini-nvim;
|
||||
}
|
||||
{
|
||||
name = "mini.icons";
|
||||
path = mini-icons;
|
||||
}
|
||||
{
|
||||
name = "grug-far.nvim";
|
||||
path = grug-far-nvim;
|
||||
}
|
||||
];
|
||||
mkEntryFromDrv = drv:
|
||||
if lib.isDerivation drv
|
||||
then {
|
||||
name = "${lib.getName drv}";
|
||||
path = drv;
|
||||
}
|
||||
else drv;
|
||||
lazyPath = pkgs.linkFarm "lazy-plugins" (builtins.map mkEntryFromDrv plugins);
|
||||
in
|
||||
''
|
||||
require("lazy").setup({
|
||||
defaults = {
|
||||
lazy = true,
|
||||
},
|
||||
dev = {
|
||||
-- reuse files from pkgs.vimPlugins.*
|
||||
path = "${lazyPath}",
|
||||
patterns = { "." },
|
||||
-- fallback to download
|
||||
fallback = true,
|
||||
},
|
||||
rocks = {
|
||||
enabled = false,
|
||||
hererocks = false,
|
||||
},
|
||||
spec = {
|
||||
{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
|
||||
-- The following configs are needed for fixing lazyvim on nix
|
||||
-- disable mason.nvim, use programs.neovim.extraPackages
|
||||
{ "mason-org/mason-lspconfig.nvim", enabled = false },
|
||||
{ "mason-org/mason.nvim", enabled = false },
|
||||
-- import/override with your plugins
|
||||
{ import = "lazyvim.plugins.extras.lang.go" },
|
||||
{ import = "lazyvim.plugins.extras.lang.clangd" },
|
||||
{ import = "lazyvim.plugins.extras.lang.rust" },
|
||||
{ import = "lazyvim.plugins.extras.lang.typescript" },
|
||||
{ import = "lazyvim.plugins.extras.lang.python" },
|
||||
{ import = "lazyvim.plugins.extras.lang.tailwind" },
|
||||
{ import = "lazyvim.plugins.extras.lang.java" },
|
||||
{ import = "lazyvim.plugins.extras.lang.json" },
|
||||
{ import = "lazyvim.plugins.extras.lang.yaml" },
|
||||
{ import = "lazyvim.plugins.extras.lang.toml" },
|
||||
{ import = "lazyvim.plugins.extras.lang.docker" },
|
||||
{ import = "lazyvim.plugins.extras.lang.kotlin" },
|
||||
{ import = "lazyvim.plugins.extras.lang.dart" },
|
||||
{ import = "plugins" },
|
||||
-- treesitter handled by xdg.configFile."nvim/parser", put this line at the end of spec to clear ensure_installed
|
||||
{ "nvim-treesitter/nvim-treesitter",
|
||||
opts = function(_, opts)
|
||||
opts.ensure_installed = {}
|
||||
end,
|
||||
},
|
||||
},
|
||||
})
|
||||
'';
|
||||
};
|
||||
|
||||
# https://github.com/nvim-treesitter/nvim-treesitter#i-get-query-error-invalid-node-type-at-position
|
||||
xdg.configFile."nvim/parser".source =
|
||||
let
|
||||
parsers = pkgs.symlinkJoin {
|
||||
name = "treesitter-parsers";
|
||||
paths =
|
||||
(pkgs.vimPlugins.nvim-treesitter.withPlugins (plugins:
|
||||
with plugins; [
|
||||
bash
|
||||
c
|
||||
go
|
||||
lua
|
||||
rust
|
||||
java
|
||||
dart
|
||||
kotlin
|
||||
python
|
||||
javascript
|
||||
typescript
|
||||
tsx
|
||||
vue
|
||||
html
|
||||
css
|
||||
json
|
||||
yaml
|
||||
toml
|
||||
dockerfile
|
||||
])).dependencies;
|
||||
};
|
||||
in
|
||||
"${parsers}/parser";
|
||||
|
||||
# Normal LazyVim config here, see https://github.com/LazyVim/starter/tree/main/lua
|
||||
xdg.configFile."nvim/lua".source = ./lua;
|
||||
}
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
-- Autocmds are automatically loaded on the VeryLazy event
|
||||
-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
|
||||
--
|
||||
-- Add any additional autocmds here
|
||||
-- with `vim.api.nvim_create_autocmd`
|
||||
--
|
||||
-- Or remove existing autocmds by their group name (which is prefixed with `lazyvim_` for the defaults)
|
||||
-- e.g. vim.api.nvim_del_augroup_by_name("lazyvim_wrap_spell")
|
||||
@@ -1,53 +0,0 @@
|
||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not (vim.uv or vim.loop).fs_stat(lazypath) then
|
||||
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
|
||||
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
|
||||
if vim.v.shell_error ~= 0 then
|
||||
vim.api.nvim_echo({
|
||||
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
|
||||
{ out, "WarningMsg" },
|
||||
{ "\nPress any key to exit..." },
|
||||
}, true, {})
|
||||
vim.fn.getchar()
|
||||
os.exit(1)
|
||||
end
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
require("lazy").setup({
|
||||
spec = {
|
||||
-- add LazyVim and import its plugins
|
||||
{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
|
||||
-- import/override with your plugins
|
||||
{ import = "plugins" },
|
||||
},
|
||||
defaults = {
|
||||
-- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
|
||||
-- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.
|
||||
lazy = false,
|
||||
-- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
|
||||
-- have outdated releases, which may break your Neovim install.
|
||||
version = false, -- always use the latest git commit
|
||||
-- version = "*", -- try installing the latest stable version for plugins that support semver
|
||||
},
|
||||
install = { colorscheme = { "tokyonight", "habamax" } },
|
||||
checker = {
|
||||
enabled = true, -- check for plugin updates periodically
|
||||
notify = false, -- notify on update
|
||||
}, -- automatically check for plugin updates
|
||||
performance = {
|
||||
rtp = {
|
||||
-- disable some rtp plugins
|
||||
disabled_plugins = {
|
||||
"gzip",
|
||||
-- "matchit",
|
||||
-- "matchparen",
|
||||
-- "netrwPlugin",
|
||||
"tarPlugin",
|
||||
"tohtml",
|
||||
"tutor",
|
||||
"zipPlugin",
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
@@ -1,28 +0,0 @@
|
||||
return {
|
||||
{
|
||||
"zbirenbaum/copilot.lua",
|
||||
cmd = "Copilot",
|
||||
event = "InsertEnter",
|
||||
config = function()
|
||||
require("copilot").setup({
|
||||
suggestion = { enabled = true, auto_trigger = true },
|
||||
})
|
||||
end,
|
||||
},
|
||||
|
||||
{
|
||||
"CopilotC-Nvim/CopilotChat.nvim",
|
||||
branch = "main",
|
||||
dependencies = {
|
||||
{ "zbirenbaum/copilot.lua" },
|
||||
{ "nvim-lua/plenary.nvim" },
|
||||
},
|
||||
opts = {
|
||||
debug = false,
|
||||
},
|
||||
keys = {
|
||||
{ "<leader>cc", "<cmd>CopilotChatToggle<cr>", desc = "CopilotChat - Toggle" },
|
||||
{ "<leader>ce", "<cmd>CopilotChatExplain<cr>", mode = "v", desc = "CopilotChat - Explain code" },
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
return {
|
||||
{
|
||||
"LazyVim/LazyVim",
|
||||
opts = {
|
||||
treesitter = false,
|
||||
},
|
||||
},
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
event = { "BufReadPost", "BufNewFile" },
|
||||
opts = {
|
||||
ensure_installed = {},
|
||||
auto_install = false,
|
||||
highlight = { enable = true },
|
||||
indent = { enable = true },
|
||||
incremental_selection = {
|
||||
enable = true,
|
||||
keymaps = {
|
||||
init_selection = "gnn",
|
||||
node_incremental = "grn",
|
||||
scope_incremental = "grc",
|
||||
node_decremental = "grm",
|
||||
},
|
||||
},
|
||||
},
|
||||
config = function(_, opts)
|
||||
require("nvim-treesitter.configs").setup(opts)
|
||||
end,
|
||||
},
|
||||
}
|
||||
Reference in New Issue
Block a user