diff --git a/common/home.nix b/common/home.nix index 5d056ab..dfe631d 100644 --- a/common/home.nix +++ b/common/home.nix @@ -27,6 +27,7 @@ croc asciinema_3 grex + mise # Rust utils bat @@ -78,6 +79,7 @@ g = "lazygit"; d = "lazydocker"; k = "kubectl"; + colima-start = "colima start --cpu 4 --memory 8 --vm-type=vz --vz-rosetta"; }; }; @@ -98,6 +100,9 @@ if type -q nvs nvs env --source | source end + if type -q mise + mise activate fish | source + end ''; }; bash = { diff --git a/flake.lock b/flake.lock index 7efea9e..25035e6 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1764952935, - "narHash": "sha256-cRPB2zESVMjIGxJ49qj4t4qnT0ae44E+fS/mkfOS/BY=", + "lastModified": 1767968155, + "narHash": "sha256-eefHCgK0H1rYdt39iafXeWXhM9o1jkNikTqDmInMZMo=", "owner": "nix-community", "repo": "home-manager", - "rev": "519828bf1c97f8bc2ed2d3b79214067047d3c67d", + "rev": "b52d47d670d2be28c99333b008896cef4c8df6fb", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1764161084, - "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", + "lastModified": 1767718503, + "narHash": "sha256-V+VkFs0aSG0ca8p/N3gib7FAf4cq9jyr5Gm+ZBrHQpo=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "e95de00a471d07435e0527ff4db092c84998698e", + "rev": "9f48ffaca1f44b3e590976b4da8666a9e86e6eb1", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764915887, - "narHash": "sha256-CeBCJ9BMsuzVgn8GVfuSRZ6xeau7szzG0Xn6O/OxP9M=", + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "42e29df35be6ef54091d3a3b4e97056ce0a98ce8", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", "type": "github" }, "original": { diff --git a/hosts/mac14.nix b/hosts/mac14.nix index 1a175b6..55dec08 100644 --- a/hosts/mac14.nix +++ b/hosts/mac14.nix @@ -15,6 +15,8 @@ "bambu-studio" "cyberduck" "kicad" + "datagrip" + # "nikitabobko/tap/aerospace" ]; pkgs = pkgs: with pkgs; [ diff --git a/secrets/vscode/profiles/main/data/extensions.yml b/secrets/vscode/profiles/main/data/extensions.yml index 29e6dfa..89c14f4 100644 Binary files a/secrets/vscode/profiles/main/data/extensions.yml and b/secrets/vscode/profiles/main/data/extensions.yml differ diff --git a/secrets/vscode/profiles/main/data/keybindings-macos.json b/secrets/vscode/profiles/main/data/keybindings-macos.json index 68fb18e..e625c33 100644 Binary files a/secrets/vscode/profiles/main/data/keybindings-macos.json and b/secrets/vscode/profiles/main/data/keybindings-macos.json differ diff --git a/secrets/vscode/profiles/main/data/settings.json b/secrets/vscode/profiles/main/data/settings.json index e66c55b..cfc9067 100644 Binary files a/secrets/vscode/profiles/main/data/settings.json and b/secrets/vscode/profiles/main/data/settings.json differ diff --git a/secrets/vscode/profiles/main/data/ui-state.yml b/secrets/vscode/profiles/main/data/ui-state.yml index e8de351..b277857 100644 Binary files a/secrets/vscode/profiles/main/data/ui-state.yml and b/secrets/vscode/profiles/main/data/ui-state.yml differ