diff options
| author | makefu <github@syntax-fehler.de> | 2017-11-28 20:28:35 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-11-28 20:28:35 +0100 |
| commit | 7180f25b35b0cd5f853356ba635c5b8366c4da63 (patch) | |
| tree | 43eb31e59e8f7718214cd8746e15d3914cdc6678 /lass/5pkgs | |
| parent | 65825bd5ce47504ec9596c0f951eb752999e75f4 (diff) | |
| parent | 635543efe237e79202cc95db6f303699cadd0c85 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/5pkgs')
| -rw-r--r-- | lass/5pkgs/default.nix | 2 | ||||
| -rw-r--r-- | lass/5pkgs/xmonad-lass.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix index d04833255..e0775f076 100644 --- a/lass/5pkgs/default.nix +++ b/lass/5pkgs/default.nix @@ -20,5 +20,7 @@ xml2json = pkgs.callPackage ./xml2json/default.nix {}; xmonad-lass = import ./xmonad-lass.nix { inherit config pkgs; }; yt-next = pkgs.callPackage ./yt-next/default.nix {}; + + screengrab = pkgs.writeDashBin "screengrab" "${pkgs.ffmpeg}/bin/ffmpeg -f x11grab -r 25 -s 1024x768 -i :0.0 -c:v huffyuv $1"; }; } diff --git a/lass/5pkgs/xmonad-lass.nix b/lass/5pkgs/xmonad-lass.nix index 12c078940..478686245 100644 --- a/lass/5pkgs/xmonad-lass.nix +++ b/lass/5pkgs/xmonad-lass.nix @@ -25,7 +25,6 @@ import Data.List (isInfixOf) import System.Environment (getArgs, withArgs) import System.IO (hPutStrLn, stderr) import System.Posix.Process (executeFile) -import Text.Read (readEither) import XMonad.Actions.CopyWindow (copy, kill1) import XMonad.Actions.CycleWS (toggleWS) import XMonad.Actions.DynamicWorkspaces ( addWorkspacePrompt, renameWorkspace, removeEmptyWorkspace) |