From 99e159d679c9ae5a270c263c295e321d3a3659c6 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 13 Apr 2021 15:54:34 +0200
Subject: modules/user/devhell: fix eval … again
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Mistyped with my evaluation fix and added lib.optional instead of
lib.optionals, so a list got into systemPackages which breaks evaluation
in a hard to debug way (and also made me discover a hillarious segfault
in nix).
---
 modules/user/devhell/profiles/services.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/user/devhell')

diff --git a/modules/user/devhell/profiles/services.nix b/modules/user/devhell/profiles/services.nix
index 591f5055..78c9a15e 100644
--- a/modules/user/devhell/profiles/services.nix
+++ b/modules/user/devhell/profiles/services.nix
@@ -85,9 +85,9 @@ in {
     services.xserver.windowManager.i3 = {
       enable = true;
       package = pkgs.i3-gaps;
-      extraPackages = with pkgs; [ polybar i3status-rust i3blocks-gaps rofi ]
-        ++ lib.optional (pkgs ? i3-auto-layout) [ pkgs.i3-auto-layout ];
-      # FIXME: lib.optional construct can be removed if i3-auto-layout is in unstable
+      extraPackages = with pkgs; [
+        polybar i3status-rust i3blocks-gaps rofi i3-auto-layout
+      ];
     };
 
     services.journald.extraConfig = ''
-- 
cgit 1.4.1