From cd74c7b0d45ddace0843355657b47322c77e700b Mon Sep 17 00:00:00 2001
From: Glen Goodwin <glen.goodwin1992@gmail.com>
Date: Tue, 19 Sep 2023 12:03:27 -0400
Subject: [PATCH] updates

---
 hosts/configuration.nix     |  8 ++++++++
 hosts/default.nix           |  7 ++++---
 hosts/thinkpad/default.nix  |  1 +
 modules/programs/waybar.nix | 16 ++++++++--------
 modules/themes/home.nix     |  3 +--
 5 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/hosts/configuration.nix b/hosts/configuration.nix
index b7b1a14..1b8a17b 100644
--- a/hosts/configuration.nix
+++ b/hosts/configuration.nix
@@ -99,6 +99,14 @@
     wireplumber.enable = true;
   };
 
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 30d";
+  };
+
+  nix.settings.auto-optimise-store = true;
+
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];
diff --git a/hosts/default.nix b/hosts/default.nix
index d82d957..460d70f 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -1,11 +1,11 @@
-{ lib, inputs, system, home-manager, user, hyprland, devenv, ... }:
+{ lib, inputs, system, home-manager, user, ... }:
 
 {
 
   thinkpad = lib.nixosSystem {
     inherit system;
     specialArgs = {
-      inherit user inputs hyprland system devenv;
+      inherit user inputs system;
       host = {
         hostName = "thinkpad";
         mainMonitor = "eDP-1";
@@ -15,12 +15,13 @@
     modules = [
       ./thinkpad
       ./configuration.nix
+      ../modules/themes/home.nix
 
       home-manager.nixosModules.home-manager
       {
         home-manager.useGlobalPkgs = true;
         home-manager.useUserPackages = true;
-        home-manager.extraSpecialArgs = { inherit user devenv inputs; };
+        home-manager.extraSpecialArgs = { inherit user inputs; };
         home-manager.users.${user} = {
           imports = [ (import ./home.nix) ] ++ [ (import ./thinkpad/home.nix) ];
 
diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index fd3f36e..333f67b 100644
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -31,6 +31,7 @@
     #logind.lidSwitch = "ignore";           # Laptop does not go to sleep when lid is closed
     auto-cpufreq.enable = true;
     blueman.enable = true;
+    tailscale.enable = true;
   };
 
   #temporary bluetooth fix
diff --git a/modules/programs/waybar.nix b/modules/programs/waybar.nix
index ab61ba9..bb36e8c 100644
--- a/modules/programs/waybar.nix
+++ b/modules/programs/waybar.nix
@@ -20,13 +20,13 @@
           font-family: FiraCode Nerd Font Mono;
           /*font-weight: bold;*/
           font-size: 12px;
-          text-shadow: 0px 0px 5px #000000;
+          text-shadow: 0px 0px 5px #${config.colorScheme.colors.base00};
         }
         button:hover {
           background-color: rgba(80,100,100,0.4);
         }
         window#waybar {
-          background-color: rgba(0,0,0,0.8);
+          background-color: #${config.colorScheme.colors.base00};
           transition-property: background-color;
           transition-duration: .5s;
           border-bottom: none;
@@ -50,7 +50,7 @@
         #battery,
         #custom-ds4,
         #tray {
-          color: #999999;
+          color: #${config.colorScheme.colors.base09};
           background-clip: padding-box;
         }
         #custom-menu {
@@ -60,18 +60,18 @@
         #workspaces button {
           padding: 0px 5px;
           min-width: 5px;
-          color: rgba(255,255,255,0.8);
+          color: #${config.colorScheme.colors.base09};
         }
         #workspaces button:hover {
-          background-color: rgba(0,0,0,0.2);
+          background-color: #${config.colorScheme.colors.base02};
         }
         /*#workspaces button.focused {*/
         #workspaces button.active {
-          color: rgba(255,255,255,0.8);
-          background-color: rgba(80,100,100,0.4);
+          color: #${config.colorScheme.colors.base0C};
+          background-color: #${config.colorScheme.colors.base02};
         }
         #workspaces button.visible {
-          color: #ccffff;
+          color: #${config.colorScheme.colors.base0E};
         }
         #workspaces button.hidden {
           color: #999999;
diff --git a/modules/themes/home.nix b/modules/themes/home.nix
index 68b7b6e..8633916 100644
--- a/modules/themes/home.nix
+++ b/modules/themes/home.nix
@@ -3,8 +3,7 @@
 {
   imports = [ inputs.nix-colors.homeManagerModules.default ];
   # choose a theme from here https://github.com/tinted-theming/base16-schemes/tree/main
-  #colorScheme = inputs.nix-colors.colorSchemes.gruvbox-dark-medium;
-  colorScheme = inputs.nix-colors.colorSchemes.gruvbox-dark-hard;
+  colorScheme = inputs.nix-colors.colorSchemes.everforest;