font and color improvements

2 files changed, 13 insertions, 8 deletions

diff --git a/linux.nix b/linux.nix
index 04c8236..23f4b5a 100644
--- a/linux.nix
+++ b/linux.nix
@@ -9,10 +9,12 @@ let
     "dark" = {
       background = "#292b2e";
       foreground = "#b2b2b2";
+      highlight = "#5d4d7a";
     };
     "light" = {
       background = "#fbf8ef";
       foreground = "#655370";
+      highlight = "#67b11d";
     };
   };
 in
@@ -23,8 +25,8 @@ in
 
   xresources = {
     properties = {
-      "XTerm*font" = "-*-terminus-medium-r-normal--18-*-*-*-*-*-iso10646-1";
-      "XTerm*faceName" = "Terminus";
+      "XTerm*font" = "-*-FiraMono-medium-r-normal--18-*-*-*-*-*-iso10646-1";
+      "XTerm*faceName" = "FireMono";
       "XTerm*faceSize" = "10";
       "XTerm*termName" = "xterm-256color";
       "XTerm*metaSendsEscape" = true;
diff --git a/xmonad.hs b/xmonad.hs
index 5095fa5..48f89af 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -33,16 +33,19 @@ import XMonad.Util.EZConfig (additionalKeys)
 data Colors = Colors
   { foreground :: String
   , background :: String
+  , highlight :: String
   }
 
 lightTheme = Colors
-  { foreground = "#67b11d"
+  { highlight = "#67b11d"
   , background = "#fbf8ef"
+  , foreground = "#655370"
   }
 
 darkTheme = Colors
-  { foreground = "#5d4d7a"
+  { highlight = "#5d4d7a"
   , background = "#292b2e"
+  , foreground = "#b2b2b2"
   }
 
 getColorsFromXtheme :: IO Colors
@@ -108,10 +111,10 @@ addSpace = spacingRaw
   True
 
 myTabCfg theme = def
-  { fontName = "xft:mononoki:size=10:ant"
-  , activeBorderColor = foreground theme
+  { fontName = "xft:Fira Sans:size=10:ant"
+  , activeBorderColor = highlight theme
   , inactiveBorderColor = background theme
-  , activeColor = foreground theme
+  , activeColor = highlight theme
   , inactiveColor = background theme
   }
 
@@ -142,7 +145,7 @@ myConf theme = additionalKeys c (insKeys c)
   where c = def
           { modMask = mod4Mask -- ^ super instead of alt
           , normalBorderColor = background theme
-          , focusedBorderColor = foreground theme
+          , focusedBorderColor = highlight theme
           , borderWidth = 3
           , manageHook = manageDocks <+> manageHook def
           , layoutHook = myLayout theme