3 Commits
1.8.0 ... 1.9.0

Author SHA1 Message Date
2ebdf4e6a3 feat: update to nixos-25.11
All checks were successful
check-commits / Check commits (pull_request) Successful in 9s
build-flake / build (pull_request) Successful in 5m7s
build-flake / Build flake (push) Successful in 5m38s
build-flake / Release a new version (push) Successful in 9s
2025-12-01 21:19:28 +02:00
b614474c26 feat: add venv-selector, update blink config
All checks were successful
check-commits / Check commits (pull_request) Successful in 8s
build-flake / build (pull_request) Successful in 4m2s
2025-11-12 18:03:44 +02:00
512086bffe version(flake): bump version
All checks were successful
build-flake / Build flake (push) Successful in 4m5s
build-flake / Release a new version (push) Successful in 10s
2025-11-03 21:04:42 +02:00
14 changed files with 89 additions and 207 deletions

View File

@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v5
- name: Setup sudo (required for the next step) - name: Setup sudo (required for the next step)
run: apt-get update && apt-get install -y sudo run: apt-get update && apt-get install -y sudo
- name: Setup nix - name: Setup nix

2
cog.toml Normal file
View File

@@ -0,0 +1,2 @@
[commit_types]
version = { bump_patch = true, changelog_title = "Version" }

View File

@@ -12,14 +12,14 @@
./modules/plugins/conform-nvim.nix ./modules/plugins/conform-nvim.nix
./modules/plugins/fzf-lua.nix ./modules/plugins/fzf-lua.nix
./modules/plugins/gitsigns.nix ./modules/plugins/gitsigns.nix
# ./modules/plugins/lazygit.nix
./modules/plugins/mini.nix ./modules/plugins/mini.nix
./modules/plugins/neotree.nix # ./modules/plugins/neotree.nix
./modules/plugins/oil.nix ./modules/plugins/oil.nix
./modules/plugins/snacks.nix ./modules/plugins/snacks.nix
./modules/plugins/tmux-navigator.nix ./modules/plugins/tmux-navigator.nix
./modules/plugins/treesitter.nix ./modules/plugins/treesitter.nix
./modules/plugins/undotree.nix ./modules/plugins/undotree.nix
./modules/plugins/venv-selector.nix
./modules/plugins/which-key.nix ./modules/plugins/which-key.nix
]; ];

View File

@@ -2,10 +2,6 @@
plugins.blink-cmp = { plugins.blink-cmp = {
enable = true; enable = true;
settings = { settings = {
appearance = {
nerd_font_variant = "normal";
use_nvim_cmp_as_default = true;
};
completion = { completion = {
accept = { accept = {
auto_brackets = { auto_brackets = {
@@ -15,39 +11,17 @@
}; };
}; };
}; };
trigger = {
show_on_keyword = true;
show_on_trigger_character = true;
};
documentation = {
auto_show = true;
auto_show_delay_ms = 500;
};
menu = {
auto_show = true;
};
};
keymap = {
preset = "default";
}; };
signature = { signature = {
enabled = true; enabled = true;
}; };
sources = { sources = {
default = [ default = [
"omni"
"lsp" "lsp"
"buffer" "buffer"
"snippets"
"path" "path"
]; ];
providers = {
buffer = {
score_offset = -7;
};
lsp = {
fallbacks = [ ];
};
};
}; };
}; };
}; };

View File

@@ -46,41 +46,8 @@
plugins.conform-nvim = { plugins.conform-nvim = {
enable = true; enable = true;
autoInstall.enable = true;
settings = { settings = {
format_on_save = ''
function(bufnr)
if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
return
end
if slow_format_filetypes[vim.bo[bufnr].filetype] then
return
end
local function on_format(err)
if err and err:match("timeout$") then
slow_format_filetypes[vim.bo[bufnr].filetype] = true
end
end
return { timeout_ms = 200, lsp_fallback = true }, on_format
end
'';
format_after_save = ''
function(bufnr)
if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
return
end
if not slow_format_filetypes[vim.bo[bufnr].filetype] then
return
end
return { lsp_fallback = true }
end
'';
notify_on_error = true;
formatters_by_ft = { formatters_by_ft = {
html = { html = {
__unkeyed-1 = "prettierd"; __unkeyed-1 = "prettierd";
@@ -112,7 +79,7 @@
__unkeyed-2 = "prettier"; __unkeyed-2 = "prettier";
stop_after_first = true; stop_after_first = true;
}; };
python = [ "ruff" ]; python = [ "ruff_format" ];
lua = [ "stylua" ]; lua = [ "stylua" ];
nix = [ "nixfmt-rfc-style" ]; nix = [ "nixfmt-rfc-style" ];
markdown = { markdown = {
@@ -132,43 +99,14 @@
"shfmt" "shfmt"
]; ];
json = [ "jq" ]; json = [ "jq" ];
go = [
"goimports"
"gofmt"
];
"_" = [ "trim_whitespace" ]; "_" = [ "trim_whitespace" ];
}; };
formatters = { formatters = {
ruff = {
command = "${lib.getExe pkgs.ruff}";
};
nixfmt-rfc-style = {
command = "${lib.getExe pkgs.nixfmt-rfc-style}";
};
alejandra = {
command = "${lib.getExe pkgs.alejandra}";
};
jq = {
command = "${lib.getExe pkgs.jq}";
};
prettier = {
command = "${lib.getExe pkgs.nodePackages.prettier}";
};
prettierd = {
command = "${lib.getExe pkgs.prettierd}";
};
stylua = {
command = "${lib.getExe pkgs.stylua}";
};
shellcheck = {
command = "${lib.getExe pkgs.shellcheck}";
};
shfmt = {
command = "${lib.getExe pkgs.shfmt}";
};
shellharden = {
command = "${lib.getExe pkgs.shellharden}";
};
yamlfmt = {
command = "${lib.getExe pkgs.yamlfmt}";
};
terraform_fmt = { terraform_fmt = {
command = "${lib.getExe ( command = "${lib.getExe (
pkgs.terraform.overrideAttrs (oldAttrs: { pkgs.terraform.overrideAttrs (oldAttrs: {

View File

@@ -1,30 +1,5 @@
{ lib, pkgs, ... }:
{ {
plugins.fzf-lua = { plugins.fzf-lua = {
enable = true; enable = true;
# keymaps = {
# "<leader>sf" = {
# action = "files";
# options = {
# desc = "Fzf-Lua File Grep";
# };
# };
# "<leader>sg" = {
# action = "live_grep_native";
# options = {
# desc = "Fzf-Lua File Grep";
# };
# };
# "<leader>sv" = {
# action = "git_files";
# # settings = {
# # previewers.cat.cmd = lib.getExe' pkgs.coreutils "cat";
# # winopts.height = 0.5;
# # };
# options = {
# desc = "Fzf-Lua VCS Grep (Git)";
# };
# };
# };
}; };
} }

View File

@@ -17,59 +17,8 @@
./lua_ls.nix ./lua_ls.nix
./marksman.nix ./marksman.nix
./nixd.nix ./nixd.nix
./ruff.nix ./pyright.nix
./tflint.nix ./tflint.nix
./yamlls.nix ./yamlls.nix
]; ];
# lsp.keymaps = [
# {
# key = "gd";
# lspBufAction = "definition";
# }
# {
# key = "gD";
# lspBufAction = "references";
# }
# {
# key = "gt";
# lspBufAction = "type_definition";
# }
# {
# key = "gi";
# lspBufAction = "implementation";
# }
# {
# key = "K";
# lspBufAction = "hover";
# }
# {
# action = lib.nixvim.mkRaw "function() vim.diagnostic.jump({ count=-1, float=true }) end";
# key = "<leader>k";
# }
# {
# action = lib.nixvim.mkRaw "function() vim.diagnostic.jump({ count=1, float=true }) end";
# key = "<leader>j";
# }
# {
# action = "<CMD>LspStop<Enter>";
# key = "<leader>lx";
# }
# {
# action = "<CMD>LspStart<Enter>";
# key = "<leader>ls";
# }
# {
# action = "<CMD>LspRestart<Enter>";
# key = "<leader>lr";
# }
# # {
# # action = lib.nixvim.mkRaw "require('telescope.builtin').lsp_definitions";
# # key = "gd";
# # }
# {
# action = "<CMD>Lspsaga hover_doc<Enter>";
# key = "K";
# }
# ];
} }

View File

@@ -0,0 +1,3 @@
{
lsp.servers.pyright.enable = true;
}

View File

@@ -1,3 +0,0 @@
{
lsp.servers.ruff.enable = true;
}

View File

@@ -23,9 +23,11 @@
treesitter-textobjects = { treesitter-textobjects = {
enable = true; enable = true;
select = { settings = {
enable = true; select = {
lookahead = true; enable = true;
lookahead = true;
};
}; };
}; };
}; };

View File

@@ -0,0 +1,26 @@
{ lib, ... }:
{
plugins.venv-selector = {
enable = true;
settings = {
dap_enabled = true;
name = [
"venv"
".venv"
];
pyenv_path = lib.nixvim.mkRaw "vim.fn.expand('$HOME/.pyenv/versions')";
};
};
keymaps = [
{
mode = "n";
key = "<leader>cv";
action = "<cmd>VenvSelect<CR>";
options = {
desc = "Select Python virtual env";
};
}
];
}

60
flake.lock generated
View File

@@ -5,11 +5,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1760948891, "lastModified": 1763759067,
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -26,11 +26,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759362264, "lastModified": 1763759067,
"narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -87,27 +87,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1761016216, "lastModified": 1764522689,
"narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "481cf557888e05d3128a76f14c76397b7d7cc869", "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1754788789, "lastModified": 1761765539,
"narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "a73b9c743612e4244d865a2fdee11865283c04e6", "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -116,26 +116,40 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1764338033,
"narHash": "sha256-1LNGcU+aTbATD3BPCf7U1KsP1CjCH+ZWqM6JH0sZ6Q0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ba9b83e5fb4b552a423d24dabe5ccb47a9c89901",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"nixpkgs": [ "nixpkgs": "nixpkgs_2",
"nixpkgs"
],
"nuschtosSearch": "nuschtosSearch", "nuschtosSearch": "nuschtosSearch",
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1760795571, "lastModified": 1764614282,
"narHash": "sha256-gi+tWWAknKuTNso3yMeKsT9nj0jx+tuYF7g7nmLUWT8=", "narHash": "sha256-oHT1/E5yf9lvOVHtO5joevADcQLGp5mVab5shVVqxso=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "6c945865ba5de87fa2d0dd8a0e66ca572ddf9043", "rev": "6bdabc1359d7658e1d9ce065db37df92e904b581",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixvim", "repo": "nixvim",
"type": "github" "type": "github"
} }
@@ -150,11 +164,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760652422, "lastModified": 1761730856,
"narHash": "sha256-C88Pgz38QIl9JxQceexqL2G7sw9vodHWx1Uaq+NRJrw=", "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "3ebeebe8b6a49dfb11f771f761e0310f7c48d726", "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -2,10 +2,9 @@
description = "Neovim configuration, declaratively written using nix"; description = "Neovim configuration, declaratively written using nix";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
nixvim.url = "github:nix-community/nixvim/nixos-25.05"; nixvim.url = "github:nix-community/nixvim/nixos-25.11";
nixvim.inputs.nixpkgs.follows = "nixpkgs";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";

3
renovate.json5 Normal file
View File

@@ -0,0 +1,3 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json"
}