From ee5b374e7523aa21f2647ae745f7b415a0ecb8d3 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Wed, 9 Feb 2022 20:07:09 -0800
Subject: home-manager: fix configuration for i3/polybar

At least the correct configuration is put on disk and the startup script
is correct.
---
 users/fcuny/i3.nix | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/users/fcuny/i3.nix b/users/fcuny/i3.nix
index cea7897..3d46edf 100644
--- a/users/fcuny/i3.nix
+++ b/users/fcuny/i3.nix
@@ -8,7 +8,7 @@ in
   xsession.windowManager.i3 = {
     enable = true;
     config = {
-      modified = mod;
+      modifier = mod;
       terminal = "${pkgs.alacritty}/bin/alacritty";
       window = {
         titlebar = false;
@@ -33,21 +33,13 @@ 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;
+  xdg.configFile."polybar/aptos.ini".source = ../../configs/polybar/aptos.ini;
+  xdg.configFile."polybar/carmel.ini".source = ../../configs/polybar/carmel.ini;
+  xdg.configFile."polybar/modules".source = ../../configs/polybar/modules;
 
   services.polybar = {
     enable = true;
     package = pkgs.polybarFull;
-    script = "polybar --config=${config.xdg.configFile."polybar/config".source}/${config.hostname}.conf &";
+    script = "polybar --config=${config.xdg.configFile."polybar/config".source}/$(hostname -s).conf &";
   };
 }
-- 
cgit 1.4.1