From b7140f3ad8149b2f2196362b31e6551eb48fe8ca Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Thu, 12 Nov 2020 17:24:42 -0800
Subject: get xmonad working

---
 linux.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'linux.nix')

diff --git a/linux.nix b/linux.nix
index a1b9107..3a9bcd9 100644
--- a/linux.nix
+++ b/linux.nix
@@ -51,6 +51,12 @@ let
       foreground = "#655370";
     };
   };
+  xmonadPackages = self: [
+    self.xmonad-contrib
+    #self.taffybar # fails to build
+    self.xmonad-extras
+    self.monad-logger
+  ];
 in
 {
   imports = [
@@ -159,7 +165,6 @@ in
   services = {
     lorri.enable = true;
     emacs.enable = true;
-    network-manager-applet.enable = true;
 
     kbfs.enable = true;
     keybase.enable = true;
@@ -357,6 +362,7 @@ in
 
   xsession = {
     enable = true;
+    scriptPath = ".hm-xsession";
     pointerCursor = {
       package = pkgs.vanilla-dmz;
       name = "Vanilla-DMZ";
@@ -364,12 +370,7 @@ in
     windowManager = {
       xmonad = {
         enable = true;
-        extraPackages = hpkgs: [
-          hpkgs.xmonad-contrib
-          hpkgs.xmonad-extras
-          hpkgs.monad-logger
-          #hpkgs.taffybar
-        ];
+        extraPackages = xmonadPackages;
         enableContribAndExtras = true;
         config = ./lib/xmonad.hs;
       };
-- 
cgit v1.2.3