diff --git a/README.md b/README.md index ac50f50..048ad14 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# Jet's NixOS config +# Jet's Nixos config -I've done NixOS a few times, but this round has been very comfortable. Nothing is really that special about it, but feel free to copy it! +I've done nixos a few times but this time around it's been very comfterable. Nothing is really that special about it, but feel free to copy it! -> silly language thing credited to https://github.com/SylvanFranklin/.config +> silly language thing creddited to https://github.com/SylvanFranklin/.config This flake currently defines one host: `framework` which is my laptop. diff --git a/flake.lock b/flake.lock index f05138c..3db4601 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1775002057, - "narHash": "sha256-2BlROtk2O6cHEBWYOodHIHWGh55x/kK0nlQIrVHRj68=", + "lastModified": 1774586286, + "narHash": "sha256-VuNhpBWmYbGAoV2r/6SoP7TsFnkGlLbCbPTkBsDtLF8=", "owner": "ryoppippi", "repo": "claude-code-overlay", - "rev": "f657902903109bd56352ff86cd522b4721b3b87a", + "rev": "f8202e2dc56b054969348d1cf98082d54e31c947", "type": "github" }, "original": { @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1774977969, - "narHash": "sha256-MbCh0ayUhnP8Z/83tTPR9iTzNxQkfleedmlcgsHh1LA=", + "lastModified": 1774566674, + "narHash": "sha256-UVHUY9jHiFj9jqY3KH28OThDEX4JUeEEWIUE+3VFJVI=", "owner": "sadjow", "repo": "codex-cli-nix", - "rev": "8be597476146c75f440708f9a7ad50ae489641c4", + "rev": "d43a70bd123e49cb862ee36d0e3ab2ed550308df", "type": "github" }, "original": { @@ -87,11 +87,11 @@ ] }, "locked": { - "lastModified": 1775080052, - "narHash": "sha256-jAB4ZZbx8ECu9GcE/PUUwT+wpooZ0Ssmn2imB8PVTdM=", + "lastModified": 1774738535, + "narHash": "sha256-2jfBEZUC67IlnxO5KItFCAd7Oc+1TvyV/jQlR+2ykGQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "6267895e9898399f0ce2fe79b645e9ee4858aaff", + "rev": "769e07ef8f4cf7b1ec3b96ef015abec9bc6b1e2a", "type": "github" }, "original": { @@ -108,11 +108,11 @@ ] }, "locked": { - "lastModified": 1774991950, - "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=", + "lastModified": 1773422513, + "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7", + "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", "type": "github" }, "original": { @@ -128,11 +128,11 @@ ] }, "locked": { - "lastModified": 1774762074, - "narHash": "sha256-89Mh4Eb/5stVJX6kGagVMijcU2FmfeD8Qv7UXc5d92o=", + "lastModified": 1774156144, + "narHash": "sha256-gdYe9wTPl4ignDyXUl1LlICWj41+S0GB5lG1fKP17+A=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "bc13aeaed568be76eab84df88ff39261bb52ff70", + "rev": "55b588747fa3d7fc351a11831c4b874dab992862", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1774933469, - "narHash": "sha256-OrnCQeUO2bqaWUl0lkDWyGWjKsOhtCyd7JSfTedQNUE=", + "lastModified": 1774567711, + "narHash": "sha256-uVlOHBvt6Vc/iYNJXLPa4c3cLXwMllOCVfAaLAcphIo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f4c4c2c0c923d7811ac2a63ccc154767e4195337", + "rev": "3f6f874dfc34d386d10e434c48ad966c4832243e", "type": "github" }, "original": { @@ -158,11 +158,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1775083152, - "narHash": "sha256-jmj9atnmjkaqnmNz63TV0gcoaNeC1ooxmxyWgQ9vGfk=", + "lastModified": 1774737476, + "narHash": "sha256-Bf6YP8iirgloZ+MwyDvRl/DDQrfNMrE4Ou47l/StxJ8=", "owner": "nix-community", "repo": "NUR", - "rev": "f0acccabf10fa7fa1e8d27da0d20e2f6df3150b2", + "rev": "88adcc30bbaa5b6d16f48a5a2ccc10758d145db3", "type": "github" }, "original": { @@ -228,11 +228,11 @@ ] }, "locked": { - "lastModified": 1775021133, - "narHash": "sha256-JB0u0evfSlmNg9HdGDxtXjaCcdKUpFPdSAMGxvJo5Pw=", + "lastModified": 1774708879, + "narHash": "sha256-rTYvYkQL69/YkZB+MRA/IaX1qJ1lPx5KXoQS2/9+7Mw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "4bf1a6837064486c4f573a9d500c4cf3c1c075c0", + "rev": "d01d23c798cceef42307d5789bfbce70515e8800", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index dc4610f..901c9f6 100644 --- a/flake.nix +++ b/flake.nix @@ -30,56 +30,13 @@ outputs = inputs@{ + self, nixpkgs, home-manager, nixos-hardware, ... }: { - packages.x86_64-linux = - let - pkgs = nixpkgs.legacyPackages.x86_64-linux; - t3Version = "0.0.15"; - t3App = pkgs.appimageTools.wrapType2 rec { - pname = "t3"; - version = t3Version; - - src = pkgs.fetchurl { - url = "https://github.com/pingdotgg/t3code/releases/download/v${version}/T3-Code-${version}-x86_64.AppImage"; - hash = "sha256:67ccbb4961f9e7e642edc469828d1c746dbbdeb6c38854b7a5742ddeea7bb038"; - }; - - extraPkgs = pkgs: [ pkgs.xdg-utils ]; - }; - t3Icon = pkgs.fetchurl { - url = "https://raw.githubusercontent.com/pingdotgg/t3code/v${t3Version}/apps/desktop/resources/icon.png"; - hash = "sha256-rXMAXnje7dOKxoqQ/G16Ohub9A54IPhhlv9x1/aKcvw="; - }; - t3Desktop = pkgs.makeDesktopItem { - name = "t3-code"; - desktopName = "T3 Code"; - genericName = "AI Coding Assistant"; - exec = "t3 %U"; - icon = "${t3Icon}"; - terminal = false; - categories = [ - "Development" - "IDE" - ]; - startupNotify = true; - comment = "Launch T3 Code from the GitHub release AppImage"; - }; - in - { - t3code = pkgs.symlinkJoin { - name = "t3code-${t3Version}"; - paths = [ - t3App - t3Desktop - ]; - }; - }; - formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt; nixosConfigurations = { framework = nixpkgs.lib.nixosSystem { diff --git a/home.nix b/home.nix index 3e3c538..6fc3820 100644 --- a/home.nix +++ b/home.nix @@ -9,6 +9,13 @@ let name = "Jet"; email = "jet@extremist.software"; sshSigningKey = "~/.ssh/id_ed25519.pub"; + t3 = pkgs.writeShellApplication { + name = "t3"; + runtimeInputs = [ pkgs.nodejs_24 ]; + text = '' + exec npx --yes --package=t3@0.0.14 t3 "$@" + ''; + }; zellijNewTabZoxide = pkgs.writeShellApplication { name = "zellij-new-tab-zoxide"; runtimeInputs = [ @@ -480,6 +487,8 @@ in git remote add origin "ssh://forgejo@''${login}/''${user}/''${name}.git" '') (writeShellScriptBin "ow" '' + DNS="$(tailscale status --json | jq -r '.Self.DNSName')" + DNS="''${DNS%.}" sudo -v sudo tailscale serve --bg 4096 exec opencode web --hostname 127.0.0.1 --port 4096 @@ -491,7 +500,7 @@ in ffmpeg-full claude-code opencode - inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.t3code + t3 zellijNewTabZoxide zellijSyncTabName inputs.codex-cli-nix.packages.${pkgs.stdenv.hostPlatform.system}.default