From ed2b07f6a2c27176a13d1447629f46dce579885b Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Wed, 18 Sep 2024 21:35:58 +0300
Subject: [PATCH 1/3] Move some packages to be user specific

---
 nixos_common.nix                | 3 ---
 users/functionalhacker/home.nix | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos_common.nix b/nixos_common.nix
index 365b86bf..5593e233 100644
--- a/nixos_common.nix
+++ b/nixos_common.nix
@@ -75,10 +75,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..0b3bceef 100644
--- a/users/functionalhacker/home.nix
+++ b/users/functionalhacker/home.nix
@@ -12,11 +12,14 @@
       fd
       gcc
       neovide
+      neovim
       nerdfonts
       nodejs
       pass
       ripgrep
       tree-sitter
+      usbutils
+      wl-clipboard
       yarn
     ];
 

From c94dbb7c33aa57be6646b15059172e318153e1b1 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Wed, 18 Sep 2024 23:01:43 +0300
Subject: [PATCH 2/3] Add plymouth

---
 nixos_common.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/nixos_common.nix b/nixos_common.nix
index 5593e233..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 = {

From 0c00ca07ad1d416c28881b36283188b01d2ddd2e Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Wed, 18 Sep 2024 23:02:29 +0300
Subject: [PATCH 3/3] Add gpg configuration to git

---
 users/functionalhacker/home.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/users/functionalhacker/home.nix b/users/functionalhacker/home.nix
index 0b3bceef..08ec2598 100644
--- a/users/functionalhacker/home.nix
+++ b/users/functionalhacker/home.nix
@@ -12,7 +12,6 @@
       fd
       gcc
       neovide
-      neovim
       nerdfonts
       nodejs
       pass
@@ -110,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";
+        };
+      };
     };
   };
 }