Merge branch 'master' of github.com:IvanMalison/dotfiles

dotfiles/config/taffybar/taffybar.css

@@ -5,7 +5,7 @@
 
 @define-color active-window-color @white;
 @define-color urgent-window-color @taffy-blue;
-@define-color font-color @black;
+@define-color font-color @white;
 @define-color menu-background-color @white;
 @define-color menu-font-color @black;
 
@@ -28,10 +28,7 @@
 }
 
 .contents {
-	padding-top: 3px;
-	padding-bottom: 3px;
-	padding-right: 3px;
-	padding-left: 3px;
+	padding: 7px;
 	transition: background-color .5s;
 }
 

dotfiles/config/taffybar/taffybar.hs

@@ -136,11 +136,11 @@ main = do
         defaultWorkspacesConfig
         { underlineHeight = 3
         , underlinePadding = 2
-        , minIcons = 3
+        , minIcons = 1
         , getWindowIconPixbuf = myIcons
         -- , windowIconSize = 31
         , widgetGap = 0
-        , showWorkspaceFn = const True
+        , showWorkspaceFn = hideEmpty
         , updateRateLimitMicroseconds = 100000
         , labelSetter = workspaceNamesLabelSetter
         }
@@ -165,8 +165,8 @@ main = do
               , mpris2New
               ]
         , barPosition = Top
-        , barPadding = 10
-        , barHeight = 53
+        , barPadding = 0
+        , barHeight = 45
         }
       simpleTaffyConfig = baseConfig
         -- { endWidgets = []

nixos/configuration.nix

@@ -181,12 +181,15 @@ in
     stack
 
     # Tools
+    bazaar
     binutils
     dfeet
     gcc
     gdb
-    gitFull
     git-sync
+    gitAndTools.git-fame
+    gitAndTools.hub
+    gitFull
     gnumake
     gnupg
     htop