From d24b4cbd2a657782949509fbe992f964f7eda7c1 Mon Sep 17 00:00:00 2001
From: Felix Suchert <dev@felixsuchert.de>
Date: Tue, 12 Nov 2024 13:21:11 -0500
Subject: [PATCH] update scripts from fixing errors

---
 pallas/create_home.sh       | 20 +++++++++++++-------
 pallas/nvim/lazy-lock.json  |  2 +-
 pallas/terminal/config.fish | 13 ++-----------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/pallas/create_home.sh b/pallas/create_home.sh
index e46cfd7..6e05979 100755
--- a/pallas/create_home.sh
+++ b/pallas/create_home.sh
@@ -68,11 +68,17 @@ xcode-select --install
 if test ! $(which brew); then
     /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
 fi
+echo >> /Users/felix/.zprofile
+echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> /Users/felix/.zprofile
+eval "$(/opt/homebrew/bin/brew shellenv)"
 
 printf "\033[33m[info] Installing some basic binaries\033[39m"
 brew install fish
-sudo echo "/usr/local/bin/fish" >> /etc/shells
-chsh -s /usr/local/bin/fish
+sudo echo "/opt/homebrew/bin/fish" >> /etc/shells
+chsh -s /opt/homebrew/bin/fish
+
+# required for Intel applications
+softwareupdate --install-rosetta --agree-to-license
 
 binaries=(
     pass
@@ -116,7 +122,6 @@ binaries=(
     tree
     tree-sitter
     tmux
-    sigtop
     ripgrep
     qrencode
     python
@@ -134,7 +139,7 @@ binaries=(
     audacity
     calibre
     discord
-    docker
+    homebrew/cask/docker
     dropbox
     firefox@nightly
     font-hack-nerd-font
@@ -152,9 +157,9 @@ binaries=(
     mactex
     magicavoxel
     mark-text
-    neovide
+    homebrew/cask/neovide
     obsidian
-    openttd
+    homebrew/cask/openttd
     signal
     spotify
     steam
@@ -175,6 +180,8 @@ binaries=(
 
 brew install ${binaries[@]}
 
+brew install --HEAD tbvdm/tap/sigtop
+
 
 printf "\033[33m[info] Cloning password store\033[39m"
 git clone git@code.dummyco.de:feliix42/pass.git ~/.password-store
@@ -194,7 +201,6 @@ ln -s $PWD/mail/neomutt ~/.config/neomutt
 printf "\033[33m[info] Setting up Fish Shell\033[39m"
 mkdir -p ~/.config/fish/
 ln -s $PWD/terminal/config.fish ~/.config/fish/config.fish
-git clone git@github.com:oh-my-fish/plugin-foreign-env.git ~/.config/fish/plugin-foreign-env
 
 printf "\033[33m[info] Setting up vim\033[39m"
 
diff --git a/pallas/nvim/lazy-lock.json b/pallas/nvim/lazy-lock.json
index 53a8d5c..5ef9d6a 100644
--- a/pallas/nvim/lazy-lock.json
+++ b/pallas/nvim/lazy-lock.json
@@ -12,7 +12,7 @@
   "fzf.vim": { "branch": "master", "commit": "ec75ffbfd50630bf2b8d444d89487e149bacf7f3" },
   "gruvbox-baby": { "branch": "main", "commit": "bd52e62d8134647090108189e69c8b3cd18bdbbf" },
   "hledger-vim": { "branch": "master", "commit": "f9b4171f0ce2562dd804305a1ed087eaf6a4f028" },
-  "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" },
+  "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
   "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
   "neoformat": { "branch": "master", "commit": "d9d3311097eacdba9bd7a425b267d304b509e7ea" },
   "nerdcommenter": { "branch": "master", "commit": "3f860f2d981547c18f2c9599e3c358ea488c3be4" },
diff --git a/pallas/terminal/config.fish b/pallas/terminal/config.fish
index f59158d..fe2c32b 100644
--- a/pallas/terminal/config.fish
+++ b/pallas/terminal/config.fish
@@ -9,10 +9,9 @@ export LC_NUMERIC="de_DE.UTF-8"
 export LC_TIME="de_DE.UTF-8"
 export LC_ALL="en_GB.UTF-8"
 
-export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:/usr/local/opt/gnu-sed/libexec/gnubin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/Library/TeX/texbin:$HOME/.cargo/bin:$HOME/.local/bin:$HOME/Library/Python/3.8/bin"
+fish_add_path /opt/homebrew/bin
+#export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:/usr/local/opt/gnu-sed/libexec/gnubin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/Library/TeX/texbin:$HOME/.cargo/bin:$HOME/.local/bin:$HOME/Library/Python/3.8/bin"
 
-# kitty terminal emulator auto completion
-# kitty + complete setup fish | source
 
 # fancier ls
 alias ls="lsd"
@@ -53,11 +52,3 @@ end
 # set up GPG pinentry
 set -gx GPG_TTY (tty)
 
-###### Nix Setup ######
-# include this plugin so nix will work
-# https://github.com/NixOS/nix/issues/1512
-# https://github.com/oh-my-fish/plugin-foreign-env
-set fish_function_path $fish_function_path $HOME/.config/fish/plugin-foreign-env/functions
-
-# initialize nix
-fenv source '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'