diff options
| -rw-r--r-- | depo/default.nix | 3 | ||||
| -rw-r--r-- | depo/hikuj-zupip/configuration.nix (renamed from depo/hidor-kahih/configuration.nix) | 14 | ||||
| -rw-r--r-- | depo/hikuj-zupip/default.nix (renamed from depo/hidor-kahih/default.nix) | 3 | ||||
| -rw-r--r-- | depo/hikuj-zupip/hardware.nix (renamed from depo/hidor-kahih/hardware.nix) | 0 | ||||
| -rw-r--r-- | depo/nutin-madaj/default.nix | 3 | ||||
| -rw-r--r-- | depo/packages.nix | 2 | ||||
| -rw-r--r-- | keys/deploy.pub | 1 |
7 files changed, 23 insertions, 3 deletions
diff --git a/depo/default.nix b/depo/default.nix index 65e06ae..131320d 100644 --- a/depo/default.nix +++ b/depo/default.nix @@ -1,4 +1,5 @@ { nutin-madaj = import ./nutin-madaj; -hidor-kahih = import ./hidor-kahih; +hikuj-zupip = import ./hikuj-zupip; + } diff --git a/depo/hidor-kahih/configuration.nix b/depo/hikuj-zupip/configuration.nix index d3172e3..00fbf46 100644 --- a/depo/hidor-kahih/configuration.nix +++ b/depo/hikuj-zupip/configuration.nix @@ -76,6 +76,11 @@ }; }; + # https://github.com/NixOS/nixpkgs/issues/53985 + systemd.services.gitlab-runner.path = [ + "/run/wrappers" + ]; + services = { pcscd.enable = true; logind = { @@ -83,6 +88,15 @@ extraConfig = "IdleAction=ignore"; }; + # runner for hero ci + gitlab-runner = { + packages = [ pkgs.bash pkgs.git pkgs.python3 ]; + enable = true; + gracefulTimeout = "2min"; + gracefulTermination = true; + configFile = "/home/ben/gitlab-runner.toml"; + }; + openssh = { enable = true; forwardX11 = true; diff --git a/depo/hidor-kahih/default.nix b/depo/hikuj-zupip/default.nix index 4af629f..ed1733e 100644 --- a/depo/hidor-kahih/default.nix +++ b/depo/hikuj-zupip/default.nix @@ -21,6 +21,7 @@ import "${nixpkgs}/nixos" { ./configuration.nix ]; - users.users.root.openssh.authorizedKeys.keys = [(builtins.readFile ../../keys/ben.pub)]; + users.users.root.openssh.authorizedKeys.keys = + [(builtins.readFile ../../keys/deploy.pub)]; }; } diff --git a/depo/hidor-kahih/hardware.nix b/depo/hikuj-zupip/hardware.nix index fc0e7a0..fc0e7a0 100644 --- a/depo/hidor-kahih/hardware.nix +++ b/depo/hikuj-zupip/hardware.nix diff --git a/depo/nutin-madaj/default.nix b/depo/nutin-madaj/default.nix index 8789c0c..bb854cd 100644 --- a/depo/nutin-madaj/default.nix +++ b/depo/nutin-madaj/default.nix @@ -88,6 +88,7 @@ import "${nixpkgs}/nixos" { networking.hostName = "simatime"; networking.firewall.allowPing = true; services.openssh.enable = true; - users.users.root.openssh.authorizedKeys.keys = [(builtins.readFile ../../keys/ben.pub)]; + users.users.root.openssh.authorizedKeys.keys = + [(builtins.readFile ../../keys/deploy.pub)]; }; } diff --git a/depo/packages.nix b/depo/packages.nix index c542d54..2c522f6 100644 --- a/depo/packages.nix +++ b/depo/packages.nix @@ -5,5 +5,7 @@ pkgs.wget pkgs.ranger pkgs.vnstat + pkgs.gitAndTools.gitFull + pkgs.python3 ]; } diff --git a/keys/deploy.pub b/keys/deploy.pub new file mode 100644 index 0000000..664a2d9 --- /dev/null +++ b/keys/deploy.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDlLRbbXgwjF7IqObf4dZE/jj0HoT6xJR6bP/6ZrJz7NPCPIgY3GacOtBfkJp6KK0zKQdFmxNpcfb3zgpe/Ru7pkmSfI9IoWAU3aLPWK2G3tbLPmktGmF9C53OhyXgFtBGr2Q/+wSRKAfN/FrEEa2FuRBtvtcAMiwbQLbFCzlmWhE7swSBvg38ZSFrjhANsEhfNVCtsrtG16fkfrfmBFv4JIog1fEoMKmXg7rhMjpaas8+n52HMFXvjllePRpywK4wB20GOcOuDSdc3i3zs7NFuicGunEpW2S/byrHotSWHZ9VuUwPn3GJ6xorrGyvsRuPS2anhHTSBxYCqYdXg0BIYUn1x5Uhtzd8kIU06gSLsvuhqGCLNucnXAT1Zix7pSlO21be81SX4vwQEth+6Dkm6kja0ArHZL6wglF8Njd1fV9iOwvcS07clwa/2S8suFLwVrQXz16vfAfA2zi4/qeop5Sv9W4DIOZuIMPmbWZCoy7L6Fu4+x4prb8LCQNM5m4CP3HngCW8PpxtBbBJd0dcXVap1HgDTIt/CLH8ms52uX5k3bHuvzryOihSuwmi/cDZAJAmbgclM9klsZr4R/GAoAWhhGxXM2tLuiwZ2nLvCPlXbBazZpdM2aC3VIwnMwJrJFu2u9B6RSsz2ijbygecT98UmiMYK7Mk1y6GkvY+mDQ== ben@lithium |