diff --git a/flake.nix b/flake.nix index 320a584..5ea2be3 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { # Packages nixpkgs.url = "nixpkgs/nixos-24.11"; - unixpkgs.url = "nixpkgs/master"; + jjuinixpkgs.url = "github:Adda0/nixpkgs/jjui"; # Testing PR labellenixpkgs.url = "github:FabianRig/nixpkgs/update-labelle-1.3.2"; # Current 24.11 version doesn't match dependencies # OS disko = { diff --git a/hm/git/default.nix b/hm/git/default.nix index ecab4ec..caca6ad 100644 --- a/hm/git/default.nix +++ b/hm/git/default.nix @@ -2,15 +2,17 @@ pkgs, lib, config, + jjuinixpkgs, ... }: let cfg = config.programs.git; + jjuipkgs = import jjuinixpkgs { inherit (pkgs) system; }; in { config = lib.mkIf cfg.enable { home.packages = [ - (pkgs.callPackage ./jjui.nix { }) + jjuipkgs.jjui (pkgs.writeShellApplication { name = "git-sync"; text = ( diff --git a/hm/git/jjui.nix b/hm/git/jjui.nix deleted file mode 100644 index 0cadd8a..0000000 --- a/hm/git/jjui.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ buildGoModule, fetchFromGitHub }: -buildGoModule { - pname = "jjui"; - version = "2024-11-28"; - - src = fetchFromGitHub { - owner = "GeoffreyFrogeye"; - repo = "jjui"; - rev = "push-sszqvsmvqxmy"; # base16 colors - sha256 = "sha256-jNi5Ek3Qy/MojlQXBNlqREy7UxnyMaJuUtKPysWBoNU="; - }; - - vendorHash = "sha256-kg5b3tzwyAhn00GwdUDf4OdYZvCJZHgkgpzHFWy5SxI="; - - postInstall = '' - mv $out/bin/cmd $out/bin/jjui - ''; - - doCheck = false; # Some tests are not working - -}