diff --git a/laptop/configuration.nix b/laptop/configuration.nix
index 5c5c7258..4a00a01b 100644
--- a/laptop/configuration.nix
+++ b/laptop/configuration.nix
@@ -10,9 +10,22 @@
       ./home-manager.nix
     ];
 
+  # Basic configs
+  time.timeZone = ${timezone}
+
+  # Keep the system up-to-date automatically
+  system = {
+    autoUpgrade = {
+      enable = true;
+      allowReboot = false;
+      channel = https://channels.nixos.org/nixos-23.05
+    };
+  };
+
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
+  boot.cleanTmpDir = true;
   # Plymouth splash screen 
   boot.plymouth.enable = true;
   boot.initrd.systemd.enable = true;
@@ -170,6 +183,35 @@
       options = "--delete-older-than 30d";
   };
 
+  # Configure BASH exports
+  programs = {
+    bash = {
+      enableCompletion = true;
+      enableLsColors = true;
+      shellAliases = {
+        d = "docker";
+        dc = "docker-compose";
+        de = "docker exec -it";
+        ddate = "date +%Y.%m.%d";
+        dday = "date +%A";
+        g = "git";
+        ga = "git add -A";
+        gb = "git branch";
+        gc = "git commit";
+        gca = "git commit -a";
+        gco = "git checkout";
+        gd = "git diff";
+        gl = "git pull --prune";
+        gp = "git push origin HEAD";
+        gs = "git status -sb";
+        hs = "home-manager switch";
+        ll = "ls -lah";
+        rm = "rm -i";
+        tdate = "date +%Y.%m.%d..%H.%M";
+        ttime = "date +%H.%M";
+      }
+    };
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/testing/configuration.nix b/testing/configuration.nix
index a380dc8c..a8fb4b05 100644
--- a/testing/configuration.nix
+++ b/testing/configuration.nix
@@ -138,8 +138,6 @@
         de = "docker exec -it";
         ddate = "date +%Y.%m.%d";
         dday = "date +%A";
-        e = "emacsclient -nw"; # emacs in a terminal
-        f = "fossil";
         g = "git";
         ga = "git add -A";
         gb = "git branch";