From d6b9ea90b9449058bc1560ab4980e9452506a114 Mon Sep 17 00:00:00 2001
From: Swarsel <leon.schwarzaeugl@gmail.com>
Date: Wed, 7 Feb 2024 17:22:11 +0100
Subject: [PATCH] add missing gpgagent conf for fourside

---
 Nix.org                     | 21 ++++++---------------
 profiles/fourside/home.nix  |  7 ++++++-
 profiles/fourside/nixos.nix | 17 ++++-------------
 3 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/Nix.org b/Nix.org
index ea66b53..77abf42 100644
--- a/Nix.org
+++ b/Nix.org
@@ -1291,19 +1291,10 @@ New setup for the SP3, this time using NixOS - another machine will take over th
       greetd.settings.initial_session.user="swarsel";
     };
 
-    # Bootloader
-    # boot.loader.grub.enable = true;
-    # boot.loader.grub.device = "/dev/sda"; # TEMPLATE - if only one disk, this will work
-    # boot.loader.grub.useOSProber = true;
-
-    # --------------------------------------
-    # you might need a configuration like this instead:
-    # Bootloader
-    # boot.loader.grub.enable = true;
-    # boot.loader.grub.devices = ["nodev" ];
-    # boot.loader.grub.useOSProber = true;
-    # boot.kernelPackages = pkgs.linuxPackages_latest;
-    # --------------------------------------
+    boot = {
+      loader.systemd-boot.enable = true;
+      loader.efi.canTouchEfiVariables = true;
+    };
 
     networking.hostName = "fourside"; # Define your hostname.
 
@@ -1343,7 +1334,7 @@ New setup for the SP3, this time using NixOS - another machine will take over th
 
   {
 
-    <<gpgconf>>
+    <<gpgagent>>
     home = {
       username = "swarsel";
       homeDirectory = "/home/swarsel";
@@ -1375,7 +1366,7 @@ New setup for the SP3, this time using NixOS - another machine will take over th
             # xkb_options = "grp:win_space_toggle";
             # # xkb_options = "ctrl:nocaps,grp:win_space_toggle";
             # xkb_variant = "altgr-intl";
-          };
+          # };
           "type:touchpad" = {
             dwt = "enabled";
             tap = "enabled";
diff --git a/profiles/fourside/home.nix b/profiles/fourside/home.nix
index c0b95ea..f5f1598 100644
--- a/profiles/fourside/home.nix
+++ b/profiles/fourside/home.nix
@@ -3,6 +3,11 @@
 {
 
   
+  services.gpg-agent = {
+    enable = true;
+    enableSshSupport = true;
+  };
+  
   home = {
     username = "swarsel";
     homeDirectory = "/home/swarsel";
@@ -51,7 +56,7 @@
           # xkb_options = "grp:win_space_toggle";
           # # xkb_options = "ctrl:nocaps,grp:win_space_toggle";
           # xkb_variant = "altgr-intl";
-        };
+        # };
         "type:touchpad" = {
           dwt = "enabled";
           tap = "enabled";
diff --git a/profiles/fourside/nixos.nix b/profiles/fourside/nixos.nix
index ed6eb00..6d265d2 100644
--- a/profiles/fourside/nixos.nix
+++ b/profiles/fourside/nixos.nix
@@ -14,19 +14,10 @@
     greetd.settings.initial_session.user="swarsel";
   };
 
-  # Bootloader
-  # boot.loader.grub.enable = true;
-  # boot.loader.grub.device = "/dev/sda"; # TEMPLATE - if only one disk, this will work
-  # boot.loader.grub.useOSProber = true;
-
-  # --------------------------------------
-  # you might need a configuration like this instead:
-  # Bootloader
-  # boot.loader.grub.enable = true;
-  # boot.loader.grub.devices = ["nodev" ];
-  # boot.loader.grub.useOSProber = true;
-  # boot.kernelPackages = pkgs.linuxPackages_latest;
-  # --------------------------------------
+  boot = {
+    loader.systemd-boot.enable = true;
+    loader.efi.canTouchEfiVariables = true;
+  };
 
   networking.hostName = "fourside"; # Define your hostname.