From a8b399b3941f2df6e357372c4c36ab931e407081 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Wed, 23 Jan 2019 22:07:03 +0100
Subject: Add athena-specific config

It remains to be seen how to integrate highdpi-specific stuff.
---
 gui/conf/xmonad.hs | 12 ++++++++++++
 host/asterix.nix   |  3 +--
 host/athena.nix    | 23 +++++++++++++++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 host/athena.nix

diff --git a/gui/conf/xmonad.hs b/gui/conf/xmonad.hs
index c1b40b7..bf067f9 100644
--- a/gui/conf/xmonad.hs
+++ b/gui/conf/xmonad.hs
@@ -119,6 +119,16 @@ hostSpecificKeybindings host = case host of
                , ("M-i c" , showNotification "`acpi --thermal | awk '{print $4}'`°C"
                                              "`cat /proc/acpi/ibm/fan | awk '/speed/{print $2}'` RPM")
                , ("M-c n" , spawn "networkmanager_dmenu") ]
+  "athena"  -> [ ("M-i b" , showNotification "Battery"
+                                             "`acpi | cut -c 10-`")
+               , ("M-i c" , showNotification "`acpi --thermal | awk '{print $4}'`°C"
+                                             "`cat /proc/acpi/ibm/fan | awk '/speed/{print $2}'` RPM")
+               , ("M-c n" , spawn "networkmanager_dmenu")
+               , ("<XF86MonBrightnessUp>"   , spawn "xbacklight -inc 5")
+               , ("<XF86MonBrightnessDown>" , spawn "xbacklight -dec 5")
+               , ("<XF86AudioRaiseVolume>"  , spawn "amixer sset Master 10%+")
+               , ("<XF86AudioLowerVolume>"  , spawn "amixer sset Master 10%-")
+               , ("<XF86AudioMute>"         , spawn "amixer sset Master toggle") ]
   "obelix"  -> [ ("M-i g" , showNotification "GPU"
                                              "`nvidia-smi --query-gpu=name,temperature.gpu,utilization.gpu,utilization.memory --format=csv,noheader | awk -F',' '{print $1 \" running at\" $2 \"°C due to\" $3 \" load and\" $4 \" memory usage\"}'`") ]
   _         -> [ ]
@@ -295,7 +305,9 @@ screenWidthOn  host = case host of
   "obelix"   -> 1920
   "majestix" -> 1680
   "asterix"  -> 1366
+  "athena"   -> 2560
 screenHeightOn host = case host of
   "obelix"   -> 1200
   "majestix" -> 1050
   "asterix"  -> 768
+  "athena"   -> 1440
diff --git a/host/asterix.nix b/host/asterix.nix
index 925713c..1594c6f 100644
--- a/host/asterix.nix
+++ b/host/asterix.nix
@@ -9,8 +9,7 @@
   home.packages = let
     mypkgs = import (fetchTarball "https://pkgs.kummerlaender.eu/nixexprs.tar.gz") { };
   in [
-  # only asterix has a 3g modem
-    mypkgs.modem-manager-gui
     pkgs.networkmanager_dmenu
+    pkgs.acpi
   ];
 }
diff --git a/host/athena.nix b/host/athena.nix
new file mode 100644
index 0000000..6ebe90d
--- /dev/null
+++ b/host/athena.nix
@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ../gui/default.nix
+  ];
+
+  home.packages = with pkgs; [
+    networkmanager_dmenu
+    acpi
+    xorg.xbacklight 
+  ];
+
+  xresources.extraConfig = ''
+    Xft.dpi: 160
+    Xft.autohint: 0
+    Xft.lcdfilter: lcddefault
+    Xft.hintstyle: hintfull
+    Xft.hinting: 1
+    Xft.antialias: 1
+    Xft.rgba: rgb
+  '';
+}
-- 
cgit v1.2.3