From 125606e069ddfe8bbbc007574c978bc320ce8373 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 15 Jun 2015 01:18:45 +0200 Subject: modules/lass: fix xresources lib import --- modules/lass/xresources.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/lass/xresources.nix b/modules/lass/xresources.nix index 1b85830c..46ff075c 100644 --- a/modules/lass/xresources.nix +++ b/modules/lass/xresources.nix @@ -12,7 +12,7 @@ with lib; let - inherit (import ../../lib { inherit pkgs; }) shell-escape; + inherit (import ../../lib { inherit lib; }) shell-escape; inherit (pkgs) writeScript; in -- cgit v1.2.3 From 20cb2996291df989b11706815d460e3113d7abd7 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 15 Jun 2015 01:19:14 +0200 Subject: mors&uriel: import patched chromium --- modules/mors/default.nix | 1 + modules/uriel/default.nix | 1 + 2 files changed, 2 insertions(+) (limited to 'modules') diff --git a/modules/mors/default.nix b/modules/mors/default.nix index d9ddd285..fa68aeae 100644 --- a/modules/mors/default.nix +++ b/modules/mors/default.nix @@ -25,6 +25,7 @@ ../lass/ircd.nix ../../secrets/mors-pw.nix ./repos.nix + ../lass/chromium-patched.nix ]; nixpkgs = { diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix index a54dfa7e..00e24d2b 100644 --- a/modules/uriel/default.nix +++ b/modules/uriel/default.nix @@ -17,6 +17,7 @@ ../lass/sshkeys.nix ../lass/bird.nix ./repos.nix + ../lass/chromium-patched.nix ]; nixpkgs = { -- cgit v1.2.3 From c5353ca4444e07d493417df66403f85e4ac44d73 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 15 Jun 2015 01:19:48 +0200 Subject: bump nixpkgs --- modules/mors/default.nix | 2 +- modules/uriel/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/mors/default.nix b/modules/mors/default.nix index fa68aeae..8246130c 100644 --- a/modules/mors/default.nix +++ b/modules/mors/default.nix @@ -30,7 +30,7 @@ nixpkgs = { url = "https://github.com/Lassulus/nixpkgs"; - rev = "b74c8eeb73a75eb61148c190df4733474a99a205"; + rev = "45c99e522dcc4ef24cf71dbe38d94a308cb30530"; }; networking.hostName = "mors"; diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix index 00e24d2b..7f2b9032 100644 --- a/modules/uriel/default.nix +++ b/modules/uriel/default.nix @@ -22,7 +22,7 @@ nixpkgs = { url = "https://github.com/Lassulus/nixpkgs"; - rev = "b74c8eeb73a75eb61148c190df4733474a99a205"; + rev = "45c99e522dcc4ef24cf71dbe38d94a308cb30530"; }; networking.hostName = "uriel"; -- cgit v1.2.3 From 5c27ea09e0d0d37167ac9f9e61dfd107ca359fc3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 19 Jun 2015 00:18:00 +0200 Subject: lass/modules: fix gitolite-base imports --- modules/lass/xresources.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/lass/xresources.nix b/modules/lass/xresources.nix index 46ff075c..0ad46a61 100644 --- a/modules/lass/xresources.nix +++ b/modules/lass/xresources.nix @@ -12,7 +12,7 @@ with lib; let - inherit (import ../../lib { inherit lib; }) shell-escape; + inherit (import ../../lib { inherit pkgs; inherit lib; }) shell-escape; inherit (pkgs) writeScript; in -- cgit v1.2.3 From aa4227fce677d5cd61f068e69945b59f71b43e1c Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 19 Jun 2015 00:42:13 +0200 Subject: modules/lass: beautify code --- modules/lass/xresources.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/lass/xresources.nix b/modules/lass/xresources.nix index 0ad46a61..00a9e5c9 100644 --- a/modules/lass/xresources.nix +++ b/modules/lass/xresources.nix @@ -43,7 +43,7 @@ in }; }; - config = + config = let cfg = config.services.xresources; xres = concatStringsSep "\n" (attrValues cfg.resources); @@ -53,6 +53,5 @@ in echo ${shell-escape xres} | xrdb -merge ''; }; - } -- cgit v1.2.3 From 98775ff29ec15452a56a6e3262d454c41d7ee87b Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 19 Jun 2015 00:45:56 +0200 Subject: mors: add git.nix --- modules/mors/default.nix | 1 + modules/mors/git.nix | 71 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 modules/mors/git.nix (limited to 'modules') diff --git a/modules/mors/default.nix b/modules/mors/default.nix index 8246130c..d83d6abc 100644 --- a/modules/mors/default.nix +++ b/modules/mors/default.nix @@ -26,6 +26,7 @@ ../../secrets/mors-pw.nix ./repos.nix ../lass/chromium-patched.nix + ./git.nix ]; nixpkgs = { diff --git a/modules/mors/git.nix b/modules/mors/git.nix new file mode 100644 index 00000000..1dd61d16 --- /dev/null +++ b/modules/mors/git.nix @@ -0,0 +1,71 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ + ../tv/git + ]; + + services.git = + let + inherit (builtins) readFile; + # TODO lib should already include our stuff + inherit (import ../../lib { inherit lib pkgs; }) addNames git; + + krebs-private = name: desc: + { + inherit desc; + hooks = { + post-receive = git.irc-announce { + nick = config.networking.hostName; # TODO make this the default + channel = "#retiolum"; + server = "ire.retiolum"; + }; + }; + } + in rec { + enable = true; + + users = addNames { + tv = { pubkey = readFile ; }; + lass = { pubkey = readFile ; }; + uriel = { pubkey = readFile ; }; + makefu = { pubkey = "xxx"; }; + }; + + repos = addNames { + shitment = { + desc = "shitment repository"; + hooks = { + post-receive = git.irc-announce { + nick = config.networking.hostName; # TODO make this the default + channel = "#retiolum"; + server = "ire.retiolum"; + }; + }; + public = true; + }; + testing = { + desc = "testing repository"; + hooks = { + post-receive = git.irc-announce { + nick = config.networking.hostName; # TODO make this the default + channel = "#repository"; + server = "ire.retiolum"; + }; + }; + public = true; + }; + }; + + rules = with git; with users; with repos; [ + { user = lass; + repo = [ testing shitment ]; + perm = push master [ non-fast-forward create delete merge ]; + } + { user = [ tv uriel makefu ]; + repo = [ testing shitment ]; + perm = fetch; + } + ]; + }; +} -- cgit v1.2.3