From a278c6588750c09f97e83c53d86aef5ec82a7bcd Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 17 Feb 2016 15:00:52 +0100
Subject: l 5: callPackage -> pkgs.callPackage

---
 lass/5pkgs/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'lass/5pkgs')

diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index fee4654ae..ce29ae33c 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -1,16 +1,13 @@
 { pkgs, ... }:
 
-let
-  inherit (pkgs) callPackage;
-in
 {
   nixpkgs.config.packageOverrides = rec {
     firefoxPlugins = {
-      noscript = callPackage ./firefoxPlugins/noscript.nix {};
-      ublock = callPackage ./firefoxPlugins/ublock.nix {};
-      vimperator = callPackage ./firefoxPlugins/vimperator.nix {};
+      noscript = pkgs.callPackage ./firefoxPlugins/noscript.nix {};
+      ublock = pkgs.callPackage ./firefoxPlugins/ublock.nix {};
+      vimperator = pkgs.callPackage ./firefoxPlugins/vimperator.nix {};
     };
-    newsbot-js = callPackage ./newsbot-js/default.nix {};
+    newsbot-js = pkgs.callPackage ./newsbot-js/default.nix {};
     xmonad-lass =
       let src = pkgs.writeNixFromCabal "xmonad-lass.nix" ./xmonad-lass; in
       pkgs.haskellPackages.callPackage src {};
-- 
cgit v1.2.3


From 43f06b9773bdd93e0e369012081dc359aa29ea1e Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 17 Feb 2016 15:01:35 +0100
Subject: l 5 xmonad-lass Main: fix xmonad errors

---
 lass/5pkgs/xmonad-lass/Main.hs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'lass/5pkgs')

diff --git a/lass/5pkgs/xmonad-lass/Main.hs b/lass/5pkgs/xmonad-lass/Main.hs
index faaa00aab..503df3be7 100644
--- a/lass/5pkgs/xmonad-lass/Main.hs
+++ b/lass/5pkgs/xmonad-lass/Main.hs
@@ -12,7 +12,6 @@ import XMonad
 import System.IO (hPutStrLn, stderr)
 import System.Environment (getArgs, withArgs, getEnv, getEnvironment)
 import System.Posix.Process (executeFile)
-import XMonad.Prompt (defaultXPConfig)
 import XMonad.Actions.DynamicWorkspaces ( addWorkspacePrompt, renameWorkspace
                                         , removeEmptyWorkspace)
 import XMonad.Actions.GridSelect
@@ -73,7 +72,7 @@ mainNoArgs = do
         -- $ withUrgencyHook borderUrgencyHook "magenta"
         -- $ withUrgencyHookC BorderUrgencyHook { urgencyBorderColor = "magenta" } urgencyConfig { suppressWhen = Never }
         $ withUrgencyHook (SpawnUrgencyHook "echo emit Urgency ")
-        $ defaultConfig
+        $ def
             { terminal          = myTerm
             , modMask           = mod4Mask
             , workspaces        = workspaces0
@@ -169,7 +168,7 @@ myWSConfig = myGSConfig
     }
 
 pagerConfig :: PagerConfig
-pagerConfig = defaultPagerConfig
+pagerConfig = def
     { pc_font           = myFont
     , pc_cellwidth      = 64
     --, pc_cellheight     = 36 -- TODO automatically keep screen aspect
@@ -182,13 +181,13 @@ pagerConfig = defaultPagerConfig
     where
     windowColors _ _ _ True _ = ("#ef4242","#ff2323")
     windowColors wsf m c u wf = do
-        let def = defaultWindowColors wsf m c u wf
+        let y = defaultWindowColors wsf m c u wf
         if m == False && wf == True
-            then ("#402020", snd def)
-            else def
+            then ("#402020", snd y)
+            else y
 
 wGSConfig :: GSConfig Window
-wGSConfig = defaultGSConfig
+wGSConfig = def
     { gs_cellheight = 20
     , gs_cellwidth = 192
     , gs_cellpadding = 5
-- 
cgit v1.2.3