fix build on linux

This commit is contained in:
Noah Masur
2022-06-19 23:54:16 -04:00
parent e22a4f3df2
commit fdfc66c7ad
6 changed files with 27 additions and 11 deletions

View File

@ -4,11 +4,11 @@
programs.fish = {
shellAbbrs = {
nr = "rebuild-darwin";
nro = "rebuild-darwin offline";
nr = lib.mkForce "rebuild-darwin";
nro = lib.mkForce "rebuild-darwin offline";
};
functions = {
rebuild-nixos = {
rebuild-darwin = {
body = ''
if test "$argv[1]" = "offline"
set option "--option substitute false"
@ -16,7 +16,7 @@
pushd ${config.dotfilesPath}
git add --all
popd
commandline -r darwin-rebuild switch $option --flake ${config.dotfilesPath}#macbook
commandline -r "darwin-rebuild switch $option --flake ${config.dotfilesPath}#macbook"
commandline -f execute
'';
};

View File

@ -1,8 +1,19 @@
{ config, pkgs, ... }: {
{ config, pkgs, lib, ... }: {
users.users."${config.user}" = { # macOS user
home = "/Users/${config.user}";
shell = pkgs.zsh; # Default shell
};
home-manager.users.${config.user} = {
accounts.email.accounts.home = {
passwordCommand = lib.mkForce
"${pkgs.age}/bin/age --decrypt --identity /Users/${config.user}/.ssh/id_ed25519 ${
builtins.toString ./mailpass.age
}";
};
};
}