From d07bb2e9475fb42260266fe348ebe7da547fa497 Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Mon, 26 Feb 2024 16:19:03 +0100 Subject: [PATCH] nix support --- mzte-nv/conf/ftplugin/nix.fnl | 3 +++ mzte-nv/conf/lua/pluginconf/p-lspconf.fnl | 4 +++- scripts/mzteinit/src/env.zig | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 mzte-nv/conf/ftplugin/nix.fnl diff --git a/mzte-nv/conf/ftplugin/nix.fnl b/mzte-nv/conf/ftplugin/nix.fnl new file mode 100644 index 0000000..4370b58 --- /dev/null +++ b/mzte-nv/conf/ftplugin/nix.fnl @@ -0,0 +1,3 @@ +;; Use 2-space indentation for nix +(set vim.o.shiftwidth 2) +(set vim.o.tabstop 2) diff --git a/mzte-nv/conf/lua/pluginconf/p-lspconf.fnl b/mzte-nv/conf/lua/pluginconf/p-lspconf.fnl index 3ea1cd0..e7019c0 100644 --- a/mzte-nv/conf/lua/pluginconf/p-lspconf.fnl +++ b/mzte-nv/conf/lua/pluginconf/p-lspconf.fnl @@ -7,7 +7,8 @@ (when (not args) (set args {})) (tset args :on_attach (if args.on_attach - `(fn [client# bufnr#] (mztenv.lsp.onAttach client# bufnr#) + `(fn [client# bufnr#] + (mztenv.lsp.onAttach client# bufnr#) (,args.on_attach client# bufnr#)) `mztenv.lsp.onAttach)) (tset args :capabilities `caps) @@ -53,6 +54,7 @@ true)] :telemetry {:enable false}}}}) +(setup :nil_ls {:settings {:nil {:formatting {:command [:nixpkgs-fmt]}}}}) (setup :ocamllsp) (setup :prosemd_lsp) (setup :racket_langserver) diff --git a/scripts/mzteinit/src/env.zig b/scripts/mzteinit/src/env.zig index 27ecb49..b67347f 100644 --- a/scripts/mzteinit/src/env.zig +++ b/scripts/mzteinit/src/env.zig @@ -134,6 +134,7 @@ pub fn populateEnvironment(env: *std.process.EnvMap) !bool { var b = delimitedWriter(bufstream.writer(), ':'); for ([_][]const u8{ + ".nix-profile/bin", ".mix/escripts", ".cargo/bin", ".local/bin",