diff --git a/.config/fish/functions/worktree.fish b/.config/fish/functions/worktree.fish index 0466c0e..93f6d09 100644 --- a/.config/fish/functions/worktree.fish +++ b/.config/fish/functions/worktree.fish @@ -32,6 +32,7 @@ function worktree # Elixir projects if test -e "mix.exs" + echo "Elixir project detected. Copying over _build and deps" if test -d "_build" cp -cR _build ../$dirname/ end @@ -42,6 +43,7 @@ function worktree # typically untracked files if test -e ".envrc" + echo "Copying over .envrc" cp .envrc ../$dirname/ end if test -e ".npmrc" diff --git a/.config/nix-darwin/hosts/Sloanes-MacBook-Air/default.nix b/.config/nix-darwin/hosts/Sloanes-MacBook-Air/default.nix index 9cc4e0e..2305d51 100644 --- a/.config/nix-darwin/hosts/Sloanes-MacBook-Air/default.nix +++ b/.config/nix-darwin/hosts/Sloanes-MacBook-Air/default.nix @@ -5,6 +5,7 @@ environment.systemPackages = with pkgs; [ rustup + stripe-cli ]; homebrew = { diff --git a/.config/nix-darwin/modules/darwin/global.nix b/.config/nix-darwin/modules/darwin/global.nix index fcb5459..3ea7155 100644 --- a/.config/nix-darwin/modules/darwin/global.nix +++ b/.config/nix-darwin/modules/darwin/global.nix @@ -51,7 +51,10 @@ autoUpdate = true; upgrade = true; }; - brews = [ "openssl" ]; + brews = [ + "openssl" + "wxwidgets" + ]; taps = [ "homebrew/cask-versions" "homebrew/cask-fonts" @@ -59,6 +62,7 @@ casks = [ "1password" "alfred" + "appcleaner" "dash6" "fantastical" "firefox" diff --git a/.config/nix-darwin/modules/darwin/nixvim.nix b/.config/nix-darwin/modules/darwin/nixvim.nix index bc9bf5e..fa9efaf 100644 --- a/.config/nix-darwin/modules/darwin/nixvim.nix +++ b/.config/nix-darwin/modules/darwin/nixvim.nix @@ -44,6 +44,15 @@ hash = "sha256-rBHgZsBSf4iHI2X6W8PydmIqlv4Ok8nT+Tgj5Dxi73M="; }; }) + (pkgs.vimUtils.buildVimPlugin { + name = "vim-kitty"; + src = pkgs.fetchFromGitHub { + owner = "fladson"; + repo = "vim-kitty"; + rev = "4f3f2901717320f80a1e16a868f706762be8535b"; + hash = "sha256-tK7G5m3X8k2HjUA6Rm6Lz82K2GjXzcc1JNlxWrbBxGU="; + }; + }) ]; colorscheme = "helix-boo"; @@ -176,6 +185,8 @@ { key = "w"; action = "w"; } { key = "q"; action = "q"; } + { key = "s"; action = "split"; } + { key = "v"; action = "vsplit"; } { key = ""; action = "nohlsearch"; mode = "n"; } # root level leader commands diff --git a/.config/nix-darwin/users/sloane/default.nix b/.config/nix-darwin/users/sloane/default.nix index 521e7ef..b6cd59c 100644 --- a/.config/nix-darwin/users/sloane/default.nix +++ b/.config/nix-darwin/users/sloane/default.nix @@ -11,6 +11,7 @@ devenv watchman fd + wget ]; sessionVariables = {