From 031ceb122f2f898ca4ba839b271983ae5c228868 Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Fri, 23 Aug 2024 21:42:46 +0200
Subject: [PATCH] feat: gpg stuff

---
 hosts/default/configuration.nix  |  4 +++-
 hosts/default/home.nix           |  2 +-
 hosts/default/root.nix           |  4 ++--
 hosts/server/configuration.nix   | 23 +++++++++++++++--------
 hosts/server/home.nix            |  4 ++--
 modules/applications/firefox.nix |  2 +-
 modules/applications/git.nix     |  2 ++
 7 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
index 81d68be..d604d28 100644
--- a/hosts/default/configuration.nix
+++ b/hosts/default/configuration.nix
@@ -139,7 +139,7 @@
     noa = {
       isNormalUser = true;
       description = "Noa Aarts";
-      extraGroups = [ "networkmanager" "wheel" "docker" ];
+      extraGroups = [ "networkmanager" "wheel" "docker" "wireshark" ];
       hashedPassword = "$6$rounds=512400$Zip3xoK2zcoR4qEL$N13YTHO5tpWfx2nKb1sye.ZPwfoRtMQ5f3YrMZqKzzoFoSSHHJ.l5ulCEa9HygFxZmBtPnwlseFEtl8ERnwF50";
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBFemc4Pzp7I0y8FHxgRO/c/ReBmXuqXR6CWqbhiQ+0t noa@Noas_flaptop"
@@ -190,6 +190,8 @@
     nix-ld.libraries = with pkgs; [
       wayland
     ];
+
+    wireshark.enable = true;
   };
 
   modules = {
diff --git a/hosts/default/home.nix b/hosts/default/home.nix
index 42a7b67..6f618b3 100644
--- a/hosts/default/home.nix
+++ b/hosts/default/home.nix
@@ -33,7 +33,7 @@
       enable = true;
       git = {
         name = "Noa Aarts";
-        email = "itepastra@gmail.com";
+        email = "noa@voorwaarts.nl";
       };
     };
   };
diff --git a/hosts/default/root.nix b/hosts/default/root.nix
index 9692fb1..73555dc 100644
--- a/hosts/default/root.nix
+++ b/hosts/default/root.nix
@@ -39,8 +39,8 @@
     apps = {
       enable = true;
       git = {
-        name = "Noa Auto";
-        email = "itepastra@gmail.com";
+        name = "Noa Aarts";
+        email = "noa@voorwaarts.nl";
       };
     };
   };
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index f8014bb..55e47f4 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -65,11 +65,13 @@
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    sddm
-    git
-    zsh
-  ];
+  environment = {
+    systemPackages = with pkgs; [
+      sddm
+      git
+      zsh
+    ];
+  };
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
@@ -80,9 +82,14 @@
   # };
 
   # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-  services.openssh.settings.PasswordAuthentication = false;
-  services.openssh.settings.KbdInteractiveAuthentication = false;
+  services = {
+    openssh = {
+      enable = true;
+      settings.PasswordAuthentication = false;
+      settings.KbdInteractiveAuthentication = false;
+    };
+  };
+
   programs.zsh.enable = true;
 
   home-manager = {
diff --git a/hosts/server/home.nix b/hosts/server/home.nix
index 19be6d9..fdd09c7 100644
--- a/hosts/server/home.nix
+++ b/hosts/server/home.nix
@@ -40,14 +40,14 @@
     # Programming langs
     go
     nodejs
-		factorio-headless
+    factorio-headless
   ];
 
   modules = {
     apps.git = {
       enable = true;
       name = "Noa Aarts";
-      email = "itepastra@gmail.com";
+      email = "noa@voorwaarts.nl";
     };
     apps.zsh.enable = true;
   };
diff --git a/modules/applications/firefox.nix b/modules/applications/firefox.nix
index 60f4b5d..a5a54e7 100644
--- a/modules/applications/firefox.nix
+++ b/modules/applications/firefox.nix
@@ -11,7 +11,7 @@ in
     programs.firefox = {
       enable = true;
       # TODO: add some default firefox settings
-      package = (pkgs.firefox.override { extraNativeMessagingHosts = [ pkgs.passff-host ]; });
+      package = (pkgs.firefox.override { nativeMessagingHosts = [ pkgs.passff-host ]; });
     };
 
     home.packages = [
diff --git a/modules/applications/git.nix b/modules/applications/git.nix
index 2a5a798..7fc6c57 100644
--- a/modules/applications/git.nix
+++ b/modules/applications/git.nix
@@ -15,6 +15,7 @@ in
       description = "the git user Name";
       type = lib.types.str;
     };
+    do_sign = lib.mkEnableOption "enable commit signing";
   };
 
 
@@ -27,6 +28,7 @@ in
         init = { defaultBranch = "main"; };
         safe.directory = "/etc/nixos";
         pull.rebase = false;
+        commit.gpgsign = cfg.do_sign;
       };
     };
   };