config/apps/nextcloud.nix

@@ -1,7 +0,0 @@
-{ ... }:
-{
-  services.nextcloud-client = {
-    enable = true;
-    startInBackground = true;
-  };
-}

config/modules/bspwm/bspwm.nix

@@ -1,18 +1,15 @@
 { pkgs, ... }:
 {
-  xsession.windowManager.bspwm = let theme = import ../theme.nix; in {
+  xsession.windowManager.bspwm = let colors = import ../color-scheme.nix; in {
     enable = true;
     settings = {
-      normal_border_color = theme.colors.disabled;
-      active_border_color = theme.colors.secondary;
-      focused_border_color = theme.colors.primary;
-
-      border_width = theme.sizing.m;
-      window_gap = theme.sizing.xl;
+      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;
-      single_monocle = true;
-      honor_size_hints = true;
     };
     extraConfig = ''
       bspc monitor DP-2 -d I II III IV V
@@ -29,11 +26,6 @@
 
       ${pkgs.feh}/bin/feh --bg-fill ${pkgs.atau-pkgs.atau-wallpapers}/share/backgrounds/atau-wallpapers/aos1.png
     '';
-    startupPrograms = [
-      "bluetoothd"
-      "picom"
-      "polybar primary"
-      "polybar secondary"
-    ];
+    startupPrograms = [ "picom" "polybar primary" "polybar secondary" ];
   };
 }

config/modules/bspwm/polybar.nix

@@ -4,20 +4,20 @@
     enable = true;
     script = ""; # required but we start polybar via bspwm, so dont start it here.
     config = rec {
-      theme = import ../theme.nix;
+      colors = import ../.color-scheme.nix;
 
       common-bar = {
         width = "100%";
-        height = "${theme.sizing.str.xl}pt";
-        radius = theme.border-radius;
+        height = "24pt";
+        radius = 10;
 
         #;dpi = 96
 
-        background = theme.colors.background;
-        foreground = theme.colors.foreground;
+        background = colors.background;
+        foreground = colors.foreground;
         line-size = "3pt";
 
-        border-size = "${theme.sizing.str.m}pt";
+        border-size = "4pt";
         border-color = "#00000000";
 
         padding-left = 0;
@@ -26,7 +26,7 @@
         module-margin = 1;
 
         separator = "|";
-        separator-foreground = theme.colors.disabled;
+        separator-foreground = colors.disabled;
 
         font-0 = "monospace;2";
         wm-restack = "bspwm";
@@ -59,19 +59,19 @@
         pin-workspaces = true;
 
         label-active = "%name%";
-        label-active-background = theme.colors.background-alt;
-        label-active-underline = theme.colors.primary;
+        label-active-background = colors.background-alt;
+        label-active-underline = colors.primary;
         label-active-padding = 1;
 
         label-occupied = "%name%";
         label-occupied-padding = 1;
 
         label-urgent = "%name%";
-        label-urgent-background = theme.colors.alert;
+        label-urgent-background = colors.alert;
         label-urgent-padding = 1;
 
         label-empty = "%name%";
-        label-empty-foreground = theme.colors.disabled;
+        label-empty-foreground = colors.disabled;
         label-empty-padding = 1;
       };
     };

config/modules/color-scheme.nix

@@ -0,0 +1,12 @@
+{
+  background = "#282A2E";
+  background-alt = "#373B41";
+
+  foreground = "#C5C8C6";
+
+  primary = "#F0C674";
+  secondary = "#8ABEB7";
+
+  alert = "#A54242";
+  disabled = "#707880";
+}

config/modules/theme.nix

@@ -1,30 +0,0 @@
-{
-  border-radius = 5;
-  colors = {
-    background = "#282A2E";
-    background-alt = "#373B41";
-
-    foreground = "#C5C8C6";
-
-    primary = "#F0C674";
-    secondary = "#8ABEB7";
-
-    alert = "#A54242";
-    disabled = "#707880";
-  };
-  sizing = rec {
-    xs = 1;
-    s = 2;
-    m = 4;
-    l = 8;
-    xl = 16;
-
-    str = {
-      xs = toString xs;
-      s = toString s;
-      m = toString m;
-      l = toString l;
-      xl = toString xl;
-    };
-  };
-}

config/users/alex/default.nix

@@ -7,6 +7,7 @@
   home.homeDirectory = "/home/${user}";
 
   imports = [
+    ../../apps/vscode.nix
     ../../modules/bspwm
 
     ../../apps/bash.nix
@@ -14,8 +15,6 @@
     ../../apps/git.nix
     ../../apps/kitty.nix
     ../../apps/mpv.nix
-    ../../apps/nextcloud.nix
-    ../../apps/vscode.nix
   ];
 
   # Packages that should be installed to the user profile.
@@ -49,6 +48,7 @@
     lmms
     lutris
     moonlight-qt
+    nextcloud-client
     nixpkgs-fmt
     nodejs_20
     obsidian