4 files changed, 8 insertions, 4 deletions
diff --git a/modules/desktop/polybar/bar/main.nix b/modules/desktop/polybar/bar/main.nix
index 8b52fab..983d8eb 100644
--- a/modules/desktop/polybar/bar/main.nix
+++ b/modules/desktop/polybar/bar/main.nix
@@ -9,7 +9,7 @@ in
   fixed-center = false;
   height = 35;
   override-redirect = false;
-  wm-restack = "bspwm";
+  wm-restack = "i3";
   enable-ipc = true;
 
   border-top-size = 1;
@@ -34,7 +34,7 @@ in
   font-1 = "${config.fonts.normal}:weight=Bold:pixelsize=${largerFontSize};3";
   font-2 = "${config.fonts.normal}:style=Light:pixelsize=${largerFontSize};2";
 
-  modules-left = "bspwm separator";
+  modules-left = "i3 separator";
   modules-center = "xwindow";
   modules-right = "separator volume separator battery separator wifi wifi-separator ethernet ethernet-separator time separator memory separator cpu separator date";
 }
diff --git a/modules/desktop/polybar/default.nix b/modules/desktop/polybar/default.nix
index 9aeb772..b46fc17 100644
--- a/modules/desktop/polybar/default.nix
+++ b/modules/desktop/polybar/default.nix
@@ -11,6 +11,7 @@
     services.polybar.package = (
       pkgs.polybar.override {
         pulseSupport = true;
+        i3Support = true;
       }
     );
     services.polybar.script = "${config.services.polybar.package}/bin/polybar main &";
diff --git a/modules/desktop/polybar/module/default.nix b/modules/desktop/polybar/module/default.nix
index 57854ca..05f6946 100644
--- a/modules/desktop/polybar/module/default.nix
+++ b/modules/desktop/polybar/module/default.nix
@@ -2,11 +2,11 @@
 
 {
   "module/battery" = import ./battery.nix { inherit config; };
-  "module/bspwm" = import ./bspwm.nix { inherit config; };
   "module/cpu" = import ./cpu.nix { inherit config; };
   "module/date" = import ./date.nix { inherit config; };
   "module/ethernet-separator" = import ./ethernet-separator.nix { inherit config; };
   "module/ethernet" = import ./ethernet.nix { inherit config; };
+  "module/i3" = import ./i3.nix { inherit config; };
   "module/memory" = import ./memory.nix { inherit config; };
   "module/separator" = import ./separator.nix { inherit config; };
   "module/time" = import ./time.nix { inherit config; };
diff --git a/modules/desktop/polybar/module/bspwm.nix b/modules/desktop/polybar/module/i3.nix
index a760acf..ac235f1 100644
--- a/modules/desktop/polybar/module/bspwm.nix
+++ b/modules/desktop/polybar/module/i3.nix
@@ -2,7 +2,7 @@
 
 with config.scheme.withHashtag;
 {
-  type = "internal/bspwm";
+  type = "internal/i3";
 
   label-focused = "%index%";
   label-focused-underline = "${base0D}";
@@ -18,4 +18,7 @@ with config.scheme.withHashtag;
   label-empty = "%index%";
   label-empty-foreground = "${base03}";
   label-empty-padding = 1;
+
+  pin-workspaces = true;
+  index-sort = true;
 }