From 11d4804be85725b5e246391cbf508b204901253a Mon Sep 17 00:00:00 2001
From: Alex <alexmat2on@protonmail.com>
Date: Thu, 1 Aug 2024 18:57:35 -0400
Subject: [PATCH] add colorscheme

---
 config/modules/bspwm/bspwm.nix   |  9 +++++++--
 config/modules/bspwm/polybar.nix | 11 +----------
 config/modules/color-scheme.nix  | 12 ++++++++++++
 3 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 config/modules/color-scheme.nix

diff --git a/config/modules/bspwm/bspwm.nix b/config/modules/bspwm/bspwm.nix
index 6b63af0..3ef7755 100644
--- a/config/modules/bspwm/bspwm.nix
+++ b/config/modules/bspwm/bspwm.nix
@@ -1,9 +1,14 @@
 { pkgs, ... }:
 {
-  xsession.windowManager.bspwm = {
+  xsession.windowManager.bspwm = let colors = import ../color-scheme.nix; in {
     enable = true;
     settings = {
-      border_width = 10;
+      normal_border_color = colors.disabled;
+      active_border_color = colors.secondary;
+      focused_border_color = colors.primary;
+
+      border_width = 2;
+      window_gap = 10;
       focus_follows_pointer = true;
     };
     extraConfig = ''
diff --git a/config/modules/bspwm/polybar.nix b/config/modules/bspwm/polybar.nix
index c0ba809..66965d2 100644
--- a/config/modules/bspwm/polybar.nix
+++ b/config/modules/bspwm/polybar.nix
@@ -4,16 +4,7 @@
     enable = true;
     script = ""; # required but we start polybar via bspwm, so dont start it here.
     config = rec {
-      colors = {
-        background = "#282A2E";
-        # background = "#ff00ff";
-        background-alt = "#373B41";
-        foreground = "#C5C8C6";
-        primary = "#F0C674";
-        secondary = "#8ABEB7";
-        alert = "#A54242";
-        disabled = "#707880";
-      };
+      colors = import ../.color-scheme.nix;
 
       common-bar = {
         width = "100%";
diff --git a/config/modules/color-scheme.nix b/config/modules/color-scheme.nix
new file mode 100644
index 0000000..54ccf0f
--- /dev/null
+++ b/config/modules/color-scheme.nix
@@ -0,0 +1,12 @@
+{
+  background = "#282A2E";
+  background-alt = "#373B41";
+
+  foreground = "#C5C8C6";
+
+  primary = "#F0C674";
+  secondary = "#8ABEB7";
+
+  alert = "#A54242";
+  disabled = "#707880";
+}