diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 140fd42..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-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 88ec7f2..6cdf0c9 100644
--- a/system/nix.nix
+++ b/system/nix.nix
@@ -23,6 +23,11 @@ in
     flake = "/etc/nixos";
   };
 
+  programs.git = {
+    enable = true;
+    config.safe.directory = [ "/etc/nixos" ];
+  };
+
   systemd.services.nixos-upgrade.preStart = ''
     nix flake update --flake ${config.system.autoUpgrade.flake}
   '';