Merge branch 'main' into #5_improve_dev_shell

.gitattributes

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

applications/gitlab_runner.nix

@@ -52,6 +52,9 @@
 
     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 = {
       enable = true;
 
@@ -65,6 +68,7 @@
         runner_nix = {
           cloneUrl = cfg.runner.gitlab;
           description = cfg.runner.description;
+          registrationFlags = [ "--docker-host" "tcp://127.0.0.1:2375" ];
           registrationConfigFile = config.age.secrets.runner_nix.path;
           dockerImage = cfg.runner.docker.image;
 
@@ -103,6 +107,7 @@
         runner_general = {
           cloneUrl = cfg.runner.gitlab;
           description = cfg.runner.description;
+          registrationFlags = [ "--docker-host" "tcp://127.0.0.1:2375" ];
           registrationConfigFile = config.age.secrets.runner_general.path;
           dockerImage = cfg.runner.docker.image;
         };

flake.lock

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

flake.nix

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