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
commite7ac3fc703929cd503bc6a01cad449a5b2c328f2 (patch)
treea03346a78c60212faa190f4d9ae146ef5a2d6324 /nin/1systems
parenta7e49dd5fc590ba2ccb26d559d672767c87a7692 (diff)
parent793742b9d1b2eab942e5d06ed27028c636cda583 (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 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" ''