merge

.gitignore

@@ -7,4 +7,5 @@ result
 shell.nix
 .vscode
 **/*/*.py
-.envrc
+.envrc
+.DS_Store

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";
     };
   };
 

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";
+    #     };
+    #   };
+    # };
   };
 }

modules/nixos/desktop/gnome/default.nix

@@ -28,7 +28,7 @@ in
 
     programs = {
       kdeconnect = {
-        enable = lib.mkDefault true;
+        enable = false;
         package = pkgs.gnomeExtensions.gsconnect;
       };
     };