From 05e3b8b222f67ed2d2487a9025f40a3b83777d89 Mon Sep 17 00:00:00 2001
From: DashieTM <fabio.lenherr@gmail.com>
Date: Sun, 17 Nov 2024 13:41:10 +0100
Subject: [PATCH] Temporarily remove neovide

---
 flake.nix                          |  4 +++-
 modules/programs/basePackages.nix  |  2 +-
 modules/programs/coding.nix        |  3 ++-
 modules/programs/gnomeServices.nix | 25 ++++++++++++++++---------
 modules/programs/greetd.nix        |  2 ++
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/flake.nix b/flake.nix
index 56557d7..f944a9b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,7 +14,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    sops-nix.url = "github:Mic92/sops-nix";
+    # wow... major fuckup -> TODO remove
+    sops-nix.url = "github:Mic92/sops-nix?ref=d2bd7f433b28db6bc7ae03d5eca43564da0af054";
 
     Hyprspace = {
       url = "github:KZDKM/Hyprspace";
@@ -63,6 +64,7 @@
         system = "x86_64-linux";
         overlays = [ inputs.nur.overlay ];
         config = {
+          allowUnsupportedSystem = true;
           permittedInsecurePackages = [ "olm-3.2.16" ];
           allowUnfree = true;
         };
diff --git a/modules/programs/basePackages.nix b/modules/programs/basePackages.nix
index 5fa0aff..3356e35 100644
--- a/modules/programs/basePackages.nix
+++ b/modules/programs/basePackages.nix
@@ -119,7 +119,7 @@
               package = pkgs.nix-direnv;
             };
           };
-          ssh.startAgent = true;
+          #ssh.startAgent = true;
           gnupg.agent.enable = true;
         }
         // config.mods.basePackages.specialPrograms
diff --git a/modules/programs/coding.nix b/modules/programs/coding.nix
index 456acfb..7969b01 100644
--- a/modules/programs/coding.nix
+++ b/modules/programs/coding.nix
@@ -451,7 +451,8 @@
         home.packages =
           with pkgs;
           [
-            (lib.mkIf config.mods.coding.dashvim neovide)
+            # TODO re-enable, fucking amazing experience right now
+            # (lib.mkIf config.mods.coding.dashvim neovide)
             (lib.mkIf config.mods.coding.jetbrains jetbrains-toolbox)
           ]
           ++ config.mods.coding.additionalPackages
diff --git a/modules/programs/gnomeServices.nix b/modules/programs/gnomeServices.nix
index 4bc4d7e..886b9e7 100644
--- a/modules/programs/gnomeServices.nix
+++ b/modules/programs/gnomeServices.nix
@@ -29,6 +29,9 @@
   config = lib.mkIf config.mods.gnomeServices.enable (
     lib.optionalAttrs (options ? services.gnome.gnome-keyring) {
       programs.dconf.enable = true;
+      environment.extraInit = ''
+        export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/keyring/ssh" 
+      '';
       services = {
         # needed for GNOME services outside of GNOME Desktop
         dbus.packages = with pkgs; [
@@ -41,15 +44,19 @@
       };
     }
     // lib.optionalAttrs (options ? home.packages) {
-      home.packages =
-        let
-          packages = with pkgs; [
-            nautilus
-            sushi
-            nautilus-python
-          ];
-        in
-        lib.mkIf config.mods.nautilus.enable packages;
+      services.gnome-keyring.enable = true;
+      home = {
+        packages =
+          let
+            packages = with pkgs; [
+              gcr
+              nautilus
+              sushi
+              nautilus-python
+            ];
+          in
+          lib.mkIf config.mods.nautilus.enable packages;
+      };
     }
   );
 }
diff --git a/modules/programs/greetd.nix b/modules/programs/greetd.nix
index e8900f5..5756100 100644
--- a/modules/programs/greetd.nix
+++ b/modules/programs/greetd.nix
@@ -135,6 +135,8 @@
 
         # unlock GPG keyring on login
         security.pam.services.greetd.enableGnomeKeyring = true;
+        security.pam.services.greetd.sshAgentAuth = true;
+        security.pam.sshAgentAuth.enable = true;
       }
       // lib.optionalAttrs (options ? home) {
         xdg.configFile."regreet/regreet.toml".source =