teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

update: digga/fup refactoring

Browse source
This commit is contained in:
David Arnold 2021-07-20 18:33:45 -05:00
parent a088edd77a
commit dcb425341d
No known key found for this signature in database
GPG key ID: AB15A6AF1101390D
2 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
flake.lock
View file

@ -159,6 +159,7 @@
"deploy": "deploy", "deploy": "deploy",
"devshell": "devshell", "devshell": "devshell",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"flake-utils-plus": "flake-utils-plus",
"home-manager": [ "home-manager": [
"home" "home"
], ],
@ -168,15 +169,14 @@
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixpkgs": [ "nixpkgs": [
"nixos" "nixos"
], ]
"utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1626470112, "lastModified": 1626826189,
"narHash": "sha256-hC5I3A1HxfGi45avpYBf8zXi1hQkHYWgRgUM4sF9byI=", "narHash": "sha256-Ao4zLLMvs0Q8mDMtTbi7JyUHZAPUkZpo1OArgKLTOzA=",
"owner": "divnix", "owner": "divnix",
"repo": "digga", "repo": "digga",
"rev": "f25928ed0bf05ab20af5a8231d264ae01b42ab34", "rev": "e97d0ec012df585529eefe0381e087d73261e76e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -217,6 +217,28 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils-plus": {
"inputs": {
"flake-utils": [
"digga",
"flake-utils"
]
},
"locked": {
"lastModified": 1626825599,
"narHash": "sha256-hgjuzvLE+jlt9z6k5MDbc0Fod4k5frZGnN7zArrlpd4=",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "ea46e02fb86785d3c883d658b194d69799386673",
"type": "github"
},
"original": {
"owner": "gytis-ivaskevicius",
"ref": "staging",
"repo": "flake-utils-plus",
"type": "github"
}
},
"home": { "home": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -373,7 +395,7 @@
], ],
"flake-utils": [ "flake-utils": [
"digga", "digga",
"utils", "flake-utils-plus",
"flake-utils" "flake-utils"
], ],
"nixpkgs": [ "nixpkgs": [
@ -429,6 +451,10 @@
"digga", "digga",
"flake-utils" "flake-utils"
], ],
"flake-utils-plus": [
"digga",
"flake-utils-plus"
],
"home": "home", "home": "home",
"latest": "latest", "latest": "latest",
"naersk": "naersk_2", "naersk": "naersk_2",
@ -442,33 +468,7 @@
"nixos" "nixos"
], ],
"nur": "nur", "nur": "nur",
"nvfetcher": "nvfetcher", "nvfetcher": "nvfetcher"
"utils": [
"digga",
"utils"
]
}
},
"utils": {
"inputs": {
"flake-utils": [
"digga",
"flake-utils"
]
},
"locked": {
"lastModified": 1626288344,
"narHash": "sha256-TioHDqWJkw37jjx4DVrH6LCzwrUfAqXbWl4rKR91fpA=",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "5c6ee69f6957afc2fe22c094717d6d78516418b5",
"type": "github"
},
"original": {
"owner": "gytis-ivaskevicius",
"ref": "staging",
"repo": "flake-utils-plus",
"type": "github"
} }
} }
}, },

18
flake.nix
View file

@ -33,7 +33,7 @@
nvfetcher.url = "github:berberman/nvfetcher"; nvfetcher.url = "github:berberman/nvfetcher";
nvfetcher.inputs.nixpkgs.follows = "latest"; nvfetcher.inputs.nixpkgs.follows = "latest";
nvfetcher.inputs.flake-compat.follows = "digga/deploy/flake-compat"; nvfetcher.inputs.flake-compat.follows = "digga/deploy/flake-compat";
nvfetcher.inputs.flake-utils.follows = "digga/utils/flake-utils"; nvfetcher.inputs.flake-utils.follows = "digga/flake-utils-plus/flake-utils";
ci-agent.url = "github:hercules-ci/hercules-ci-agent"; ci-agent.url = "github:hercules-ci/hercules-ci-agent";
ci-agent.inputs.nix-darwin.follows = "darwin"; ci-agent.inputs.nix-darwin.follows = "darwin";
@ -51,7 +51,7 @@
nixpkgs.follows = "nixos"; nixpkgs.follows = "nixos";
nixlib.follows = "digga/nixlib"; nixlib.follows = "digga/nixlib";
blank.follows = "digga/blank"; blank.follows = "digga/blank";
utils.follows = "digga/utils"; flake-utils-plus.follows = "digga/flake-utils-plus";
flake-utils.follows = "digga/flake-utils"; flake-utils.follows = "digga/flake-utils";
# end ANTI CORRUPTION LAYER # end ANTI CORRUPTION LAYER
}; };
@ -81,7 +81,7 @@
channels = { channels = {
nixos = { nixos = {
imports = [ (digga.lib.importers.overlays ./overlays) ]; imports = [ (digga.lib.importOverlays ./overlays) ];
overlays = [ overlays = [
digga.overlays.patchedNix digga.overlays.patchedNix
nur.overlay nur.overlay
@ -109,7 +109,7 @@
hostDefaults = { hostDefaults = {
system = "x86_64-linux"; system = "x86_64-linux";
channelName = "nixos"; channelName = "nixos";
imports = [ (digga.lib.importers.modules ./modules) ]; imports = [ (digga.lib.importModules ./modules) ];
externalModules = [ externalModules = [
{ lib.our = self.lib; } { lib.our = self.lib; }
digga.nixosModules.nixConfig digga.nixosModules.nixConfig
@ -120,14 +120,14 @@
]; ];
}; };
imports = [ (digga.lib.importers.hosts ./hosts) ]; imports = [ (digga.lib.importHosts ./hosts) ];
hosts = { hosts = {
/* set host specific properties here */ /* set host specific properties here */
NixOS = { }; NixOS = { };
}; };
importables = rec { importables = rec {
profiles = digga.lib.importers.rakeLeaves ./profiles // { profiles = digga.lib.rakeLeaves ./profiles // {
users = digga.lib.importers.rakeLeaves ./users; users = digga.lib.rakeLeaves ./users;
}; };
suites = with profiles; rec { suites = with profiles; rec {
base = [ core users.nixos users.root ]; base = [ core users.nixos users.root ];
@ -136,10 +136,10 @@
}; };
home = { home = {
imports = [ (digga.lib.importers.modules ./users/modules) ]; imports = [ (digga.lib.importModules ./users/modules) ];
externalModules = [ ]; externalModules = [ ];
importables = rec { importables = rec {
profiles = digga.lib.importers.rakeLeaves ./users/profiles; profiles = digga.lib.rakeLeaves ./users/profiles;
suites = with profiles; rec { suites = with profiles; rec {
base = [ direnv git ]; base = [ direnv git ];
}; };