1 files changed, 20 insertions, 11 deletions

diff --git a/users/fcuny/i3.nix b/users/fcuny/i3.nix
index b3ac043..cea7897 100644
--- a/users/fcuny/i3.nix
+++ b/users/fcuny/i3.nix
@@ -8,10 +8,17 @@ in
   xsession.windowManager.i3 = {
     enable = true;
     config = {
+      modified = mod;
       terminal = "${pkgs.alacritty}/bin/alacritty";
+      window = {
+        titlebar = false;
+        border = 2;
+      };
       keybindings = lib.mkOptionDefault {
         "${mod}+r" = "exec --no-startup-id ${pkgs.rofi}/bin/rofi -show drun";
+        "${mod}+l" = "exec ${pkgs.systemd}/bin/loginctl lock-session";
       };
+      bars = [ ];
     };
   };
 
@@ -26,19 +33,21 @@ in
     };
   };
 
+  config.xdg.configFile."polybar/aptos.ini".source = ../../configs/polybar/aptos.ini;
+  config.xdg.configFile."polybar/carmel.ini".source = ../../configs/polybar/carmel.ini;
+  config.xdg.configFile."polybar/modules/battery.ini".source = ../../configs/polybar/modules/battery.ini;
+  config.xdg.configFile."polybar/modules/bluetooth.ini".source = ../../configs/polybar/modules/bluetooth.ini;
+  config.xdg.configFile."polybar/modules/colors.ini".source = ../../configs/polybar/modules/colors.ini;
+  config.xdg.configFile."polybar/modules/date.ini".source = ../../configs/polybar/modules/date.ini;
+  config.xdg.configFile."polybar/modules/i3.ini".source = ../../configs/polybar/modules/i3.ini;
+  config.xdg.configFile."polybar/modules/mpd.ini".source = ../../configs/polybar/modules/mpd.ini;
+  config.xdg.configFile."polybar/modules/pulseaudio.ini".source = ../../configs/polybar/modules/pulseaudio.ini;
+  config.xdg.configFile."polybar/modules/wired.ini".source = ../../configs/polybar/modules/wired.ini;
+  config.xdg.configFile."polybar/modules/wireless.ini".source = ../../configs/polybar/modules/wireless.ini;
+
   services.polybar = {
     enable = true;
     package = pkgs.polybarFull;
-    script = "";
-    config =  {
-      "bar/main" = {
-        background = "#000000";
-        foreground = "#fafafa";
-      };
-      "module/pulseaudio" = {
-        type = "internal/pulseaudio";
-        use-ui-max = false;
-      };
-    };
+    script = "polybar --config=${config.xdg.configFile."polybar/config".source}/${config.hostname}.conf &";
   };
 }