b12f restructure #1

Merged
teutat3s merged 218 commits from b12f into main 2020-11-24 18:27:01 +00:00
4 changed files with 25 additions and 1 deletions
Showing only changes of commit ca6843ab44 - Show all commits

View file

@ -632,6 +632,22 @@
"type": "github" "type": "github"
} }
}, },
"pub-solar": {
"locked": {
"lastModified": 1654369474,
"narHash": "sha256-omGF0Ws0l/HE+S08hDObnNptPwM+dVhnA8ya+TAKBHI=",
"owner": "pub-solar",
"repo": "nixpkgs",
"rev": "0b509c42845cea8389e02dcb589eec1c8a165f10",
"type": "github"
},
"original": {
"owner": "pub-solar",
"ref": "fix/use-latest-unstable-yubikey-agent",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
@ -647,7 +663,8 @@
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nur": "nur", "nur": "nur",
"nvfetcher": "nvfetcher" "nvfetcher": "nvfetcher",
"pub-solar": "pub-solar"
} }
}, },
"utils": { "utils": {

View file

@ -10,6 +10,7 @@
# Track channels with commits tested and built by hydra # Track channels with commits tested and built by hydra
nixos.url = "github:nixos/nixpkgs/nixos-22.05"; nixos.url = "github:nixos/nixpkgs/nixos-22.05";
latest.url = "github:nixos/nixpkgs/nixos-unstable"; latest.url = "github:nixos/nixpkgs/nixos-unstable";
pub-solar.url = "github:pub-solar/nixpkgs/fix/use-latest-unstable-yubikey-agent";
digga.url = "github:divnix/digga"; digga.url = "github:divnix/digga";
digga.inputs.nixpkgs.follows = "nixos"; digga.inputs.nixpkgs.follows = "nixos";

View file

@ -19,6 +19,10 @@ channels: final: prev: {
tdesktop tdesktop
; ;
inherit (channels.pub-solar)
yubikey-agent
;
haskellPackages = prev.haskellPackages.override haskellPackages = prev.haskellPackages.override
(old: { (old: {

View file

@ -10,6 +10,8 @@ in
config = { config = {
home-manager.users = { inherit (hmUsers) ben; }; home-manager.users = { inherit (hmUsers) ben; };
services.yubikey-agent.enable = true;
pub-solar = { pub-solar = {
# These are your personal settings # These are your personal settings
# The only required settings are `name` and `password`, # The only required settings are `name` and `password`,