Merge bb2a78272b into 1bb901edeb

languages/clang: unpin clang-tools package
Merge pull request #317 from diniamo/autopairs-use-booltostring
2024-06-25 21:36:00 +02:00 · 2024-06-25 22:32:12 +03:00 · 2024-06-25 12:12:40 +00:00 · 2024-06-25 14:01:44 +02:00
2 changed files with 3 additions and 3 deletions
--- a/modules/plugins/autopairs/nvim-autopairs/config.nix
+++ b/modules/plugins/autopairs/nvim-autopairs/config.nix
@ -4,8 +4,8 @@
  ...
 }: let
  inherit (lib.modules) mkIf;
+  inherit (lib.trivial) boolToString;
  inherit (lib.nvim.dag) entryAnywhere;
-  inherit (lib.nvim.lua) toLuaObject;

  cfg = config.vim.autopairs;
 in {
@ -13,7 +13,7 @@ in {
    vim.startPlugins = ["nvim-autopairs"];

    vim.luaConfigRC.autopairs = entryAnywhere ''
-      require("nvim-autopairs").setup({ map_cr = ${toLuaObject (!config.vim.autocomplete.enable)} })
+      require("nvim-autopairs").setup({ map_cr = ${boolToString (!config.vim.autocomplete.enable)} })
    '';
  };
 }
--- a/modules/plugins/languages/clang.nix
+++ b/modules/plugins/languages/clang.nix
@ -35,7 +35,7 @@
      '';
    };
    clangd = {
-      package = pkgs.clang-tools_16;
+      package = pkgs.clang-tools;
      lspConfig = ''
        local clangd_cap = capabilities
        -- use same offsetEncoding as null-ls
Author	SHA1	Message	Date
diniamo	a5517a04ae	Merge `bb2a78272b` into `1bb901edeb`	2024-06-25 21:36:00 +02:00
NotAShelf	1bb901edeb	languages/clang: unpin clang-tools package	2024-06-25 22:32:12 +03:00
raf	155bc8e1cc	Merge pull request #317 from diniamo/autopairs-use-booltostring modules/autopairs: use boolToString instead of toLuaObject	2024-06-25 12:12:40 +00:00
diniamo	a145f997f3	modules/autopairs: use boolToString instead of toLuaObject	2024-06-25 14:01:44 +02:00