diff --git a/_sources/generated.json b/_sources/generated.json index 1c57fb5..9520efe 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -62,7 +62,7 @@ }, "clickee": { "cargoLock": null, - "date": "2025-09-14", + "date": "2026-07-15", "extract": null, "name": "clickee", "passthru": null, @@ -72,13 +72,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "ca379a35ac60cc80fa4bf68a27ee0c30724ad324", - "sha256": "sha256-NuXYKiCzicWJxwHg4mQYYMUhOd83o+cYjqrUiSKjDEs=", + "rev": "9990db3c977ca643676b6ec25b9fbe7bee652e41", + "sha256": "sha256-74TUuJJb6tGYO/B0lkgYLVNxRdkOpFYhGoyxfUcC+L8=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/@ptr.pet/clickee" }, - "version": "ca379a35ac60cc80fa4bf68a27ee0c30724ad324" + "version": "9990db3c977ca643676b6ec25b9fbe7bee652e41" }, "clickee-proxy": { "cargoLock": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index 6515904..666549a 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -48,17 +48,17 @@ }; clickee = { pname = "clickee"; - version = "ca379a35ac60cc80fa4bf68a27ee0c30724ad324"; + version = "9990db3c977ca643676b6ec25b9fbe7bee652e41"; src = fetchgit { url = "https://tangled.org/@ptr.pet/clickee"; - rev = "ca379a35ac60cc80fa4bf68a27ee0c30724ad324"; + rev = "9990db3c977ca643676b6ec25b9fbe7bee652e41"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-NuXYKiCzicWJxwHg4mQYYMUhOd83o+cYjqrUiSKjDEs="; + sha256 = "sha256-74TUuJJb6tGYO/B0lkgYLVNxRdkOpFYhGoyxfUcC+L8="; }; - date = "2025-09-14"; + date = "2026-07-15"; }; clickee-proxy = { pname = "clickee-proxy"; diff --git a/deploy.nu b/deploy.nu index 4affa87..2dc3f2c 100755 --- a/deploy.nu +++ b/deploy.nu @@ -63,7 +63,7 @@ let hosts = { pupos: { type: "nixos", user: "dawn", - addr: "100.64.0.53", + addr: "pupos", }, } diff --git a/hosts/pupos/default.nix b/hosts/pupos/default.nix index 1722edc..234e110 100644 --- a/hosts/pupos/default.nix +++ b/hosts/pupos/default.nix @@ -18,8 +18,9 @@ isNormalUser = true; extraGroups = [ "wheel" "networkmanager" ]; openssh.authorizedKeys.keys = [ - "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIHzGssWmVUOzJ9NyBPkcNfXk/cMAGYyDGDdYyAydN8dNAAAABHNzaDo=" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILUIHFy8lBU8Iy5253Lglw0v67k9ozxjLWprjTjwTsrm" ]; + linger = true; }; security.sudo.wheelNeedsPassword = false; @@ -45,7 +46,7 @@ imports = [ ../../users/modules/tailscale ]; services.tailscale.ours = { enable = true; - controlServer = "https://headscale.nekomimi.pet"; + controlServer = "https://vpn.klbr.net"; authKeyFile = "/home/dawn/.config/tailscale/ours-authkey"; port = 1059; }; diff --git a/lib/systems.nix b/lib/systems.nix index a209d69..e25e9fb 100644 --- a/lib/systems.nix +++ b/lib/systems.nix @@ -1 +1 @@ -[ "x86_64-linux" ] +[ "x86_64-linux" "aarch64-darwin" ] diff --git a/modules/nushell/aliases.nu b/modules/nushell/aliases.nu index 74e4568..c10e563 100644 --- a/modules/nushell/aliases.nu +++ b/modules/nushell/aliases.nu @@ -1,5 +1,10 @@ alias g = git +alias l = ls +alias ll = ls -l +alias la = ls -a +alias myip = echo + alias n = nix alias nfu = nix flake update alias nfs = nix flake show diff --git a/modules/nushell/prompt.nu b/modules/nushell/prompt.nu index 5dd0097..db41b31 100644 --- a/modules/nushell/prompt.nu +++ b/modules/nushell/prompt.nu @@ -6,6 +6,7 @@ let host_colors = { dzwonek: {start: "0x595CFF", end: "0xC6F8FF"}, volsinii: {start: "0x595CFF", end: "0xC6F8FF"}, trimounts: {start: "0x533A71", end: "0xFE5F55"}, + caladon: {start: "0x4C6FFF", end: "0xB8A1FF"}, } let user_colors = { kirara: {start: "0xFF407D", end: "0xEE99C2"}, @@ -16,13 +17,15 @@ let user_colors = { } def create_left_prompt [] { - let hostname = sys host | get hostname + # use macos's short local hostname so tailscale's magicdns suffix cannot + # change the host color lookup. + let hostname = ^scutil --get LocalHostName | str trim # str replace handles whoami output on windows let username = whoami | str replace $"($hostname)\\" "" - let c = $host_colors | get $hostname + let c = $host_colors | get -o $hostname | default {start: "0x595CFF", end: "0xC6F8FF"} let hostname_fmt = $hostname | ansi gradient --fgstart $c.start --fgend $c.end - let c = $user_colors | get $username + let c = $user_colors | get -o $username | default {start: "0x640D5F", end: "0xD91656"} let username_fmt = $username | ansi gradient --fgstart $c.start --fgend $c.end let dir = match (do -i { $env.PWD | path relative-to $nu.home-path }) {