From 67526d6c0849d9abc60c9a4cbee28e3a2dc707ce Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 25 May 2015 19:32:54 +0200 Subject: activate gitolite config --- modules/mors/default.nix | 1 + modules/mors/repos.nix | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 modules/mors/repos.nix (limited to 'modules/mors') diff --git a/modules/mors/default.nix b/modules/mors/default.nix index 8768cd1ec..c7d1f1b9a 100644 --- a/modules/mors/default.nix +++ b/modules/mors/default.nix @@ -24,6 +24,7 @@ ../lass/binary-caches.nix ../lass/ircd.nix ../../secrets/mors-pw.nix + ./repos.nix ]; nixpkgs = { url = "https://github.com/Lassulus/nixpkgs"; diff --git a/modules/mors/repos.nix b/modules/mors/repos.nix new file mode 100644 index 000000000..6d3cf2157 --- /dev/null +++ b/modules/mors/repos.nix @@ -0,0 +1,75 @@ +{ ... }: + +{ + imports = [ + ../lass/gitolite-base.nix + ]; + + services.gitolite = { + repos = { + + config = { + users = { + lass = "RW+"; + uriel = "R"; + tv = "R"; + }; + extraConfig = "option hook.post-receive = irc-announce"; + }; + + pass = { + users = { + lass = "RW+"; + uriel = "R"; + }; + }; + + load-env = { + users = { + lass = "RW+"; + uriel = "R"; + tv = "R"; + }; + extraConfig = "option hook.post-receive = irc-announce"; + }; + + emse-hsdb = { + users = { + lass = "RW+"; + uriel = "R"; + tv = "R"; + }; + extraConfig = "option hook.post-receive = irc-announce"; + }; + + painload = { + users = { + lass = "RW+"; + tv = "R"; + makefu = "R"; + }; + extraConfig = "option hook.post-receive = irc-announce"; + }; + + brain = { + users = { + lass = "RW+"; + tv = "R"; + makefu = "R"; + }; + extraConfig = "option hook.post-receive = irc-announce"; + }; + + services = { + users = { + lass = "RW+"; + tv = "R"; + makefu = "R"; + reaktor = "R"; + }; + extraConfig = "option hook.post-receive = irc-announce"; + }; + + }; + }; +} -- cgit v1.2.3 From bcd6a13478397310a2d69c39bfc9ebff5a1c0ade Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 25 May 2015 19:33:15 +0200 Subject: cleanup code & update hashes --- modules/mors/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'modules/mors') diff --git a/modules/mors/default.nix b/modules/mors/default.nix index c7d1f1b9a..6dfd05039 100644 --- a/modules/mors/default.nix +++ b/modules/mors/default.nix @@ -28,7 +28,7 @@ ]; nixpkgs = { url = "https://github.com/Lassulus/nixpkgs"; - rev = "eba85883a07a9fc414d7860f8d6fee4d9f09b2ac"; + rev = "0b1dfed50d9ec2222b94d68f84376f66e82d19e3"; }; networking.hostName = "mors"; @@ -55,8 +55,6 @@ initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ]; #kernelModules = [ "kvm-intel" "msr" ]; kernelModules = [ "msr" ]; - extraModprobeConfig = '' - ''; }; fileSystems = { "/" = { @@ -146,7 +144,6 @@ ''; services.xserver = { - videoDriver = "intel"; vaapiDrivers = [ pkgs.vaapiIntel ]; deviceSection = '' -- cgit v1.2.3 From 1da4b25cb8554f7b14e7192365e21349a00ce425 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 1 Jun 2015 03:10:59 +0200 Subject: add xmonad-config repo --- modules/mors/repos.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'modules/mors') diff --git a/modules/mors/repos.nix b/modules/mors/repos.nix index 6d3cf2157..d54d43725 100644 --- a/modules/mors/repos.nix +++ b/modules/mors/repos.nix @@ -70,6 +70,13 @@ extraConfig = "option hook.post-receive = irc-announce"; }; + xmonad-config = { + users = { + lass = "RW+"; + uriel = "R"; + }; + }; + }; }; } -- cgit v1.2.3 From d08eee4ea72ee3b45a4c3b6ae911b60f61193954 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 10 Jun 2015 00:15:24 +0200 Subject: krebs-repos: add initial config --- modules/mors/repos.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'modules/mors') diff --git a/modules/mors/repos.nix b/modules/mors/repos.nix index d54d43725..e31ba9481 100644 --- a/modules/mors/repos.nix +++ b/modules/mors/repos.nix @@ -3,6 +3,8 @@ { imports = [ ../lass/gitolite-base.nix + ../common/krebs-keys.nix + ../common/krebs-repos.nix ]; services.gitolite = { @@ -42,20 +44,17 @@ extraConfig = "option hook.post-receive = irc-announce"; }; - painload = { + brain = { users = { lass = "RW+"; - tv = "R"; - makefu = "R"; }; extraConfig = "option hook.post-receive = irc-announce"; + #hooks.post-receive = irc-announce; }; - brain = { + painload = { users = { lass = "RW+"; - tv = "R"; - makefu = "R"; }; extraConfig = "option hook.post-receive = irc-announce"; }; @@ -63,9 +62,6 @@ services = { users = { lass = "RW+"; - tv = "R"; - makefu = "R"; - reaktor = "R"; }; extraConfig = "option hook.post-receive = irc-announce"; }; -- cgit v1.2.3 From afa7f0b98d89c9746c204e4ee0dd79e7ae4eb23f Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 10 Jun 2015 00:21:12 +0200 Subject: mors & uriel: update revs --- modules/mors/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'modules/mors') diff --git a/modules/mors/default.nix b/modules/mors/default.nix index 6dfd05039..d9ddd285b 100644 --- a/modules/mors/default.nix +++ b/modules/mors/default.nix @@ -26,9 +26,10 @@ ../../secrets/mors-pw.nix ./repos.nix ]; + nixpkgs = { url = "https://github.com/Lassulus/nixpkgs"; - rev = "0b1dfed50d9ec2222b94d68f84376f66e82d19e3"; + rev = "b74c8eeb73a75eb61148c190df4733474a99a205"; }; networking.hostName = "mors"; -- cgit v1.2.3