From c2bbac4020bbeb31313030443c12d7097794163c Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Fri, 22 Aug 2025 09:36:02 -0500
Subject: [PATCH] merge

---
 .gitignore                                    |  3 +-
 .../mattjallen@macbook-pro/default.nix        |  2 +-
 modules/home/sops/default.nix                 | 30 +++++++++----------
 modules/nixos/desktop/gnome/default.nix       |  2 +-
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index e546427..d138305 100755
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ result
 shell.nix
 .vscode
 **/*/*.py
-.envrc
\ No newline at end of file
+.envrc
+.DS_Store
\ No newline at end of file
diff --git a/homes/aarch64-darwin/mattjallen@macbook-pro/default.nix b/homes/aarch64-darwin/mattjallen@macbook-pro/default.nix
index ebe2dfc..268d243 100755
--- a/homes/aarch64-darwin/mattjallen@macbook-pro/default.nix
+++ b/homes/aarch64-darwin/mattjallen@macbook-pro/default.nix
@@ -29,7 +29,7 @@ in
     homeDirectory = "/Users/mattjallen";
     packages = lib.mkForce packages;
     sessionVariables = {
-      NH_DARWIN_FLAKE = "${home.homeDirectory}/nix-config#mac";
+      NH_DARWIN_FLAKE = "${home.homeDirectory}/nix-config";
     };
   };
 
diff --git a/modules/home/sops/default.nix b/modules/home/sops/default.nix
index 1c51dc2..28089c5 100644
--- a/modules/home/sops/default.nix
+++ b/modules/home/sops/default.nix
@@ -13,20 +13,20 @@ in
   imports = [ ./options.nix ];
 
   config = lib.mkIf cfg.enable {
-    sops = {
-      age.keyFile = "/home/${user}/.config/sops/age/keys.txt";
-      defaultSopsFile = "/etc/nixos/secrets/secrets.yaml";
-      validateSopsFiles = false;
-      secrets = {
-        "ssh-keys-public/desktop-nixos" = {
-          path = "/home/${user}/.ssh/id_ed25519.pub";
-          mode = "0644";
-        };
-        "ssh-keys-private/desktop-nixos" = {
-          path = "/home/${user}/.ssh/id_ed25519";
-          mode = "0600";
-        };
-      };
-    };
+    # sops = {
+    #   age.keyFile = "/home/${user}/.config/sops/age/keys.txt";
+    #   defaultSopsFile = "/etc/nixos/secrets/secrets.yaml";
+    #   validateSopsFiles = false;
+    #   secrets = {
+    #     "ssh-keys-public/desktop-nixos" = {
+    #       path = "/home/${user}/.ssh/id_ed25519.pub";
+    #       mode = "0644";
+    #     };
+    #     "ssh-keys-private/desktop-nixos" = {
+    #       path = "/home/${user}/.ssh/id_ed25519";
+    #       mode = "0600";
+    #     };
+    #   };
+    # };
   };
 }
diff --git a/modules/nixos/desktop/gnome/default.nix b/modules/nixos/desktop/gnome/default.nix
index 556abbe..99b0725 100644
--- a/modules/nixos/desktop/gnome/default.nix
+++ b/modules/nixos/desktop/gnome/default.nix
@@ -28,7 +28,7 @@ in
 
     programs = {
       kdeconnect = {
-        enable = lib.mkDefault true;
+        enable = false;
         package = pkgs.gnomeExtensions.gsconnect;
       };
     };