diff options
| -rw-r--r-- | nin/1systems/axon/config.nix | 4 | ||||
| -rw-r--r-- | nin/2configs/ableton.nix | 20 | ||||
| -rw-r--r-- | nin/2configs/git.nix | 11 | ||||
| -rw-r--r-- | nin/source.nix | 5 |
4 files changed, 25 insertions, 15 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" '' diff --git a/nin/2configs/ableton.nix b/nin/2configs/ableton.nix new file mode 100644 index 000000000..343a9089d --- /dev/null +++ b/nin/2configs/ableton.nix @@ -0,0 +1,20 @@ +{ config, pkgs, ... }: let + mainUser = config.users.extraUsers.nin; +in { + users.users= { + ableton = { + isNormalUser = true; + extraGroups = [ + "audio" + "video" + ]; + packages = [ + pkgs.wine + pkgs.winetricks + ]; + }; + }; + security.sudo.extraConfig = '' + ${mainUser.name} ALL=(ableton) NOPASSWD: ALL + ''; +} diff --git a/nin/2configs/git.nix b/nin/2configs/git.nix index 9ebbaabd2..aed4a9f48 100644 --- a/nin/2configs/git.nix +++ b/nin/2configs/git.nix @@ -36,17 +36,6 @@ let make-public-repo = name: { cgit ? {}, ... }: { inherit cgit name; public = true; - hooks = { - post-receive = pkgs.git-hooks.irc-announce { - # TODO make nick = config.krebs.build.host.name the default - nick = config.krebs.build.host.name; - channel = "#xxx"; - server = "irc.r"; - verbose = config.krebs.build.host.name == "onondaga"; - # TODO define branches in some kind of option per repo - branches = [ "master" ]; - }; - }; }; make-rules = diff --git a/nin/source.nix b/nin/source.nix index ccf5e6acc..ce1879357 100644 --- a/nin/source.nix +++ b/nin/source.nix @@ -12,8 +12,5 @@ in nin = "/home/nin/secrets/${name}"; }; stockholm.file = toString <stockholm>; - nixpkgs.git = { - url = https://github.com/nixos/nixpkgs; - ref = "afe9649"; - }; + nixpkgs = (import <stockholm/krebs/source.nix> host).nixpkgs; } |