diff options
author | nin <nin@c-base.org> | 2018-05-02 15:13:40 +0200 |
---|---|---|
committer | nin <nin@c-base.org> | 2018-05-02 15:13:40 +0200 |
commit | 689fb1a77ad53722086da922de2de533460205b3 (patch) | |
tree | 408667e6aa15e1e0fa031e99c003c3968ba1578d /tv | |
parent | 702136442c5f8c4f7f1bb911bd21d238a164218a (diff) | |
parent | 37fa7bff9339799984554b8ccbacf1f07281d6ce (diff) |
Merge branch 'master' of prism:stockholm
Diffstat (limited to 'tv')
-rw-r--r-- | tv/2configs/urlwatch.nix | 5 | ||||
-rw-r--r-- | tv/2configs/xserver/default.nix | 1 | ||||
-rw-r--r-- | tv/5pkgs/simple/xmonad-tv/default.nix | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix index 509257c48..897def8c9 100644 --- a/tv/2configs/urlwatch.nix +++ b/tv/2configs/urlwatch.nix @@ -13,11 +13,6 @@ with import <stockholm/lib>; http://www.exim.org/ - { - url = https://api.github.com/repos/Gabriel439/nix-diff/git/refs/heads/master; - filter = "system:${pkgs.jq}/bin/jq -r .object.sha"; - } - # ref src/nixpkgs/pkgs/tools/admin/sec/default.nix { url = https://api.github.com/repos/simple-evcorr/sec/tags; diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix index 7ba78b974..6ef8a8768 100644 --- a/tv/2configs/xserver/default.nix +++ b/tv/2configs/xserver/default.nix @@ -11,6 +11,7 @@ in { environment.systemPackages = [ pkgs.ff + pkgs.font-size pkgs.gitAndTools.qgit pkgs.mpv pkgs.sxiv diff --git a/tv/5pkgs/simple/xmonad-tv/default.nix b/tv/5pkgs/simple/xmonad-tv/default.nix index 94c70153d..d474b7edd 100644 --- a/tv/5pkgs/simple/xmonad-tv/default.nix +++ b/tv/5pkgs/simple/xmonad-tv/default.nix @@ -133,6 +133,8 @@ myKeys conf = Map.fromList $ [ ((_4 , xK_Escape ), forkFile "/run/wrappers/bin/slock" [] Nothing) , ((_4S , xK_c ), kill) + , ((_4 , xK_p ), forkFile "${pkgs.pass}/bin/passmenu" ["--type"] Nothing) + , ((_4 , xK_x ), chooseAction spawnTermAt) , ((_4C , xK_x ), spawnRootTerm) |