NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-09-05 18:01:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'main' into main

Browse source
This commit is contained in:
raf 2025-08-31 22:28:12 +03:00 • committed by GitHub
commit c3ed4dd94f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 336 additions and 321 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.lock generated
View file

@ -38,11 +38,11 @@
}, },
"mnw": { "mnw": {
"locked": { "locked": {
"lastModified": 1748710831, "lastModified": 1756580127,
"narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=", "narHash": "sha256-XK+ZQWjnd96Uko73jY1dc23ksnuWnF/Myc4rT/LQOmc=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "mnw", "repo": "mnw",
"rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d", "rev": "ecdb5ba1b08ac198d9e9bfbf9de3b234fb1eb252",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -53,11 +53,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1755049066, "lastModified": 1756536218,
"narHash": "sha256-ANrc15FSoOAdNbfKHxqEJjZLftIwIsenJGRb/04K41s=", "narHash": "sha256-ynQxPVN2FIPheUgTFhv01gYLbaiSOS7NgWJPm9LF9D0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e45f8f193029378d0aaee5431ba098dc80054e9a", "rev": "a918bb3594dd243c2f8534b3be01b3cb4ed35fd1",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake/pkgs/by-name/avante-nvim/package.nix
View file

@ -22,7 +22,7 @@
pname = "avante-nvim-lib"; pname = "avante-nvim-lib";
inherit version src; inherit version src;
cargoHash = "sha256-8mBpzndz34RrmhJYezd4hLrJyhVL4S4IHK3plaue1k8="; cargoHash = "sha256-pTWCT2s820mjnfTscFnoSKC37RE7DAPKxP71QuM+JXQ=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

2
modules/plugins/tabline/nvim-bufferline/config.nix
View file

@ -15,7 +15,7 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
vim = { vim = {
startPlugins = [ startPlugins = [
"nvim-bufferline-lua" "bufferline-nvim"
"bufdelete-nvim" "bufdelete-nvim"
]; ];

24
modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix
View file

@ -3,7 +3,7 @@
lib, lib,
... ...
}: let }: let
inherit (lib.options) mkOption mkEnableOption literalExpression; inherit (lib.options) mkOption mkEnableOption literalExpression literalMD;
inherit (lib.types) enum bool either nullOr str int listOf attrs; inherit (lib.types) enum bool either nullOr str int listOf attrs;
inherit (lib.generators) mkLuaInline; inherit (lib.generators) mkLuaInline;
inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.binds) mkMappingOption;
@ -24,17 +24,28 @@ in {
movePrevious = mkMappingOption "Move previous buffer" "<leader>bmp"; movePrevious = mkMappingOption "Move previous buffer" "<leader>bmp";
}; };
setupOpts = mkPluginSetupOption "Bufferline-nvim" { setupOpts = mkPluginSetupOption "bufferline-nvim" {
highlights = mkOption { highlights = mkOption {
type = either attrs luaInline; type = either attrs luaInline;
default = default =
if config.vim.theme.enable && config.vim.theme.name == "catppuccin" if config.vim.theme.enable && config.vim.theme.name == "catppuccin"
then then
mkLuaInline mkLuaInline ''
'' (function()
require("catppuccin.groups.integrations.bufferline").get() local integration = require("catppuccin.groups.integrations.bufferline")
return (integration.get_theme or integration.get)()
end)()
'' ''
else {}; else {};
defaultText = literalMD ''
```lua
(function()
local integration = require("catppuccin.groups.integrations.bufferline")
return (integration.get_theme or integration.get)()
end)()
```
if the active theme is Catppuccin, `{}` otherwise.
'';
description = '' description = ''
Overrides the highlight groups of bufferline. Overrides the highlight groups of bufferline.
@ -59,10 +70,11 @@ in {
themable = mkOption { themable = mkOption {
type = bool; type = bool;
default = true; default = true;
example = false;
description = '' description = ''
Whether or not to allow highlight groups to be overridden. Whether or not to allow highlight groups to be overridden.
While false, bufferline.nvim sets highlights as default. While `false`, bufferline.nvim sets highlights as default.
''; '';
}; };

617
npins/sources.json
View file

File diff suppressed because it is too large Load diff