Compare commits

..

1 Commits

Author SHA1 Message Date
dichgrem
2856446385 style:env
update:flake

Version 435 -> 436:
  bash-grammar: 0.0.0+rev=a06c2e4 → ∅, -1321.5 KiB
  brave: 1.85.116 → 1.85.117, -224.7 KiB
  c-grammar: 0.0.0+rev=ae19b67 → ∅, -615.4 KiB
  c-grammar-neovim: 0.11.5 → ∅, -615.4 KiB
  cinnamon-desktop: 6.6.0 → 6.6.1
  cinnamon-translations: 6.6.0 → 6.6.1, +568.6 KiB
  css-grammar: 0.0.0+rev=dda5cfc → ∅, -126.8 KiB
  dart-grammar: 0.0.0+rev=d4d8f3e → ∅, -996.2 KiB
  dockerfile-grammar: 0.0.0+rev=971acdd → ∅, -70.0 KiB
  firefox: +29.6 KiB
  firefox-unwrapped: -23.4 KiB
  go-grammar: 0.0.0+rev=2346a3a → ∅, -235.7 KiB
  html-grammar: 0.0.0+rev=73a3947 → ∅, -33.9 KiB
  initrd: ε → ∅
  initrd-linux-zen: 6.18 → 6.18.1
  ipxe: 1.21.1-unstable-2025-12-08 → 1.21.1-unstable-2025-12-15
  java-grammar: 0.0.0+rev=e10607b → ∅, -426.8 KiB
  javascript-grammar: 0.0.0+rev=58404d8 → ∅, -433.5 KiB
  json-grammar: 0.0.0+rev=001c28d → ∅, -20.5 KiB
  kazumi: 1.9.2 → 1.9.3, +16.0 KiB
  kotlin: 2.2.21 → 2.3.0, +2115.1 KiB
  kotlin-grammar: 0.0.0+rev=57fb456 → ∅, -5287.6 KiB
  libplasma: +10.4 KiB
  libressl: -3287.6 KiB
  linux-zen: 6.18, 6.18-modules → 6.18.1, 6.18.1-modules, -11.5 KiB
  lua-grammar: 0.0.0+rev=d760230 → ∅, -74.3 KiB
  lua-grammar-neovim: 0.11.5 → ∅, -74.4 KiB
  lua-language-server: 3.15.0 → 3.16.1, +27.9 KiB
  markdown-grammar-neovim: 0.11.5 → ∅, -365.2 KiB
  markdown_inline-grammar-neovim: 0.11.5 → ∅, -352.1 KiB
  mesa: 25.3.1 → 25.3.2, +21.9 KiB
  nemo: 6.6.1 → 6.6.2
  networkmanager: 1.54.1 → 1.54.3, +41.9 KiB
  nixos-system-dos: 26.05.20251215.1306659 → 26.05.20251218.c6245e8
  nodejs: 24.11.1 → 24.12.0, +22.3 KiB
  python-grammar: 0.0.0+rev=710796b → ∅, -479.0 KiB
  query-grammar-neovim: 0.11.5 → ∅, -39.3 KiB
  rust-analyzer: 2025-12-08 → 2025-12-15
  rust-analyzer-unwrapped: 2025-12-08 → 2025-12-15, +130.4 KiB
  rust-grammar: 0.0.0+rev=261b202 → ∅, -1119.4 KiB
  source: +251.1 KiB
  toml-grammar: 0.0.0+rev=64b5683 → ∅, -41.3 KiB
  tree-sitter-bash: ∅ → 0.0.0+rev=a06c2e4, +1321.5 KiB
  tree-sitter-c: ∅ → 0.0.0+rev=ae19b67, +615.4 KiB
  tree-sitter-c-neovim: ∅ → 0.11.5, +615.4 KiB
  tree-sitter-css: ∅ → 0.0.0+rev=dda5cfc, +126.8 KiB
  tree-sitter-dart: ∅ → 0.0.0+rev=d4d8f3e, +996.2 KiB
  tree-sitter-dockerfile: ∅ → 0.0.0+rev=971acdd, +70.0 KiB
  tree-sitter-go: ∅ → 0.0.0+rev=2346a3a, +235.7 KiB
  tree-sitter-html: ∅ → 0.0.0+rev=73a3947, +33.9 KiB
  tree-sitter-java: ∅ → 0.0.0+rev=e10607b, +426.8 KiB
  tree-sitter-javascript: ∅ → 0.0.0+rev=58404d8, +433.5 KiB
  tree-sitter-json: ∅ → 0.0.0+rev=001c28d, +20.5 KiB
  tree-sitter-kotlin: ∅ → 0.0.0+rev=57fb456, +5287.6 KiB
  tree-sitter-lua: ∅ → 0.0.0+rev=d760230, +74.3 KiB
  tree-sitter-lua-neovim: ∅ → 0.11.5, +74.4 KiB
  tree-sitter-markdown-neovim: ∅ → 0.11.5, +365.2 KiB
  tree-sitter-markdown_inline-neovim: ∅ → 0.11.5, +352.1 KiB
  tree-sitter-python: ∅ → 0.0.0+rev=710796b, +479.0 KiB
  tree-sitter-query-neovim: ∅ → 0.11.5, +39.3 KiB
  tree-sitter-rust: ∅ → 0.0.0+rev=261b202, +1119.4 KiB
  tree-sitter-toml: ∅ → 0.0.0+rev=64b5683, +41.3 KiB
  tree-sitter-tsx: ∅ → 0.0.0+rev=75b3874, +1437.6 KiB
  tree-sitter-typescript: ∅ → 0.0.0+rev=75b3874, +1405.6 KiB
  tree-sitter-vim-neovim: ∅ → 0.11.5, +1057.1 KiB
  tree-sitter-vimdoc-neovim: ∅ → 0.11.5, +166.5 KiB
  tree-sitter-vue: ∅ → 0.0.0+rev=22bdfa6, +52.4 KiB
  tree-sitter-yaml: ∅ → 0.0.0+rev=7708026, +210.9 KiB
  tsx-grammar: 0.0.0+rev=75b3874 → ∅, -1437.6 KiB
  typescript-grammar: 0.0.0+rev=75b3874 → ∅, -1405.6 KiB
  unit-script-initrd-nixos-activation: ∅ → ε
  vim-grammar-neovim: 0.11.5 → ∅, -1057.1 KiB
  vimdoc-grammar-neovim: 0.11.5 → ∅, -166.5 KiB
  vimplugin-LazyVim: 2025-11-11 → 15.13.0-unstable-2025-11-11
  vimplugin-bufferline.nvim: 2025-01-14 → 4.9.1-unstable-2025-01-14
  vimplugin-cmp_luasnip: 2024-11-04 → 0-unstable-2024-11-04
  vimplugin-conform.nvim: 2025-12-03 → 9.1.0-unstable-2025-12-14
  vimplugin-dashboard-nvim: 2025-08-31 → 0-unstable-2025-08-31
  vimplugin-flash.nvim: 2025-10-28 → 2.1.0-unstable-2025-10-28
  vimplugin-friendly-snippets: 2025-04-29 → 0-unstable-2025-04-29
  vimplugin-lazy.nvim: 2025-11-06 → 11.17.5-unstable-2025-11-06
  vimplugin-lazydev.nvim: 2025-11-06 → 1.10.0-unstable-2025-11-06
  vimplugin-mini.icons: 2025-11-03 → 0.16.0-unstable-2025-11-03
  vimplugin-mini.nvim: 2025-12-11 → 0.16.0-unstable-2025-12-13
  vimplugin-neo-tree.nvim: 2025-12-08 → 3.38.0-unstable-2025-12-08
  vimplugin-neoconf.nvim: 2025-12-12 → 1.4.0-unstable-2025-12-16
  vimplugin-neodev.nvim: 2024-07-06 → 3.0.0-unstable-2024-07-06
  vimplugin-noice.nvim: 2025-11-03 → 4.10.0-unstable-2025-11-03
  vimplugin-nvim-lint: 2025-12-11 → 0-unstable-2025-12-13
  vimplugin-nvim-lspconfig: 2025-12-12 → 2.5.0-unstable-2025-12-15
  vimplugin-nvim-notify: 2025-09-06 → 3.15.0-unstable-2025-09-06
  vimplugin-nvim-treesitter: 2025-05-24 → 0.10.0-unstable-2025-05-24
  vimplugin-nvim-treesitter-context: 2025-12-06 → 1.0.0-unstable-2025-12-06
  vimplugin-nvim-ts-autotag: 2025-09-10 → 0-unstable-2025-09-10
  vimplugin-nvim-ts-context-commentstring: 2024-12-07 → 0-unstable-2024-12-07
  vimplugin-persistence.nvim: 2025-10-28 → 3.1.0-unstable-2025-10-28
  vimplugin-snacks.nvim: 2025-11-18 → 2.30.0-unstable-2025-11-18
  vimplugin-todo-comments.nvim: 2025-11-10 → 1.5.0-unstable-2025-11-10
  vimplugin-tokyonight.nvim: 2025-11-05 → 4.14.1-unstable-2025-11-05
  vimplugin-trouble.nvim: 2025-10-31 → 3.7.1-unstable-2025-10-31
  vimplugin-vim-illuminate: 2025-05-24 → 0-unstable-2025-05-24
  vimplugin-vim-startuptime: 2025-02-18 → 4.5.0-unstable-2025-02-18
  vimplugin-which-key.nvim: 2025-10-28 → 3.17.0-unstable-2025-10-28
  vue-grammar: 0.0.0+rev=22bdfa6 → ∅, -52.4 KiB
  xapp: 3.2.0 → 3.2.1, +12.7 KiB
  yaml-grammar: 0.0.0+rev=7708026 → ∅, -210.9 KiB
  zed-editor: 0.216.1 → 0.217.2, -1236.5 KiB

feat:add_bun&&gemini_cli
2025-12-22 21:25:30 +08:00
7 changed files with 300 additions and 116 deletions

75
flake.lock generated
View File

@@ -105,24 +105,6 @@
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"fromYaml": {
"flake": false,
"locked": {
@@ -165,11 +147,11 @@
]
},
"locked": {
"lastModified": 1766553851,
"narHash": "sha256-hHKQhHkXxuPJwLkI8wdu826GLV5AcuW9/HVdc9eBnTU=",
"lastModified": 1766282146,
"narHash": "sha256-0V/nKU93KdYGi+5LB/MVo355obBJw/2z9b2xS3bPJxY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "7eca7f7081036a7b740090994c9ec543927f89a7",
"rev": "61fcc9de76b88e55578eb5d79fc80f2b236df707",
"type": "github"
},
"original": {
@@ -178,34 +160,13 @@
"type": "github"
}
},
"lazyvim": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1765315270,
"narHash": "sha256-E06fubkv6gWLiQd/K0njl8wtFShu30rDLNRhf/LRma0=",
"owner": "pfassina",
"repo": "lazyvim-nix",
"rev": "a3615f3ac58cefacb83123643394f88d09006912",
"type": "github"
},
"original": {
"owner": "pfassina",
"repo": "lazyvim-nix",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1766309749,
"narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=",
"lastModified": 1766070988,
"narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816",
"rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
"type": "github"
},
"original": {
@@ -243,7 +204,6 @@
"root": {
"inputs": {
"home-manager": "home-manager",
"lazyvim": "lazyvim",
"nixpkgs": "nixpkgs",
"stylix": "stylix"
}
@@ -261,7 +221,7 @@
"nixpkgs"
],
"nur": "nur",
"systems": "systems_2",
"systems": "systems",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes",
@@ -269,11 +229,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1766440186,
"narHash": "sha256-7B/dntEDan+pMB8B/sG6599f3mQaySAJL+c9NhdMP7k=",
"lastModified": 1765897595,
"narHash": "sha256-NgTRxiEC5y96zrhdBygnY+mSzk5FWMML39PcRGVJmxg=",
"owner": "danth",
"repo": "stylix",
"rev": "844294a58ef0badb3067c4f2fe063030537eb624",
"rev": "e6829552d4bb659ebab00f08c61d8c62754763f3",
"type": "github"
},
"original": {
@@ -297,21 +257,6 @@
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tinted-foot": {
"flake": false,
"locked": {

View File

@@ -2,17 +2,17 @@
description = "🥶";
inputs = {
home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
lazyvim.inputs.nixpkgs.follows = "nixpkgs";
lazyvim.url = "github:pfassina/lazyvim-nix";
stylix.inputs.nixpkgs.follows = "nixpkgs";
stylix.url = "github:danth/stylix";
# chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
# daeuniverse.url = "github:daeuniverse/flake.nix";
# disko.inputs.nixpkgs.follows = "nixpkgs";
# disko.url = "github:nix-community/disko";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# nixvim.inputs.nixpkgs.follows = "nixpkgs";
# nixvim.url = "github:nix-community/nixvim";
stylix.inputs.nixpkgs.follows = "nixpkgs";
stylix.url = "github:danth/stylix";
};
outputs = inputs: let

View File

@@ -1,81 +1,233 @@
{ inputs, config, lib, pkgs, ... }:
{
imports = [ inputs.lazyvim.homeManagerModules.default ];
programs.lazyvim = {
{ config
, lib
, pkgs
, ...
}: {
programs.neovim = {
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; [
# All
tree-sitter
# Go
#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;
}

View File

@@ -0,0 +1,8 @@
-- 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")

View File

@@ -0,0 +1,53 @@
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",
},
},
},
})

View File

@@ -0,0 +1,30 @@
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,
},
}

View File

@@ -53,7 +53,6 @@ in {
wget
aria2
yt-dlp
openssl
#Android
xxd
@@ -93,9 +92,6 @@ in {
pnpm
bun
nodejs_24
# Agent
codex
gemini-cli
];
};