From f5b202f0ce888e18bb8bfd7e67850e2d9fb81043 Mon Sep 17 00:00:00 2001
From: elkowar <5300871+elkowar@users.noreply.github.com>
Date: Tue, 11 Aug 2020 13:18:46 +0200
Subject: [PATCH] cleanup

---
 files/.config/configstore/update-notifier-npm.json |  8 +++++++-
 files/.config/htop/htoprc                          |  2 +-
 files/.xmonad/lib/Config.hs                        | 12 ++++--------
 files/nix-stuff/nixpkgs/config/gtk.nix             |  5 +++--
 files/nix-stuff/nixpkgs/home.nix                   |  3 +++
 files/nix-stuff/nixpkgs/profiles/desktop.nix       |  4 ----
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/files/.config/configstore/update-notifier-npm.json b/files/.config/configstore/update-notifier-npm.json
index 18e8dc8..78e91f9 100644
--- a/files/.config/configstore/update-notifier-npm.json
+++ b/files/.config/configstore/update-notifier-npm.json
@@ -1,4 +1,10 @@
 {
 	"optOut": false,
-	"lastUpdateCheck": 1596968361979
+	"lastUpdateCheck": 1597140285958,
+	"update": {
+		"latest": "6.14.7",
+		"current": "6.14.6",
+		"type": "patch",
+		"name": "npm"
+	}
 }
\ No newline at end of file
diff --git a/files/.config/htop/htoprc b/files/.config/htop/htoprc
index f5c4222..3c98eb4 120000
--- a/files/.config/htop/htoprc
+++ b/files/.config/htop/htoprc
@@ -1 +1 @@
-/nix/store/khgb01ah9qx65314m2i6klylm5brkvnj-home-manager-files/.config/htop/htoprc
\ No newline at end of file
+/nix/store/spsy6k9bx1rvrfqwmd848r2j6pw1w3bi-home-manager-files/.config/htop/htoprc
\ No newline at end of file
diff --git a/files/.xmonad/lib/Config.hs b/files/.xmonad/lib/Config.hs
index a104fe3..9be7f65 100644
--- a/files/.xmonad/lib/Config.hs
+++ b/files/.xmonad/lib/Config.hs
@@ -33,6 +33,7 @@ import Data.Foldable                  ( for_ )
 
 import Data.Function ((&))
 
+import qualified XMonad.Layout.Decoration
 import XMonad hiding ((|||))
 import XMonad.Actions.CopyWindow
 import XMonad.Actions.PhysicalScreens ( horizontalScreenOrderer )
@@ -158,21 +159,16 @@ aqua      = "#8ec07c"
 -- }}}
 
 -- Layout ---------------------------------------- {{{
-
+myTabTheme :: Theme
 myTabTheme = def -- defaultThemeWithButtons
-    { -- activeColor      = "#8ec07c"
-      activeColor         = "#1d2021"
-      --activeColor       = "#1d2021"
-     --activeColor        = "#504945"
-    --, inactiveColor     = "#282828"
+    { activeColor         = "#1d2021"
     , inactiveColor       = "#282828"
     , activeBorderColor   = "#1d2021"
     , inactiveBorderColor = "#282828"
     , activeTextColor     = "#fbf1c7"
     , inactiveTextColor   = "#fbf1c7"
-    , decoHeight          = 15
+    , decoHeight          = 20
     , fontName            = "-misc-cozettevector-*-*-*-*-10-*-*-*-*-*-*-*"
-    --, fontName          = "-misc-scientifica-*-*-*-*-10-*-*-*-*-*-*-*"
     }
 
 data EmptyShrinker = EmptyShrinker deriving (Show, Read)
diff --git a/files/nix-stuff/nixpkgs/config/gtk.nix b/files/nix-stuff/nixpkgs/config/gtk.nix
index 382558e..a3e1ec3 100644
--- a/files/nix-stuff/nixpkgs/config/gtk.nix
+++ b/files/nix-stuff/nixpkgs/config/gtk.nix
@@ -8,7 +8,8 @@
   #iconTheme.name = "Numix";
   #iconTheme.package = pkgs.arc-icon-theme;
   iconTheme.name = "Numix";
-  font.name = "Terminus (TTF) 12";
+  #font.name = "Terminus (TTF) 12";
+  font.name = "xos4 Terminus 12";
 
   gtk2.extraConfig = ''gtk-theme-name = "Adwaita-dark"'';
 
@@ -16,7 +17,7 @@
     gtk-menu-images = 1;
     gtk-xft-hinting = 1;
     gtk-xft-rgba = "rgb";
-    gtk-application-prefer-dark-theme = true;
+    gtk-application-prefer-dark-theme = 1;
     gtk-decoration-layout = ":";
     gtk-toolbar-style = "GTK_TOOLBAR_ICONS";
     gtk-toolbar-icon-size = "GTK_ICON_SIZE_LARGE_TOOLBAR";
diff --git a/files/nix-stuff/nixpkgs/home.nix b/files/nix-stuff/nixpkgs/home.nix
index 4258c18..eb9d002 100644
--- a/files/nix-stuff/nixpkgs/home.nix
+++ b/files/nix-stuff/nixpkgs/home.nix
@@ -31,6 +31,9 @@ in
     desktop.enable = true;
   };
 
+  gtk = import ./config/gtk.nix { inherit pkgs; inherit myConf; };
+
+
 
 
   imports = [ ./profiles/base.nix ./profiles/desktop.nix ];
diff --git a/files/nix-stuff/nixpkgs/profiles/desktop.nix b/files/nix-stuff/nixpkgs/profiles/desktop.nix
index 670c15e..a3e9236 100644
--- a/files/nix-stuff/nixpkgs/profiles/desktop.nix
+++ b/files/nix-stuff/nixpkgs/profiles/desktop.nix
@@ -11,14 +11,10 @@ in
 
   config = lib.mkIf cfg.enable {
 
-
-    gtk = import ../config/gtk.nix { inherit pkgs; inherit myConf; };
-
     home.packages = with pkgs; [
       elkowar_local.bashtop
       elkowar_local.liquidctl
 
-
       cool-retro-term
       simplescreenrecorder
       gromit-mpx