diff --git a/darwin/base/nix.nix b/darwin/base/nix.nix index 021b8eff..12430d4f 100644 --- a/darwin/base/nix.nix +++ b/darwin/base/nix.nix @@ -8,6 +8,9 @@ ci.flake = inputs.ci; }; package = pkgs.nixUnstable; + binaryCaches = [ "https://arc.cachix.org" "https://kittywitch.cachix.org" "https://nix-community.cachix.org" ]; + binaryCachePublicKeys = + [ "arc.cachix.org-1:DZmhclLkB6UO0rc0rBzNpwFbbaeLfyn+fYccuAy7YVY=" "kittywitch.cachix.org-1:KIzX/G5cuPw5WgrXad6UnrRZ8UDr7jhXzRTK/lmqyK0=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "ryantrinkle.com-1:JJiAKaRv9mWgpVAz8dwewnZe0AzzEAzPkagE9SP5NWI=" ]; extraOptions = '' experimental-features = nix-command flakes keep-derivations = true diff --git a/darwin/systems/sumireko.nix b/darwin/systems/sumireko.nix index 85375dd5..35ba57dd 100644 --- a/darwin/systems/sumireko.nix +++ b/darwin/systems/sumireko.nix @@ -4,9 +4,52 @@ darwin.base darwin.kat ]; - + security.pam.enableSudoTouchIdAuth = true; + home-manager.users.root.programs.ssh = { + enable = true; + matchBlocks = { + "daiyousei-build" = { + hostname = "daiyousei.kittywit.ch"; + port = 62954; + user = "root"; + }; + "renko-build" = { + hostname = "192.168.64.3"; + port = 62954; + user = "root"; + }; + }; + }; + + nix = { + envVars = { + "SSH_AUTH_SOCK" = "/Users/kat/.gnupg/S.gpg-agent.ssh"; + }; + buildMachines = [ + { + hostName = "renko-build"; + sshUser = "root"; + system = "x86_64-linux"; + maxJobs = 100; + speedFactor = 1; + supportedFeatures = [ "benchmark" "big-parallel" "kvm" ]; + mandatoryFeatures = [ ]; + } + { + hostName = "daiyousei-build"; + sshUser = "root"; + system = "aarch64-linux"; + maxJobs = 100; + speedFactor = 1; + supportedFeatures = [ "benchmark" "big-parallel" "kvm" ]; + mandatoryFeatures = [ ]; + } + ]; + distributedBuilds = true; + }; + homebrew = { brewPrefix = "/opt/homebrew/bin"; casks = [ @@ -18,11 +61,12 @@ "utm" "mullvadvpn" "bitwarden" - ]; - masApps = { - Tailscale = 1475387142; + "gimp" + ]; + masApps = { + Tailscale = 1475387142; + }; }; - }; environment.systemPackages = with pkgs; [ terraform diff --git a/home/shell/packages.nix b/home/shell/packages.nix index 9ad9c91b..89e59101 100644 --- a/home/shell/packages.nix +++ b/home/shell/packages.nix @@ -1,5 +1,8 @@ { config, pkgs, ... }: { home.packages = with pkgs; [ + # task managers + htop + btop # disk usage duc-cli # nix formatting diff --git a/nixos/base/locale.nix b/nixos/base/locale.nix index 12ded209..85a17263 100644 --- a/nixos/base/locale.nix +++ b/nixos/base/locale.nix @@ -9,6 +9,7 @@ supportedLocales = [ "en_CA.UTF-8/UTF-8" "en_GB.UTF-8/UTF-8" + "en_US.UTF-8/UTF-8" ]; }; console = { diff --git a/nixos/systems/renko.nix b/nixos/systems/renko.nix new file mode 100644 index 00000000..d104e522 --- /dev/null +++ b/nixos/systems/renko.nix @@ -0,0 +1,53 @@ +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") + ]; + + + deploy.tf = { + resources.renko = { + provider = "null"; + type = "resource"; + connection = { + port = builtins.head config.services.openssh.ports; + host = "192.168.64.3"; + }; + }; + }; + + boot = { + loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; + initrd = { + availableKernelModules = [ "ehci_pci" "uhci_hcd" "ahci" "usbhid" "sd_mod" "sr_mod" ]; + kernelModules = [ ]; + }; + kernelModules = [ "kvm-amd" ]; + extraModulePackages = [ ]; + }; + + fileSystems = { + "/" = { + device = "/dev/disk/by-uuid/a4b4dea9-dd55-4055-9c98-49349ec43e5c"; + fsType = "ext4"; + }; + "/boot" = { + device = "/dev/disk/by-uuid/957B-56F1"; + fsType = "vfat"; + }; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/59399595-6a74-480c-b98c-e356761c0861"; } + ]; + + networking.useDHCP = lib.mkDefault true; + + hardware.cpu.amd.updateMicrocode = lib.mkDefault false; + + system.stateVersion = "22.05"; +}