1 files changed, 60 insertions, 13 deletions

diff --git a/modules/user/desktop/window-managers/sway.nix b/modules/user/desktop/window-managers/sway.nix
index 14ae618..c52b1cf 100644
--- a/modules/user/desktop/window-managers/sway.nix
+++ b/modules/user/desktop/window-managers/sway.nix
@@ -8,7 +8,6 @@
 {
   options.desktop.windowManager = lib.mkOption { type = with lib.types; nullOr (enum [ "sway" ]); };
   config = {
-    desktop.components.waybar.enable = lib.mkDefault (config.desktop.windowManager == "sway");
     home.packages = with pkgs; [
       grim
       slurp
@@ -16,6 +15,16 @@
 
     programs = {
       fuzzel.enable = lib.mkDefault (config.desktop.windowManager == "sway");
+      i3blocks = {
+        enable = lib.mkDefault (config.desktop.windowManager == "sway");
+        bars.bottom = {
+          time = {
+            command = "date +'%F %R'";
+            interval = 60;
+          };
+        };
+      };
+
       swaylock = {
         enable = lib.mkDefault (config.desktop.windowManager == "sway");
         settings = {
@@ -31,7 +40,49 @@
           enable = lib.mkForce true;
           package = null; # use the nixos module
           config = {
-            bars = [ ];
+            bars = [
+              {
+                colors = {
+                  activeWorkspace = {
+                    background = "#11111b";
+                    border = "#11111b";
+                    text = "#cdd6f4";
+                  };
+
+                  background = "#11111b";
+                  focusedBackground = "#11111b";
+                  focusedSeparator = "#313244";
+                  focusedStatusline = "#cdd6f4";
+                  focusedWorkspace = {
+                    background = "#11111b";
+                    border = "#11111b";
+                    text = "#89b4fa";
+                  };
+
+                  inactiveWorkspace = {
+                    background = "#11111b";
+                    border = "#11111b";
+                    text = "#313244";
+                  };
+
+                  separator = "#313244";
+                  statusline = "#cdd6f4";
+                  urgentWorkspace = {
+                    background = "#11111b";
+                    border = "#11111b";
+                    text = "#f38ba8";
+                  };
+                };
+
+                fonts = {
+                  names = [ "Fira Code" ];
+                  size = 8.0;
+                };
+
+                statusCommand = "${pkgs.i3blocks}/bin/i3blocks -c ~/.config/i3blocks/bottom";
+              }
+            ];
+
             bindswitches = {
               "lid:off" = {
                 action = "output eDP-1 power on";
@@ -46,12 +97,8 @@
 
             colors = # catppuccin mocha
               let
-                accent = if (config.desktop.accent == "pink") then pink else blue;
                 base = "#1e1e2e";
                 blue = "#89b4fa";
-                flamingo = "#f2cdcd";
-                indicator = if (config.desktop.accent == "pink") then flamingo else teal;
-                pink = "#f5c2e7";
                 red = "#f38ba8";
                 surface1 = "#45475a";
                 teal = "#94e2d5";
@@ -59,10 +106,10 @@
               in
               {
                 focused = {
-                  background = "${accent}";
-                  border = "${accent}";
-                  childBorder = "${accent}";
-                  indicator = "${indicator}";
+                  background = "${blue}";
+                  border = "${blue}";
+                  childBorder = "${blue}";
+                  indicator = "${teal}";
                   text = "${base}";
                 };
 
@@ -174,20 +221,20 @@
             modifier = "Mod4";
             output = {
               "eDP-1" = {
-                background = "~/Pictures/wallpaper.jpg fill";
+                background = "~/Pictures/wallpaper.png fill";
                 mode = "2256x1504@60Hz";
                 position = "0 0";
                 scale = "1.5";
               };
 
               "DP-1" = {
-                background = "~/Pictures/wallpaper.jpg fill";
+                background = "~/Pictures/wallpaper.png fill";
                 mode = "1920x1080@165Hz";
                 position = "0 0";
               };
 
               "DP-2" = {
-                background = "~/Pictures/wallpaper.jpg fill";
+                background = "~/Pictures/wallpaper.png fill";
                 mode = "1920x1080@75Hz";
                 position = "1920 0";
               };