diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..140fd42
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,28 @@
+image: nixos/nix:2.9.1
+
+variables:
+  NIX_CONFIG: "experimental-features = nix-command flakes"
+
+before_script:
+  - nix-env -iA cachix -f https://cachix.org/api/v1/install
+  - cachix use felschr
+
+stages:
+  - test
+  - build
+
+check:
+  stage: test
+  script:
+    - cachix watch-exec felschr nix flake check --no-build
+
+build:
+  stage: build
+  script:
+    - cachix watch-exec felschr nix build .#deconz
+    - cachix watch-exec felschr nix build .#nixosConfigurations.home-server.config.system.build.toplevel
+    # disabled because GitLab.com runner runs out of space
+    # - cachix watch-exec felschr nix build .#nixosConfigurations.home-pc.config.system.build.toplevel
+  only:
+    - main
+  allow_failure: true
diff --git a/system/nix.nix b/system/nix.nix
index 6cdf0c9..cb2bc23 100644
--- a/system/nix.nix
+++ b/system/nix.nix
@@ -25,7 +25,7 @@ in
 
   programs.git = {
     enable = true;
-    config.safe.directory = [ "/etc/nixos" ];
+    config.safeDirectory = [ "/etc/nixos" ];
   };
 
   systemd.services.nixos-upgrade.preStart = ''