From de5129f7a60e9a00fcef8b004445e4dfd817b7e8 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 26 Aug 2016 07:32:38 +0200
Subject: [PATCH] archachatina: support polaris

---
 archachatina.nix | 21 +++++++++++++++------
 common-sw.nix    |  8 +++++++-
 i3.nix           | 13 +++++++++++--
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/archachatina.nix b/archachatina.nix
index 78e5ea4..c515be5 100644
--- a/archachatina.nix
+++ b/archachatina.nix
@@ -35,6 +35,8 @@
     uvccapture
   ];
 
+  services.thermald.enable = true;
+
   virtualisation.docker.enable = true;
   users.extraUsers.gebner.extraGroups = [ "docker" "libvirtd" ];
 
@@ -58,12 +60,19 @@
   networking.firewall.allowedTCPPorts = [ config.services.nix-serve.port ];
 
   nixpkgs.config.packageOverrides = super: let self = super.pkgs; in {
-      # mesa_drivers = self.mesaDarwinOr (
-      #   let mo = self.mesa_noglu.override {
-      #         llvmPackages = self.llvmPackages_36;
-      #       };
-      #   in mo.drivers
-      # );
+      mesa_drivers = self.mesaDarwinOr (
+        let mo = self.mesa_noglu.override {
+              llvmPackages = pkgs.llvmPackages_39;
+              grsecEnabled = false;
+              enableTextureFloats = true;
+            };
+        in mo.drivers
+      );
   };
 
+  #boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages_latest;
+  boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages_4_7;
+
+  services.xserver.videoDrivers = [ "amdgpu" ];
+
 }
diff --git a/common-sw.nix b/common-sw.nix
index 99011ea..2c12ea8 100644
--- a/common-sw.nix
+++ b/common-sw.nix
@@ -60,7 +60,6 @@
     spass
     z3
     cvc4
-    why3
     graphviz
     # toysolver
     stable.haskellPackages.tip-lib
@@ -68,6 +67,7 @@
     emacsPackages.proofgeneral_4_3_pre
 
     stablePkgs # protect nixpkgs checkout from GC
+    unstablePkgs
   ] ++ (with aspellDicts; [ en de fr nl ]);
 
   nixpkgs.config.packageOverrides = pkgs: with pkgs; let
@@ -81,6 +81,10 @@
       rev = "5237768d62a40236d24fafbd9f4f97f3227399ce";
       sha256 = "1j707pwm6ll2cvmqvwfxxq21gd9q7l6s3vi3vc01jklplj2v20is";
     };
+    unstablePkgs = fetchNixPkgs {
+      rev = "f25006bfaff034dcc45e4cd9bd19c072b20b472d";
+      sha256 = "1013005fw3rqraql2qcx2w0wba4n2a0w9y1cv6a2jqcjbbsvz0xd";
+    };
   in {
     idea.idea-community = pkgs.idea.idea-community.overrideDerivation (oldAttrs: rec {
         name = "idea-community-${version}";
@@ -97,6 +101,8 @@
 
     stablePkgs = stablePkgs;
     stable = import stablePkgs {};
+    unstablePkgs = unstablePkgs;
+    unstable = import unstablePkgs {};
   };
 
   nixpkgs.config.allowTexliveBuilds = true;
diff --git a/i3.nix b/i3.nix
index 48fc75a..6e1bd90 100644
--- a/i3.nix
+++ b/i3.nix
@@ -18,13 +18,22 @@
     gnome_keyring
     networkmanagerapplet
     gnome_terminal
+    nautilus # in closure of gnome-terminal anyhow
     colord
     evince
     arandr
     xss-lock i3lock
     xdotool
     scrot
-  ] ++ gnome3.corePackages;
+
+    # gnome3 core packages
+    desktop_file_utils shared_mime_info
+    glib gtk3
+    glib_networking gvfs dconf
+    gnome_settings_daemon
+    gnome_themes_standard defaultIconTheme
+    hicolor_icon_theme
+  ];
 
   fonts = {
     fonts = with pkgs; [
@@ -88,7 +97,7 @@
   # services.gnome3.evolution-data-server.enable = true;
   # services.gnome3.gnome-documents.enable = true;
   services.gnome3.gnome-keyring.enable = true;
-  services.gnome3.gnome-online-accounts.enable = true;
+  #services.gnome3.gnome-online-accounts.enable = true;
   # services.gnome3.gnome-user-share.enable = true;
   services.gnome3.gvfs.enable = true;
   services.gnome3.seahorse.enable = true;