diff --git a/nixos_common.nix b/nixos_common.nix
index 365b86bf..1b796f8e 100644
--- a/nixos_common.nix
+++ b/nixos_common.nix
@@ -35,8 +35,31 @@
         enable = true;
         efiSupport = true;
         device = "nodev";
+        timeoutStyle = "hidden";
       };
     };
+
+    initrd = {
+      systemd.enable = true;
+      verbose = false;
+    };
+
+    consoleLogLevel = 0;
+
+    kernelParams = [
+      "quiet"
+      "splash"
+      "boot.shell_on_fail"
+      "loglevel=3"
+      "rd.systemd.show_status=false"
+      "rd.udev.log_level=3"
+      "udev.log_priority=3"
+    ];
+
+    plymouth = {
+      enable = true;
+      theme = "bgrt";
+    };
   };
 
   services = {
@@ -75,10 +98,7 @@
     shells = [ pkgs.zsh ];
     systemPackages = with pkgs;
       [
-        neovim
         telegram-desktop
-        usbutils
-        wl-clipboard
       ];
   };
 }
diff --git a/users/functionalhacker/home.nix b/users/functionalhacker/home.nix
index c516a06a..08ec2598 100644
--- a/users/functionalhacker/home.nix
+++ b/users/functionalhacker/home.nix
@@ -17,6 +17,8 @@
       pass
       ripgrep
       tree-sitter
+      usbutils
+      wl-clipboard
       yarn
     ];
 
@@ -107,6 +109,23 @@
       enable = true;
       userName = "Marko Korhonen";
       userEmail = "marko@korhonen.cc";
+
+      extraConfig = {
+        user.signingkey = "F2B9F713E7ED627336DD85E444FA3F28CD931BB0";
+        commit = {
+          gpgsign = true;
+          signoff = true;
+        };
+        tag = {
+          gpgsign = true;
+          signoff = true;
+        };
+        merge = {
+          prompt = false;
+          conflictstyle = "diff3";
+          tool = "nvim";
+        };
+      };
     };
   };
 }