From 3f3325a55e4a581cc3c7ab066e9fb883b1639bdc Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 18 Feb 2017 05:11:59 +0100
Subject: m x: replace laptop with new x230 (without coreboot)

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

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/hw/tp-x230.nix b/makefu/2configs/hw/tp-x230.nix
index 99563a771..855fda952 100644
--- a/makefu/2configs/hw/tp-x230.nix
+++ b/makefu/2configs/hw/tp-x230.nix
@@ -9,20 +9,26 @@ with import <stockholm/lib>;
     kernelModules = [
       "kvm-intel"
       "thinkpad_ec"
-   #   "acpi_call"
+      "acpi_call"
    #   "thinkpad_acpi"
    #   "tpm-rng"
     ];
     extraModulePackages = [
-    #  config.boot.kernelPackages.acpi_call
+      config.boot.kernelPackages.acpi_call
     ];
   };
+
+  # configured media keys inside awesomerc
+  # sound.mediaKeys.enable = true;
+  hardware.bluetooth.enable = true;
+
   services.acpid.enable = true;
   hardware.opengl.extraPackages =  [ pkgs.vaapiIntel pkgs.vaapiVdpau ];
   services.xserver = {
     videoDriver = "intel";
     deviceSection = ''
       Option "AccelMethod" "sna"
+      Option "Backlight"     "intel_backlight"
     '';
   };
   # no entropy source working
-- 
cgit v1.2.3


From 01b5372467faf232d59aa49b2a1e670ae5f4599a Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 28 Feb 2017 14:25:44 +0100
Subject: unstable @ 2017-02-28

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

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 45f7315b0..74d3635bd 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -22,7 +22,7 @@ with import <stockholm/lib>;
       user = config.krebs.users.makefu;
       source = let
           inherit (config.krebs.build) host user;
-          ref = "f66d782"; # unstable @ 2017-02-04
+          ref = "53a2baa"; # unstable @ 2017-02-28
       in {
         nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
           {
@@ -159,7 +159,7 @@ with import <stockholm/lib>;
     auto-optimise-store = true
   '';
 
-  security.setuidPrograms = [ "sendmail" ];
+  security.wrappers.sendmail.source = "${pkgs.exim}/bin/sendmail";
   services.journald.extraConfig = ''
     SystemMaxUse=1G
     RuntimeMaxUse=128M
-- 
cgit v1.2.3


From 8bacb23ad46c7c4feb8ba097ce2c221579065c2e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:45:50 +0100
Subject: m 5 esptool: ninit

---
 makefu/2configs/base-gui.nix        |  2 +-
 makefu/2configs/laptop-utils.nix    | 65 -------------------------------------
 makefu/2configs/tools/all.nix       | 10 ++++++
 makefu/2configs/tools/core-gui.nix  | 25 ++++++++++++++
 makefu/2configs/tools/core.nix      | 41 +++++++++++++++++++++++
 makefu/2configs/tools/dev.nix       | 10 ++++++
 makefu/2configs/tools/extra-gui.nix | 12 +++++++
 makefu/2configs/tools/media.nix     | 12 +++++++
 makefu/2configs/tools/sec.nix       | 15 +++++++++
 9 files changed, 126 insertions(+), 66 deletions(-)
 delete mode 100644 makefu/2configs/laptop-utils.nix
 create mode 100644 makefu/2configs/tools/all.nix
 create mode 100644 makefu/2configs/tools/core-gui.nix
 create mode 100644 makefu/2configs/tools/core.nix
 create mode 100644 makefu/2configs/tools/dev.nix
 create mode 100644 makefu/2configs/tools/extra-gui.nix
 create mode 100644 makefu/2configs/tools/media.nix
 create mode 100644 makefu/2configs/tools/sec.nix

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index 95ebabc44..43b37cd8c 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -82,7 +82,7 @@ in
 
       URxvt.perl-ext:      default,url-select
       URxvt.keysym.M-u:    perl:url-select:select_next
-      URxvt.url-select.launcher:   chromium
+      URxvt.url-select.launcher:   firefox -new-tab
       URxvt.url-select.underline: true
       URxvt.searchable-scrollback: CM-s
     '';
diff --git a/makefu/2configs/laptop-utils.nix b/makefu/2configs/laptop-utils.nix
deleted file mode 100644
index ec6d4adec..000000000
--- a/makefu/2configs/laptop-utils.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ pkgs, ... }:
-
-# tools i use when actually working with the host.
-# package version will now be maintained by nix-rebuild
-#
-# essentially `nix-env -q` of the main user
-# TODO: split gui and non-gui
-{
-  nixpkgs.config.firefox = {
-    enableAdobeFlash = true;
-  };
-
-  krebs.per-user.makefu.packages = with pkgs; [
-    # core
-    at_spi2_core
-    acpi
-    bc
-    exif
-    file
-    ntfs3g
-    pv
-    proot
-    sshpass
-    unzip
-    unrar
-    usbutils
-    zip
-
-    # dev
-    python35Packages.virtualenv
-
-
-    # gui
-    chromium
-    clipit
-    feh
-    firefox
-    keepassx
-    pcmanfm
-    skype
-    mirage
-    tightvnc
-    gnome3.dconf
-    vlc
-    virtmanager
-    wireshark
-    xdotool
-
-    # sectools
-    aria2
-    pythonPackages.binwalk-full
-    dnsmasq
-    iodine
-    mtr
-    nmap
-
-
-    # stuff
-    cac-api
-    cac-panel
-    krebspaste
-    ledger
-    pass
-  ];
-}
diff --git a/makefu/2configs/tools/all.nix b/makefu/2configs/tools/all.nix
new file mode 100644
index 000000000..09344d99d
--- /dev/null
+++ b/makefu/2configs/tools/all.nix
@@ -0,0 +1,10 @@
+{
+  imports = [
+    ./core.nix
+    ./core-gui.nix
+    ./extra-gui.nix
+    ./dev.nix
+    ./sec.nix
+    ./media.nix
+  ];
+}
diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix
new file mode 100644
index 000000000..518a60eac
--- /dev/null
+++ b/makefu/2configs/tools/core-gui.nix
@@ -0,0 +1,25 @@
+{ pkgs, ... }:
+
+{
+  nixpkgs.config.firefox = {
+    enableAdobeFlash = true;
+  };
+
+  krebs.per-user.makefu.packages = with pkgs; [
+    chromium
+    clipit
+    feh
+    firefox
+    keepassx
+    pcmanfm
+    skype
+    mirage
+    tightvnc
+    gnome3.dconf
+    vlc
+    wireshark
+    xdotool
+    scrot
+    
+  ];
+}
diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix
new file mode 100644
index 000000000..56d60812e
--- /dev/null
+++ b/makefu/2configs/tools/core.nix
@@ -0,0 +1,41 @@
+{ pkgs, ... }:
+
+# tools i use when actually working with the host.
+# package version will now be maintained by nix-rebuild
+#
+# essentially `nix-env -q` of the main user
+{
+  krebs.per-user.makefu.packages = with pkgs; [
+    at_spi2_core
+    acpi
+    bc
+    exif
+    file
+    ntfs3g
+    pv
+    proot
+    sshpass
+    usbutils
+    p7zip
+    hdparm
+    inetutils
+    ncftp
+    mutt
+    tcpdump
+    sysstat
+    which
+    weechat
+    curl
+    wget
+    wol
+    tmux
+    smartmontools
+    iftop
+
+    cac-api
+    cac-panel
+    krebspaste
+    ledger
+    pass
+  ];
+}
diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix
new file mode 100644
index 000000000..8acc25fcc
--- /dev/null
+++ b/makefu/2configs/tools/dev.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+{
+  krebs.per-user.makefu.packages = with pkgs;[
+    nodemcu-uploader
+    esptool
+    python35Packages.virtualenv
+    flashrom
+  ];
+}
diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix
new file mode 100644
index 000000000..6b8a5af66
--- /dev/null
+++ b/makefu/2configs/tools/extra-gui.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  krebs.per-user.makefu.packages = with pkgs;[
+    inkscape
+    gimp
+    skype
+    virtmanager
+    synergy
+    
+  ];
+}
diff --git a/makefu/2configs/tools/media.nix b/makefu/2configs/tools/media.nix
new file mode 100644
index 000000000..67159a176
--- /dev/null
+++ b/makefu/2configs/tools/media.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  nixpkgs.config.firefox = {
+    enableAdobeFlash = true;
+  };
+
+  krebs.per-user.makefu.packages = with pkgs; [
+    kodi
+    streamripper
+  ];
+}
diff --git a/makefu/2configs/tools/sec.nix b/makefu/2configs/tools/sec.nix
new file mode 100644
index 000000000..3a2a84556
--- /dev/null
+++ b/makefu/2configs/tools/sec.nix
@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+
+{
+  krebs.per-user.makefu.packages = with pkgs; [
+    aria2
+    mitmproxy
+    pythonPackages.binwalk-full
+    dnsmasq
+    iodine
+    mtr
+    nmap
+    msf
+    thc-hydra
+  ];
+}
-- 
cgit v1.2.3


From 0412d9c1156d78f0db3c2408ac224c50ebf43c7e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:46:23 +0100
Subject: m 2 central-stats-server: use updated kapacitor

---
 makefu/2configs/logging/central-stats-server.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/logging/central-stats-server.nix b/makefu/2configs/logging/central-stats-server.nix
index 8151d4939..30ad63879 100644
--- a/makefu/2configs/logging/central-stats-server.nix
+++ b/makefu/2configs/logging/central-stats-server.nix
@@ -5,10 +5,9 @@ let
   collectd-port = 25826;
   influx-port = 8086;
   grafana-port = 3000; # TODO nginx forward
+  db = "collectd_db";
+  logging-interface = config.makefu.server.primary-itf;
 in {
-  imports = [
-    ../../../lass/3modules/kapacitor.nix
-  ];
   services.grafana.enable = true;
   services.grafana.addr = "0.0.0.0";
 
@@ -27,11 +26,11 @@ in {
     collectd = [{
       enabled = true;
       typesdb = "${pkgs.collectd}/share/collectd/types.db";
-      database = "collectd_db";
+      database = db;
       port = collectd-port;
     }];
   };
-  lass.kapacitor =
+  krebs.kapacitor =
    let
       echoToIrc = pkgs.writeDash "echo_irc" ''
         set -euf
@@ -43,7 +42,8 @@ in {
   in {
     enable = true;
     alarms = {
-      cpu_deadman = ''
+      cpu_deadman.database = db;
+      cpu_deadman.text = ''
         var data = batch
             |query(${"'''"}
                   SELECT mean("value") AS mean
@@ -68,5 +68,8 @@ in {
     iptables -A INPUT -i retiolum -p udp --dport ${toString collectd-port} -j ACCEPT
     iptables -A INPUT -i retiolum -p tcp --dport ${toString influx-port} -j ACCEPT
     iptables -A INPUT -i retiolum -p tcp --dport ${toString grafana-port} -j ACCEPT
+    iptables -A INPUT -i ${logging-interface} -p udp --dport ${toString collectd-port} -j ACCEPT
+    iptables -A INPUT -i ${logging-interface} -p tcp --dport ${toString influx-port} -j ACCEPT
+    iptables -A INPUT -i ${logging-interface} -p tcp --dport ${toString grafana-port} -j ACCEPT
   '';
 }
-- 
cgit v1.2.3


From d88b9ded5f09d5df8784a75d2ae92f3500bd9f6d Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:46:43 +0100
Subject: m 2 omo-share: expose media-rw

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

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/omo-share.nix b/makefu/2configs/omo-share.nix
index 8a3eab98a..7d7a4ec57 100644
--- a/makefu/2configs/omo-share.nix
+++ b/makefu/2configs/omo-share.nix
@@ -48,15 +48,8 @@ in {
         browseable = "yes";
         "guest ok" = "yes";
       };
-      crypt0-rw = {
-        path = "/media/crypt0/";
-        "read only" = "no";
-        browseable = "yes";
-        "guest ok" = "no";
-        "valid users" = "makefu";
-      };
-      crypt1-rw = {
-        path = "/media/crypt1/";
+      media-rw = {
+        path = "/media/";
         "read only" = "no";
         browseable = "yes";
         "guest ok" = "no";
-- 
cgit v1.2.3


From af83dea03c002e0dc1c907c429b378ba97da0ba3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:47:27 +0100
Subject: k 2 tools/sec: do not deploy mitmproxy (broken)

---
 makefu/2configs/tools/sec.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/tools/sec.nix b/makefu/2configs/tools/sec.nix
index 3a2a84556..5ab699f35 100644
--- a/makefu/2configs/tools/sec.nix
+++ b/makefu/2configs/tools/sec.nix
@@ -3,7 +3,7 @@
 {
   krebs.per-user.makefu.packages = with pkgs; [
     aria2
-    mitmproxy
+    # mitmproxy
     pythonPackages.binwalk-full
     dnsmasq
     iodine
-- 
cgit v1.2.3


From c96761176276f39e23767f92582aa1af13ee7a26 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:50:58 +0100
Subject: main-laptop: use tools,security wrappers

---
 makefu/2configs/main-laptop.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/main-laptop.nix b/makefu/2configs/main-laptop.nix
index e1c3d20ff..eaf6dec97 100644
--- a/makefu/2configs/main-laptop.nix
+++ b/makefu/2configs/main-laptop.nix
@@ -14,7 +14,8 @@ in {
     ./base-gui.nix
     ./fetchWallpaper.nix
     ./zsh-user.nix
-    ./laptop-utils.nix
+    ./tools/core.nix
+    ./tools/core-gui.nix
   ];
 
   users.users.${config.krebs.build.user.name}.extraGroups = [ "dialout" ];
@@ -60,7 +61,7 @@ in {
             sleep 1
           '')
           [ 5 4 3 2 1 ]}
-        /var/setuid-wrappers/sudo ${pkgs.systemd}/bin/systemctl suspend
+        /var/run/wrappers/bin/sudo ${pkgs.systemd}/bin/systemctl suspend
       '';
     };
   };
-- 
cgit v1.2.3


From f23801beae6c54ca225df3d60d3dc1b0cda5471b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:51:18 +0100
Subject: m 2 printer: use dymo cups driver

---
 makefu/2configs/printer.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/printer.nix b/makefu/2configs/printer.nix
index d288748f9..7c7b00abc 100644
--- a/makefu/2configs/printer.nix
+++ b/makefu/2configs/printer.nix
@@ -5,6 +5,7 @@
     enable = true;
     drivers = [
       pkgs.samsungUnifiedLinuxDriver
+      pkgs.dymo-cups-drivers
     ];
   };
 
-- 
cgit v1.2.3


From 1135487724b442b78d7f4d863c02ab6b7fb801b2 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:53:16 +0100
Subject: m x230: move specific config to general config

---
 makefu/2configs/hw/tp-x230.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/hw/tp-x230.nix b/makefu/2configs/hw/tp-x230.nix
index 855fda952..2de32dd94 100644
--- a/makefu/2configs/hw/tp-x230.nix
+++ b/makefu/2configs/hw/tp-x230.nix
@@ -16,6 +16,8 @@ with import <stockholm/lib>;
     extraModulePackages = [
       config.boot.kernelPackages.acpi_call
     ];
+    # support backlight adjustment
+    kernelParams = [ "acpi_osi=Linux" "acpi_backlight=vendor" ];
   };
 
   # configured media keys inside awesomerc
-- 
cgit v1.2.3


From 798e80de7c522afbf619ab4b1519849f2c33ca9b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:54:39 +0100
Subject: m 2 owncloud: do not use mysql

---
 makefu/2configs/deployment/owncloud.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/deployment/owncloud.nix b/makefu/2configs/deployment/owncloud.nix
index d692ef72d..c6fb9c8e5 100644
--- a/makefu/2configs/deployment/owncloud.nix
+++ b/makefu/2configs/deployment/owncloud.nix
@@ -131,11 +131,15 @@ in  {
     ( serveCloud [ "o.euer.krebsco.de" ] )
   ];
 
-  services.mysql = {
-    enable = true;
+  services.mysql = { # TODO: currently nextcloud uses sqlite
+    enable = false;
     package = pkgs.mariadb;
     rootPassword = config.krebs.secret.files.mysql_rootPassword.path;
   };
+  services.mysqlBackup = {
+    enable = false;
+    databases = [ "nextcloud" ];
+  };
 
   krebs.secret.files.mysql_rootPassword = {
     path = "${config.services.mysql.dataDir}/mysql_rootPassword";
-- 
cgit v1.2.3


From ab88b75e1d36078d6dbb104803b0421f84a2abe9 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 15:55:02 +0100
Subject: m 2 urlwatch: watch exfat-nofuse

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

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/urlwatch.nix b/makefu/2configs/urlwatch.nix
index d575d18bc..20eb031a1 100644
--- a/makefu/2configs/urlwatch.nix
+++ b/makefu/2configs/urlwatch.nix
@@ -16,6 +16,9 @@
       http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/
       https://github.com/amadvance/snapraid/releases.atom
       https://erdgeist.org/gitweb/opentracker/info/refs?service=git-upload-pack
+      https://api.github.com/repos/embray/d2to1/tags
+      https://api.github.com/repos/dorimanx/exfat-nofuse/commits
+      https://api.github.com/repos/dorimanx/exfat-nofuse/tags
     ];
   };
 }
-- 
cgit v1.2.3


From 87cd7cd9afc1f28927f3b605f1fe97047eeaf18c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 16:23:12 +0100
Subject: m 2 tools: update

---
 makefu/2configs/tools/all.nix       | 5 +++--
 makefu/2configs/tools/core-gui.nix  | 1 -
 makefu/2configs/tools/core.nix      | 5 +++++
 makefu/2configs/tools/extra-gui.nix | 2 +-
 makefu/2configs/tools/games.nix     | 7 +++++++
 makefu/2configs/tools/media.nix     | 8 ++++----
 6 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 makefu/2configs/tools/games.nix

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/tools/all.nix b/makefu/2configs/tools/all.nix
index 09344d99d..e64e216e0 100644
--- a/makefu/2configs/tools/all.nix
+++ b/makefu/2configs/tools/all.nix
@@ -2,9 +2,10 @@
   imports = [
     ./core.nix
     ./core-gui.nix
-    ./extra-gui.nix
     ./dev.nix
-    ./sec.nix
+    ./extra-gui.nix
+    ./games.nix
     ./media.nix
+    ./sec.nix
   ];
 }
diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix
index 518a60eac..654e83baa 100644
--- a/makefu/2configs/tools/core-gui.nix
+++ b/makefu/2configs/tools/core-gui.nix
@@ -16,7 +16,6 @@
     mirage
     tightvnc
     gnome3.dconf
-    vlc
     wireshark
     xdotool
     scrot
diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix
index 56d60812e..86d72c662 100644
--- a/makefu/2configs/tools/core.nix
+++ b/makefu/2configs/tools/core.nix
@@ -9,12 +9,14 @@
     at_spi2_core
     acpi
     bc
+    rsync
     exif
     file
     ntfs3g
     pv
     proot
     sshpass
+    populate
     usbutils
     p7zip
     hdparm
@@ -30,7 +32,10 @@
     wol
     tmux
     smartmontools
+    cifs-utils
     iftop
+    taskwarrior
+    mplayer
 
     cac-api
     cac-panel
diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix
index 6b8a5af66..9cfacf408 100644
--- a/makefu/2configs/tools/extra-gui.nix
+++ b/makefu/2configs/tools/extra-gui.nix
@@ -7,6 +7,6 @@
     skype
     virtmanager
     synergy
-    
+    saleae-logic
   ];
 }
diff --git a/makefu/2configs/tools/games.nix b/makefu/2configs/tools/games.nix
new file mode 100644
index 000000000..34c686451
--- /dev/null
+++ b/makefu/2configs/tools/games.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  krebs.per-user.makefu.packages = with pkgs; [
+    steam
+  ];
+}
diff --git a/makefu/2configs/tools/media.nix b/makefu/2configs/tools/media.nix
index 67159a176..4fc3413e8 100644
--- a/makefu/2configs/tools/media.nix
+++ b/makefu/2configs/tools/media.nix
@@ -1,12 +1,12 @@
 { pkgs, ... }:
 
 {
-  nixpkgs.config.firefox = {
-    enableAdobeFlash = true;
-  };
-
   krebs.per-user.makefu.packages = with pkgs; [
     kodi
     streamripper
+    youtube-dl
+    calibre
+    vlc
+    mumble
   ];
 }
-- 
cgit v1.2.3


From e495e59af040ba517843c572c4884f1434eefccb Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 5 Mar 2017 16:59:34 +0100
Subject: m 2 default: suid for sendmail

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

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 74d3635bd..bf70ebe08 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -159,7 +159,10 @@ with import <stockholm/lib>;
     auto-optimise-store = true
   '';
 
-  security.wrappers.sendmail.source = "${pkgs.exim}/bin/sendmail";
+  security.wrappers.sendmail = {
+    source = "${pkgs.exim}/bin/sendmail";
+    setuid = true;
+  };
   services.journald.extraConfig = ''
     SystemMaxUse=1G
     RuntimeMaxUse=128M
-- 
cgit v1.2.3


From ef300aeb9e2c9230ce47ff306d4f5e4b684d69f1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 22:02:47 +0100
Subject: m 2 default: timesyncd replaced ntp in defaults

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

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index bf70ebe08..1ad7f0710 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -145,16 +145,13 @@ with import <stockholm/lib>;
     tinc = pkgs.tinc_pre;
   };
 
-  services.cron.enable = false;
-  services.nscd.enable = false;
-  services.ntp.enable = false;
-  services.timesyncd.enable = true;
-  services.ntp.servers = [
+   networking.timeServers = [
     "pool.ntp.org"
     "time.windows.com"
     "time.apple.com"
     "time.nist.gov"
   ];
+
   nix.extraOptions = ''
     auto-optimise-store = true
   '';
-- 
cgit v1.2.3


From cb48e9371a337d23e1f3f09b5d024ee60451d9d2 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Mar 2017 22:03:20 +0100
Subject: m 2 tools: xbacklight

---
 makefu/2configs/tools/core-gui.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix
index 654e83baa..6d62e92c0 100644
--- a/makefu/2configs/tools/core-gui.nix
+++ b/makefu/2configs/tools/core-gui.nix
@@ -18,7 +18,7 @@
     gnome3.dconf
     wireshark
     xdotool
+    xorg.xbacklight
     scrot
-    
   ];
 }
-- 
cgit v1.2.3