Fix main merge
This commit is contained in:
parent
9b53a8c982
commit
7d09488513
36
flake.lock
36
flake.lock
|
@ -308,6 +308,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"master": {
|
||||
"locked": {
|
||||
"lastModified": 1674941334,
|
||||
"narHash": "sha256-hLNilB0cO4KTUhqOLRfuJMakmNyitKUfj37u1DtRX6w=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "327dc97d8708c65bde5e41e210c335df4e18c3bb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "master",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"naersk": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
@ -437,6 +453,22 @@
|
|||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"pub-solar": {
|
||||
"locked": {
|
||||
"lastModified": 1654372286,
|
||||
"narHash": "sha256-z1WrQkL67Sosz1VnuKQLpzEkEl4ianeLpWJX8Q6bVQY=",
|
||||
"owner": "pub-solar",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4995a873a796c54cc49e5dca9e1d20350eceec7b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "pub-solar",
|
||||
"ref": "fix/use-latest-unstable-yubikey-agent",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
|
@ -446,11 +478,13 @@
|
|||
"flake-compat": "flake-compat_3",
|
||||
"home": "home",
|
||||
"latest": "latest_2",
|
||||
"master": "master",
|
||||
"naersk": "naersk",
|
||||
"nixos": "nixos",
|
||||
"nixos-generators": "nixos-generators",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nur": "nur"
|
||||
"nur": "nur",
|
||||
"pub-solar": "pub-solar"
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
|
|
18
flake.nix
18
flake.nix
|
@ -37,6 +37,9 @@
|
|||
nixos-hardware.url = "github:nixos/nixos-hardware";
|
||||
|
||||
nixos-generators.url = "github:nix-community/nixos-generators";
|
||||
|
||||
master.url = "github:nixos/nixpkgs/master";
|
||||
pub-solar.url = "github:pub-solar/nixpkgs/fix/use-latest-unstable-yubikey-agent";
|
||||
};
|
||||
|
||||
outputs = {
|
||||
|
@ -131,6 +134,13 @@
|
|||
iso = base ++ [base-user graphical pub-solar-iso];
|
||||
pubsolaros = [full-install base-user users.root];
|
||||
anonymous = [pubsolaros users.pub-solar];
|
||||
|
||||
b12f = pubsolaros ++ [users.ben social gaming mobile];
|
||||
biolimo = b12f ++ [graphical];
|
||||
chocolatebar = b12f ++ [graphical virtualisation];
|
||||
|
||||
yule = pubsolaros ++ [users.yule];
|
||||
droppie = yule ++ [];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -146,6 +156,8 @@
|
|||
};
|
||||
users = {
|
||||
pub-solar = {suites, ...}: {imports = suites.base;};
|
||||
ben = {suites, ...}: {imports = suites.base;};
|
||||
yule = {suites, ...}: {imports = suites.base;};
|
||||
}; # digga.lib.importers.rakeLeaves ./users/hm;
|
||||
};
|
||||
|
||||
|
@ -153,6 +165,10 @@
|
|||
|
||||
homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
|
||||
|
||||
deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations {};
|
||||
deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations {
|
||||
droppie = {
|
||||
sshUser = "yule";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -8,8 +8,4 @@
|
|||
inherit (lib) fileContents;
|
||||
in {
|
||||
pub-solar.gaming.enable = true;
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
pub-solar.docker.enable = true;
|
||||
>>>>>>> main
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue