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.nix12
-rw-r--r--lass/2configs/downloading.nix2
-rw-r--r--lass/2configs/fastpoke-pages.nix2
-rw-r--r--lass/2configs/git.nix4
-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/5pkgs/default.nix21
-rw-r--r--lass/default.nix7
22 files changed, 43 insertions, 31 deletions
diff --git a/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix
index ab24b584b..98f509050 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 cc9836dff..c7d016cd3 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 39af4a96f..2ff6dba70 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 4b94e5fd5..0103b6ec0 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 4083e0c2f..e3bb4e487 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 95c55533c..05b3470e5 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 d53e783d0..0758164f0 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 7212698bb..d2c96fdaa 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
@@ -17,8 +17,8 @@ with lib;
root = {
openssh.authorizedKeys.keys = [
config.krebs.users.lass.pubkey
- config.krebs.users.lass_uriel.pubkey
- config.krebs.users.lass_helios.pubkey
+ config.krebs.users.lass-uriel.pubkey
+ config.krebs.users.lass-helios.pubkey
];
};
mainUser = {
@@ -32,7 +32,7 @@ with lib;
];
openssh.authorizedKeys.keys = [
config.krebs.users.lass.pubkey
- config.krebs.users.lass_uriel.pubkey
+ config.krebs.users.lass-uriel.pubkey
];
};
};
@@ -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 e80b74007..115cb8b61 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 0470865b6..bf6ea8952 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 cfd1a9952..0aab298c7 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
@@ -71,7 +71,7 @@ let
with git // config.krebs.users;
repo:
singleton {
- user = [ lass lass_helios lass_uriel ];
+ user = [ lass lass-helios lass-uriel ];
repo = [ repo ];
perm = push "refs/*" [ non-fast-forward create delete merge ];
} ++
diff --git a/lass/2configs/go.nix b/lass/2configs/go.nix
index f4c2ac289..795ad7a26 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 48053d7db..22bfb18d8 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 d52418897..e3b0f45dc 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 a7e77553f..203ed0b09 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 e8a997a99..c452b4226 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 79c9de1d4..a10df779e 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 98d6339db..f8d357ce2 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 fd5cfdfd7..93441cf0d 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 bfed9e7c6..108054cb6 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/5pkgs/default.nix b/lass/5pkgs/default.nix
index 2b9582912..fee4654ae 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -3,15 +3,16 @@
let
inherit (pkgs) callPackage;
in
-
-rec {
- firefoxPlugins = {
- noscript = callPackage ./firefoxPlugins/noscript.nix {};
- ublock = callPackage ./firefoxPlugins/ublock.nix {};
- vimperator = callPackage ./firefoxPlugins/vimperator.nix {};
+{
+ nixpkgs.config.packageOverrides = rec {
+ firefoxPlugins = {
+ noscript = callPackage ./firefoxPlugins/noscript.nix {};
+ ublock = callPackage ./firefoxPlugins/ublock.nix {};
+ vimperator = callPackage ./firefoxPlugins/vimperator.nix {};
+ };
+ newsbot-js = callPackage ./newsbot-js/default.nix {};
+ xmonad-lass =
+ let src = pkgs.writeNixFromCabal "xmonad-lass.nix" ./xmonad-lass; in
+ pkgs.haskellPackages.callPackage src {};
};
- newsbot-js = callPackage ./newsbot-js/default.nix {};
- xmonad-lass =
- let src = pkgs.writeNixFromCabal "xmonad-lass.nix" ./xmonad-lass; in
- pkgs.haskellPackages.callPackage src {};
}
diff --git a/lass/default.nix b/lass/default.nix
new file mode 100644
index 000000000..69b4abaac
--- /dev/null
+++ b/lass/default.nix
@@ -0,0 +1,7 @@
+_:
+{
+ imports = [
+ ../krebs
+ ./3modules
+ ];
+}