summaryrefslogtreecommitdiffstats
path: root/nin/1systems
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2018-02-27 22:39:54 +0100
committerlassulus <lassulus@lassul.us>2018-02-27 22:39:54 +0100
commit8e73dd86b43a8c54a54da2c2c48623897dd95978 (patch)
tree0c43aaffe50e734e06fcfc66cf66f77f21c0e1eb /nin/1systems
parentae2055f0082c5c9c8857cf725ee461a53bea0ac1 (diff)
parent10ad102e7a2ee4eb3596ade1ca70f5690b7db6fe (diff)
Merge remote-tracking branch 'onondaga/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 c5f38c1f3..483a4f84b 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" ''