Merge remote-tracking branch 'prism/lassulus'

10 files changed, 51 insertions, 11 deletions

diff --git a/krebs/3modules/rtorrent.nix b/krebs/3modules/rtorrent.nix
index 3ab23ec5e..57a579bc0 100644
--- a/krebs/3modules/rtorrent.nix
+++ b/krebs/3modules/rtorrent.nix
@@ -223,7 +223,7 @@ let
             touch ${systemd-logfile}
             cp -f ${configFile} ${cfg.workDir}/.rtorrent.rc
           '';
-          ExecStart = "${pkgs.tmux.bin}/bin/tmux new-session -s rt -n rtorrent -d 'PATH=/bin:/usr/bin:${makeBinPath rutorrent-deps} ${cfg.package}/bin/rtorrent'";
+          ExecStart = "${pkgs.tmux}/bin/tmux new-session -s rt -n rtorrent -d 'PATH=/bin:/usr/bin:${makeBinPath rutorrent-deps} ${cfg.package}/bin/rtorrent'";
 
           ## you can simply sudo -u rtorrent tmux a if privateTmp is set to false
           ## otherwise the tmux session is stored in some private folder in /tmp
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index d3878d305..1aa4d9b23 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -1,5 +1,6 @@
 { config, pkgs, ... }:
 
+with config.krebs.lib;
 {
   imports = [
     ../.
@@ -66,6 +67,16 @@
         '';
       };
     }
+    {
+      krebs.nginx = {
+        enable = true;
+        servers.default.locations = [
+          (nameValuePair "~ ^/~(.+?)(/.*)?\$" ''
+            alias /home/$1/public_html$2;
+          '')
+        ];
+      };
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.mors;
@@ -170,6 +181,8 @@
   '';
 
   environment.systemPackages = with pkgs; [
+    exfat
+
     acronym
     cac-api
     sshpass
@@ -179,6 +192,8 @@
     urban
     mk_sql_pair
     remmina
+
+    logf
   ];
 
   #TODO: fix this shit
diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 47e8a68b4..c7c765302 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -243,6 +243,23 @@ in {
         ];
       };
     }
+    {
+      krebs.nginx = {
+        enable = true;
+        servers.public = {
+          listen = [ "8088" ];
+          server-names = [ "default" ];
+          locations = [
+            (nameValuePair "~ ^/~(.+?)(/.*)?\$" ''
+              alias /home/$1/public_html$2;
+            '')
+          ];
+        };
+      };
+      krebs.iptables.tables.filter.INPUT.rules = [
+       { predicate = "-p tcp --dport 8088"; target = "ACCEPT"; }
+      ];
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.prism;
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"
     ])
   ];
diff --git a/lass/5pkgs/xmonad-lass.nix b/lass/5pkgs/xmonad-lass.nix
index c07bd2b83..3bb88a1a2 100644
--- a/lass/5pkgs/xmonad-lass.nix
+++ b/lass/5pkgs/xmonad-lass.nix
@@ -114,8 +114,8 @@ myKeyMap =
     , ("<XF86AudioMute>", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-mute 0 toggle")
     , ("<XF86AudioMicMute>", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-source-mute 1 toggle")
     , ("<XF86Launch1>", gridselectWorkspace gridConfig W.view)
-    , ("<XF86MonBrightnessUp>", spawn "xbacklight -steps 1 -time 1 -inc 3")
-    , ("<XF86MonBrightnessDown>", spawn "xbacklight -steps 1 -time 1 -dec 3")
+    , ("<XF86MonBrightnessUp>", spawn "xbacklight -steps 1 -time 1 -inc 10")
+    , ("<XF86MonBrightnessDown>", spawn "xbacklight -steps 1 -time 1 -dec 10")
 
     , ("M4-a", focusUrgent)
     , ("M4-S-r", renameWorkspace    def)
diff --git a/lass/default.nix b/lass/default.nix
index 377708c3e..b1c7c1be8 100644
--- a/lass/default.nix
+++ b/lass/default.nix
@@ -2,6 +2,7 @@ _:
 {
   imports = [
     ../krebs
+    ./2configs
     ./3modules
     ./5pkgs
   ];