about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--modules/i3/default.nix4
-rw-r--r--overrides/default.nix8
2 files changed, 12 insertions, 0 deletions
diff --git a/modules/i3/default.nix b/modules/i3/default.nix
index a10c9e69..417e987a 100644
--- a/modules/i3/default.nix
+++ b/modules/i3/default.nix
@@ -102,6 +102,10 @@ in
       inherit (pkgs) dmenu xterm pvolctrl;
       inherit (pkgs.xorg) xsetroot;
       inherit wsConfig barConfig;
+
+      postInstall = ''
+        ${pkgs.i3}/bin/i3 -c "$target" -C
+      '';
     };
   };
 }
diff --git a/overrides/default.nix b/overrides/default.nix
index 54f222ad..0a134a6e 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -67,6 +67,14 @@ let
           scripts/gajim.in
       '';
     };
+
+    i3 = o: {
+      patches = (o.patches or []) ++ (singleton (everything.fetchurl {
+        url = "http://bugs.i3wm.org/report/raw-attachment/ticket/1332/"
+            + "i3-validate-config-without-x.patch";
+        sha256 = "1njmrvqr3h5wf8dwg5di136cjvnn5miaj7by3q93x8028hdpigag";
+      }));
+    };
   };
 
   # misc