From 64b06a2a0c09f5e57f65bcbf1494c856b58666c3 Mon Sep 17 00:00:00 2001 From: nin Date: Wed, 3 Jan 2018 19:53:35 +0100 Subject: nin axon: add ableton --- nin/1systems/axon/config.nix | 4 ++++ nin/2configs/ableton.nix | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 nin/2configs/ableton.nix (limited to 'nin') 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; #../2configs/copyq.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 + ''; +} -- cgit v1.2.3 From 009c64eb376bc5ebaef342b20edb866a612e729c Mon Sep 17 00:00:00 2001 From: nin Date: Tue, 27 Feb 2018 22:31:43 +0100 Subject: nin: follow krebs nixpkgs --- nin/source.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'nin') 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 ; - nixpkgs.git = { - url = https://github.com/nixos/nixpkgs; - ref = "afe9649"; - }; + nixpkgs = (import host).nixpkgs; } -- cgit v1.2.3 From 10ad102e7a2ee4eb3596ade1ca70f5690b7db6fe Mon Sep 17 00:00:00 2001 From: nin Date: Tue, 27 Feb 2018 22:34:32 +0100 Subject: nin git: remove irc announce --- nin/2configs/git.nix | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'nin') 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 = -- cgit v1.2.3 From 3bed8beabf48574823c2682cd686bf78c728345e Mon Sep 17 00:00:00 2001 From: nin Date: Tue, 27 Feb 2018 22:39:08 +0100 Subject: nin im: copy irc script from tv --- nin/2configs/im.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 nin/2configs/im.nix (limited to 'nin') 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 ; +{ + 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 + '') + ]; +} -- cgit v1.2.3 From 67969d72e137a65adba775c6219eb85ae72ccc77 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 28 Feb 2018 14:47:12 +0100 Subject: os-release: use --- nin/source.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'nin') diff --git a/nin/source.nix b/nin/source.nix index ccf5e6acc..5f3bbcb33 100644 --- a/nin/source.nix +++ b/nin/source.nix @@ -4,6 +4,11 @@ host@{ name, secure ? false }: let then "buildbot" else "nin"; _file = + "/nin/1systems/${name}/source.nix"; + pkgs = import { + overlays = map import [ + + ]; + }; in evalSource (toString _file) { nixos-config.symlink = "stockholm/nin/1systems/${name}/config.nix"; @@ -12,6 +17,7 @@ in nin = "/home/nin/secrets/${name}"; }; stockholm.file = toString ; + stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version"; nixpkgs.git = { url = https://github.com/nixos/nixpkgs; ref = "afe9649"; -- cgit v1.2.3