diff options
| author | Jeschli <jeschli@gmail.com> | 2020-04-22 12:35:00 +0200 |
|---|---|---|
| committer | Jeschli <jeschli@gmail.com> | 2020-04-22 12:35:00 +0200 |
| commit | 3c0496ec1a774c539cf10311bff821ff07ddbf01 (patch) | |
| tree | 9fbafe92c3f26571bb562255d86ffcc2975216ea /lass/5pkgs/custom | |
| parent | 119a7cfe5a87323ec7231c263abc444229564a1c (diff) | |
| parent | cabaf519b5970cbe5c1e57832d3bd12da4f47371 (diff) | |
Merge branch 'master' of https://cgit.lassul.us/stockholm
Diffstat (limited to 'lass/5pkgs/custom')
| -rw-r--r-- | lass/5pkgs/custom/xmonad-lass/default.nix | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/lass/5pkgs/custom/xmonad-lass/default.nix b/lass/5pkgs/custom/xmonad-lass/default.nix index c0aef513f..f9d73c139 100644 --- a/lass/5pkgs/custom/xmonad-lass/default.nix +++ b/lass/5pkgs/custom/xmonad-lass/default.nix @@ -1,16 +1,10 @@ { config, pkgs, ... }: -pkgs.writeHaskellPackage "xmonad-lass" { - executables.xmonad = { - extra-depends = [ - "containers" - "extra" - "unix" - "X11" - "xmonad" - "xmonad-contrib" - "xmonad-stockholm" - ]; - text = /* haskell */ '' +pkgs.writers.writeHaskellBin "xmonad" { + libraries = with pkgs.haskellPackages; [ + extra + xmonad-stockholm + ]; +} /* haskell */ '' {-# LANGUAGE LambdaCase #-} @@ -150,10 +144,7 @@ myKeyMap = , ("M4-<F2>", windows copyToAll) - , ("M4-<F4>", spawn "${pkgs.writeDash "nm-dmenu" '' - export PATH=$PATH:${pkgs.dmenu}/bin:${pkgs.networkmanagerapplet}/bin - exec ${pkgs.networkmanager_dmenu}/bin/networkmanager_dmenu "$@" - ''}") + , ("M4-<F4>", spawn "${pkgs.nm-dmenu}/bin/nm-dmenu") , ("M4-<Insert>", spawn "${pkgs.writeDash "paste" '' ${pkgs.coreutils}/bin/sleep 0.1 ${pkgs.xclip}/bin/xclip -o | ${pkgs.xdotool}/bin/xdotool type -f - @@ -223,6 +214,4 @@ gridConfig = def allWorkspaceNames :: W.StackSet i l a sid sd -> X [i] allWorkspaceNames ws = return $ map W.tag (W.hidden ws ++ (map W.workspace $ W.visible ws)) ++ [W.tag $ W.workspace $ W.current ws] - ''; - }; -} +'' |