This commit is contained in:
Kat Inskip 2023-07-17 15:07:23 -07:00
parent c27b6d21af
commit 413ee5e6bc
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
16 changed files with 55 additions and 58 deletions

View file

@ -140,18 +140,14 @@
};
hostname = "${name}.inskip.me";
sshOpts = ["-p" "${builtins.toString (builtins.head inputs.self.nixosConfigurations.${name}.config.services.openssh.ports)}"];
sshUser = "deploy";
sshUser = "root";
user = "root";
autoRollback = true;
magicRollback = true;
};
})
(set.optional (host.folder == "nixos" && host.arch != "x86_64") {
${name} = {
remoteBuild = true;
};
})
];
"${host.folder}Configurations".${name} = host.builder {
inherit (host) system modules specialArgs;
};

View file

@ -73,7 +73,6 @@ _: let
chainloader /EFI/Microsoft/Boot/bootmgfw.efi
}
'';
version = 2;
};
};
};

View file

@ -15,7 +15,7 @@ _: let
initrd.availableKernelModules = ["virtio_pci" "xhci_pci" "usb_storage" "usbhid"];
};
virtualization.rosetta.enable = true;
virtualisation.rosetta.enable = true;
fileSystems = {
"/" = {

View file

@ -15,12 +15,17 @@ _: let
extraConfig = ''
Host renko
HostName 192.168.64.5
Port 62954
User root
IdentityFile /Users/kat/.ssh/id_rsa
'';
};
nix.buildMachines = [
{
hostName = "renko";
system = "aarch64-linux";
supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"];
}
{
hostName = "renko";
system = "x86_64-linux";
@ -50,20 +55,9 @@ _: let
home-manager.users.kat = {
programs.zsh = {
sessionVariables = {
PYENV_ROOT = "$HOME/.pyenv";
PATH = "$PYENV_ROOT/bin:$PATH";
PIPENV_PYTHON = "$PYENV_ROOT/shims/python";
};
initExtra = ''
plugin=(pyenv)
eval $(pyenv init -)
eval $(pyenv virtualenv-init -)
source <(kubectl completion zsh)
'';
shellAliases = {
artemiscli = "~/.artemis/.venv/bin/artemiscli";
};
};
};

View file

@ -22,7 +22,6 @@ _: let
loader.grub = {
enable = true;
device = "/dev/sda";
version = 2;
};
initrd = {
availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];