From f42d23f69bb84186b5218cfa49e1321a80acc293 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 17 Jan 2016 00:40:06 +0100
Subject: ma 2 smart-monitor: disable autodetection

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

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/smart-monitor.nix b/makefu/2configs/smart-monitor.nix
index a37969d3d..daf3aad01 100644
--- a/makefu/2configs/smart-monitor.nix
+++ b/makefu/2configs/smart-monitor.nix
@@ -3,6 +3,7 @@
   krebs.exim-retiolum.enable = lib.mkDefault true;
   services.smartd = {
     enable = true;
+    autodetect = false;
     notifications = {
       mail = {
         enable = true;
-- 
cgit v1.2.3


From 769b939e8d74ad3d6358ccebc1ed356c3ba3f219 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 17 Jan 2016 00:41:02 +0100
Subject: ma 2 vim: disable youcompleteme, install breaks

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

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/vim.nix b/makefu/2configs/vim.nix
index 02a46d22a..227d73c81 100644
--- a/makefu/2configs/vim.nix
+++ b/makefu/2configs/vim.nix
@@ -122,7 +122,7 @@ in {
       vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // customPlugins;
       vimrcConfig.vam.pluginDictionaries = [
         { names = [ "undotree"
-          "YouCompleteMe"
+          # "YouCompleteMe"
           "vim-better-whitespace" ]; }
         { names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; }
       ];
-- 
cgit v1.2.3


From de891cf43181d28cbc9526993df4e55022d230da Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 17 Jan 2016 00:46:28 +0100
Subject: ma 2 default: whitelist unrar from unfree

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

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 7771e24d4..ec1100582 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -13,7 +13,7 @@ with lib;
     ./vim.nix
   ];
 
-
+  nixpkgs.config.allowUnfreePredicate =  (pkg: pkgs.lib.hasPrefix "unrar-" pkg.name);
   krebs = {
     enable = true;
     search-domain = "retiolum";
-- 
cgit v1.2.3


From 818ea249f08846a1b5efdf4cb09ba94e07e44e74 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 19 Jan 2016 20:04:29 +0100
Subject: ma 2 git/cgit: add init-stockholm repo

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

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix
index 35bb169cf..7d85eb8d1 100644
--- a/makefu/2configs/git/cgit-retiolum.nix
+++ b/makefu/2configs/git/cgit-retiolum.nix
@@ -16,6 +16,9 @@ let
       desc = "Tinc Advanced Graph Generation";
     };
     cac = { };
+    init-stockholm = {
+      desc = "Init stuff for stockholm";
+    };
   };
 
   priv-repos = mapAttrs make-priv-repo {
-- 
cgit v1.2.3


From 1b39a26933966c5da8316f81ae67ff88e56d348d Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 19 Jan 2016 20:37:46 +0100
Subject: ma 2 tinc-basic-retiolum: remove obsolete hosts path - corresponds
 with defaults

---
 makefu/2configs/tinc-basic-retiolum.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/tinc-basic-retiolum.nix b/makefu/2configs/tinc-basic-retiolum.nix
index 2abf4f188..f49c596fc 100644
--- a/makefu/2configs/tinc-basic-retiolum.nix
+++ b/makefu/2configs/tinc-basic-retiolum.nix
@@ -4,7 +4,6 @@ with lib;
 {
   krebs.retiolum = {
     enable = true;
-    hosts = ../../krebs/Zhosts;
     connectTo = [
       "gum"
       "pigstarter"
-- 
cgit v1.2.3