From bdce2137e713944e77b3e35f758c757a43a99d3e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 17 Apr 2016 02:03:15 +0200
Subject: ma awesome: refactor into module

---
 makefu/2configs/base-gui.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index b807957ba..f7d6991c5 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -14,7 +14,6 @@
 with config.krebs.lib;
 let
   mainUser = config.krebs.build.user.name;
-  awesomecfg = pkgs.awesomecfg.full;
 in
 {
   imports = [ ];
@@ -36,14 +35,7 @@ in
   };
   # lid switch is handled via button presses
   services.logind.extraConfig = mkDefault "HandleLidSwitch=ignore";
-  nixpkgs.config.packageOverrides = pkgs: rec {
-    awesome = pkgs.stdenv.lib.overrideDerivation pkgs.awesome (oldAttrs : {
-      postFixup = ''
-      cp ${awesomecfg}  $out/etc/xdg/awesome/rc.lua
-      '';
-    });
-  };
-
+  makefu.awesome.enable = true;
   i18n.consoleFont = "Lat2-Terminus16";
 
   fonts = {
-- 
cgit v1.2.3


From df8b7fffb1d8f117e364129619e35dc61d6f565c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 17 Apr 2016 21:19:44 +0200
Subject: ma 2 omo-share: add usenet-rw

---
 makefu/2configs/omo-share.nix | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/omo-share.nix b/makefu/2configs/omo-share.nix
index 3a4dd456f..b8f0d8c86 100644
--- a/makefu/2configs/omo-share.nix
+++ b/makefu/2configs/omo-share.nix
@@ -61,6 +61,13 @@ in {
         browseable = "yes";
         "guest ok" = "yes";
       };
+      usenet-rw = {
+        path = "/media/crypt0/usenet";
+        "read only" = "no";
+        browseable = "yes";
+        "guest ok" = "no";
+        "valid users" = "makefu";
+      };
     };
     extraConfig = ''
       guest account = smbguest
-- 
cgit v1.2.3


From 73e6fbc4c0479d684ffc40fc0add42cf0c4794ae Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 2 May 2016 17:37:14 +0200
Subject: ma 2 tp-x220: enable rngd

---
 makefu/2configs/hw/tp-x220.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/hw/tp-x220.nix b/makefu/2configs/hw/tp-x220.nix
index 0a471bde0..be3d1eb70 100644
--- a/makefu/2configs/hw/tp-x220.nix
+++ b/makefu/2configs/hw/tp-x220.nix
@@ -4,8 +4,10 @@ with config.krebs.lib;
 {
 
   imports = [ ./tp-x2x0.nix ];
-
-  boot.kernelModules = [ "kvm-intel" ];
+  boot = {
+    kernelModules = [ "kvm-intel" "acpi_call" ];
+    extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
+  };
 
   services.xserver = {
     videoDriver = "intel";
@@ -15,6 +17,8 @@ with config.krebs.lib;
     '';
   };
 
+  security.rngd.enable = true;
+
   services.xserver.displayManager.sessionCommands =''
     xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 8 1
     xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 8 2
-- 
cgit v1.2.3


From 5fdede9c672ebe4a8be845034a132bddcf09e92c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 2 May 2016 17:37:48 +0200
Subject: ma 2 omo-share: export emu-rw

---
 makefu/2configs/omo-share.nix | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/omo-share.nix b/makefu/2configs/omo-share.nix
index b8f0d8c86..5f6e6adae 100644
--- a/makefu/2configs/omo-share.nix
+++ b/makefu/2configs/omo-share.nix
@@ -13,6 +13,16 @@ in {
       omo-share = {
         listen = [ "${local-ip}:80" ];
         locations = singleton (nameValuePair "/" ''
+
+          access_log off;
+          # sendfile off;
+          # tcp_nopush on;
+          # aio on;
+          sendfile on;
+          sendfile_max_chunk 512k;
+          directio 512;
+          aio threads;
+          mp4;
           autoindex on;
           root /media;
           limit_rate_after 100m;
@@ -24,7 +34,6 @@ in {
           keepalive_timeout  65;
           keepalive_requests 200;
           reset_timedout_connection on;
-          sendfile on;
           tcp_nopush on;
           gzip off;
         '');
@@ -48,7 +57,6 @@ in {
         browseable = "yes";
         "guest ok" = "yes";
       };
-
       emu = {
         path = "/media/crypt1/emu";
         "read only" = "yes";
@@ -68,6 +76,13 @@ in {
         "guest ok" = "no";
         "valid users" = "makefu";
       };
+      emu-rw = {
+        path = "/media/crypt1/emu";
+        "read only" = "no";
+        browseable = "yes";
+        "guest ok" = "no";
+        "valid users" = "makefu";
+      };
     };
     extraConfig = ''
       guest account = smbguest
-- 
cgit v1.2.3


From 2bb038c8115739c1ce4309b50c24e95f036fe4ff Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 2 May 2016 17:38:27 +0200
Subject: ma 2 default: auto-optimise-store

---
 makefu/2configs/default.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 20faf7896..afdeec40e 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -138,6 +138,9 @@ with config.krebs.lib;
     "time.apple.com"
     "time.nist.gov"
   ];
+  nix.extraOptions = ''
+    auto-optimise-store = true
+  '';
 
   security.setuidPrograms = [ "sendmail" ];
   services.journald.extraConfig = ''
-- 
cgit v1.2.3