Compare commits

3 Commits

Author SHA1 Message Date
John Lancaster
e218eb25f3 added gmail credentials file 2025-09-23 21:10:34 -05:00
John Lancaster
01d8e9c758 disabled 1password shell home module 2025-09-23 21:10:16 -05:00
John Lancaster
682bc9d826 removed shell plugins for 1 password 2025-08-25 21:53:53 -05:00
3 changed files with 22 additions and 16 deletions

View File

@@ -11,7 +11,8 @@
./vscode.nix ./vscode.nix
../nixosModules/options.nix ../nixosModules/options.nix
inputs._1password-shell-plugins.hmModules.default # inputs._1password-shell-plugins.hmModules.default
# Commented out because it tries to configure fish shell which we don't use
]; ];
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
@@ -91,15 +92,15 @@
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
programs.home-manager.enable = true; programs.home-manager.enable = true;
# https://developer.1password.com/docs/cli/shell-plugins/nix/ # # https://developer.1password.com/docs/cli/shell-plugins/nix/
programs._1password-shell-plugins = lib.mkIf config._1password { # programs._1password-shell-plugins = lib.mkIf config._1password {
# enable 1Password shell plugins for bash, zsh, and fish shell # # enable 1Password shell plugins for bash, zsh, and fish shell
enable = true; # enable = true;
# the specified packages as well as 1Password CLI will be # # the specified packages as well as 1Password CLI will be
# automatically installed and configured to use shell plugins # # automatically installed and configured to use shell plugins
# https://developer.1password.com/docs/cli/shell-plugins # # https://developer.1password.com/docs/cli/shell-plugins
plugins = with pkgs; [ gh ]; # plugins = with pkgs; [ gh ];
}; # };
home.file.".config/1Password/ssh/agent.toml" = lib.mkIf config._1password { home.file.".config/1Password/ssh/agent.toml" = lib.mkIf config._1password {
# https://developer.1password.com/docs/ssh/agent/config # https://developer.1password.com/docs/ssh/agent/config
text = '' text = ''

View File

@@ -37,10 +37,10 @@
] ++ lib.optional config._1password "1password"; ] ++ lib.optional config._1password "1password";
}; };
shellAliases.ls = "${pkgs.eza}/bin/eza -lgos type --no-time"; shellAliases.ls = "${pkgs.eza}/bin/eza -lgos type --no-time";
initContent = lib.mkIf config._1password '' # initContent = lib.mkIf config._1password ''
if [ -f "${config.home.homeDirectory}/.config/op/plugins.sh" ]; then # if [ -f "${config.home.homeDirectory}/.config/op/plugins.sh" ]; then
source ${config.home.homeDirectory}/.config/op/plugins.sh # source ${config.home.homeDirectory}/.config/op/plugins.sh
fi # fi
''; # '';
}; };
} }

View File

@@ -34,9 +34,14 @@ in
path = "${config.xdg.configHome}/sops-nix/gmail_api_credentials.json"; path = "${config.xdg.configHome}/sops-nix/gmail_api_credentials.json";
}; };
}; };
home.sessionVariables = {
GMAIL_CREDS_PATH = "${config.xdg.configHome}/sops-nix/gmail_api_credentials.json";
};
home.packages = with pkgs; [ home.packages = with pkgs; [
(writeShellScriptBin "edit-secrets" '' (writeShellScriptBin "edit-secrets" ''
sops --config ${sopsConfigPath} ${sopsSecretsPath} ${sops}/bin/sops --config ${sopsConfigPath} ${sopsSecretsPath}
'') '')
sops sops
age age