fix: Fix bugs in dotfiles

bin/git-merge-branch

@@ -15,7 +15,7 @@ else
 fi
 
 git fetch origin
-line_count=$(git diff origin/$main_branch..$main_branch | wc -l)
+line_count=$(git diff origin/$main_branch $main_branch | wc -l)
 
 if [ $line_count -gt 0 ]; then
   printf "failed: $main_branch is not up to date with origin/$main_branch\n"

bin/git-up

@@ -5,7 +5,6 @@ set -e
 git fetch origin
 
 if git symbolic-ref --short refs/remotes/origin/HEAD >/dev/null; then
-  git fetch origin
   git rebase "$(git symbolic-ref --short refs/remotes/origin/HEAD)" "$@"
 else
   echo "You don't have a primary branch reference set for your origin remote.

bin/tmux-sessionizer

@@ -5,4 +5,4 @@
 
 set -e
 
-cd $(ls -d /Users/nick/{.dotfiles,dev/**} | fzf)
+cd $(ls -d "$HOME"/{.dotfiles,dev/**} | fzf)

config/Brewfile

@@ -19,7 +19,6 @@ brew "btop"
 brew "coreutils"
 brew "fd"
 brew "fzf"
-brew "fzf"
 brew "gh"
 brew "git"
 brew "git-flow-avh"

config/kitty/kitty.conf

@@ -16,7 +16,7 @@ window_padding_width    8
 macos_option_as_alt     yes
 
 font_size               13
-adjust_line_height      110%
+modify_font cell_height 110%
 
 background_blur         10
 background_opacity      0.95

config/nvim/lua/plugins/file_types.lua

@@ -1,7 +1,7 @@
 return {
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function()
+    init = function()
       vim.filetype.add({
         pattern = {
           [".swcrc"] = "json",

config/nvim/lua/plugins/nvim-tree.lua

@@ -1,11 +1,13 @@
 return {
   "nvim-neo-tree/neo-tree.nvim",
   dependencies = {
-    "s1n7ax/nvim-window-picker",
-    version = "2.*",
-    config = function()
-      require("window-picker").setup()
-    end,
+    {
+      "s1n7ax/nvim-window-picker",
+      version = "2.*",
+      config = function()
+        require("window-picker").setup()
+      end,
+    },
   },
   opts = {
     filesystem = {

config/wezterm/wezterm.lua

@@ -13,7 +13,7 @@ config.window_padding = {
   bottom = 20,
 }
 config.front_end = "WebGpu"
-config.default_cwd = "/Users/nick/dev"
+config.default_cwd = wezterm.home_dir .. "/dev"
 
 ---@diagnostic disable-next-line: lowercase-global
 function get_appearance()
@@ -57,7 +57,7 @@ config.keys = {
   {
     key = "l",
     mods = "LEADER",
-    action = act.MoveTabRelative(-1),
+    action = act.MoveTabRelative(1),
   },
   {
     key = "h",

zshrc

@@ -49,21 +49,21 @@ _load_settings "$HOME/.zsh/configs"
 # fi
 
 # pnpm
-export PNPM_HOME="/Users/nick/Library/pnpm"
+export PNPM_HOME="$HOME/Library/pnpm"
 export PATH="$PNPM_HOME:$PATH"
 # pnpm end
 
 export PATH="$PATH:$HOME/.maestro/bin"
 
 # bun completions
-[ -s "/Users/nick/.bun/_bun" ] && source "/Users/nick/.bun/_bun"
+[ -s "$HOME/.bun/_bun" ] && source "$HOME/.bun/_bun"
 
 # bun
 export BUN_INSTALL="$HOME/.bun"
 export PATH="$BUN_INSTALL/bin:$PATH"
 
 # Created by `pipx` on 2024-04-02 16:38:45
-export PATH="$PATH:/Users/nick/.local/bin"
+export PATH="$PATH:$HOME/.local/bin"
 
 if command -v zoxide &> /dev/null 
 then