diff --git a/modules/base.nix b/modules/base.nix
index 9465345..59c8fd0 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -38,8 +38,28 @@
     zfsSupport = true;
   };
 
+  i18n = rec {
+    defaultLocale = "en_US.UTF-8";
+    extraLocales = [ "sv_SE.UTF-8/UTF-8" ];
+
+    extraLocaleSettings = {
+      LC_ADDRESS = defaultLocale;
+      LC_CTYPE = defaultLocale;
+      LC_COLLATE = defaultLocale;
+      LC_IDENTIFICATION = defaultLocale;
+      LC_MEASUREMENT = defaultLocale;
+      LC_MESSAGES = defaultLocale;
+      LC_MONETARY = defaultLocale;
+      LC_NAME = defaultLocale;
+      LC_NUMERIC = defaultLocale;
+      LC_PAPER = defaultLocale;
+      LC_TELEPHONE = defaultLocale;
+      LC_TIME = defaultLocale;
+    };
+  };
+
+  services.xserver.xkb.layout = "se";
   time.timeZone = "Europe/Stockholm";
-  i18n.defaultLocale = "sv_SE.UTF-8";
 
   console = {
     font = "Lat2-Terminus16";
@@ -84,10 +104,13 @@
     cowsay
     fortune
     lolcat
+    bat
     fastfetch
     curl
     eza
     fzf
+    git
+    git-lfs
     ripgrep
     neovim
     odt2txt
@@ -96,7 +119,6 @@
     tpm2-tools
     unzip
     wget
-    zsh
     killall
 
     nil