diff options
| author | tv <tv@krebsco.de> | 2022-12-06 01:33:28 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2022-12-06 01:33:28 +0100 |
| commit | 2f17a36ab546bc1271649ce03504a6d4db0738e9 (patch) | |
| tree | 973b884a257bd336db954a709996e2fe3ca24503 /lass | |
| parent | 426d6e2e5cdbe52cf776400cec85036f4cb86b79 (diff) | |
| parent | 645c3564f75589531abcf17fd3c3f920d93a394a (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass')
| -rw-r--r-- | lass/1systems/prism/config.nix | 1 | ||||
| -rw-r--r-- | lass/2configs/xmonad.nix | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 7bffc39aa..75f84bca9 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -111,6 +111,7 @@ with import <stockholm/lib>; <stockholm/lass/2configs/jitsi.nix> <stockholm/lass/2configs/fysiirc.nix> <stockholm/lass/2configs/bgt-bot> + <stockholm/krebs/2configs/mastodon-proxy.nix> { services.tor = { enable = true; diff --git a/lass/2configs/xmonad.nix b/lass/2configs/xmonad.nix index 05d719b8f..8784da379 100644 --- a/lass/2configs/xmonad.nix +++ b/lass/2configs/xmonad.nix @@ -151,7 +151,14 @@ myKeyMap = , ("M4-S-q", return ()) - , ("M4-d", floatNext True >> spawn "${pkgs.copyq}/bin/copyq show") + , ("M4-d", floatNext True >> spawn "${pkgs.writers.writeDash "clipmenu" '' + PATH=${lib.makeBinPath [ + pkgs.coreutils + pkgs.gawk + pkgs.dmenu + ]} + ${pkgs.clipmenu}/bin/clipmenu + ''}") , ("M4-<F2>", windows copyToAll) |