From 36d51e5a6078b46eed4480895fa5dc3fb31ca7fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Fri, 11 Oct 2019 21:12:32 +0200
Subject: [PATCH] chore: upgrade to 19.09

---
 configs/default.nix                   | 6 +++++-
 configs/hu-berlin.nix                 | 2 +-
 configs/packages/haskell/default.nix  | 2 --
 configs/packages/haskell/packages.nix | 1 -
 configs/packages/writing.nix          | 8 ++++----
 configs/redshift.nix                  | 6 +-----
 configs/theming.nix                   | 2 +-
 deploy.nix                            | 2 +-
 nixpkgs.json                          | 6 +++---
 systems/homeros/configuration.nix     | 2 +-
 10 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/configs/default.nix b/configs/default.nix
index 68fc46c..aad0ea3 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -35,7 +35,7 @@ in
     <configs/mpv.nix>
     <configs/nano.nix>
     <configs/neovim.nix>
-    <configs/newsboat.nix>
+    # <configs/newsboat.nix> (broken)
     <configs/nixpkgs-unstable.nix>
     <configs/packages>
     <configs/printing.nix>
@@ -141,6 +141,10 @@ in
     }
     {
       time.timeZone = "Europe/Berlin";
+      location = {
+        latitude = 52.517;
+        longitude = 13.3872;
+      };
     }
     {
       home-manager.users.me = {
diff --git a/configs/hu-berlin.nix b/configs/hu-berlin.nix
index c63ab9f..a6606ae 100644
--- a/configs/hu-berlin.nix
+++ b/configs/hu-berlin.nix
@@ -18,7 +18,7 @@ let
     }}"
     phase2="auth=PAP"
   '';
-  only-hu-traffic = true;
+  only-hu-traffic = false;
 in {
   networking.wireless.networks = {
     eduroam_5GHz.auth = eduroamAuth;
diff --git a/configs/packages/haskell/default.nix b/configs/packages/haskell/default.nix
index 8ccc82c..6a6315f 100644
--- a/configs/packages/haskell/default.nix
+++ b/configs/packages/haskell/default.nix
@@ -29,14 +29,12 @@
 
   environment.systemPackages = with pkgs; [
     cabal2nix
-    stack2nix
     cabal-install
     hlint
     # haskellPackages.brittany
     (haskellPackages.ghcWithHoogle (import ./packages.nix))
   ] ++ map haskell.lib.justStaticExecutables [
     haskellPackages.ghcid
-    haskellPackages.hakyll
     # haskellPackages.hfmt
     haskellPackages.hasktags
     haskellPackages.hindent
diff --git a/configs/packages/haskell/packages.nix b/configs/packages/haskell/packages.nix
index 56cca83..b6ccb57 100644
--- a/configs/packages/haskell/packages.nix
+++ b/configs/packages/haskell/packages.nix
@@ -94,7 +94,6 @@ with haskellPackages; [
   unix-time
   unordered-containers
   vector
-  vinyl
   void
   vty
   warp
diff --git a/configs/packages/writing.nix b/configs/packages/writing.nix
index c4a8c30..56c0bb4 100644
--- a/configs/packages/writing.nix
+++ b/configs/packages/writing.nix
@@ -1,10 +1,10 @@
 { pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
-    (texlive.combine {
-      inherit (pkgs.texlive) scheme-full texdoc latex2e-help-texinfo;
-      pkgFilter = pkg: pkg.tlType == "run" || pkg.tlType == "bin" || pkg.pname == "latex2e-help-texinfo";
-    })
+    # (texlive.combine {
+    #   inherit (pkgs.texlive) scheme-full texdoc latex2e-help-texinfo;
+    #   pkgFilter = pkg: pkg.tlType == "run" || pkg.tlType == "bin" || pkg.pname == "latex2e-help-texinfo";
+    # })
     # haskellPackages.patat
     (aspellWithDicts (dict: [dict.de dict.en dict.la dict.en-computers dict.ru]))
     haskellPackages.pandoc-citeproc
diff --git a/configs/redshift.nix b/configs/redshift.nix
index 8d55314..1a6bdbb 100644
--- a/configs/redshift.nix
+++ b/configs/redshift.nix
@@ -1,7 +1,3 @@
 {
-  services.redshift = {
-    enable = true;
-    latitude = "52";
-    longitude = "13";
-  };
+  services.redshift.enable = true;
 }
diff --git a/configs/theming.nix b/configs/theming.nix
index 9e3e0a3..a1346c1 100644
--- a/configs/theming.nix
+++ b/configs/theming.nix
@@ -27,7 +27,7 @@ with config.niveum; {
     };
     qt = {
       enable = true;
-      useGtkTheme = true;
+      platformTheme = "gtk";
     };
     xsession.pointerCursor = theme.cursor // { size = 16; };
   };
diff --git a/deploy.nix b/deploy.nix
index 0fb733b..12ce088 100644
--- a/deploy.nix
+++ b/deploy.nix
@@ -25,7 +25,7 @@ let
     };
     home-manager.git = {
       url = https://github.com/rycee/home-manager;
-      ref = "2ccbf43";
+      ref = "31e8494";
     };
     stockholm.git = {
       url = https://cgit.krebsco.de/stockholm;
diff --git a/nixpkgs.json b/nixpkgs.json
index 9c6a4aa..b43fb07 100644
--- a/nixpkgs.json
+++ b/nixpkgs.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/NixOS/nixpkgs-channels",
-  "rev": "5271f8dddc0f2e54f55bd2fc1868c09ff72ac980",
-  "date": "2019-09-13T15:50:45+01:00",
-  "sha256": "0w0x7whwb98lalaw25hxarmr924m1i49c1kacyypmnh2vjbkrjmi",
+  "rev": "88bbb3c809699f44bf844094a2cd7874e0ea4a39",
+  "date": "2019-10-09T11:39:27+02:00",
+  "sha256": "0vqwws2hhsx1g4kdhm2sz9m71n0jvjvhgv9ia7fjz679s3341032",
   "fetchSubmodules": false
 }
diff --git a/systems/homeros/configuration.nix b/systems/homeros/configuration.nix
index e6c6a46..2c9a5d5 100644
--- a/systems/homeros/configuration.nix
+++ b/systems/homeros/configuration.nix
@@ -31,5 +31,5 @@
 
   networking.hostName = "homeros";
 
-  system.stateVersion = "19.03";
+  system.stateVersion = "19.09";
 }