made bw-git-helper work with flakes

pull/1/head
Tudor Roman 2022-01-22 15:39:24 +01:00
parent d206c152e5
commit 1b9b8fc72b
No known key found for this signature in database
GPG Key ID: 5AFEDD03CA5A1EA4
3 changed files with 67 additions and 14 deletions

View File

@ -1,5 +1,24 @@
{
"nodes": {
"bw-git-helper": {
"inputs": {
"nixpkgs": "nixpkgs",
"utils": "utils"
},
"locked": {
"lastModified": 1642862220,
"narHash": "sha256-e8FRsqyRWGvRDvvf0FjDMdC+92jXjNSAbDZN5eJ2RhY=",
"owner": "tudurom",
"repo": "bw-git-helper",
"rev": "88198042d990e7c70d9a89ad4d49431c1e76f7a6",
"type": "github"
},
"original": {
"owner": "tudurom",
"repo": "bw-git-helper",
"type": "github"
}
},
"emacs-overlay": {
"locked": {
"lastModified": 1642502473,
@ -56,7 +75,7 @@
"nixpkgs": [
"nixpkgs"
],
"utils": "utils"
"utils": "utils_2"
},
"locked": {
"lastModified": 1637574694,
@ -89,15 +108,15 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1642190797,
"narHash": "sha256-cxeEEAtfIACnm8sV1oz0xlNp9IVk10Fxcc09ggoEZuo=",
"owner": "nixos",
"lastModified": 1642707142,
"narHash": "sha256-BzH6xhnkn52yF4+A8C8slWFQRMInS5VYlzrH/rN1bnA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3ddd960a3b575bf3230d0e59f42614b71f9e0db9",
"rev": "6f07605b6916abee5435ea1145a7541299a87c1b",
"type": "github"
},
"original": {
"owner": "nixos",
"owner": "NixOS",
"ref": "nixos-21.11",
"repo": "nixpkgs",
"type": "github"
@ -119,18 +138,50 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1642190797,
"narHash": "sha256-cxeEEAtfIACnm8sV1oz0xlNp9IVk10Fxcc09ggoEZuo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3ddd960a3b575bf3230d0e59f42614b71f9e0db9",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-21.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"bw-git-helper": "bw-git-helper",
"emacs-overlay": "emacs-overlay",
"home-manager": "home-manager",
"nix-ld": "nix-ld",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable",
"utils": "utils_2"
"utils": "utils_3"
}
},
"utils": {
"locked": {
"lastModified": 1642700792,
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_2": {
"locked": {
"lastModified": 1610051610,
"narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=",
@ -145,7 +196,7 @@
"type": "github"
}
},
"utils_2": {
"utils_3": {
"inputs": {
"flake-utils": "flake-utils"
},

View File

@ -16,15 +16,17 @@
nix-ld.url = github:Mic92/nix-ld;
nix-ld.inputs.nixpkgs.follows = "nixpkgs";
bw-git-helper.url = github:tudurom/bw-git-helper;
};
nixConfig = {
substituters = [ "https://cache.nixos.org" "https://nix-community.cachix.org" ];
trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ];
};
outputs = inputs@{ self, utils, nixpkgs, nixpkgs-unstable, home-manager,
emacs-overlay, nixos-hardware, nix-ld, ... }:
nix-ld, bw-git-helper, ... }:
let
commonModules = [
];
@ -39,6 +41,7 @@
overlaysBuilder = channels: [
(final: prev: {
tudor = {
bw-git-helper = prev.callPackage (import inputs.bw-git-helper) {};
};
})
];

View File

@ -17,8 +17,7 @@
};
extraConfig = {
# FIXME: bit bitwarden credential helper
#credential.helper = "!bw-git-helper $@";
credential.helper = "!bw-git-helper $@";
diff.algorithm = "patience";
tag.forceSignAnnotated = true;
};
@ -34,7 +33,7 @@
'';
home.packages = with pkgs; [
#tudor.bw-git-helper
tudor.bw-git-helper
git-lfs
];
};