Changes for apple silicon, updates

Author: pggalaviz

fish/config.fish

@@ -18,9 +18,15 @@ set -x fish_color_autosuggestion blue
 set -x fish_color_error red
 # set gpg tty
 set -x GPG_TTY (eval tty)
+
 # PATH
+# for apple intel
 test -d /usr/local/bin  ;and set PATH /usr/local/bin  $PATH
 test -d /usr/local/sbin ;and set PATH /usr/local/sbin $PATH
+# for apple silicon
+test -d /opt/homebrew/bin  ;and set PATH /opt/homebrew/bin  $PATH
+test -d /opt/homebrew/sbin ;and set PATH /opt/homebrew/sbin $PATH
+
 # Set GO lang path
 test -d $HOME/go ;and set -x GOPATH $HOME/go ;and set PATH $GOPATH/bin $PATH
 test -d /usr/local/opt/go/libexec ;and set -x GOROOT /usr/local/opt/go/libexec ;and set PATH $GOROOT/bin $PATH
@@ -316,13 +322,21 @@ function dcr ; docker-compose run $argv ; end
 # Tree always with color
 function tc ; tree -C ; end
 
+function tunnel_webhook_api ; ssh -L6550:webhook-api-staging-v1.c3owtriowgpi.us-west-2.rds.amazonaws.com:5432 ssm-user@bzero-i-0135c06b28990deca ; end
+function tunnel_webhook_api_prod ; ssh -L6551:webhook-api-prod-db-v1.c3owtriowgpi.us-west-2.rds.amazonaws.com:5432 ssm-user@bzero-i-01772b4038ba99673 ; end
+
 # add asdf to $PATH
-# status --is-interactive; and source /usr/local/opt/asdf/asdf.fish
-# test -d /usr/local/opt/asdf/ ;and source /usr/local/opt/asdf/asdf.fish
+# for apple intel
 test -d /usr/local/opt/asdf/ ;and source /usr/local/opt/asdf/libexec/asdf.fish
+# for apple silicon
+test -d /opt/homebrew/opt/asdf/ ;and source /opt/homebrew/opt/asdf/libexec/asdf.fish
 
 # direnv config
 test -x /usr/local/bin/direnv ;and eval (direnv hook fish)
 
 # bat config
 test -x /usr/local/bin/bat ;and set -x BAT_THEME ansi-dark
+
+# custom
+
+set -x AWS_REGION us-west-2

fish/functions/fish_prompt.fish

@@ -1,11 +1,11 @@
 function _git_branch_name
-  echo (command git symbolic-ref HEAD ^/dev/null | sed -e 's|^refs/heads/||')
+  echo (command git symbolic-ref HEAD 2>/dev/null | sed -e 's|^refs/heads/||')
 end
 
 function _git_status_symbol
-  set -l git_status (git status --porcelain ^/dev/null)
+  set -l git_status (git status --porcelain 2>/dev/null)
   if test -n "$git_status"
-    if git status --porcelain ^/dev/null | grep '^.[^ ]' >/dev/null
+    if git status --porcelain 2>/dev/null | grep '^.[^ ]' >/dev/null
       echo '*' # dirty
     else
       echo '#' # all staged

gitconfig

@@ -1,10 +1,6 @@
 [user]
   name = Pedro G. Galaviz
   email = [email protected]
-	signingkey = 8A2AD35B2A837574
-
-[commit]
-	gpgsign = true
 
 [core]
   pager = delta
@@ -30,4 +26,4 @@
   diffFilter = delta --color-only
 
 [init]
-	defaultBranch = main
+  defaultBranch = main

nvim/init.lua

@@ -6,26 +6,44 @@
 " /_/   \___/\___/\_,_/_/\_,_/|___/_//__/
 
 
-scriptencoding utf-8
-set encoding=utf-8
+lua <<EOF
+print('hello from lua')
+
+vim.g.scriptencoding = 'utf-8'
+vim.g.encoding = 'utf-8'
+
+vim.g.config_path = '~/.config/nvim/'
+
+-- Python 3 is needed for some plugins to work
+vim.g.python3_host_prog = '/opt/homebrew/bin/python3'
+
+-- I like block & always blinking cursor
+vim.opt.guicursor = 'a:block-blinkwait100-blinkoff150-blinkon175'
+
+require('settings')
+
+EOF
+
+" scriptencoding utf-8
+" set encoding=utf-8
 
 " Use full Vim features
 set nocompatible
 
 " Config file path
-let g:config_path = "~/.config/nvim/"
+" let g:config_path = "~/.config/nvim/"
 
 " Function for sourcing config modules
 function! ConfigInc(module)
     execute 'source ' . fnameescape(g:config_path) . fnameescape(a:module)
 endfunction
 
 " Python 3 is needed for some plugins to work
-let g:python3_host_prog = '/usr/local/bin/python3'
+" let g:python3_host_prog = '/opt/homebrew/bin/python3'
 
 set termguicolors
 " I like block & always blinking cursor
-set guicursor=a:block-blinkwait100-blinkoff150-blinkon175
+" set guicursor=a:block-blinkwait100-blinkoff150-blinkon175
 
 " -------------------------------------------------------------------------------------------
 "  SETTINGS
@@ -151,6 +169,7 @@ vmap <leader>C <Plug>(sad-change-backward)
 " Move line down
 nmap ¶ <Plug>MoveLineDown
 nmap ∆ <Plug>MoveLineDown
+nmap <silent> <M-j> <Plug>MoveLineDown
 
 " Move block down
 vmap ¶ <Plug>MoveBlockDown
@@ -159,6 +178,7 @@ vmap ∆ <Plug>MoveBlockDown
 " Move line up
 nmap § <Plug>MoveLineUp
 nmap ˚ <Plug>MoveLineUp
+nmap <silent> <M-k> <Plug>MoveLineDown
 
 " Move block up
 vmap § <Plug>MoveBlockUp

nvim/init.vim

@@ -0,0 +1,10 @@
+
+-- -------------------------------------------------------------------------------------------
+-- SETTINGS
+-- -------------------------------------------------------------------------------------------
+
+-- Remap leader (Use space as leader)
+vim.g.mapleader = ' '
+
+-- Map local leader
+vim.g.maplocalleader = ','

nvim/lua/settings.lua

@@ -23,9 +23,9 @@ autocmd FileType denite-filter call s:denite_filter_settings()
 
 function! s:denite_filter_settings() abort
   imap <silent><buffer> kj
-        \ <Plug>(denite_filter_quit)
+        \ <Plug>(denite_filter_update)
   imap <silent><buffer> jk
-        \ <Plug>(denite_filter_quit)
+        \ <Plug>(denite_filter_update)
   inoremap <silent><buffer><expr> <Esc>
         \ denite#do_map('quit')
   nnoremap <silent><buffer><expr> <Esc>

nvim/plugin/denite.vim

@@ -134,7 +134,8 @@ Plug 'Shougo/neco-syntax'           " Syntax source
 Plug 'github/copilot.vim'
 
 " Language Server Protocol (LSP)
-Plug 'autozimu/LanguageClient-neovim', { 'branch': 'next', 'do': 'bash install.sh' }
+" Plug 'autozimu/LanguageClient-neovim', { 'branch': 'next', 'do': 'bash install.sh' }
+Plug 'neovim/nvim-lspconfig'        " Neovim LSP
 
 " Snippets
 Plug 'Shougo/neosnippet.vim'        " Snippets support

nvim/plugins.vim

@@ -4,9 +4,9 @@
 " -------------------------------------------------------------------------------------------
 
 " Remap leader (Use space as leader)
-let g:mapleader = ' '
+" let g:mapleader = ' '
 " Map local leader
-let g:maplocalleader = ','
+" let g:maplocalleader = ','
 
 " Release keymappings prefixes, evict entirely for use of plug-ins.
 nnoremap <Space> <Nop>

nvim/settings.vim

@@ -13,7 +13,9 @@ else
   echo_item "Homebrew is not installed and is required for configuration!" yellow
   if get_boolean_response "Do you want to install Homebrew?"; then
     echo_item "Installing Homebrew, this can take some time..." yellow
+
     /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+
     echo_item "Done!" green
   else
     echo_item "Skipping Homebrew installation..." red
@@ -47,28 +49,6 @@ echo "--------------------------------------------------------------------------
 
 
 
-# Install Node -----------------------------------------------------------------
-# ------------------------------------------------------------------------------
-if exists "node"; then
-  echo_item "Node.js is correctly installed." green
-else
-  echo_item "Node.js is not installed and is required for some tools to work." yellow
-  if get_boolean_response "Do you want to install Node?"; then
-    echo_item "Installing Node..." yellow
-    brew install node
-    brew install yarn
-    # Centralize global npm packages for different node versions
-    echo "prefix = /usr/local" > ~/.npmrc
-    echo_item "Done!" green
-  else
-    echo_item "Skipping Node.js installation..." red
-    echo_item "Node is a very useful tool, you'll probably need it."
-  fi
-fi
-echo "--------------------------------------------------------------------------"
-
-
-
 # Install Utilities ------------------------------------------------------------
 # ------------------------------------------------------------------------------
 packages=(
@@ -77,10 +57,6 @@ packages=(
 "gpg"
 "python3"
 "tree"
-"reattach-to-user-namespace"
-"minikube"
-"kubernetes-cli"
-"redis"
 "direnv"
 "bat"
 "git-delta"
@@ -90,7 +66,6 @@ do
   brew install $i
   echo "--------"
 done
-brew services start redis
 echo_item "Done!" green
 echo "--------------------------------------------------------------------------"
 
@@ -119,15 +94,11 @@ echo "Includes: flux, divvy, keka, macdown and others..."
 if get_boolean_response "Do you want to install this apps?"; then
   echo_item "Installing apps..." yellow
   apps=(
-  "phoenix"
   "flux"
   "keka"
   "macdown"
   "the-unarchiver"
   "appcleaner"
-  "postgres"
-  "kitematic"
-  "alacritty"
   )
   for i in "${apps[@]}"
   do
@@ -152,7 +123,7 @@ if get_boolean_response "Do you want to install and use Fish shell?"; then
   echo_item "Installing Fish shell..." yellow
   brew install fish
   echo_item "Changing to Fish shell... Might require password:" yellow
-  echo /usr/local/bin/fish | sudo tee -a /etc/shells
+  echo $(which fish) | sudo tee -a /etc/shells
   chsh -s $(which fish)
   echo_item "Fish shell successfully installed!" green
   echo "--------------------------------------------------------------------------"
@@ -179,25 +150,6 @@ echo "--------------------------------------------------------------------------
 
 
 
-# Install Hyper.js -------------------------------------------------------------
-# ------------------------------------------------------------------------------
-echo_item "Hyper.js terminal:" blue
-if get_boolean_response "Do you want to install Hyper.js Terminal?"; then
-  echo_item "Installing Hyper.js..." yellow
-  brew install hyper
-  echo_item "Hyper.js successfully installed!" green
-  echo "--------------------------------------------------------------------------"
-  echo_item "Symlinking Hyper.js configuration..." yellow
-  ln -sf `pwd`/hyper/hyper.js ~/.hyper.js
-  echo_item "Done!" green
-else
-  echo_item "Skipping Hyper.js installation..." red
-  echo_item "You'll need a true color terminal emulator like iTerm2 or Hyper.js"
-fi
-echo "--------------------------------------------------------------------------"
-
-
-
 # Install asdf ----------------------------------------------------------------
 # ------------------------------------------------------------------------------
 echo_item "asdf version manager (manage many languages versions):" blue
@@ -208,6 +160,7 @@ if get_boolean_response "Do you want to install asdf?"; then
   asdf plugin-add erlang
   asdf plugin-add elixir
   asdf plugin-add nodejs
+  asdf install nodejs 20.11.1
   echo_item "asdf successfully installed!" green
 else
   echo_item "Skipping asdf installation..."
@@ -259,13 +212,15 @@ if get_boolean_response "Do you want to install Neovim?"; then
   mkdir -p ~/.config/nvim
   mkdir -p ~/.config/nvim/plugin
   ln -sf `pwd`/nvim/init.vim ~/.config/nvim/
+  ln -sf `pwd`/nvim/init.lua ~/.config/nvim/
   ln -sf `pwd`/nvim/plugins.vim ~/.config/nvim/
   ln -sf `pwd`/nvim/functions.vim ~/.config/nvim/
   ln -sf `pwd`/nvim/autocmds.vim ~/.config/nvim/
   ln -sf `pwd`/nvim/keybindings.vim ~/.config/nvim/
   ln -sf `pwd`/nvim/settings.vim ~/.config/nvim/
   ln -sf `pwd`/nvim/editorconfig ~/.editorconfig
   ln -sf `pwd`/nvim/plugin/*.vim ~/.config/nvim/plugin/
+  ln -sf `pwd`/nvim/lua/*.lua ~/.config/nvim/lua/
   echo_item "Done!" green
   echo "--------------------------------------------------------------------------"
   echo_item "Downloading Neovim python 3 client..." yellow
@@ -309,15 +264,13 @@ modules=(
 "standard"
 "prettier"
 "javascript-typescript-langserver"
-"vue-language-server"
 )
 echo_item "Node Global Packages:" blue
 echo_item "Packages:"
 echo "- standard (JS style, linting & formater)"
 echo "- prettier (Style formater for css, json and scss)"
 echo "- tern (required for Neovim JS linting)"
 echo "- javascript-typescript-langserver (Language Server for Javascript)\n"
-echo "- vue-language-server (Language Server for Vue.js)\n"
 if get_boolean_response "Do you want to install these global packages?"; then
   if get_boolean_response "Do you want to use yarn?"; then
     echo_item "Installing packages with yarn..." yellow
@@ -375,7 +328,7 @@ echo "--------------------------------------------------------------------------
 echo_item "Elixir:" blue
 if get_boolean_response "Do you want to install the Elixir programming language?"; then
   echo_item "Installing Elixir..." yellow
-  brew install elixir
+  asdf install elixir 1.16.1-otp-26
   echo_item "Elixir successfully installed!" green
 else
   echo_item "Skipping Elixir installation..."
@@ -384,20 +337,6 @@ echo "--------------------------------------------------------------------------
 
 
 
-# Install Crystal --------------------------------------------------------------
-# ------------------------------------------------------------------------------
-echo_item "Crystal:" blue
-if get_boolean_response "Do you want to install the Crystal programming language?"; then
-  echo_item "Installing Crystal..." yellow
-  brew install crystal-lang
-  echo_item "Crystal successfully installed!" green
-else
-  echo_item "Skipping Crystal installation..."
-fi
-echo "--------------------------------------------------------------------------"
-
-
-
 # Install Rust -----------------------------------------------------------------
 # ------------------------------------------------------------------------------
 echo_item "Rust:" blue
@@ -423,10 +362,8 @@ echo "--------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
 echo_item "Ctags:" blue
 if get_boolean_response "Do you want to install Ctags?"; then
-  echo_item "Brew tapping Universal Ctags..." yellow
-  brew tap universal-ctags/universal-ctags
   echo_item "Installing Universal Ctags..." yellow
-  brew install --HEAD universal-ctags
+  brew install universal-ctags
   echo_item "Done!" green
   echo "--------------------------------------------------------------------------"
   echo_item "Symlinking custom Ctags..." yellow
@@ -480,17 +417,6 @@ ln -sf `pwd`/default-gems ~/.default-gems
 ln -sf `pwd`/gitconfig ~/.gitconfig
 ln -sf `pwd`/gitignore_global ~/.gitignore_global
 
-echo_item "Creating phoenix symlinks..." yellow
-mkdir -p ~/.config/phoenix
-mkdir -p ~/.config/phoenix/config
-mkdir -p ~/.config/phoenix/helpers
-mkdir -p ~/.config/phoenix/shortcuts
-mkdir -p ~/.config/phoenix/spaces
-ln -sf `pwd`/phoenix/phoenix.js ~/.config/phoenix/
-ln -sf `pwd`/phoenix/config/*.js ~/.config/phoenix/config/
-ln -sf `pwd`/phoenix/helpers/*.js ~/.config/phoenix/helpers/
-ln -sf `pwd`/phoenix/shortcuts/*.js ~/.config/phoenix/shortcuts/
-ln -sf `pwd`/phoenix/spaces/*.js ~/.config/phoenix/spaces/
 
 
 echo_item "All done here!" blue