diff --git a/darwin/default.nix b/darwin/default.nix index d014ab7..b927091 100644 --- a/darwin/default.nix +++ b/darwin/default.nix @@ -40,4 +40,5 @@ in { "MacBook-Pro" = mac { name = "ivr"; }; "MacBook-Prolocal" = mac { name = "ivr"; }; + "li" = mac { name = "li"; }; } diff --git a/darwin/hosts/li/default.nix b/darwin/hosts/li/default.nix new file mode 100644 index 0000000..a2740c3 --- /dev/null +++ b/darwin/hosts/li/default.nix @@ -0,0 +1,47 @@ +{ ... }: +let + username = "gregory.hellings"; +in +{ + greg = { + nix.cache = false; + }; + + homebrew = { + enable = true; + brews = [ + "bitwarden-cli" + "direnv" + { + name = "libvirt"; + restart_service = true; + } + "nushell" + "qemu" + ]; + casks = [ + "alt-tab" + "audacity" + "bitwarden" + "bruno" + "chromium" + "dbeaver-community" + "ghostty" + "firefox" + "notunes" + "onlyoffice" + "podman-desktop" + "tabby" + "zed" + "zoom" + ]; + user = username; + }; + + system.primaryUser = username; + + users.users."${username}" = { + name = username; + home = "/Users/${username}"; + }; +} diff --git a/garnix.yaml b/garnix.yaml index 950d73e..81e8a1b 100644 --- a/garnix.yaml +++ b/garnix.yaml @@ -19,5 +19,6 @@ builds: - homeConfigurations.exodus - darwinConfigurations.MacBook-Pro - darwinConfigurations.MacBook-Prolocal + - darwinConfigurations.li - nixosConfigurations.builder-x86 - nixosConfigurations.builder-aarch diff --git a/home/default.nix b/home/default.nix index 54f2ad0..8c7688b 100644 --- a/home/default.nix +++ b/home/default.nix @@ -40,6 +40,7 @@ in zeke = greg "zeke"; isaiah = greg "isaiah"; jeremiah = greg "jeremiah"; + li = user "li" "gregory.hellings"; linode = greg "linode"; hosea = greg "hosea"; gitlab = greg "gitlab"; diff --git a/home/hosts/ivr/default.nix b/home/hosts/ivr/default.nix index d46873f..71a4395 100644 --- a/home/hosts/ivr/default.nix +++ b/home/hosts/ivr/default.nix @@ -5,16 +5,6 @@ }: let username = "gregory.hellings"; - x = pkgs.xonsh.override { - extraPackages = ( - ps: [ - pkgs.nur.repos.xonsh-xontribs.xonsh-direnv - pkgs.nur.repos.xonsh-xontribs.xontrib-vox - ps.xonsh-apipenv - pkgs.pipenv-ivr - ] - ); - }; in { # Disables hitting local cache @@ -28,7 +18,6 @@ in home = { packages = with pkgs; [ - aacs ansible direnv home-manager @@ -36,20 +25,13 @@ in just go gopls - k9s - kubectl mariadb - minikube - mise - nil nixVersions.stable pipenv-ivr pre-commit python311 python3Packages.flake8 - skaffold twine - x ]; file = { ".pip/pip.conf".text = '' @@ -108,6 +90,5 @@ in "web4" ] ); - tmux.shell = (lib.getExe x); }; } diff --git a/home/hosts/li/default.nix b/home/hosts/li/default.nix new file mode 100644 index 0000000..8fb2d6e --- /dev/null +++ b/home/hosts/li/default.nix @@ -0,0 +1,54 @@ +{ + pkgs, + lib, + ... +}: +let + username = "gregory.hellings"; +in +{ + # Disables hitting local cache + _module.args.cache = lib.mkForce false; + greg = { + development = true; + gui = true; + nix.cache = false; + vscodium = false; + }; + + home = { + packages = with pkgs; [ + ansible + direnv + home-manager + python3Packages.ipython + just + nixVersions.stable + pre-commit + ]; + username = username; + homeDirectory = "/Users/${username}"; + }; + + programs = { + direnv = { + enable = true; + enableNushellIntegration = true; + }; + nushell = { + enable = true; + }; + starship = { + enable = true; + enableNushellIntegration = true; + settings = { + directory = { + home_symbol = "~"; + truncate_to_repo = false; + truncation_length = 0; + use_os_path_sep = true; + }; + }; + }; + }; +} diff --git a/network.json b/network.json index fd75de4..bb9e901 100644 --- a/network.json +++ b/network.json @@ -24,10 +24,7 @@ "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO/CGE2rqlL2Qr0TJkwQMsHFSDkhGWlrUlvfcvcylO1n", "ts": "100.96.198.104", "system": "x86_64-linux", - "tags": [ - "router", - "server" - ], + "tags": ["router", "server"], "nebulaIp": "10.157.0.2" }, "hosea": { @@ -35,9 +32,7 @@ "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKLIwkTTXA56sUlUjEulXXZRvZy5H4a5ZwgKWLlpkQDz", "ts": "100.68.203.1", "system": "x86_64-linux", - "tags": [ - "server" - ], + "tags": ["server"], "nebulaIp": "10.157.0.3" }, "icdm-root": { @@ -50,15 +45,8 @@ "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHleYKtfV4W1Z63Ysu9w5Rbglqlz4F92YcZoMkucoTNf", "ts": "100.84.183.79", "system": "x86_64-linux", - "systems": [ - "x86_64-linux", - "aarch64-linux" - ], - "tags": [ - "builder", - "kube", - "server" - ], + "systems": ["x86_64-linux", "aarch64-linux"], + "tags": ["builder", "kube", "server"], "nebulaIp": "10.157.0.4" }, "iso": { @@ -75,15 +63,8 @@ "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOjQjXq9WYU2Ki27BR9WwJ4ZruS/lJXbjC1b0Q42Adi0", "ts": "100.102.186.39", "system": "x86_64-linux", - "systems": [ - "x86_64-linux", - "aarch64-linux" - ], - "tags": [ - "builder", - "kube", - "server" - ], + "systems": ["x86_64-linux", "aarch64-linux"], + "tags": ["builder", "kube", "server"], "nebulaIp": "10.157.0.5" }, "joel": { @@ -91,15 +72,16 @@ "ip": "10.42.0.4", "ts": null }, + "li": { + "external": true, + "system": "aarch64-darwin" + }, "linode": { "ip": null, "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMv9Zud3kZOl86gtmkn+uj3D4kiXWDPtyUL02VVLNR4Q", "ts": "100.109.86.8", "system": "x86_64-linux", - "tags": [ - "public", - "server" - ], + "tags": ["public", "server"], "nebulaIp": "10.157.0.1" }, "MacBook-Pro.local": { @@ -136,15 +118,8 @@ "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOos0zQePsa+T6Z2dsKbPOvEdrBQ8a6mx3s7pN6ysCI0", "ts": "100.90.74.19", "system": "x86_64-linux", - "systems": [ - "x86_64-linux", - "aarch64-linux" - ], - "tags": [ - "builder", - "kube", - "server" - ], + "systems": ["x86_64-linux", "aarch64-linux"], + "tags": ["builder", "kube", "server"], "nebulaIp": "10.157.0.6" } }