Skynet/nixos
6
1
Fork 0
Code Issues 43 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into #5_improve_dev_shell

Browse source
This commit is contained in:
silver 2023-08-07 02:44:23 +01:00
commit 29c9a6b9af
4 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitattributes vendored
View file

@ -1,3 +1,9 @@
# Git config here
* text eol=lf
#############################################
# Git lfs stuff
# Documents # Documents
*.pdf filter=lfs diff=lfs merge=lfs -text *.pdf filter=lfs diff=lfs merge=lfs -text
*.doc filter=lfs diff=lfs merge=lfs -text *.doc filter=lfs diff=lfs merge=lfs -text

5
applications/gitlab_runner.nix
View file

@ -52,6 +52,9 @@
boot.kernel.sysctl."net.ipv4.ip_forward" = true; # 1 boot.kernel.sysctl."net.ipv4.ip_forward" = true; # 1
# taken from https://github.com/NixOS/nixpkgs/issues/245365#issuecomment-1663854128
virtualisation.docker.listenOptions = [ "/run/docker.sock" "127.0.0.1:2375" ];
services.gitlab-runner = { services.gitlab-runner = {
enable = true; enable = true;
@ -65,6 +68,7 @@
runner_nix = { runner_nix = {
cloneUrl = cfg.runner.gitlab; cloneUrl = cfg.runner.gitlab;
description = cfg.runner.description; description = cfg.runner.description;
registrationFlags = [ "--docker-host" "tcp://127.0.0.1:2375" ];
registrationConfigFile = config.age.secrets.runner_nix.path; registrationConfigFile = config.age.secrets.runner_nix.path;
dockerImage = cfg.runner.docker.image; dockerImage = cfg.runner.docker.image;
@ -103,6 +107,7 @@
runner_general = { runner_general = {
cloneUrl = cfg.runner.gitlab; cloneUrl = cfg.runner.gitlab;
description = cfg.runner.description; description = cfg.runner.description;
registrationFlags = [ "--docker-host" "tcp://127.0.0.1:2375" ];
registrationConfigFile = config.age.secrets.runner_general.path; registrationConfigFile = config.age.secrets.runner_general.path;
dockerImage = cfg.runner.docker.image; dockerImage = cfg.runner.docker.image;
}; };

8
flake.lock
View file

@ -252,16 +252,16 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1691252436, "lastModified": 1691276849,
"narHash": "sha256-SKKPKYOnFcwqECehxoFBMLv29CZXC5qCDuETSuXd82g=", "narHash": "sha256-RNnrzxhW38SOFIF6TY/WaX7VB3PCkYFEeRE5YZU+wHw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9607b9149c9d81fdf3dc4f3bcc278da146ffbd77", "rev": "5faab29808a2d72f4ee0c44c8e850e4e6ada972f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-23.05", "ref": "nixos-unstable",
"type": "indirect" "type": "indirect"
} }
}, },

2
flake.nix
View file

@ -4,7 +4,7 @@
inputs = { inputs = {
# gonna start off with a fairly modern base # gonna start off with a fairly modern base
nixpkgs.url = "nixpkgs/nixos-23.05"; nixpkgs.url = "nixpkgs/nixos-unstable";
# utility stuff # utility stuff
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";