summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile3
-rw-r--r--miefda/1systems/bobby.nix2
-rw-r--r--miefda/default.nix6
-rw-r--r--mv/1systems/stro.nix1
-rw-r--r--nixpkgs/default.nix6
-rw-r--r--nixpkgs/krebs0
l---------nixpkgs/lib1
-rw-r--r--nixpkgs/nixos/default.nix1
l---------nixpkgs/nixos/lib1
l---------nixpkgs/nixos/modules1
l---------root1
-rw-r--r--shared/1systems/test-all-krebs-modules.nix3
-rw-r--r--shared/1systems/test-arch.nix1
-rw-r--r--shared/1systems/test-centos6.nix1
-rw-r--r--shared/1systems/test-centos7.nix1
-rw-r--r--shared/1systems/test-failing.nix3
-rw-r--r--shared/1systems/test-minimal-deploy.nix3
-rw-r--r--shared/1systems/wolf.nix1
-rw-r--r--shared/2configs/base.nix4
-rw-r--r--shared/default.nix7
-rw-r--r--tv/1systems/cd.nix1
-rw-r--r--tv/1systems/mkdir.nix1
-rw-r--r--tv/1systems/nomic.nix1
-rw-r--r--tv/1systems/rmdir.nix1
-rw-r--r--tv/1systems/wu.nix1
-rw-r--r--tv/1systems/xu-qemu0.nix1
-rw-r--r--tv/1systems/xu.nix1
-rw-r--r--tv/2configs/default.nix4
-rw-r--r--tv/default.nix9
29 files changed, 48 insertions, 19 deletions
diff --git a/Makefile b/Makefile
index e5e3b19..384c872 100644
--- a/Makefile
+++ b/Makefile
@@ -9,10 +9,11 @@ export target_path ?= /var/src
evaluate = \
nix-instantiate \
- --arg configuration ./$(LOGNAME)/1systems/$(system).nix \
--eval \
--readonly-mode \
--show-trace \
+ -I nixos-config=./$(LOGNAME)/1systems/$(system).nix \
+ -I stockholm=. \
$(1)
execute = \
diff --git a/miefda/1systems/bobby.nix b/miefda/1systems/bobby.nix
index d245952..b85e686 100644
--- a/miefda/1systems/bobby.nix
+++ b/miefda/1systems/bobby.nix
@@ -7,7 +7,7 @@
{
imports =
[ # Include the results of the hardware scan.
-
+ ../.
../2configs/miefda.nix
../2configs/tlp.nix
../2configs/x220t.nix
diff --git a/miefda/default.nix b/miefda/default.nix
new file mode 100644
index 0000000..7f275c2
--- /dev/null
+++ b/miefda/default.nix
@@ -0,0 +1,6 @@
+_:
+{
+ imports = [
+ ../krebs
+ ];
+}
diff --git a/mv/1systems/stro.nix b/mv/1systems/stro.nix
index b3dfc57..f251cb0 100644
--- a/mv/1systems/stro.nix
+++ b/mv/1systems/stro.nix
@@ -9,6 +9,7 @@ with config.krebs.lib;
"7ae05edcdd14f6ace83ead9bf0d114e97c89a83a";
imports = [
+ ../.
../2configs/hw/x220.nix
../2configs/git.nix
../2configs/mail-client.nix
diff --git a/nixpkgs/default.nix b/nixpkgs/default.nix
deleted file mode 100644
index 8514fa4..0000000
--- a/nixpkgs/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ system ? builtins.currentSystem }:
-
-(import <stockholm> {
- inherit system;
- configuration = {};
-}).pkgs
diff --git a/nixpkgs/krebs b/nixpkgs/krebs
deleted file mode 100644
index e69de29..0000000
--- a/nixpkgs/krebs
+++ /dev/null
diff --git a/nixpkgs/lib b/nixpkgs/lib
deleted file mode 120000
index 7b13c80..0000000
--- a/nixpkgs/lib
+++ /dev/null
@@ -1 +0,0 @@
-../../upstream-nixpkgs/lib \ No newline at end of file
diff --git a/nixpkgs/nixos/default.nix b/nixpkgs/nixos/default.nix
deleted file mode 100644
index 4fe08ef..0000000
--- a/nixpkgs/nixos/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-import <stockholm>
diff --git a/nixpkgs/nixos/lib b/nixpkgs/nixos/lib
deleted file mode 120000
index 9e69d1a..0000000
--- a/nixpkgs/nixos/lib
+++ /dev/null
@@ -1 +0,0 @@
-../../../upstream-nixpkgs/nixos/lib \ No newline at end of file
diff --git a/nixpkgs/nixos/modules b/nixpkgs/nixos/modules
deleted file mode 120000
index 8aa2488..0000000
--- a/nixpkgs/nixos/modules
+++ /dev/null
@@ -1 +0,0 @@
-../../../upstream-nixpkgs/nixos/modules \ No newline at end of file
diff --git a/root b/root
deleted file mode 120000
index 1cd1825..0000000
--- a/root
+++ /dev/null
@@ -1 +0,0 @@
-../stockholm-user \ No newline at end of file
diff --git a/shared/1systems/test-all-krebs-modules.nix b/shared/1systems/test-all-krebs-modules.nix
index b98004d..e1021c7 100644
--- a/shared/1systems/test-all-krebs-modules.nix
+++ b/shared/1systems/test-all-krebs-modules.nix
@@ -2,6 +2,9 @@
let
en = { enable = true;};
in {
+ imports = [
+ ../.
+ ];
krebs = {
enable = true;
build.user = config.krebs.users.shared;
diff --git a/shared/1systems/test-arch.nix b/shared/1systems/test-arch.nix
index ece2094..14fc038 100644
--- a/shared/1systems/test-arch.nix
+++ b/shared/1systems/test-arch.nix
@@ -2,6 +2,7 @@
{
imports = [
+ ../.
../2configs/base.nix
{
boot.loader.grub = {
diff --git a/shared/1systems/test-centos6.nix b/shared/1systems/test-centos6.nix
index a8b5f9b..8add0b7 100644
--- a/shared/1systems/test-centos6.nix
+++ b/shared/1systems/test-centos6.nix
@@ -7,6 +7,7 @@ let
gw = "168.235.148.1";
in {
imports = [
+ ../.
../2configs/base.nix
../2configs/os-templates/CAC-CentOS-6.5-64bit.nix
{
diff --git a/shared/1systems/test-centos7.nix b/shared/1systems/test-centos7.nix
index 48cecc8..65daff5 100644
--- a/shared/1systems/test-centos7.nix
+++ b/shared/1systems/test-centos7.nix
@@ -5,6 +5,7 @@ let
in {
imports = [
+ ../.
../2configs/base.nix
../2configs/os-templates/CAC-CentOS-7-64bit.nix
../2configs/temp/networking.nix
diff --git a/shared/1systems/test-failing.nix b/shared/1systems/test-failing.nix
index 81a9e48..fe1c2cb 100644
--- a/shared/1systems/test-failing.nix
+++ b/shared/1systems/test-failing.nix
@@ -1,6 +1,9 @@
{ config, pkgs, ... }:
{
+ imports = [
+ ../.
+ ];
programs.ssh.startAgent = true;
programs.ssh.startAgent = false;
}
diff --git a/shared/1systems/test-minimal-deploy.nix b/shared/1systems/test-minimal-deploy.nix
index 309e289..bec2b38 100644
--- a/shared/1systems/test-minimal-deploy.nix
+++ b/shared/1systems/test-minimal-deploy.nix
@@ -1,5 +1,8 @@
{ config, pkgs, lib, ... }:
{
+ imports = [
+ ../.
+ ];
krebs = {
enable = true;
build.user = config.krebs.users.shared;
diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix
index 9a51442..3175914 100644
--- a/shared/1systems/wolf.nix
+++ b/shared/1systems/wolf.nix
@@ -6,6 +6,7 @@ let
in
{
imports = [
+ ../.
../2configs/base.nix
<nixpkgs/nixos/modules/profiles/qemu-guest.nix>
../2configs/collectd-base.nix
diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix
index 679764b..9f998b5 100644
--- a/shared/2configs/base.nix
+++ b/shared/2configs/base.nix
@@ -16,7 +16,7 @@ with config.krebs.lib;
# TODO rename shared user to "krebs"
krebs.build.user = mkDefault config.krebs.users.shared;
krebs.build.source = {
- upstream-nixpkgs = mkDefault {
+ nixpkgs = mkDefault {
url = https://github.com/NixOS/nixpkgs;
rev = "77f8f35d57618c1ba456d968524f2fb2c3448295"; # for urlwatch-minidb
};
@@ -24,8 +24,6 @@ with config.krebs.lib;
stockholm = mkDefault "${getEnv "HOME"}/stockholm";
nixos-config = "symlink:stockholm/${config.krebs.build.user.name}/1systems/${config.krebs.build.host.name}.nix";
- nixpkgs = symlink:stockholm/nixpkgs;
- stockholm-user = "symlink:stockholm/${config.krebs.build.user.name}";
};
networking.hostName = config.krebs.build.host.name;
diff --git a/shared/default.nix b/shared/default.nix
new file mode 100644
index 0000000..69b4aba
--- /dev/null
+++ b/shared/default.nix
@@ -0,0 +1,7 @@
+_:
+{
+ imports = [
+ ../krebs
+ ./3modules
+ ];
+}
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 3f804ba..9b63826 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -6,6 +6,7 @@ with config.krebs.lib;
krebs.build.host = config.krebs.hosts.cd;
imports = [
+ ../.
../2configs/hw/CAC-Developer-2.nix
../2configs/fs/CAC-CentOS-7-64bit.nix
../2configs/exim-smarthost.nix
diff --git a/tv/1systems/mkdir.nix b/tv/1systems/mkdir.nix
index 4b1fcde..58a8fdc 100644
--- a/tv/1systems/mkdir.nix
+++ b/tv/1systems/mkdir.nix
@@ -19,6 +19,7 @@ in
krebs.build.host = config.krebs.hosts.mkdir;
imports = [
+ ../.
../2configs/hw/CAC-Developer-1.nix
../2configs/fs/CAC-CentOS-7-64bit.nix
../2configs/exim-smarthost.nix
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index 610434f..2c9775d 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -6,6 +6,7 @@ with config.krebs.lib;
krebs.build.host = config.krebs.hosts.nomic;
imports = [
+ ../.
../2configs/hw/AO753.nix
../2configs/exim-retiolum.nix
../2configs/git.nix
diff --git a/tv/1systems/rmdir.nix b/tv/1systems/rmdir.nix
index 942e55e..c54caa6 100644
--- a/tv/1systems/rmdir.nix
+++ b/tv/1systems/rmdir.nix
@@ -19,6 +19,7 @@ in
krebs.build.host = config.krebs.hosts.rmdir;
imports = [
+ ../.
../2configs/hw/CAC-Developer-1.nix
../2configs/fs/CAC-CentOS-7-64bit.nix
../2configs/exim-smarthost.nix
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 4b97991..6154e4d 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -6,6 +6,7 @@ with config.krebs.lib;
krebs.build.host = config.krebs.hosts.wu;
imports = [
+ ../.
../2configs/hw/w110er.nix
../2configs/exim-retiolum.nix
../2configs/git.nix
diff --git a/tv/1systems/xu-qemu0.nix b/tv/1systems/xu-qemu0.nix
index 03ac19c..8945c19 100644
--- a/tv/1systems/xu-qemu0.nix
+++ b/tv/1systems/xu-qemu0.nix
@@ -10,6 +10,7 @@
krebs.build.host = config.krebs.hosts.xu-qemu0;
imports = [
+ ../.
<nixpkgs/nixos/modules/profiles/qemu-guest.nix>
];
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 6d300f1..5ec1fe5 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -6,6 +6,7 @@ with config.krebs.lib;
krebs.build.host = config.krebs.hosts.xu;
imports = [
+ ../.
../2configs/hw/x220.nix
../2configs/exim-retiolum.nix
../2configs/git.nix
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 9694e7b..c4a2d6b 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -9,12 +9,10 @@ with config.krebs.lib;
user = config.krebs.users.tv;
source = mapAttrs (_: mkDefault) ({
nixos-config = "symlink:stockholm/tv/1systems/${config.krebs.build.host.name}.nix";
- nixpkgs = symlink:stockholm/nixpkgs;
secrets = "/home/tv/secrets/${config.krebs.build.host.name}";
secrets-common = "/home/tv/secrets/common";
stockholm = "/home/tv/stockholm";
- stockholm-user = "symlink:stockholm/tv";
- upstream-nixpkgs = {
+ nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
rev = "77f8f35d57618c1ba456d968524f2fb2c3448295";
dev = "/home/tv/nixpkgs";
diff --git a/tv/default.nix b/tv/default.nix
new file mode 100644
index 0000000..b1c7c1b
--- /dev/null
+++ b/tv/default.nix
@@ -0,0 +1,9 @@
+_:
+{
+ imports = [
+ ../krebs
+ ./2configs
+ ./3modules
+ ./5pkgs
+ ];
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-01 07:59:11 +0000