diff --git a/justfile b/justfile index 24604df..dafa17d 100644 --- a/justfile +++ b/justfile @@ -1,8 +1,9 @@ switch attic="false": #!/usr/bin/env bash - nix-channel --update - nix flake update --flake ./nix/. - sudo darwin-rebuild switch --verbose --flake ./nix/. + nix-channel --update --option access-tokens "github.com=$(gh auth token)" + # https://github.com/NixOS/nix/issues/4653 + nix flake update --flake ./nix/. --option access-tokens "github.com=$(gh auth token)" + sudo darwin-rebuild switch --verbose --flake ./nix/. --option access-tokens "github.com=$(gh auth token)" if [ "{{attic}}" = "true" ]; then just attic just clean @@ -10,8 +11,8 @@ switch attic="false": update attic="false": #!/usr/bin/env bash - nix-channel --update - sudo darwin-rebuild switch --verbose --flake ./nix/. + nix-channel --update --option access-tokens "github.com=$(gh auth token)" + sudo darwin-rebuild switch --verbose --flake ./nix/. --option access-tokens "github.com=$(gh auth token)" if [ "{{attic}}" = "true" ]; then just attic just clean @@ -51,7 +52,6 @@ dot: zed ~/.zshrc zed ~/.bashrc # https://github.com/NixOS/nix/issues/8254#issuecomment-1787238439 - # https://github.com/NixOS/nix/issues/4653 zed ~/.config/nix/nix.conf zed ~/.gitconfig zed ~/.config/jj/config.toml @@ -84,3 +84,8 @@ docker: docker system prune -f -a # docker run --rm --privileged -d --name buildkit moby/buildkit + +git_upstream: + git remote add upstream git@github.com:loco-rs/loco-openapi-Initializer.git + git remote set-branches upstream main + git fetch upstream main diff --git a/nix/flake.lock b/nix/flake.lock index 13b699b..6fc3ae3 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754340878, - "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", + "lastModified": 1754393734, + "narHash": "sha256-fbnmAwTQkuXHKBlcL5Nq1sMAzd3GFqCOQgEQw6Hy0Ak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cab778239e705082fe97bb4990e0d24c50924c04", + "rev": "a683adc19ff5228af548c6539dbc3440509bfed3", "type": "github" }, "original": { @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1754448563, - "narHash": "sha256-JdgvzorJa4h2RSjIUj+rEYDCdQl1ubqoS8WebYJjQ2s=", + "lastModified": 1754575663, + "narHash": "sha256-afOx8AG0KYtw7mlt6s6ahBBy7eEHZwws3iCRoiuRQS4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1bee06db858d83014983af40e9d1cfca96c32f7f", + "rev": "6db0fb0e9cec2e9729dc52bf4898e6c135bb8a0f", "type": "github" }, "original": { diff --git a/nix/flake.nix b/nix/flake.nix index a4ab3c4..71bf6db 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -36,6 +36,7 @@ # https://search.nixos.org/packages environment.systemPackages = with pkgs; [ # keepassxc + google-chrome raycast rclone keka @@ -61,7 +62,6 @@ jjui gitbutler btop - # micro just hyperfine cmake @@ -88,7 +88,7 @@ # targets = [ "wasm32-unknown-unknown" ]; # }) - # (pkgs.rust-bin.stable."1.87.0".default.override { + # (pkgs.rust-bin.stable."1.89.0".default.override { # # extensions = [ "rustc-codegen-cranelift-preview" ]; # targets = [ "wasm32-unknown-unknown" ]; # })