summaryrefslogtreecommitdiffstats
path: root/nin/2configs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-03-07 01:49:57 +0100
committermakefu <github@syntax-fehler.de>2018-03-07 01:49:57 +0100
commit6b647a237a5f4db23b7eff70f305be7106da7711 (patch)
tree3542eabb416599e0d2dea8a2f2358f27f4b911e2 /nin/2configs
parent194e7011d42ed75c76dc7a7efea450ba6497d2f1 (diff)
parent02f67eed443ba552d775d1a0ab7860d439f7552b (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'nin/2configs')
-rw-r--r--nin/2configs/ableton.nix20
-rw-r--r--nin/2configs/git.nix11
-rw-r--r--nin/2configs/im.nix19
3 files changed, 39 insertions, 11 deletions
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
+ '')
+ ];
+}