fix/upstreaming-merge-conflicts #41

Merged
teutat3s merged 19 commits from refs/pull/41/head into main 2021-10-11 22:11:36 +00:00
3 changed files with 60 additions and 21 deletions
Showing only changes of commit e0da74c87c - Show all commits

View file

@ -93,11 +93,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1628068208, "lastModified": 1628752686,
"narHash": "sha256-akJBkj6os4bjO1drhketJvXNC21yPuy4ufL2pyius4M=", "narHash": "sha256-Lzh9MYUJDsjgif+YEyOErXtj1IH+ci8J1C30g1ms69s=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "d72174307d5b88ec24cc2e69e875228fe3d642ed", "rev": "e5546f9c2503c26d175f08a81fc0a0f330be4cbe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -108,11 +108,11 @@
}, },
"devshell": { "devshell": {
"locked": { "locked": {
"lastModified": 1625086391, "lastModified": 1629275356,
"narHash": "sha256-IpNPv1v8s4L3CoxhwcgZIitGpcrnNgnj09X7TA0QV3k=", "narHash": "sha256-R17M69EKXP6q8/mNHaK53ECwjFo1pdF+XaJC9Qq8zjg=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "4b5ac7cf7d9a1cc60b965bb51b59922f2210cbc7", "rev": "26f25a12265f030917358a9632cd600b51af1d97",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -131,6 +131,7 @@
"home-manager": [ "home-manager": [
"home" "home"
], ],
"nix": "nix",
"nixlib": [ "nixlib": [
"nixos" "nixos"
], ],
@ -140,11 +141,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1628211944, "lastModified": 1632784893,
"narHash": "sha256-2q1dNUzitVd0JNRHYTubbyb8ks3fL9hPJOvQgofxELE=", "narHash": "sha256-SBmGCObLqF9CrWoF7hrBpiCMPTUFzHiBvAtCJXQrPg4=",
"owner": "divnix", "owner": "divnix",
"repo": "digga", "repo": "digga",
"rev": "760bb9c29063258ba547145de0ab96acd7eba4c0", "rev": "6316878be3527ef2b27b8e92afb44ce1857830b3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -192,16 +193,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1627071952, "lastModified": 1630859749,
"narHash": "sha256-FhE0KOuI9Kl4eyGJXu4bh9fBP2hbxjnD1DlKHljCcYs=", "narHash": "sha256-qkoU2rIbbP2+T0dfcqXW35GCWNsi0Y1IgN9BELmt4Zo=",
"owner": "gytis-ivaskevicius", "owner": "divnix",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"rev": "51a82925db31073bc4822c9b538a0a3ebf1134b2", "rev": "a4e267e3fc87e60c5029c6c3855935ff1ff3018e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "gytis-ivaskevicius", "owner": "divnix",
"ref": "staging",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"type": "github" "type": "github"
} }
@ -243,6 +243,23 @@
"type": "github" "type": "github"
} }
}, },
"lowdown-src": {
"flake": false,
"locked": {
"lastModified": 1617481909,
"narHash": "sha256-SqnfOFuLuVRRNeVJr1yeEPJue/qWoCp5N6o5Kr///p4=",
"owner": "kristapsdz",
"repo": "lowdown",
"rev": "148f9b2f586c41b7e36e73009db43ea68c7a1a4d",
"type": "github"
},
"original": {
"owner": "kristapsdz",
"ref": "VERSION_0_8_4",
"repo": "lowdown",
"type": "github"
}
},
"naersk": { "naersk": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -286,6 +303,28 @@
"type": "github" "type": "github"
} }
}, },
"nix": {
"inputs": {
"lowdown-src": "lowdown-src",
"nixpkgs": [
"digga",
"nixpkgs"
]
},
"locked": {
"lastModified": 1630335771,
"narHash": "sha256-eljjEPJdLK3aDskF7qX4YM/6KCq+w9nr+IKhrKW/AIQ=",
"owner": "nixos",
"repo": "nix",
"rev": "50a35860ee9237d341948437c5f70a7f0987d393",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nix",
"type": "github"
}
},
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1628203131, "lastModified": 1628203131,

View file

@ -99,8 +99,8 @@
hostDefaults = { hostDefaults = {
system = "x86_64-linux"; system = "x86_64-linux";
channelName = "nixos"; channelName = "nixos";
imports = [ (digga.lib.importModules ./modules) ]; imports = [ (digga.lib.importExportableModules ./modules) ];
externalModules = [ modules = [
{ lib.our = self.lib; } { lib.our = self.lib; }
digga.nixosModules.bootstrapIso digga.nixosModules.bootstrapIso
digga.nixosModules.nixConfig digga.nixosModules.nixConfig
@ -126,8 +126,8 @@
}; };
home = { home = {
imports = [ (digga.lib.importModules ./users/modules) ]; imports = [ (digga.lib.importExportableModules ./users/modules) ];
externalModules = [ ]; modules = [ ];
importables = rec { importables = rec {
profiles = digga.lib.rakeLeaves ./users/profiles; profiles = digga.lib.rakeLeaves ./users/profiles;
suites = with profiles; rec { suites = with profiles; rec {

View file

@ -1,9 +1,9 @@
{ self, inputs, ... }: { self, inputs, ... }:
{ {
externalModules = with inputs; [ modules = with inputs; [
bud.devshellModules.bud bud.devshellModules.bud
]; ];
modules = [ exportedModules = [
./devos.nix ./devos.nix
]; ];
} }