update nvim config
This commit is contained in:
parent
5ba4ef2acc
commit
6aa0ceeae7
|
@ -22,7 +22,7 @@ pub fn build(b: *std.build.Builder) !void {
|
||||||
lib.strip = mode != .Debug;
|
lib.strip = mode != .Debug;
|
||||||
lib.unwind_tables = true;
|
lib.unwind_tables = true;
|
||||||
|
|
||||||
b.getInstallStep().dependOn(&(try InstallStep.init(b, lib)).step);
|
b.getInstallStep().dependOn(&b.addInstallFile(lib.getOutputSource(), "share/nvim/mzte-nv.so").step);
|
||||||
|
|
||||||
// this is the install step for the lua config compiler binary
|
// this is the install step for the lua config compiler binary
|
||||||
const compiler = b.addExecutable(.{
|
const compiler = b.addExecutable(.{
|
||||||
|
@ -40,42 +40,3 @@ pub fn build(b: *std.build.Builder) !void {
|
||||||
|
|
||||||
compiler.install();
|
compiler.install();
|
||||||
}
|
}
|
||||||
|
|
||||||
const InstallStep = struct {
|
|
||||||
builder: *std.build.Builder,
|
|
||||||
step: std.build.Step,
|
|
||||||
lib: *std.build.LibExeObjStep,
|
|
||||||
|
|
||||||
fn init(builder: *std.build.Builder, lib: *std.build.LibExeObjStep) !*InstallStep {
|
|
||||||
const self = try builder.allocator.create(InstallStep);
|
|
||||||
self.* = .{
|
|
||||||
.builder = builder,
|
|
||||||
.lib = lib,
|
|
||||||
.step = std.build.Step.init(.custom, "install", builder.allocator, make),
|
|
||||||
};
|
|
||||||
self.step.dependOn(&lib.step);
|
|
||||||
return self;
|
|
||||||
}
|
|
||||||
|
|
||||||
fn make(step: *std.build.Step) anyerror!void {
|
|
||||||
const self = @fieldParentPtr(InstallStep, "step", step);
|
|
||||||
|
|
||||||
const plugin_install_dir = std.build.InstallDir{
|
|
||||||
.custom = "share/nvim",
|
|
||||||
};
|
|
||||||
const plugin_basename = "mzte-nv.so";
|
|
||||||
|
|
||||||
const dest_path = self.builder.getInstallPath(
|
|
||||||
plugin_install_dir,
|
|
||||||
plugin_basename,
|
|
||||||
);
|
|
||||||
|
|
||||||
try self.builder.updateFile(
|
|
||||||
self.lib.getOutputSource().getPath(self.builder),
|
|
||||||
dest_path,
|
|
||||||
);
|
|
||||||
|
|
||||||
// FIXME: the uninstall step doesn't do anything, despite this
|
|
||||||
self.builder.pushInstalledFile(plugin_install_dir, plugin_basename);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
|
@ -1,4 +1,9 @@
|
||||||
;; Blame conjure for this BS config
|
;; Blame conjure for this BS config
|
||||||
|
;; NOTE: this is ran before conjure initialization
|
||||||
|
|
||||||
|
;; Disable auto-attach
|
||||||
|
(tset vim :g "conjure#client_on_load" false)
|
||||||
|
|
||||||
(tset vim :g "conjure#mapping#prefix" :<F1>)
|
(tset vim :g "conjure#mapping#prefix" :<F1>)
|
||||||
|
|
||||||
;; Only enable used clients
|
;; Only enable used clients
|
||||||
|
@ -9,6 +14,7 @@
|
||||||
:lua
|
:lua
|
||||||
:lisp
|
:lisp
|
||||||
:python])
|
:python])
|
||||||
|
(tset vim :g "conjure#filetype#rust" false)
|
||||||
|
|
||||||
;; This has custom handling for compat with LSP
|
;; This has custom handling for compat with LSP
|
||||||
(tset vim :g "conjure#mapping#doc_word" false)
|
(tset vim :g "conjure#mapping#doc_word" false)
|
||||||
|
|
|
@ -67,7 +67,7 @@
|
||||||
(use/pconf use :CKolkey/ts-node-action :tsn-actions
|
(use/pconf use :CKolkey/ts-node-action :tsn-actions
|
||||||
{:requires :jose-elias-alvarez/null-ls.nvim})
|
{:requires :jose-elias-alvarez/null-ls.nvim})
|
||||||
(use :nvim-treesitter/playground)
|
(use :nvim-treesitter/playground)
|
||||||
(use/pconf use :Olical/conjure :conjure)
|
(use {1 :Olical/conjure :setup (pconf :conjure)})
|
||||||
(cmp-plugins use))
|
(cmp-plugins use))
|
||||||
|
|
||||||
((. (require :packer) :startup) init)
|
((. (require :packer) :startup) init)
|
||||||
|
|
Loading…
Reference in a new issue