diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index fc2e0d65..b24c00aa 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest if: "!contains(github.event.pull_request.title, '[skip ci]')" steps: - - uses: actions/labeler@v5 + - uses: actions/labeler@v6 with: repo-token: ${{ secrets.GITHUB_TOKEN }} configuration-path: .github/labels.yml diff --git a/docs/manual/configuring/autocmds.md b/docs/manual/configuring/autocmds.md index be10e726..92df10f7 100644 --- a/docs/manual/configuring/autocmds.md +++ b/docs/manual/configuring/autocmds.md @@ -43,7 +43,7 @@ with the following options: | `enable` | `bool` | `true` | Enables or disables this autocommand definition. | `true` | | `event` | `nullOr (listOf str)` | `null` | **Required.** List of Neovim events that trigger this autocommand (e.g., `BufWritePre`, `FileType`). | `[ "BufWritePre" ]` | | `pattern` | `nullOr (listOf str)` | `null` | List of file patterns (globs) to match against (e.g., `*.py`, `*`). If `null`, matches all files for the given event. | `[ "*.lua", "*.nix" ]` | -| `callback` | `nullOr luaInline` | `null` | A Lua function to execute when the event triggers. Use `lib.nvim.types.luaInline` or `lib.options.literalExpression "mkLuaInline '''...'''"`. **Cannot be used with `command`.** | `lib.nvim.types.luaInline "function() print('File saved!') end"` | +| `callback` | `nullOr luaInline` | `null` | A Lua function to execute when the event triggers. Use `lib.generators.mkLuaInline`. **Cannot be used with `command`.** | `lib.generators.mkLuaInline "function() print('File saved!') end"` | | `command` | `nullOr str` | `null` | A Vimscript command to execute when the event triggers. **Cannot be used with `callback`.** | `"echo 'File saved!'"` | | `group` | `nullOr str` | `null` | The name of an `augroup` (defined in `vim.augroups`) to associate this autocommand with. | `"MyCustomAuGroup"` | | `desc` | `nullOr str` | `null` | A description for the autocommand (useful for introspection). | `"Format buffer on save"` | @@ -71,7 +71,7 @@ Vimscript) for the same autocommand. Choose one. pattern = [ "*.lua" ]; group = "UserSetup"; desc = "Notify after saving Lua file"; - callback = lib.nvim.types.luaInline '' + callback = lib.generators.mkLuaInline '' function() vim.notify("Lua file saved!", vim.log.levels.INFO) end diff --git a/flake.lock b/flake.lock index a6080d0b..9528e9b7 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "mnw": { "locked": { - "lastModified": 1756580127, - "narHash": "sha256-XK+ZQWjnd96Uko73jY1dc23ksnuWnF/Myc4rT/LQOmc=", + "lastModified": 1756659871, + "narHash": "sha256-v6Rh4aQ6RKjM2N02kK9Usn0Ix7+OY66vNpeklc1MnGE=", "owner": "Gerg-L", "repo": "mnw", - "rev": "ecdb5ba1b08ac198d9e9bfbf9de3b234fb1eb252", + "rev": "ed6cc3e48557ba18266e598a5ebb6602499ada16", "type": "github" }, "original": { @@ -53,11 +53,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756536218, - "narHash": "sha256-ynQxPVN2FIPheUgTFhv01gYLbaiSOS7NgWJPm9LF9D0=", + "lastModified": 1756696532, + "narHash": "sha256-6FWagzm0b7I/IGigOv9pr6LL7NQ86mextfE8g8Q6HBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a918bb3594dd243c2f8534b3be01b3cb4ed35fd1", + "rev": "58dcbf1ec551914c3756c267b8b9c8c86baa1b2f", "type": "github" }, "original": { diff --git a/modules/neovim/init/autocmds.nix b/modules/neovim/init/autocmds.nix index 81580e6b..07656134 100644 --- a/modules/neovim/init/autocmds.nix +++ b/modules/neovim/init/autocmds.nix @@ -38,7 +38,7 @@ type = nullOr luaInline; default = null; example = literalExpression '' - mkLuaInline ''' + lib.generators.mkLuaInline ''' function() print("Saving a Lua file...") end diff --git a/modules/plugins/theme/supported-themes.nix b/modules/plugins/theme/supported-themes.nix index ea858cae..17ba2311 100644 --- a/modules/plugins/theme/supported-themes.nix +++ b/modules/plugins/theme/supported-themes.nix @@ -71,6 +71,9 @@ in { require('catppuccin').setup { flavour = "${style}", transparent_background = ${boolToString transparent}, + float = { + transparent = ${boolToString transparent}, + }, term_colors = true, integrations = { nvimtree = { diff --git a/modules/plugins/utility/images/image-nvim/image-nvim.nix b/modules/plugins/utility/images/image-nvim/image-nvim.nix index 5fa7fdb9..f6998f55 100644 --- a/modules/plugins/utility/images/image-nvim/image-nvim.nix +++ b/modules/plugins/utility/images/image-nvim/image-nvim.nix @@ -9,14 +9,16 @@ in { setupOpts = mkPluginSetupOption "image.nvim" { backend = mkOption { - type = enum ["kitty" "ueberzug"]; + type = enum ["kitty" "ueberzug" "sixel"]; default = "ueberzug"; description = '' The backend to use for rendering images. - - kitty - best in class, works great and is very snappy - - ueberzug - backed by ueberzugpp, supports any terminal, + * `kitty` - best in class, works great and is very snappy. Recommended + by upstream. + * `ueberzug` - backed by ueberzugpp, supports any terminal, but has lower performance + * `sixel` - uses the Sixel graphics protocol, widely supported by many terminals ''; }; diff --git a/modules/wrapper/lazy/config.nix b/modules/wrapper/lazy/config.nix index c1bd8829..026b165c 100644 --- a/modules/wrapper/lazy/config.nix +++ b/modules/wrapper/lazy/config.nix @@ -145,7 +145,7 @@ in { ]; lazy.builtLazyConfig = '' - require('lz.n').load(${toLuaObject lznSpecs}) + ${optionalString (length lznSpecs > 0) "require('lz.n').load(${toLuaObject lznSpecs})"} ${optionalString cfg.enableLznAutoRequire "require('lzn-auto-require').enable()"} ''; }) diff --git a/npins/sources.json b/npins/sources.json index bad7156c..50693e84 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -775,9 +775,9 @@ }, "branch": "master", "submodules": false, - "revision": "a8d6829ce8472a79df140bc494e75f1847f8861e", - "url": "https://github.com/3rd/image.nvim/archive/a8d6829ce8472a79df140bc494e75f1847f8861e.tar.gz", - "hash": "0aq8qdlhyncy5gdbz2ybbfzb2dik1sr9iysg64p4ry5kh8bd2277" + "revision": "446a8a5cc7a3eae3185ee0c697732c32a5547a0b", + "url": "https://github.com/3rd/image.nvim/archive/446a8a5cc7a3eae3185ee0c697732c32a5547a0b.tar.gz", + "hash": "18hgp9qkm596rl0k1n4rrri8y6k84fkacphf9x3mrqwgqrixx80i" }, "img-clip": { "type": "Git", @@ -931,9 +931,9 @@ }, "branch": "master", "submodules": false, - "revision": "8c7d8e3c4242f625fcefb7eed182238c6b39a772", - "url": "https://github.com/nvim-neorocks/lz.n/archive/8c7d8e3c4242f625fcefb7eed182238c6b39a772.tar.gz", - "hash": "0lvyy1apdxlsqhphvg0y54ry8q2dqha2l5rfy7rr47yipkva9mjq" + "revision": "590d1fcae1c34bf7f366de87908aa990a2b555af", + "url": "https://github.com/nvim-neorocks/lz.n/archive/590d1fcae1c34bf7f366de87908aa990a2b555af.tar.gz", + "hash": "05vmxjv2jkz70gxh3banlclrgc9sg1acn4jqbg7rkjgyrpi9yhbv" }, "lzn-auto-require": { "type": "Git",