Merge remote-tracking branch 'prism/lassulus'

5 files changed, 15 insertions, 8 deletions

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index a78f52b83..2649ecab9 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -4,11 +4,8 @@ let
   mainUser = config.users.extraUsers.mainUser;
 in {
   imports = [
-    ./default.nix
-    #./urxvt.nix
     ./xserver
     ./mpv.nix
-    #./pulse.nix
     ./power-action.nix
   ];
   hardware.pulseaudio = {
diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index 902af61a7..9e3fe888c 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -2,7 +2,7 @@
 
 {
   krebs.build.source.nixpkgs.git = {
-    url = https://github.com/nixos/nixpkgs;
-    ref = "c5cbda24147de441906871238138eb7fc90282db";
+    url = https://github.com/lassulus/nixpkgs;
+    ref = "3fb009d94e70f5d1151f4ec239a90d2de1979a74";
   };
 }
diff --git a/lass/2configs/privoxy.nix b/lass/2configs/privoxy.nix
index bf5f6e206..33e8d1e46 100644
--- a/lass/2configs/privoxy.nix
+++ b/lass/2configs/privoxy.nix
@@ -6,9 +6,6 @@
     extraConfig = ''
       #use polipo
       forward / localhost:8123
-
-      #route .onion through tor
-      forward-socks4a .onion localhost:9050
     '';
   };
   services.polipo.enable = true;
diff --git a/lass/2configs/tests/dummy-secrets/torrent-authfile b/lass/2configs/tests/dummy-secrets/torrent-authfile
new file mode 100644
index 000000000..93a8e1fed
--- /dev/null
+++ b/lass/2configs/tests/dummy-secrets/torrent-authfile
@@ -0,0 +1 @@
+"xxx"
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index becd1a872..d5ad38c07 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -48,6 +48,9 @@ in {
       "ubikmedia.eu"
       "facts.cloud"
       "youthtube.xyz"
+      "illucloud.eu"
+      "illucloud.de"
+      "illucloud.com"
       "www.ubikmedia.de"
       "www.aldona.ubikmedia.de"
       "www.apanowicz.de"
@@ -57,6 +60,9 @@ in {
       "www.ubikmedia.eu"
       "www.facts.cloud"
       "www.youthtube.xyz"
+      "www.illucloud.eu"
+      "www.illucloud.de"
+      "www.illucloud.com"
     ])
     (serveWordpress [
       "ubikmedia.de"
@@ -67,6 +73,9 @@ in {
       "ubikmedia.eu"
       "facts.cloud"
       "youthtube.xyz"
+      "illucloud.eu"
+      "illucloud.de"
+      "illucloud.com"
       "www.apanowicz.de"
       "www.nirwanabluete.de"
       "www.aldonasiech.com"
@@ -74,6 +83,9 @@ in {
       "www.ubikmedia.eu"
       "www.facts.cloud"
       "www.youthtube.xyz"
+      "www.illucloud.eu"
+      "www.illucloud.de"
+      "www.illucloud.com"
       "*.ubikmedia.de"
     ])
   ];