diff --git a/home/lukas/default.nix b/home/lukas/default.nix
index ff40e9f..58f7c59 100644
--- a/home/lukas/default.nix
+++ b/home/lukas/default.nix
@@ -12,6 +12,7 @@
     ./xgd.nix
     ./hyprland.nix
     ./rofi.nix
+    ./libreoffice.nix
   ];
 
   home.username = "lukas";
diff --git a/home/lukas/git.nix b/home/lukas/git.nix
index 0429486..0fb8ae1 100644
--- a/home/lukas/git.nix
+++ b/home/lukas/git.nix
@@ -13,6 +13,8 @@ in {
       gpg.format = "ssh";
       gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
       user.signingkey = "~/.ssh/id_ed25519.pub";
+      pull.rebase = false;
+      init.defaultBranch = "master";
     };
   };
 }
diff --git a/home/lukas/libreoffice.nix b/home/lukas/libreoffice.nix
new file mode 100644
index 0000000..65ed106
--- /dev/null
+++ b/home/lukas/libreoffice.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+let
+  libreoffice = pkgs.libreoffice;
+in {
+
+  home.packages = with pkgs; [
+    libreoffice
+    hunspell
+    hunspellDicts.en_US
+    hunspellDicts.de_DE
+  ];
+}
diff --git a/modules/system/docker.nix b/modules/system/docker.nix
index b26d2b7..a878015 100644
--- a/modules/system/docker.nix
+++ b/modules/system/docker.nix
@@ -1,6 +1,3 @@
 {
-  virtualisation.docker = {
-    enable = true;
-    rootless = true;
-  };
+  virtualisation.docker.enable = true;
 }