From b03b8f6328744cd7b6d94fbb982220298f34d13a Mon Sep 17 00:00:00 2001 From: notgne2 Date: Tue, 14 Sep 2021 05:19:02 -0700 Subject: [PATCH] fix firenvim --- flake.nix | 6 +++++- home-manager/users/notgne2_pc.nix | 12 +++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 2e642ce..791fc6d 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,10 @@ url = "git+ssh://git@git.wizbos.club/notgne2/mudl.git"; inputs.nixpkgs.follows = "nixpkgs"; }; + firenvim = { + url = "github:glacambre/firenvim"; + flake = false; + }; }; outputs = { self, nixpkgs, ... }@inputs: { @@ -48,7 +52,7 @@ homeManagerModules.common = import ./home-manager/common.nix inputs; homeManagerModules.common-notgne2 = import ./home-manager/users/notgne2.nix; - homeManagerModules.common-notgne2_pc = import ./home-manager/users/notgne2_pc.nix; + homeManagerModules.common-notgne2_pc = import ./home-manager/users/notgne2_pc.nix inputs; homeManagerModules.common-glooder = import ./home-manager/users/glooder.nix; homeManagerModules.common-chekkie = import ./home-manager/users/chekkie.nix; }; diff --git a/home-manager/users/notgne2_pc.nix b/home-manager/users/notgne2_pc.nix index 1888f3b..3f51d1c 100644 --- a/home-manager/users/notgne2_pc.nix +++ b/home-manager/users/notgne2_pc.nix @@ -1,3 +1,4 @@ +inputs: { config, pkgs, lib, ... }: let # TODO: find a better source @@ -111,11 +112,12 @@ in } ( pkgs.vimUtils.buildVimPlugin { - name = "firenvim"; - src = builtins.fetchGit { - url = "git+ssh://git@github.com/glacambre/firenvim.git"; - rev = "3b6558c47f6a3721fadce5b4ac70335be9863632"; - }; + pname = "firenvim"; + src = inputs.firenvim; + # yes im stupid + version = builtins.readFile (pkgs.runCommandNoCC "firenvim-version" {} '' + ${pkgs.jq}/bin/jq -j .version < ${inputs.firenvim}/package.json > $out + ''); }) vim-gitgutter ];