From 869090da419c73c0067ffcc36f817a05c2b97695 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 24 Aug 2016 19:53:32 +0200
Subject: l 2 baseX: don't import default.nix

---
 lass/2configs/baseX.nix | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'lass/2configs')

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 = {
-- 
cgit v1.2.3


From c3bfd3c3b2bc04b5237b58f65c635818abbcd197 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 24 Aug 2016 22:16:13 +0200
Subject: l 2 tests dummy-secrets: add torrent-authfile

---
 lass/2configs/tests/dummy-secrets/torrent-authfile | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 lass/2configs/tests/dummy-secrets/torrent-authfile

(limited to 'lass/2configs')

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"
-- 
cgit v1.2.3


From 5ba1efdca4ca95bfd6001de5eef179b86b8fa0b6 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 24 Aug 2016 23:53:27 +0200
Subject: l 2 nixpkgs: c5cbda2 -> 9ad6040

---
 lass/2configs/nixpkgs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index 902af61a7..ae947b240 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 = "9ad60400c2a4b964c0947bb52a84ec3f601261ef";
   };
 }
-- 
cgit v1.2.3


From c65c9e6e851945e44acf736d0317eefd02fd8a36 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 3 Sep 2016 03:01:16 +0200
Subject: l 2 privoxy: remove onion proxy

---
 lass/2configs/privoxy.nix | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'lass/2configs')

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;
-- 
cgit v1.2.3


From ca035b3252b9d480f40495b189b259da6794eaa6 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 3 Sep 2016 03:01:50 +0200
Subject: l 2 websites domsen: add .illucloud

---
 lass/2configs/websites/domsen.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'lass/2configs')

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"
     ])
   ];
-- 
cgit v1.2.3


From 69d537f1052a2915d802134caafc4040aae037bf Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 3 Sep 2016 18:51:17 +0200
Subject: l 2 nixpkgs: 9ad6040 -> 3fb009d

---
 lass/2configs/nixpkgs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index ae947b240..9e3fe888c 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
 {
   krebs.build.source.nixpkgs.git = {
     url = https://github.com/lassulus/nixpkgs;
-    ref = "9ad60400c2a4b964c0947bb52a84ec3f601261ef";
+    ref = "3fb009d94e70f5d1151f4ec239a90d2de1979a74";
   };
 }
-- 
cgit v1.2.3