loptland: add ssh key of phone, make sure that fish loads op in terminal only session, without bricking homemanager

This commit is contained in:
Christoph Hollizeck 2024-11-08 00:14:39 +01:00
parent a0103c86d9
commit b8155bff9e
Signed by: Daholli
GPG key ID: 1763BB530F50279E
2 changed files with 112 additions and 117 deletions

View file

@ -18,7 +18,7 @@ let
in in
{ {
options.${namespace}.apps.cli-apps.helix = { options.${namespace}.apps.cli-apps.helix = {
enable = mkEnableOption "Whether to enable nixvim or not"; enable = mkEnableOption "Whether to enable helix or not";
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
@ -30,8 +30,7 @@ in
}; };
${namespace} = { ${namespace} = {
home = { home.extraOptions = {
extraOptions = {
programs.helix = { programs.helix = {
enable = true; enable = true;
package = helix-pkg; package = helix-pkg;
@ -128,9 +127,6 @@ in
]; ];
language-server = { language-server = {
nil = {
command = "${pkgs.nil}/bin/nil";
};
nixd = { nixd = {
command = "${pkgs.nixd}/bin/nixd"; command = "${pkgs.nixd}/bin/nixd";
}; };
@ -152,7 +148,6 @@ in
}; };
}; };
}; };
};
nix.extra-substituters.${cachix-url} = { nix.extra-substituters.${cachix-url} = {
key = cachix-key; key = cachix-key;

View file

@ -108,15 +108,15 @@ in
user.trustedPublicKeys = [ user.trustedPublicKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHFrDiO5+vMfD5MimkzN32iw3MnSMLZ0mHvOrHVVmLD0" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHFrDiO5+vMfD5MimkzN32iw3MnSMLZ0mHvOrHVVmLD0"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII4Pr7p0jizrvIl0UhcvrmL5SHRQQQWIcHLAnRFyUZS6"
]; ];
};
home.extraOptions = { snowfallorg.users.${config.${namespace}.user.name}.home.config = {
programs.fish.shellInit = '' programs.fish.shellInit = ''
eval $(op signin) eval $(op signin)
''; '';
}; };
};
system.stateVersion = "24.11"; system.stateVersion = "24.11";
} }