all repos — nixfiles @ 3873b5b38671356ee775ecf0ad06920d8f301d72

System and user configuration, managed by nix and home-manager

import elgit module from git-server role

Alin
commit

3873b5b38671356ee775ecf0ad06920d8f301d72

parent

0ba41dbde1ca2da95e4e5180c80f574acba222d5

2 files changed, 7 insertions(+), 11 deletions(-)

changed files
M flake.nix → flake.nix
@@ -137,15 +137,9 @@ nixosConfigurations.linde = nixpkgs.lib.nixosSystem {
         system = "aarch64-linux";
         specialArgs = { inherit inputs; };
         modules = [
-          {
-            nixpkgs.overlays = [
-              elgit.overlays.default
-            ];
-          }
           srvos.nixosModules.server
           srvos.nixosModules.hardware-hetzner-cloud-arm
           agenix.nixosModules.default
-          elgit.nixosModules.elgit
           mycal.nixosModules.mycal
           ./packages/modules/nixos/laminar.nix
           ./packages/modules/nixos/git-pr.nix

@@ -157,11 +151,6 @@ nixosConfigurations.smrk = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };
         modules = [
-          {
-            nixpkgs.overlays = [
-              elgit.overlays.default
-            ];
-          }
           srvos.nixosModules.server
           vpsadminos.nixosConfigurations.containerUnstable
           agenix.nixosModules.default
M system/roles/git-server.nix → system/roles/git-server.nix
@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  inputs,
   pkgs,
   ...
 }:

@@ -113,6 +114,12 @@
   mkMirrorWants = repo: map (target: "mirror-to-${target}@${repo}.path");
 in
 {
+  imports = [
+    inputs.elgit.nixosModules.elgit
+  ];
+  nixpkgs.overlays = [
+    inputs.elgit.overlays.default
+  ];
   services.gitolite = {
     enable = true;
     adminPubkey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHYUyDdw92TNXguAxcmcmZmn/7ECGdRp6ckjxU+5zCw3BCnsS5+xEvHBVnnFdJRoH2XpfMeJjE+fi67zFVhlbn4= root@secretive.marvin";