Hydrogen got the changes applied
This commit is contained in:
+7
-9
@@ -1,4 +1,4 @@
|
||||
{ pkgs, hostname, userConfig, ... }:
|
||||
{ config, lib, pkgs, hostname, userConfig, ... }:
|
||||
let
|
||||
onePassPath = if pkgs.stdenv.isDarwin
|
||||
then "${userConfig.homeDirectory}/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
|
||||
@@ -7,13 +7,15 @@ let
|
||||
then pkgs."ghostty-bin"
|
||||
else pkgs.ghostty;
|
||||
in {
|
||||
home.stateVersion = "26.05";
|
||||
home.stateVersion = lib.mkDefault "26.05";
|
||||
home.username = userConfig.username;
|
||||
home.homeDirectory = userConfig.homeDirectory;
|
||||
home.sessionVariables.SSH_AUTH_SOCK = onePassPath;
|
||||
home.sessionVariables.CLAUDE_CONFIG_DIR = "${config.xdg.configHome}/claude";
|
||||
|
||||
xdg.enable = true;
|
||||
xdg.configFile."ssh.conf".source = ./config.ssh.conf;
|
||||
xdg.configFile."claude/settings.json".source = ./config.claude.json;
|
||||
xdg.configFile."1Password/ssh/agent.toml".text = ''
|
||||
[[ssh-keys]]
|
||||
item = "${userConfig._1PassKeyName}"
|
||||
@@ -26,10 +28,6 @@ in {
|
||||
autosuggestion.enable = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
|
||||
initContent = ''
|
||||
export SSH_AUTH_SOCK=~/.1password/agent.sock
|
||||
'';
|
||||
|
||||
shellAliases = {
|
||||
ll = "ls -l";
|
||||
gst = "git status";
|
||||
@@ -85,9 +83,9 @@ in {
|
||||
extraConfig = builtins.readFile ./config.ssh.conf;
|
||||
settings = {
|
||||
"*" = {
|
||||
controlMaster = "auto";
|
||||
controlPath = "~/.ssh/master-%r@%h:%p";
|
||||
identityAgent = onePassPath;
|
||||
ControlMaster = "auto";
|
||||
ControlPath = "~/.ssh/master-%r@%h:%p";
|
||||
IdentityAgent = "\"${onePassPath}\"";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user