summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
Diffstat (limited to 'lass')
-rw-r--r--lass/1systems/cloudkrebs.nix1
-rw-r--r--lass/1systems/dishfire.nix1
-rw-r--r--lass/1systems/echelon.nix1
-rw-r--r--lass/1systems/helios.nix1
-rw-r--r--lass/1systems/mors.nix1
-rw-r--r--lass/1systems/prism.nix1
-rw-r--r--lass/1systems/uriel.nix1
-rw-r--r--lass/2configs/base.nix6
-rw-r--r--lass/2configs/downloading.nix2
-rw-r--r--lass/2configs/fastpoke-pages.nix2
-rw-r--r--lass/2configs/git.nix2
-rw-r--r--lass/2configs/go.nix2
-rw-r--r--lass/2configs/teamviewer.nix2
-rw-r--r--lass/2configs/xserver/Xresources.nix2
-rw-r--r--lass/2configs/xserver/default.nix2
-rw-r--r--lass/2configs/xserver/xserver.conf.nix2
-rw-r--r--lass/3modules/owncloud_nginx.nix2
-rw-r--r--lass/3modules/per-user.nix3
-rw-r--r--lass/3modules/static_nginx.nix2
-rw-r--r--lass/3modules/wordpress_nginx.nix2
-rw-r--r--lass/default.nix7
21 files changed, 28 insertions, 17 deletions
diff --git a/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix
index ab24b584..98f50905 100644
--- a/lass/1systems/cloudkrebs.nix
+++ b/lass/1systems/cloudkrebs.nix
@@ -7,6 +7,7 @@ let
ip = (head config.krebs.build.host.nets.internet.addrs4);
in {
imports = [
+ ../.
../2configs/os-templates/CAC-CentOS-7-64bit.nix
../2configs/base.nix
../2configs/retiolum.nix
diff --git a/lass/1systems/dishfire.nix b/lass/1systems/dishfire.nix
index cc9836df..c7d016cd 100644
--- a/lass/1systems/dishfire.nix
+++ b/lass/1systems/dishfire.nix
@@ -2,6 +2,7 @@
{
imports = [
+ ../.
<nixpkgs/nixos/modules/profiles/qemu-guest.nix>
../2configs/base.nix
../2configs/git.nix
diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix
index 39af4a96..2ff6dba7 100644
--- a/lass/1systems/echelon.nix
+++ b/lass/1systems/echelon.nix
@@ -7,6 +7,7 @@ let
ip = (head config.krebs.build.host.nets.internet.addrs4);
in {
imports = [
+ ../.
../2configs/os-templates/CAC-CentOS-7-64bit.nix
../2configs/base.nix
../2configs/retiolum.nix
diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix
index 67e3738e..88fb6aac 100644
--- a/lass/1systems/helios.nix
+++ b/lass/1systems/helios.nix
@@ -3,6 +3,7 @@
with builtins;
{
imports = [
+ ../.
../2configs/baseX.nix
../2configs/browsers.nix
../2configs/programs.nix
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index ebce9395..f6ac1b4e 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -2,6 +2,7 @@
{
imports = [
+ ../.
../2configs/baseX.nix
../2configs/programs.nix
../2configs/bitcoin.nix
diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 95c55533..05b3470e 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -6,6 +6,7 @@ let
ip = (head config.krebs.build.host.nets.internet.addrs4);
in {
imports = [
+ ../.
../2configs/base.nix
../2configs/downloading.nix
../2configs/git.nix
diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index d53e783d..0758164f 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -3,6 +3,7 @@
with builtins;
{
imports = [
+ ../.
../2configs/baseX.nix
../2configs/browsers.nix
../2configs/games.nix
diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix
index 4c73fc0c..d2c96fda 100644
--- a/lass/2configs/base.nix
+++ b/lass/2configs/base.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
{
imports = [
../2configs/vim.nix
@@ -50,12 +50,10 @@ with lib;
user = config.krebs.users.lass;
source = mapAttrs (_: mkDefault) ({
nixos-config = "symlink:stockholm/lass/1systems/${config.krebs.build.host.name}.nix";
- nixpkgs = symlink:stockholm/nixpkgs;
secrets = "/home/lass/secrets/${config.krebs.build.host.name}";
#secrets-common = "/home/lass/secrets/common";
stockholm = "/home/lass/stockholm";
- stockholm-user = "symlink:stockholm/lass";
- upstream-nixpkgs = {
+ nixpkgs = {
url = https://github.com/Lassulus/nixpkgs;
rev = "d0e3cca04edd5d1b3d61f188b4a5f61f35cdf1ce";
dev = "/home/lass/src/nixpkgs";
diff --git a/lass/2configs/downloading.nix b/lass/2configs/downloading.nix
index e80b7400..115cb8b6 100644
--- a/lass/2configs/downloading.nix
+++ b/lass/2configs/downloading.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
let
rpc-password = import <secrets/transmission-pw.nix>;
diff --git a/lass/2configs/fastpoke-pages.nix b/lass/2configs/fastpoke-pages.nix
index 0470865b..bf6ea895 100644
--- a/lass/2configs/fastpoke-pages.nix
+++ b/lass/2configs/fastpoke-pages.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
let
createStaticPage = domain:
diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index ac6aae44..76b897d1 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
let
diff --git a/lass/2configs/go.nix b/lass/2configs/go.nix
index f4c2ac28..795ad7a2 100644
--- a/lass/2configs/go.nix
+++ b/lass/2configs/go.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
{
environment.systemPackages = [
pkgs.go
diff --git a/lass/2configs/teamviewer.nix b/lass/2configs/teamviewer.nix
index 48053d7d..22bfb18d 100644
--- a/lass/2configs/teamviewer.nix
+++ b/lass/2configs/teamviewer.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
{
services.teamviewer.enable = true;
}
diff --git a/lass/2configs/xserver/Xresources.nix b/lass/2configs/xserver/Xresources.nix
index d5241889..e3b0f45d 100644
--- a/lass/2configs/xserver/Xresources.nix
+++ b/lass/2configs/xserver/Xresources.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
pkgs.writeText "Xresources" ''
URxvt*scrollBar: false
diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix
index c407bb59..82cfd57b 100644
--- a/lass/2configs/xserver/default.nix
+++ b/lass/2configs/xserver/default.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }@args:
-with lib;
+with config.krebs.lib;
let
# TODO krebs.build.user
diff --git a/lass/2configs/xserver/xserver.conf.nix b/lass/2configs/xserver/xserver.conf.nix
index e8a997a9..c452b422 100644
--- a/lass/2configs/xserver/xserver.conf.nix
+++ b/lass/2configs/xserver/xserver.conf.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
let
cfg = config.services.xserver;
diff --git a/lass/3modules/owncloud_nginx.nix b/lass/3modules/owncloud_nginx.nix
index 79c9de1d..a10df779 100644
--- a/lass/3modules/owncloud_nginx.nix
+++ b/lass/3modules/owncloud_nginx.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
let
cfg = config.lass.owncloud;
diff --git a/lass/3modules/per-user.nix b/lass/3modules/per-user.nix
index 98d6339d..f8d357ce 100644
--- a/lass/3modules/per-user.nix
+++ b/lass/3modules/per-user.nix
@@ -1,7 +1,6 @@
{ config, lib, pkgs, ... }:
-with builtins;
-with lib;
+with config.krebs.lib;
let
cfg = config.lass.per-user;
diff --git a/lass/3modules/static_nginx.nix b/lass/3modules/static_nginx.nix
index fd5cfdfd..93441cf0 100644
--- a/lass/3modules/static_nginx.nix
+++ b/lass/3modules/static_nginx.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
let
cfg = config.lass.staticPage;
diff --git a/lass/3modules/wordpress_nginx.nix b/lass/3modules/wordpress_nginx.nix
index bfed9e7c..108054cb 100644
--- a/lass/3modules/wordpress_nginx.nix
+++ b/lass/3modules/wordpress_nginx.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with lib;
+with config.krebs.lib;
let
cfg = config.lass.wordpress;
diff --git a/lass/default.nix b/lass/default.nix
new file mode 100644
index 00000000..69b4abaa
--- /dev/null
+++ b/lass/default.nix
@@ -0,0 +1,7 @@
+_:
+{
+ imports = [
+ ../krebs
+ ./3modules
+ ];
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 04:13:01 +0000