reorg + condiational secrets

home-manager/global.nix

@@ -3,7 +3,7 @@
 
   imports = [
     # ./beets.nix
-    ./keybase.nix
+    # ./keybase.nix
     "${inputs.vscode-server}/modules/vscode-server/home.nix"
   ] ++ (builtins.attrValues outputs.homeManagerModules);
 

home-manager/global/keybase.nix

@@ -1,35 +0,0 @@
-{ config, pkgs, inputs, lib,  util, hostName, ... }:
-with lib;
-with lib.my;
-let 
-cfg = config.custom.keybase;
-username = config.home.username;
-secretstore = config._secretstore;
-# host = config.networking.hostName;
-
-in {
-  # imports =  [
-  #   "${inputs.self}/lib/hm_secrets.nix" 
-  #   ];
-
-  options.custom.keybase = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Enable KeyBase";
-    };
-  };
-
-
-  config = mkIf cfg.enable {
-      services.keybase.enable = true;
-      services.kbfs.enable = true;
-      systemd.user.services.keybase.Unit.After = [ "sops-nix.service" ];
-      systemd.user.services.kbfs.Unit.After = [ "sops-nix.service" ];
-
-      sops = {
-       secrets = hm_secrets "${secretstore}/user_dotfiles/${username}@${hostName}/keybase/" "${config.xdg.configHome}/keybase/";
-      };
-};
-}
-

home-manager/users/sstent/default.nix

@@ -8,7 +8,7 @@
 # in
 {
   imports = [
-    ../../global
+    ../../global.nix
   ];
       home.username = "sstent";
       home.homeDirectory = "/home/sstent";
@@ -98,6 +98,8 @@ programs = {
     enable = true;
     userName  = "sstent";
     userEmail = "stuart.stent@gmail.com";
+    extraConfig = { pull.rebase = true; };
+
   };
  ssh = {
     enable = true;