summaryrefslogtreecommitdiffstats
path: root/nin
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
commitbecf1ce7ac7688692c3770571387b3761be11698 (patch)
tree6238277fa4c42de03b393d89cdbb12d8582afba4 /nin
parent2934d4524bcbae13043d684a27597c8b08c0851b (diff)
parent793742b9d1b2eab942e5d06ed27028c636cda583 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'nin')
-rw-r--r--nin/1systems/axon/config.nix4
-rw-r--r--nin/2configs/ableton.nix20
-rw-r--r--nin/2configs/git.nix11
-rw-r--r--nin/2configs/im.nix19
-rw-r--r--nin/source.nix5
5 files changed, 44 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/2configs/im.nix b/nin/2configs/im.nix
new file mode 100644
index 000000000..b078dbd53
--- /dev/null
+++ b/nin/2configs/im.nix
@@ -0,0 +1,19 @@
+{ config, lib, pkgs, ... }:
+with import <stockholm/lib>;
+{
+ environment.systemPackages = with pkgs; [
+ (pkgs.writeDashBin "im" ''
+ export PATH=${makeSearchPath "bin" (with pkgs; [
+ tmux
+ gnugrep
+ weechat
+ ])}
+ ssh chat@onondaga
+ if tmux list-sessions -F\#S | grep -q '^im''$'; then
+ exec tmux attach -t im
+ else
+ exec tmux new -s im weechat
+ fi
+ '')
+ ];
+}
diff --git a/nin/source.nix b/nin/source.nix
index 5f3bbcb33..9fb2cb390 100644
--- a/nin/source.nix
+++ b/nin/source.nix
@@ -18,8 +18,5 @@ in
};
stockholm.file = toString <stockholm>;
stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version";
- nixpkgs.git = {
- url = https://github.com/nixos/nixpkgs;
- ref = "afe9649";
- };
+ nixpkgs = (import <stockholm/krebs/source.nix> host).nixpkgs;
}