summaryrefslogtreecommitdiffstats
path: root/nin/1systems
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2018-02-28 20:22:08 +0000
committerjeschli <jeschli@gmail.com>2018-02-28 20:22:08 +0000
commita8e30e2c3bb58372d26714e82c7986f22f2be652 (patch)
tree30cb2689c69f38d73a5980ff7588b1e71257ee1c /nin/1systems
parente9ab05ec113f45fd746d255ffded43b23c9363e4 (diff)
parente00bacc232833cd39bdde33ef01f2189224929ad (diff)
Merge branch 'staging/jeschli' of prism.i:stockholm into staging/jeschli
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" ''