summaryrefslogtreecommitdiffstats
path: root/nin/1systems
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2018-02-28 22:51:18 +0100
committertv <tv@krebsco.de>2018-02-28 22:51:18 +0100
commitad83919c5b4039c0ea75d9f290d689843a35ca0d (patch)
tree45643c633eb0a759d19340562254092f722b46af /nin/1systems
parentd450e63fd61a31e3b34da38f48260e1bfbb013cc (diff)
parente00bacc232833cd39bdde33ef01f2189224929ad (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'nin/1systems')
-rw-r--r--nin/1systems/axon/config.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/nin/1systems/axon/config.nix b/nin/1systems/axon/config.nix
index c5f38c1..483a4f8 100644
--- a/nin/1systems/axon/config.nix
+++ b/nin/1systems/axon/config.nix
@@ -11,6 +11,7 @@ with lib;
<stockholm/nin>
<nixpkgs/nixos/modules/installer/scan/not-detected.nix>
#../2configs/copyq.nix
+ <stockholm/nin/2configs/ableton.nix>
<stockholm/nin/2configs/games.nix>
<stockholm/nin/2configs/git.nix>
<stockholm/nin/2configs/retiolum.nix>
@@ -98,6 +99,9 @@ with lib;
enable = true;
};
+ services.xserver.displayManager.sessionCommands = ''
+ ${pkgs.xorg.xhost}/bin/xhost + local:
+ '';
services.xserver.desktopManager.xfce = let
xbindConfig = pkgs.writeText "xbindkeysrc" ''