From e6ffc77378c5c0ee674cec15d274b3d53cd00d46 Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Mon, 20 May 2024 14:25:39 +0300 Subject: [PATCH] flake.lock: update nix2lua --- flake.lock | 8 ++++---- modules/buffer.nix | 2 +- modules/build/neovim.nix | 2 +- modules/plugins/style/nvim-treesitter.nix | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index bdd60a2..81df676 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nix2lua": { "locked": { - "lastModified": 1716152918, - "narHash": "sha256-AvjnTReWS5TFgjXKtUOuzVjHZz94bhmRBGpTBP9XfqI=", + "lastModified": 1716204167, + "narHash": "sha256-Jo1bjYIMy0Zj4zrkcMrcG0N2Qnhc75OnxL6fnqBG+mg=", "ref": "refs/heads/main", - "rev": "da13688260265f83e8b8221a7b46d8d84b3942fc", - "revCount": 47, + "rev": "654eda07372a9a2a03e746d9758f6b39de396a83", + "revCount": 51, "type": "git", "url": "https://git.pleshevski.ru/mynix/nix2lua" }, diff --git a/modules/buffer.nix b/modules/buffer.nix index 7578c6f..b92cc84 100644 --- a/modules/buffer.nix +++ b/modules/buffer.nix @@ -25,7 +25,7 @@ let inherit event; inherit (cfg) pattern; callback = with lib; with nix2lua; lambda [ "ev" ] (lib.flatten [ - (flip mapAttrsToList cfg.opt (k: v: if v == null then null else set "vim.opt.${k}" v)) + (flip mapAttrsToList cfg.opt (k: set "vim.opt.${k}")) ]); }; diff --git a/modules/build/neovim.nix b/modules/build/neovim.nix index 20a25af..92bb6f8 100644 --- a/modules/build/neovim.nix +++ b/modules/build/neovim.nix @@ -38,7 +38,7 @@ in # Global Opts (flip mapAttrsToList config.vim.g (k: set "vim.g.${k}")) # Opts - (flip mapAttrsToList config.vim.opt (k: v: if v == null then null else set "vim.opt.${k}" v)) + (flip mapAttrsToList config.vim.opt (k: set "vim.opt.${k}")) # Plugins (map (v: v.genConfig) (filter (v: v.enable) (attrValues config.plugin))) # Cmd diff --git a/modules/plugins/style/nvim-treesitter.nix b/modules/plugins/style/nvim-treesitter.nix index 29eca91..719c722 100644 --- a/modules/plugins/style/nvim-treesitter.nix +++ b/modules/plugins/style/nvim-treesitter.nix @@ -90,7 +90,7 @@ in }; beforeSetup = with lib; optionals (cfg.extraGrammars != { }) ( - mapAttrsToList (k: v: set "parser_config.${v.language}" { }) cfg.extraGrammars + mapAttrsToList (k: v: set (pipe1 "parser_config" v.language) { }) cfg.extraGrammars ); setupSettings = lib.mkMerge [