summaryrefslogtreecommitdiffstats
path: root/lass/2configs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-06-14 21:54:55 +0200
committermakefu <github@syntax-fehler.de>2018-06-14 21:54:55 +0200
commitd98e41a4d70755b10d123678250bb6353b53b5bd (patch)
treeb64f54fcba0bcf31b4962632803634a57b5df0a7 /lass/2configs
parent8cad4d187446901206e8110d27d1763c2df942d2 (diff)
parent006a3174eccecfee96e7b4fb9c818043a0334535 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/2configs')
-rw-r--r--lass/2configs/baseX.nix1
-rw-r--r--lass/2configs/blue.nix5
-rw-r--r--lass/2configs/default.nix1
-rw-r--r--lass/2configs/git.nix2
-rw-r--r--lass/2configs/repo-sync.nix4
-rw-r--r--lass/2configs/websites/domsen.nix5
6 files changed, 13 insertions, 5 deletions
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index a387f2c5d..afdefaa45 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -68,6 +68,7 @@ in {
environment.systemPackages = with pkgs; [
acpi
+ ag
bank
cabal2nix
dic
diff --git a/lass/2configs/blue.nix b/lass/2configs/blue.nix
index c0417b865..363705edc 100644
--- a/lass/2configs/blue.nix
+++ b/lass/2configs/blue.nix
@@ -9,6 +9,11 @@ with (import <stockholm/lib>);
./pass.nix
];
+ environment.systemPackages = with pkgs; [
+ ag
+ nmap
+ ];
+
services.tor.enable = true;
krebs.iptables.tables.filter.INPUT.rules = [
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index ed97b4897..a43113177 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -23,7 +23,6 @@ with import <stockholm/lib>;
config.krebs.users.lass-blue.pubkey
config.krebs.users.lass-shodan.pubkey
config.krebs.users.lass-icarus.pubkey
- config.krebs.users.lass-xerxes.pubkey
];
};
mainUser = {
diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index e41ff606f..72cfd5e75 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -54,7 +54,7 @@ let
cgit.section = "art";
};
nix-user-chroot = {
- cgit.desc = "Fork of nix-user-chroot my lethalman";
+ cgit.desc = "Fork of nix-user-chroot by lethalman";
cgit.section = "software";
};
krops = {
diff --git a/lass/2configs/repo-sync.nix b/lass/2configs/repo-sync.nix
index 1cf22552c..615f5a728 100644
--- a/lass/2configs/repo-sync.nix
+++ b/lass/2configs/repo-sync.nix
@@ -126,8 +126,8 @@ in {
(sync-remote "xintmap" "https://github.com/4z3/xintmap")
(sync-remote "realwallpaper" "https://github.com/lassulus/realwallpaper")
(sync-remote "lassulus-blog" "https://github.com/lassulus/lassulus-blog")
- (sync-remote "painload" "https://github.com/krebscode/painload")
- (sync-remote "Reaktor" "https://github.com/krebscode/Reaktor")
+ (sync-remote "painload" "https://github.com/krebs/painload")
+ (sync-remote "Reaktor" "https://github.com/krebs/Reaktor")
(sync-remote "nixos-wiki" "https://github.com/Mic92/nixos-wiki.wiki.git")
(sync-retiolum "go")
(sync-retiolum "much")
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 4e8361a17..e4f50e2d1 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -26,7 +26,10 @@ in {
./default.nix
./sqlBackup.nix
(servePage [ "reich-gebaeudereinigung.de" "www.reich-gebaeudereinigung.de" ])
- (servePage [ "freemonkey.art" ])
+ (servePage [
+ "freemonkey.art"
+ "www.freemonkey.art"
+ ])
(serveOwncloud [ "o.ubikmedia.de" ])
(serveWordpress [
"ubikmedia.de"