Compare commits

..

No commits in common. "main" and "fix/helm-template-lsp" have entirely different histories.

13 changed files with 240 additions and 174 deletions

View file

@ -7,9 +7,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v5
uses: actions/checkout@v4
- name: Renovate
uses: renovatebot/github-action@v43.0.14
uses: renovatebot/github-action@v41.0.13
with:
configurationFile: renovate.json5
renovate-version: full

View file

@ -19,10 +19,10 @@ jobs:
steps:
- name: Repository Checkout
uses: actions/checkout@v5
uses: actions/checkout@v4
- name: Install Nix
uses: DeterminateSystems/nix-installer-action@v20
uses: DeterminateSystems/nix-installer-action@v16
- name: Check for Updates
id: check_updates
@ -44,7 +44,7 @@ jobs:
- name: Update flake.lock
if: steps.check_updates.outputs.update_available == 'true'
uses: DeterminateSystems/update-flake-lock@v27
uses: DeterminateSystems/update-flake-lock@v24
with:
nix-options: --debug --log-format raw
token: ${{ secrets.FLAKE_TOKEN }}
@ -69,12 +69,12 @@ jobs:
steps:
- name: Repository Checkout
uses: actions/checkout@v5
uses: actions/checkout@v4
with:
ref: update_flake_lock_action
- name: Install Nix
uses: DeterminateSystems/nix-installer-action@v20
uses: DeterminateSystems/nix-installer-action@v16
- name: Build and Test Configuration
id: build
@ -100,7 +100,7 @@ jobs:
- name: Create Issue on Build Failure
if: env.build_status == 'failure'
uses: actions/github-script@v8
uses: actions/github-script@v7
with:
script: |
const os = '${{ matrix.os }}';

View file

@ -1,10 +1,10 @@
{
plugins.lspkind = {
enable = true;
settings = {
symbol_map = {
Copilot = " ";
};
symbolMap = {
Copilot = " ";
};
extraOptions = {
maxwidth = 50;
ellipsis_char = "...";
};

View file

@ -1,15 +1,13 @@
{
plugins.illuminate = {
enable = true;
settings = {
under_cursor = false;
filetypes_denylist = [
"Outline"
"TelescopePrompt"
"alpha"
"harpoon"
"reason"
];
};
underCursor = false;
filetypesDenylist = [
"Outline"
"TelescopePrompt"
"alpha"
"harpoon"
"reason"
];
};
}

View file

@ -1,42 +1,40 @@
{
plugins.neo-tree = {
enable = true;
settings = {
sources = [
"filesystem"
"buffers"
"git_status"
"document_symbols"
];
add_blank_line_at_top = false;
sources = [
"filesystem"
"buffers"
"git_status"
"document_symbols"
];
addBlankLineAtTop = false;
filesystem = {
bind_to_cwd = false;
follow_current_file = {
enabled = true;
};
filesystem = {
bindToCwd = false;
followCurrentFile = {
enabled = true;
};
};
defaultComponentConfigs = {
indent = {
withExpanders = true;
expanderCollapsed = "󰅂";
expanderExpanded = "󰅀";
expanderHighlight = "NeoTreeExpander";
};
default_component_configs = {
indent = {
with_expanders = true;
expander_collapsed = "󰅂";
expander_expanded = "󰅀";
expander_highlight = "NeoTreeExpander";
};
git_status = {
symbols = {
added = " ";
conflict = "󰩌 ";
deleted = "󱂥";
ignored = " ";
modified = " ";
renamed = "󰑕";
staged = "󰩍";
unstaged = "";
untracked = " ";
};
gitStatus = {
symbols = {
added = " ";
conflict = "󰩌 ";
deleted = "󱂥";
ignored = " ";
modified = " ";
renamed = "󰑕";
staged = "󰩍";
unstaged = "";
untracked = " ";
};
};
};

View file

@ -6,58 +6,56 @@
indent.enable = true;
highlight.enable = true;
};
folding.enable = false;
folding = false;
nixvimInjections = true;
grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars;
};
plugins.treesitter-textobjects = {
enable = false;
settings = {
select = {
enable = true;
lookahead = true;
keymaps = {
"aa" = "@parameter.outer";
"ia" = "@parameter.inner";
"af" = "@function.outer";
"if" = "@function.inner";
"ac" = "@class.outer";
"ic" = "@class.inner";
"ii" = "@conditional.inner";
"ai" = "@conditional.outer";
"il" = "@loop.inner";
"al" = "@loop.outer";
"at" = "@comment.outer";
};
select = {
enable = true;
lookahead = true;
keymaps = {
"aa" = "@parameter.outer";
"ia" = "@parameter.inner";
"af" = "@function.outer";
"if" = "@function.inner";
"ac" = "@class.outer";
"ic" = "@class.inner";
"ii" = "@conditional.inner";
"ai" = "@conditional.outer";
"il" = "@loop.inner";
"al" = "@loop.outer";
"at" = "@comment.outer";
};
move = {
enable = true;
goto_next_start = {
"]m" = "@function.outer";
"]]" = "@class.outer";
};
goto_next_end = {
"]M" = "@function.outer";
"][" = "@class.outer";
};
goto_previous_start = {
"[m" = "@function.outer";
"[[" = "@class.outer";
};
goto_previous_end = {
"[M" = "@function.outer";
"[]" = "@class.outer";
};
};
move = {
enable = true;
gotoNextStart = {
"]m" = "@function.outer";
"]]" = "@class.outer";
};
swap = {
enable = true;
swap_next = {
"<leader>a" = "@parameters.inner";
};
swap_previous = {
"<leader>A" = "@parameter.outer";
};
gotoNextEnd = {
"]M" = "@function.outer";
"][" = "@class.outer";
};
gotoPreviousStart = {
"[m" = "@function.outer";
"[[" = "@class.outer";
};
gotoPreviousEnd = {
"[M" = "@function.outer";
"[]" = "@class.outer";
};
};
swap = {
enable = true;
swapNext = {
"<leader>a" = "@parameters.inner";
};
swapPrevious = {
"<leader>A" = "@parameter.outer";
};
};
};

View file

@ -103,7 +103,7 @@
"isort"
];
lua = [ "stylua" ];
nix = [ "nixfmt" ];
nix = [ "nixfmt-rfc-style" ];
markdown = {
__unkeyed-1 = "prettierd";
__unkeyed-2 = "prettier";
@ -132,8 +132,8 @@
isort = {
command = "${lib.getExe pkgs.isort}";
};
nixfmt = {
command = "${lib.getExe pkgs.nixfmt}";
nixfmt-rfc-style = {
command = "${lib.getExe pkgs.nixfmt-rfc-style}";
};
alejandra = {
command = "${lib.getExe pkgs.alejandra}";

View file

@ -38,6 +38,9 @@
terraformls = {
enable = true;
};
ansiblels = {
enable = true;
};
jsonls = {
enable = true;
};
@ -67,10 +70,8 @@
"http://json.schemastore.org/ansible-playbook" = "*play*.{yml,yaml}";
"http://json.schemastore.org/chart" = "Chart.{yml,yaml}";
"https://json.schemastore.org/dependabot-v2" = ".github/dependabot.{yml,yaml}";
"https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json" =
"*docker-compose*.{yml,yaml}";
"https://raw.githubusercontent.com/argoproj/argo-workflows/master/api/jsonschema/schema.json" =
"*flow*.{yml,yaml}";
"https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json" = "*docker-compose*.{yml,yaml}";
"https://raw.githubusercontent.com/argoproj/argo-workflows/master/api/jsonschema/schema.json" = "*flow*.{yml,yaml}";
};
};
};
@ -138,17 +139,17 @@
extraConfigLua = ''
local _border = "rounded"
vim.lsp.handlers["textDocument/hover"] = function(err, result, ctx, config)
config = config or {}
config.border = _border
return vim.lsp.handlers.hover(err, result, ctx, config)
end
vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(
vim.lsp.handlers.hover, {
border = _border
}
)
vim.lsp.handlers["textDocument/signatureHelp"] = function(err, result, ctx, config)
config = config or {}
config.border = _border
return vim.lsp.handlers.signature_help(err, result, ctx, config)
end
vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
vim.lsp.handlers.signature_help, {
border = _border
}
)
vim.diagnostic.config{
float={border=_border}

View file

@ -1,17 +1,18 @@
{
plugins.startup = {
enable = true;
settings = {
colors = {
background = "#ffffff";
folded_section = "#ffffff";
};
colors = {
background = "#ffffff";
foldedSection = "#ffffff";
};
sections = {
header = {
type = "text";
oldfiles_directory = false;
oldfilesDirectory = false;
align = "center";
fold_section = false;
foldSection = false;
title = "Header";
margin = 5;
content = [
@ -23,15 +24,15 @@
" ╚═════╝░╚══════╝░╚════╝░░╚════╝░╚═╝░░╚═╝░░░╚═╝░░░╚═╝░░░╚═╝░░░╚══════╝░╚════╝░╚═╝░░╚═╝"
];
highlight = "Statement";
default_color = "";
oldfiles_amount = 0;
defaultColor = "";
oldfilesAmount = 0;
};
body = {
type = "mapping";
oldfiles_directory = false;
oldfilesDirectory = false;
align = "center";
fold_section = false;
foldSection = false;
title = "Menu";
margin = 5;
content = [
@ -67,21 +68,21 @@
]
];
highlight = "string";
default_color = "";
oldfiles_amount = 0;
defaultColor = "";
oldfilesAmount = 0;
};
};
options = {
paddings = [
1
3
];
};
parts = [
"header"
"body"
options = {
paddings = [
1
3
];
};
parts = [
"header"
"body"
];
};
}

View file

@ -1,5 +1,7 @@
{ pkgs, ... }:
{
extraPlugins = with pkgs.vimPlugins; [
];
extraPlugins =
with pkgs.vimPlugins;
[
];
}

View file

@ -1,4 +1,3 @@
{ pkgs, ... }:
{
config = {
extraConfigLuaPre =
@ -11,7 +10,7 @@
'';
clipboard = {
providers.wl-copy.enable = pkgs.stdenv.isLinux;
providers.wl-copy.enable = true;
};
opts = {

129
flake.lock generated
View file

@ -3,15 +3,15 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1767039857,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "NixOS",
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "NixOS",
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
@ -21,11 +21,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1775087534,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
"lastModified": 1741352980,
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
"type": "github"
},
"original": {
@ -42,11 +42,11 @@
]
},
"locked": {
"lastModified": 1772408722,
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
"lastModified": 1738453229,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github"
},
"original": {
@ -55,6 +55,24 @@
"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"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
@ -76,13 +94,41 @@
"type": "github"
}
},
"ixx": {
"inputs": {
"flake-utils": [
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [
"nixvim",
"nuschtosSearch",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729958008,
"narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
"owner": "NuschtOS",
"repo": "ixx",
"rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"ref": "v0.0.6",
"repo": "ixx",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1775710090,
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
"lastModified": 1741246872,
"narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4c1018dae018162ec878d42fec712642d214fdfa",
"rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
"type": "github"
},
"original": {
@ -94,11 +140,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1774748309,
"narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
"lastModified": 1740877520,
"narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "333c4e0545a6da976206c74db8773a1645b5870a",
"rev": "147dee35aab2193b174e4c0868bd80ead5ce755c",
"type": "github"
},
"original": {
@ -109,11 +155,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1774701658,
"narHash": "sha256-CIS/4AMUSwUyC8X5g+5JsMRvIUL3YUfewe8K4VrbsSQ=",
"lastModified": 1738797219,
"narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b63fe7f000adcfa269967eeff72c64cafecbbebe",
"rev": "1da52dd49a127ad74486b135898da2cef8c62665",
"type": "github"
},
"original": {
@ -125,11 +171,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1770073757,
"narHash": "sha256-Vy+G+F+3E/Tl+GMNgiHl9Pah2DgShmIUBJXmbiQPHbI=",
"lastModified": 1730768919,
"narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "47472570b1e607482890801aeaf29bfb749884f6",
"rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc",
"type": "github"
},
"original": {
@ -143,14 +189,14 @@
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_2",
"systems": "systems"
"nuschtosSearch": "nuschtosSearch"
},
"locked": {
"lastModified": 1776128025,
"narHash": "sha256-spZM5zll0cBPHHSZPioZREArzCsllurKQsJME08nnXY=",
"lastModified": 1741098523,
"narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "0a12693297d23f1b3af04ba6112b5936e2eba41b",
"rev": "03065fd4708bfdf47dd541d655392a60daa25ded",
"type": "github"
},
"original": {
@ -159,6 +205,29 @@
"type": "github"
}
},
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils",
"ixx": "ixx",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1738508923,
"narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
"owner": "NuschtOS",
"repo": "search",
"rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"repo": "search",
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat",
@ -166,11 +235,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1775585728,
"narHash": "sha256-8Psjt+TWvE4thRKktJsXfR6PA/fWWsZ04DVaY6PUhr4=",
"lastModified": 1741350116,
"narHash": "sha256-QKp83UTH0hGc7TYkQdX5JdagvBnP5169WyxXkMrkPqY=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "580633fa3fe5fc0379905986543fd7495481913d",
"rev": "ca78dfc9652483f3ae52cfe70fdfbfe664451e2b",
"type": "github"
},
"original": {

View file

@ -56,12 +56,12 @@
src = ./.;
hooks = {
statix.enable = true;
nixfmt.enable = true;
nixfmt-rfc-style.enable = true;
};
};
};
formatter = pkgs.nixfmt;
formatter = pkgs.nixfmt-rfc-style;
packages = {
default = nvim;