Compare commits

..

No commits in common. "98a3416191bc8391b03b188ce230b6d986d69334" and "8fd2a4fb6ec676d45c67ff56fdfd2e45acc3d547" have entirely different histories.

5 changed files with 10 additions and 44 deletions

View File

@ -19,14 +19,10 @@
outputs = inputs: let outputs = inputs: let
overlays = [ overlays = [
# Add our own local packages # Add our own local packages
(final: prev: { (final: prev: rec {
# Make my local packages available as pkgs.mypkgs.<foo> # Make my local packages available as pkgs.mypkgs.<foo>
mypkgs = prev.callPackage ./pkgs {}; mypkgs = prev.callPackage ./pkgs {};
}) })
# more up to date ssh-tpm-agent. Can probably ditch this post-24.05
(final: prev: {
ssh-tpm-agent = (import inputs.nixpkgs-unstable { system = prev.system; }).ssh-tpm-agent;
})
]; ];
in (rec { in (rec {
profiles = import ./home/profiles.nix; profiles = import ./home/profiles.nix;
@ -72,6 +68,11 @@
# Standalone home-manager configurations # Standalone home-manager configurations
homeConfigurations = { homeConfigurations = {
boron = lib.mkHome {
system = "aarch64-darwin";
profiles = with profiles; [default dev dev-gui sensitive mac docker aws];
username = "samuel.willcocks";
};
zinc = lib.mkHome { zinc = lib.mkHome {
system = "aarch64-darwin"; system = "aarch64-darwin";
profiles = with profiles; [default dev dev-gui sensitive mac]; profiles = with profiles; [default dev dev-gui sensitive mac];

View File

@ -6,8 +6,9 @@
in { in {
home.packages = packages.all; home.packages = packages.all;
home.sessionVariables = { home.sessionVariables = {
EDITOR = "vim"; # is overriden to nvim in vim.nix if needed "PATH" = "$HOME/.local/bin:$PATH";
WORDCHARS = "\${WORDCHARS//[\\/.=]/}"; # ctrl-w on paths without make angery "EDITOR" = "vim";
"WORDCHARS" = "\${WORDCHARS//[\\/.=]/}"; # ctrl-w on paths without make angery
}; };
/* /*
# For some reason this doesn't play nice when using home manager config from inside # For some reason this doesn't play nice when using home manager config from inside

View File

@ -10,7 +10,6 @@
dev-gui = {...}: { dev-gui = {...}: {
imports = [./vscode.nix]; imports = [./vscode.nix];
}; };
tpmssh = ./tpmssh.nix;
# Sensitive stuff # Sensitive stuff
sensitive = {...}: { sensitive = {...}: {
imports = [ imports = [

View File

@ -1,35 +0,0 @@
# Enable tpm-ssh-agent in a systemd user service
{pkgs, config, lib, ...}: {
home.packages = [ pkgs.ssh-tpm-agent ];
home.sessionVariables = {
SSH_AUTH_SOCK = let
maybeProxy = lib.strings.optionalString config.services.gpg-agent.enableSshSupport " -A $(${config.programs.gpg.package}/bin/gpgconf --list-dirs agent-ssh-socket)";
cmd = "${pkgs.ssh-tpm-agent}/bin/ssh-tpm-agent --print-socket${maybeProxy}";
in "$(${cmd})";
TESTIFICLES = "hello";
};
systemd.user.sockets.ssh-tpm-agent = {
Unit.WantedBy = [ "sockets.target" ];
Socket = {
ListenStream = "%t/ssh-tpm-agent.sock";
SocketMode = "0600";
Service = "ssh-tpm-agent.service";
};
};
systemd.user.services.ssh-tpm-agent = {
Unit = {
Requires = [ "ssh-tpm-agent.socket" ];
ConditionEnvironment = "!SSH_AGENT_PID";
};
Service = {
Environment = ''
SSH_AUTH_SOCK="%t/ssh-tpm-agent.sock"
'';
ExecStart = "${pkgs.ssh-tpm-agent}";
PassEnvironment = "SSH_AGENT_PID";
SuccessExitStatus = 2;
Type = "simple";
};
};
}

View File

@ -5,7 +5,7 @@
lib, lib,
... ...
}: { }: {
home.sessionVariables.EDITOR = lib.mkForce "nvim"; home.sessionVariables = lib.mkForce {"EDITOR" = "nvim";};
home.packages = with pkgs; [ripgrep]; home.packages = with pkgs; [ripgrep];
programs.neovim = { programs.neovim = {
enable = true; enable = true;