Compare commits
No commits in common. "6c9a852e7814033ce609755a6c60eb1f453341ab" and "31c94bc8d27c2ae3e48783c455567e2a378bcbaa" have entirely different histories.
6c9a852e78
...
31c94bc8d2
3 changed files with 14 additions and 115 deletions
113
flake.lock
113
flake.lock
|
@ -370,24 +370,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_4": {
|
|
||||||
"inputs": {
|
|
||||||
"systems": "systems_6"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1710146030,
|
|
||||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flakeCompat": {
|
"flakeCompat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
@ -404,21 +386,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flakey-profile": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1712898590,
|
|
||||||
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
|
|
||||||
"owner": "lf-",
|
|
||||||
"repo": "flakey-profile",
|
|
||||||
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "lf-",
|
|
||||||
"repo": "flakey-profile",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"haskell-flake": {
|
"haskell-flake": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1675296942,
|
"lastModified": 1675296942,
|
||||||
|
@ -478,43 +445,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"lix": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1724624492,
|
|
||||||
"narHash": "sha256-J3COggDipocT+ozSxz96GuwSyMrT5+Xa2fGfxaIShqw=",
|
|
||||||
"rev": "b6884388a1281d70bb4e5bb12e1cadd34bb832f0",
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/b6884388a1281d70bb4e5bb12e1cadd34bb832f0.tar.gz?rev=b6884388a1281d70bb4e5bb12e1cadd34bb832f0"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"lix-module": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": "flake-utils_4",
|
|
||||||
"flakey-profile": "flakey-profile",
|
|
||||||
"lix": [
|
|
||||||
"lix"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1723511483,
|
|
||||||
"narHash": "sha256-rT/OkVXKkns2YvyF1nFvl+8Gc3sld1c1sXPtGkbqaDY=",
|
|
||||||
"rev": "cecf70b77539c1a593f60ec9d0305b5e537ab6a9",
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cecf70b77539c1a593f60ec9d0305b5e537ab6a9.tar.gz?rev=cecf70b77539c1a593f60ec9d0305b5e537ab6a9"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"naersk": {
|
"naersk": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_5"
|
"nixpkgs": "nixpkgs_5"
|
||||||
|
@ -886,8 +816,6 @@
|
||||||
"colmena": "colmena",
|
"colmena": "colmena",
|
||||||
"compsoc_public": "compsoc_public",
|
"compsoc_public": "compsoc_public",
|
||||||
"flake-utils": "flake-utils_3",
|
"flake-utils": "flake-utils_3",
|
||||||
"lix": "lix",
|
|
||||||
"lix-module": "lix-module",
|
|
||||||
"nixpkgs": "nixpkgs_8",
|
"nixpkgs": "nixpkgs_8",
|
||||||
"simple-nixos-mailserver": "simple-nixos-mailserver",
|
"simple-nixos-mailserver": "simple-nixos-mailserver",
|
||||||
"skynet_discord_bot": "skynet_discord_bot",
|
"skynet_discord_bot": "skynet_discord_bot",
|
||||||
|
@ -1103,11 +1031,11 @@
|
||||||
"utils": "utils_11"
|
"utils": "utils_11"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1724627980,
|
"lastModified": 1724346134,
|
||||||
"narHash": "sha256-n64oKqJSXJxgchBoF1mEPPaNVTLQhMyq65NafLdaWyc=",
|
"narHash": "sha256-SWsK4tP4J5s09cvYBq0jw+r8YKr/8QmFDL1si8Fu7cE=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "39c216bc6c9c3a8b1be076e683caac23e338f1af",
|
"rev": "08862ebe5dbbd02b83596edfd05810a965fa668d",
|
||||||
"revCount": 69,
|
"revCount": 68,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://forgejo.skynet.ie/Skynet/wiki"
|
"url": "https://forgejo.skynet.ie/Skynet/wiki"
|
||||||
},
|
},
|
||||||
|
@ -1222,21 +1150,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems_15": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"systems_2": {
|
"systems_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1681028828,
|
||||||
|
@ -1377,7 +1290,7 @@
|
||||||
},
|
},
|
||||||
"utils_10": {
|
"utils_10": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_14"
|
"systems": "systems_13"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1694529238,
|
"lastModified": 1694529238,
|
||||||
|
@ -1395,7 +1308,7 @@
|
||||||
},
|
},
|
||||||
"utils_11": {
|
"utils_11": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_15"
|
"systems": "systems_14"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1694529238,
|
"lastModified": 1694529238,
|
||||||
|
@ -1431,7 +1344,7 @@
|
||||||
},
|
},
|
||||||
"utils_3": {
|
"utils_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_7"
|
"systems": "systems_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1710146030,
|
||||||
|
@ -1449,7 +1362,7 @@
|
||||||
},
|
},
|
||||||
"utils_4": {
|
"utils_4": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_8"
|
"systems": "systems_7"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1685518550,
|
"lastModified": 1685518550,
|
||||||
|
@ -1467,7 +1380,7 @@
|
||||||
},
|
},
|
||||||
"utils_5": {
|
"utils_5": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_9"
|
"systems": "systems_8"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1687171271,
|
"lastModified": 1687171271,
|
||||||
|
@ -1485,7 +1398,7 @@
|
||||||
},
|
},
|
||||||
"utils_6": {
|
"utils_6": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_10"
|
"systems": "systems_9"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1710146030,
|
||||||
|
@ -1503,7 +1416,7 @@
|
||||||
},
|
},
|
||||||
"utils_7": {
|
"utils_7": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_11"
|
"systems": "systems_10"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1689068808,
|
"lastModified": 1689068808,
|
||||||
|
@ -1521,7 +1434,7 @@
|
||||||
},
|
},
|
||||||
"utils_8": {
|
"utils_8": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_12"
|
"systems": "systems_11"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1689068808,
|
"lastModified": 1689068808,
|
||||||
|
@ -1539,7 +1452,7 @@
|
||||||
},
|
},
|
||||||
"utils_9": {
|
"utils_9": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_13"
|
"systems": "systems_12"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1689068808,
|
"lastModified": 1689068808,
|
||||||
|
|
13
flake.nix
13
flake.nix
|
@ -7,17 +7,6 @@
|
||||||
# Return to using unstable once the current master is merged in
|
# Return to using unstable once the current master is merged in
|
||||||
# nixpkgs.url = "nixpkgs/nixos-unstable";
|
# nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
lix = {
|
|
||||||
url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
lix-module = {
|
|
||||||
url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
inputs.lix.follows = "lix";
|
|
||||||
};
|
|
||||||
|
|
||||||
# utility stuff
|
# utility stuff
|
||||||
flake-utils.url = "github:numtide/flake-utils";
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
agenix.url = "github:ryantm/agenix";
|
agenix.url = "github:ryantm/agenix";
|
||||||
|
@ -27,7 +16,7 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
colmena.url = "github:zhaofengli/colmena";
|
colmena.url = "github:zhaofengli/colmena";
|
||||||
attic.url = "github:zhaofengli/attic";
|
attic.url = github:zhaofengli/attic;
|
||||||
|
|
||||||
# we host our own
|
# we host our own
|
||||||
simple-nixos-mailserver = {
|
simple-nixos-mailserver = {
|
||||||
|
|
|
@ -20,9 +20,6 @@ in {
|
||||||
|
|
||||||
# base application config for all servers
|
# base application config for all servers
|
||||||
../applications/_base.nix
|
../applications/_base.nix
|
||||||
|
|
||||||
#
|
|
||||||
inputs.lix-module.nixosModules.default
|
|
||||||
];
|
];
|
||||||
|
|
||||||
options.skynet = {
|
options.skynet = {
|
||||||
|
|
Loading…
Reference in a new issue