From 61f1aba8bc69dc522710d5871545cf4b4ec8645b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 27 Nov 2018 21:06:20 +0100
Subject: * krops: get nixpkgs from store for ci

---
 jeschli/krops.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'jeschli')

diff --git a/jeschli/krops.nix b/jeschli/krops.nix
index d45d57c6..fff01437 100644
--- a/jeschli/krops.nix
+++ b/jeschli/krops.nix
@@ -1,11 +1,13 @@
 { name }: let
   inherit (import ../krebs/krops.nix { inherit name; })
+    krebs-nixpkgs
     krebs-source
     lib
     pkgs
   ;
 
   source = { test }: lib.evalSource [
+    (krebs-nixpkgs { test = test; })
     krebs-source
     {
       nixos-config.symlink = "stockholm/jeschli/1systems/${name}/config.nix";
-- 
cgit v1.2.3


From 95f6255f586e93e096d56de75add76d7560b9df1 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 28 Nov 2018 21:30:46 +0100
Subject: * krops: merge krebs-nixpkgs into krebs-source

---
 jeschli/krops.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'jeschli')

diff --git a/jeschli/krops.nix b/jeschli/krops.nix
index fff01437..989abcdd 100644
--- a/jeschli/krops.nix
+++ b/jeschli/krops.nix
@@ -1,14 +1,12 @@
 { name }: let
   inherit (import ../krebs/krops.nix { inherit name; })
-    krebs-nixpkgs
     krebs-source
     lib
     pkgs
   ;
 
   source = { test }: lib.evalSource [
-    (krebs-nixpkgs { test = test; })
-    krebs-source
+    (krebs-source { test = test; })
     {
       nixos-config.symlink = "stockholm/jeschli/1systems/${name}/config.nix";
       secrets = if test then {
-- 
cgit v1.2.3


From 53359a60f5f0114b013c6241b52aa7387d1b922a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 29 Nov 2018 21:24:31 +0100
Subject: xmonad-stockholm: 1.2.0 -> 1.3.0

---
 jeschli/5pkgs/simple/xmonad-jeschli/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'jeschli')

diff --git a/jeschli/5pkgs/simple/xmonad-jeschli/default.nix b/jeschli/5pkgs/simple/xmonad-jeschli/default.nix
index 4ebd98f0..827c77b7 100644
--- a/jeschli/5pkgs/simple/xmonad-jeschli/default.nix
+++ b/jeschli/5pkgs/simple/xmonad-jeschli/default.nix
@@ -24,8 +24,9 @@ import Control.Monad.Extra (whenJustM)
 import Graphics.X11.ExtraTypes.XF86
 import Text.Read (readEither)
 import XMonad
-import System.IO (hPutStrLn, stderr)
 import System.Environment (getArgs, withArgs, getEnv, getEnvironment, lookupEnv)
+import System.Exit (exitFailure)
+import System.IO (hPutStrLn, stderr)
 import System.Posix.Process (executeFile)
 import XMonad.Actions.DynamicWorkspaces ( addWorkspacePrompt, renameWorkspace
                                         , removeEmptyWorkspace)
@@ -66,12 +67,14 @@ myFont = "-schumacher-*-*-*-*-*-*-*-*-*-*-*-iso10646-*"
 
 main :: IO ()
 main = getArgs >>= \case
-    ["--shutdown"] -> sendShutdownEvent
-    _ -> mainNoArgs
+    [] -> mainNoArgs
+    ["--shutdown"] -> shutdown
+    args -> hPutStrLn stderr ("bad arguments: " <> show args) >> exitFailure
 
 mainNoArgs :: IO ()
 mainNoArgs = do
     workspaces0 <- getWorkspaces0
+    handleShutdownEvent <- newShutdownEventHandler
     xmonad
         -- $ withUrgencyHookC dzenUrgencyHook { args = ["-bg", "magenta", "-fg", "magenta", "-h", "2"], duration = 500000 }
         --                   urgencyConfig { remindWhen = Every 1 }
-- 
cgit v1.2.3


From 5f0b1b803500f468a1d60217cc0fc81bb8fd58aa Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 30 Nov 2018 09:40:53 +0100
Subject: lib: add mapNixDir{,1}

---
 jeschli/5pkgs/simple/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'jeschli')

diff --git a/jeschli/5pkgs/simple/default.nix b/jeschli/5pkgs/simple/default.nix
index 1b9d8c23..6ba4fec8 100644
--- a/jeschli/5pkgs/simple/default.nix
+++ b/jeschli/5pkgs/simple/default.nix
@@ -15,10 +15,4 @@ let
     else override;
 in
 
-  listToAttrs
-    (map
-      (name: nameValuePair (removeSuffix ".nix" name)
-                           (callPackage (./. + "/${name}") {}))
-      (filter
-        (name: name != "default.nix" && !hasPrefix "." name)
-        (attrNames (readDir ./.))))
+  mapNixDir (path: callPackage path {}) ./.
-- 
cgit v1.2.3