From 495fcf0775f5f3599a899ebaea323161f93eb715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Wed, 15 May 2019 18:21:58 +0200
Subject: [PATCH] 19.03

---
 configs/default.nix                   |  7 +++----
 configs/git.nix                       | 12 ++++++++++++
 configs/i3.nix                        | 10 +++++-----
 deploy.nix                            |  1 +
 nixpkgs.json                          |  6 +++---
 systems/homeros/configuration.nix     |  2 +-
 systems/scardanelli/configuration.nix |  2 +-
 7 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/configs/default.nix b/configs/default.nix
index 740002a..5f20948 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -49,9 +49,6 @@
     <configs/xautolock.nix>
     <configs/xresources.nix>
     <configs/zsh.nix>
-    {
-      nix.buildCores = 0;
-    }
     {
       niveum.user = {
         github = "kmein";
@@ -74,6 +71,7 @@
         allowUnfree = true;
         packageOverrides = pkgs: {
           autorenkalender = pkgs.callPackage <packages/autorenkalender.nix> {};
+          quote-db = pkgs.haskellPackages.callPackage <packages/quote-db.nix> {};
           bvg = pkgs.callPackage <packages/bvg.nix> {};
           daybook = pkgs.callPackage <packages/daybook.nix> {};
           font-size = pkgs.callPackage <packages/font-size.nix> { font = config.niveum.fonts.terminal; };
@@ -150,7 +148,7 @@
         (pkgs.unstable.writers.writeDashBin "niveum-update" ''
           NIVEUM_DIR=/home/kfm/prog/git/niveum
 
-          nix-prefetch-git --url https://github.com/NixOS/nixpkgs-channels --rev refs/heads/nixos-18.09 > "$NIVEUM_DIR/nixpkgs.json"
+          nix-prefetch-git --url https://github.com/NixOS/nixpkgs-channels --rev refs/heads/nixos-${config.system.stateVersion} > "$NIVEUM_DIR/nixpkgs.json"
         '')
       ];
     }
@@ -334,6 +332,7 @@
         autorenkalender
         font-size
         odyssey
+        # quote-db
         literature-quote
         dic
         yt-next
diff --git a/configs/git.nix b/configs/git.nix
index 2894060..dce2159 100644
--- a/configs/git.nix
+++ b/configs/git.nix
@@ -1,5 +1,17 @@
 { pkgs, config, ... }:
 {
+  imports = [ <modules/git.nix> ];
+
+  # niveum.git = {
+  #   enable = true;
+  #   repositories.niveum = {
+  #     enable = true;
+  #     location = "/tmp/niveum";
+  #     branches = [ "master" ];
+  #     remotes.origin = "git@github.com:kmein/niveum";
+  #   };
+  # };
+
   environment.systemPackages = [
     pkgs.git
     pkgs.gitAndTools.hub
diff --git a/configs/i3.nix b/configs/i3.nix
index c62aff8..0ea3ff6 100644
--- a/configs/i3.nix
+++ b/configs/i3.nix
@@ -72,7 +72,7 @@ in with config.niveum; {
             separator = " "
           }
 
-          order += "run_watch retiolum"
+          # order += "run_watch retiolum"
           order += "path_exists openvpn"
           order += "wireless ${wifi-interface}"
           order += "battery all"
@@ -85,10 +85,10 @@ in with config.niveum; {
             format_down = "offline"
           }
 
-          run_watch retiolum {
-            pidfile = "/var/run/tinc.retiolum.pid"
-            format = "%title"
-          }
+          # run_watch retiolum {
+          #   pidfile = "/var/run/tinc.retiolum.pid"
+          #   format = "%title"
+          # }
 
           path_exists openvpn {
             path = "/proc/sys/net/ipv4/conf/tun0"
diff --git a/deploy.nix b/deploy.nix
index 430544f..43e128c 100644
--- a/deploy.nix
+++ b/deploy.nix
@@ -5,6 +5,7 @@
 let
   krops = builtins.fetchGit {
     url = "https://cgit.krebsco.de/krops/";
+    ref = "v1.14.0";
   };
   lib = import "${krops}/lib";
   pkgs = import "${krops}/pkgs" {};
diff --git a/nixpkgs.json b/nixpkgs.json
index cb7ab10..ab23111 100644
--- a/nixpkgs.json
+++ b/nixpkgs.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/NixOS/nixpkgs-channels",
-  "rev": "571b40d3f50466d3e91c1e609d372de96d782793",
-  "date": "2019-04-23T11:24:45+02:00",
-  "sha256": "0qjpkx2b5pac1nqr5chvlrlcyyk294w2079ybf88p95qxkqbbby5",
+  "rev": "7cd2e4ebe8ca91f829b405451586868744270100",
+  "date": "2019-05-14T00:18:11+02:00",
+  "sha256": "0h4lacvqmk356ihc7gnb44dni6m5qza23vlgl6w6jdhr9pjcmdcm",
   "fetchSubmodules": false
 }
diff --git a/systems/homeros/configuration.nix b/systems/homeros/configuration.nix
index f7be224..4c3e529 100644
--- a/systems/homeros/configuration.nix
+++ b/systems/homeros/configuration.nix
@@ -16,5 +16,5 @@
 
   networking.hostName = "homeros";
 
-  system.stateVersion = "18.09";
+  system.stateVersion = "19.03";
 }
diff --git a/systems/scardanelli/configuration.nix b/systems/scardanelli/configuration.nix
index 4f4cd7d..60dbfd7 100644
--- a/systems/scardanelli/configuration.nix
+++ b/systems/scardanelli/configuration.nix
@@ -13,5 +13,5 @@
 
   networking.hostName = "scardanelli";
 
-  system.stateVersion = "18.09";
+  system.stateVersion = "19.03";
 }