From 660f180b86d7786cdfc14f9f112666c7ad99e272 Mon Sep 17 00:00:00 2001 From: NexVeridian Date: Thu, 17 Jul 2025 19:19:29 -0700 Subject: [PATCH] fix proton --- dot/.zshrc | 2 ++ justfile | 16 +++++++----- nix/flake.lock | 71 +++++--------------------------------------------- nix/flake.nix | 16 +++++------- 4 files changed, 23 insertions(+), 82 deletions(-) diff --git a/dot/.zshrc b/dot/.zshrc index 386f4f3..a3e1b44 100644 --- a/dot/.zshrc +++ b/dot/.zshrc @@ -29,6 +29,8 @@ alias du="dua i" alias lg="lazygit" alias ld="lazydocker" +alias jg="jjui" +alias jjinit="jj git init --colocate" # alias cargo="RUSTFLAGS='-Z threads=16' cargo" # alias cargo="CARGO_PROFILE_DEV_CODEGEN_BACKEND=cranelift cargo -Zcodegen-backend" diff --git a/justfile b/justfile index f259a21..24604df 100644 --- a/justfile +++ b/justfile @@ -53,6 +53,8 @@ dot: # 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 rc: just hetzner @@ -60,19 +62,19 @@ rc: just rclone-proton rclone: - rclone sync -v /Users/elijahmcmorris/Desktop/Stuff/Excel tower:main/Excel - rclone sync -v /Users/elijahmcmorris/Desktop/Stuff/Pic tower:main/Pic - rclone sync -v /Users/elijahmcmorris/.cache/lm-studio/models tower:lm-studio/models + rclone sync -v --transfers 32 --multi-thread-streams 32 /Users/elijahmcmorris/Desktop/Stuff/Excel tower:main/Excel + rclone sync -v --transfers 32 --multi-thread-streams 32 /Users/elijahmcmorris/Desktop/Stuff/Pic tower:main/Pic + rclone sync -v --transfers 32 --multi-thread-streams 32 /Users/elijahmcmorris/.cache/lm-studio/models tower:lm-studio/models rclone-proton: - rclone sync -v /Users/elijahmcmorris/Desktop/Stuff/Excel proton:Excel + rclone sync -v --protondrive-replace-existing-draft=true /Users/elijahmcmorris/Desktop/Stuff/Excel proton:Excel wikidata: - rclone copyto -v tower:main/latest-all.json.bz2 /Users/elijahmcmorris/Desktop/Stuff/Programing/nextrack/data/latest-all.json.bz2 + rclone copyto -v --transfers 32 --multi-thread-streams 32 tower:main/latest-all.json.bz2 /Users/elijahmcmorris/Desktop/Stuff/Programing/nextrack/data/latest-all.json.bz2 hetzner: - rclone sync -v hetzner:NexVeridian/minecraft-data-vanilla /Users/elijahmcmorris/Desktop/Stuff/Excel/!Other/hetzner/minecraft-data-vanilla - rclone sync -v hetzner:NexVeridian/data/parquet /Users/elijahmcmorris/Desktop/Stuff/Excel/!Other/hetzner/data/parquet + rclone sync -v --transfers 32 --multi-thread-streams 32 hetzner:NexVeridian/minecraft-data-vanilla /Users/elijahmcmorris/Desktop/Stuff/Excel/!Other/hetzner/minecraft-data-vanilla + rclone sync -v --transfers 32 --multi-thread-streams 32 hetzner:NexVeridian/data/parquet /Users/elijahmcmorris/Desktop/Stuff/Excel/!Other/hetzner/data/parquet docker: # colima stop diff --git a/nix/flake.lock b/nix/flake.lock index 8d7f015..13b699b 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -20,71 +20,13 @@ "type": "github" } }, - "nix-rosetta-builder": { - "inputs": { - "nixos-generators": "nixos-generators", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1745249216, - "narHash": "sha256-bNuaIdGrs8LfintWymo9KQTILwVxsw5T6zdfxZY6K0g=", - "owner": "cpick", - "repo": "nix-rosetta-builder", - "rev": "5cf6aa1f3f2fbb70443d33b5ef7779b7c7063392", - "type": "github" - }, - "original": { - "owner": "cpick", - "repo": "nix-rosetta-builder", - "type": "github" - } - }, - "nixlib": { - "locked": { - "lastModified": 1736643958, - "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixos-generators": { - "inputs": { - "nixlib": "nixlib", - "nixpkgs": [ - "nix-rosetta-builder", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737057290, - "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=", - "owner": "nix-community", - "repo": "nixos-generators", - "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-generators", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1752077645, - "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", + "lastModified": 1754340878, + "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", + "rev": "cab778239e705082fe97bb4990e0d24c50924c04", "type": "github" }, "original": { @@ -97,7 +39,6 @@ "root": { "inputs": { "nix-darwin": "nix-darwin", - "nix-rosetta-builder": "nix-rosetta-builder", "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay" } @@ -109,11 +50,11 @@ ] }, "locked": { - "lastModified": 1752461263, - "narHash": "sha256-f4XVgqkWF1vSzPbOG5xvi4aAd/n1GwSNsji3mLMFwYQ=", + "lastModified": 1754448563, + "narHash": "sha256-JdgvzorJa4h2RSjIUj+rEYDCdQl1ubqoS8WebYJjQ2s=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9cc51d100d24fb7ea13a0bee1480ee84fa12a0ad", + "rev": "1bee06db858d83014983af40e9d1cfca96c32f7f", "type": "github" }, "original": { diff --git a/nix/flake.nix b/nix/flake.nix index a305e6b..a4ab3c4 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -10,11 +10,6 @@ url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; - - nix-rosetta-builder = { - url = "github:cpick/nix-rosetta-builder"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = @@ -23,7 +18,6 @@ nix-darwin, nixpkgs, rust-overlay, - nix-rosetta-builder, }: let configuration = @@ -46,24 +40,26 @@ rclone keka yt-dlp - zoom-us - teams # game modrinth-app + # meetings + zoom-us + teams + # dev attic-client # colima # docker - dbeaver-bin + # dbeaver-bin # dev cli lazygit lazydocker jujutsu jjui - # gitui + gitbutler btop # micro just