From f1eb1f66207c0538b03f85378b68c3f26f067d84 Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Fri, 16 Jun 2023 10:02:19 -0700 Subject: [PATCH] Syncing sumireko configs --- kat/default.nix | 4 +- kat/shell/ssh.nix | 6 +++ kat/{vscodium.nix => vscode.nix} | 2 +- {common => nixos/common}/fonts.nix | 0 systems/sumireko.nix | 59 ++++++++++++++++++++++++------ 5 files changed, 57 insertions(+), 14 deletions(-) rename kat/{vscodium.nix => vscode.nix} (98%) rename {common => nixos/common}/fonts.nix (100%) diff --git a/kat/default.nix b/kat/default.nix index 7a7edd8c..f4f4cb1b 100644 --- a/kat/default.nix +++ b/kat/default.nix @@ -28,14 +28,14 @@ in imports = with dirImports; [ gui wezterm - vscodium + vscode gpg ]; }; work = { imports = with dirImports; [ wezterm - vscodium + vscode gpg ]; }; diff --git a/kat/shell/ssh.nix b/kat/shell/ssh.nix index 9cba5804..8ae3f646 100644 --- a/kat/shell/ssh.nix +++ b/kat/shell/ssh.nix @@ -5,5 +5,11 @@ _: { controlPersist = "10m"; hashKnownHosts = true; compression = true; + extraConfig = '' + Host renko + HostName 192.168.64.3 + Port 62954 + User root + ''; }; } diff --git a/kat/vscodium.nix b/kat/vscode.nix similarity index 98% rename from kat/vscodium.nix rename to kat/vscode.nix index c7296340..122c311a 100644 --- a/kat/vscodium.nix +++ b/kat/vscode.nix @@ -1,7 +1,6 @@ {pkgs, ...}: { programs.vscode = { enable = true; - package = pkgs.vscodium; extensions = with pkgs.vscode-extensions; [ kamadorueda.alejandra mkhl.direnv @@ -12,6 +11,7 @@ jnoortheen.nix-ide vscodevim.vim catppuccin.catppuccin-vsc + github.copilot ]; userSettings = { "nix.enableLanguageServer" = true; diff --git a/common/fonts.nix b/nixos/common/fonts.nix similarity index 100% rename from common/fonts.nix rename to nixos/common/fonts.nix diff --git a/systems/sumireko.nix b/systems/sumireko.nix index b21f01c5..6f9b7a59 100644 --- a/systems/sumireko.nix +++ b/systems/sumireko.nix @@ -6,12 +6,32 @@ _: let }: { imports = with tree; [ kat.work - darwin.distributed ]; security.pam.enableSudoTouchIdAuth = true; - distributed.systems.renko.preference = 5; + home-manager.users.root.programs.ssh = { + enable = true; + extraConfig = '' + Host renko + HostName 192.168.64.3 + Port 62954 + User root + ''; + }; + + nix.buildMachines = [ + { + hostName = "renko"; + system = "x86_64-linux"; + supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"]; + } + ]; + + nix.distributedBuilds = true; + nix.extraOptions = '' + builders-use-substitutes = true + ''; environment.systemPackages = with pkgs; [ fd # fd, better fine! @@ -22,8 +42,31 @@ _: let deploy-rs.deploy-rs # deployment system rnix-lsp # vscode nix extensions terraform # terraform + kubectl # kubernetes + k9s # cute k8s client, canines~ + kubernetes-helm # helm + awscli ]; + 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"; + }; + }; + }; + homebrew = { brewPrefix = "/opt/homebrew/bin"; brews = [ @@ -31,31 +74,25 @@ _: let "pinentry-mac" "awscurl" "pandoc" - "helm" ]; casks = [ "utm" - "discord" "barrier" - "mullvadvpn" "bitwarden" - "deluge" - "telegram-desktop" - "spotify" - "element" - "signal" - "brave-browser" + "firefox" "disk-inventory-x" "dozer" "devtoys" "cyberduck" "docker" + "spotify" "pycharm-ce" "slack" "boop" "obsidian" "contexts" "rectangle" + "keybase" ]; taps = [ "pulumi/tap"