[git] Added delta pager

.config/nvim/lua/plugins/lazy.lua

@@ -46,15 +46,6 @@ lazy.setup({
         ft = { "python", "json" },
     },
 
-    {
-        "zbirenbaum/copilot.lua",
-        cmd = "Copilot",
-        event = "InsertEnter",
-        config = function()
-            require("plugins.copilot")
-        end,
-    },
-
     --Nvim to browser
     "subnut/nvim-ghost.nvim",
 

.config/nvim/lua/plugins/lspconfig.lua

@@ -75,7 +75,7 @@ mason_lspconfig.setup_handlers({
             end,
         })
     end,
-    ["basedpyright"] = function ()
+    ["basedpyright"] = function()
         lspconfig["basedpyright"].setup({
             capabilities = capabilities,
             settings = {
@@ -92,7 +92,7 @@ mason_lspconfig.setup_handlers({
                 },
             },
         })
-    end
+    end,
 })
 
 

.config/skhd/skhdrc

@@ -11,13 +11,14 @@ cmd - u : yabai --load-sa && yabai --restart # Assuming you have scripting addit
 cmd - h : yabai -m window --resize right:-20:0
 cmd - l : yabai -m window --resize left:20:0
 
+
 # Focus workspaces 1 through 6
-cmd - 1 : index=$(yabai -m query --spaces --space | jq .display); yabai -m space 1 --display ${index}; yabai -m space --focus 1
-cmd - 2 : index=$(yabai -m query --spaces --space | jq .display); yabai -m space 2 --display ${index}; yabai -m space --focus 2
-cmd - 3 : index=$(yabai -m query --spaces --space | jq .display); yabai -m space 3 --display ${index}; yabai -m space --focus 3
-cmd - 4 : index=$(yabai -m query --spaces --space | jq .display); yabai -m space 4 --display ${index}; yabai -m space --focus 4
-cmd - 5 : index=$(yabai -m query --spaces --space | jq .display); yabai -m space 5 --display ${index}; yabai -m space --focus 5
-cmd - 6 : index=$(yabai -m query --spaces --space | jq .display); yabai -m space 6 --display ${index}; yabai -m space --focus 6
+cmd - 1 : index=$(yabai -m query --spaces --space | jq .display); yabai -m display --focus ${index}; yabai -m space --focus 1
+cmd - 2 : index=$(yabai -m query --spaces --space | jq .display); yabai -m display --focus ${index}; yabai -m space --focus 2
+cmd - 3 : index=$(yabai -m query --spaces --space | jq .display); yabai -m display --focus ${index}; yabai -m space --focus 3
+cmd - 4 : index=$(yabai -m query --spaces --space | jq .display); yabai -m display --focus ${index}; yabai -m space --focus 4
+cmd - 5 : index=$(yabai -m query --spaces --space | jq .display); yabai -m display --focus ${index}; yabai -m space --focus 5
+cmd - 6 : index=$(yabai -m query --spaces --space | jq .display); yabai -m display --focus ${index}; yabai -m space --focus 6
 
 # Move window between monitor
 cmd + shift - e: yabai -m window --display next

.config/tmux/tmux_general.conf

@@ -7,7 +7,7 @@ set -g mouse on
 set -g base-index 1
 set -g pane-base-index 1
 set -g detach-on-destroy off
-set -g history-limit 10000
+set -g history-limit 250000
 set -g set-clipboard on
 set -g status-position top  
 set -g renumber-windows on
@@ -15,3 +15,5 @@ setw -g mode-keys vi
 set -g status-style 'bg=#181926 fg=#cad3f5'
 set -g status-right ""
 set -g status-left-length 20
+set-option -g default-command /bin/zsh
+set-option -g default-shell /bin/zsh

.config/yabai/yabairc

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 yabai -m signal --add event=dock_did_restart action="sudo yabai --load-sa"
 sudo yabai --load-sa
 
@@ -9,10 +11,18 @@ yabai -m config focus_follows_mouse autofocus
 yabai -m config window_placement first_child
 yabai -m config window_placement second_child
 
-yabai -m rule --add app="^Firefox$" space=2
+yabai -m rule --add app="^Firefox$" space=two
 # Add more rules based on your applications and workspace preferences
 
 
+
+yabai -m space 1 --label one
+yabai -m space 2 --label two 
+yabai -m space 3 --label three
+yabai -m space 4 --label four
+yabai -m space 5 --label five
+yabai -m space 6 --label six
+
 #Indicator
 yabai -m signal --add event=mission_control_exit action='echo "refresh" | nc -U /tmp/yabai-indicator.socket'
 yabai -m signal --add event=display_added action='echo "refresh" | nc -U /tmp/yabai-indicator.socket'

.config/zsh/main.zsh

@@ -33,6 +33,4 @@ enable-fzf-tab
 # opam configuration
 source $HOME/.opam/opam-init/init.zsh > /dev/null 2>&1 || true
 
-eval "$(zoxide init zsh)"
-
 eval "$(direnv hook zsh)"

.config/zsh/replacements.zsh

@@ -4,10 +4,6 @@ ls() {
     eza --icons -l --sort type "$@"
 }
 
-cd(){
-    z "$@"
-}
-
 nvim() {
     /opt/homebrew/bin/nvim --listen /tmp/nvim.pipe "$@"
 }

.gitconfig

@@ -1,25 +1,34 @@
 [user]
- email = afonso@francof.net
- name = afonso
- signingkey = ~/.ssh/simple_sk
+    email = afonso@francof.net
+    name = afonso
+    signingkey = ~/.ssh/simple_sk
 [includeIf "hasconfig:remote.*.url:https://github.com/**"]
- path = ~/.gitconfig-gh
+    path = ~/.gitconfig-gh
 [includeIf "hasconfig:remote.*.url:ssh://git@github.com/**"]
- path = ~/.gitconfig-gh
+    path = ~/.gitconfig-gh
 [filter "lfs"]
- process = git-lfs filter-process
- required = true
- clean = git-lfs clean -- %f
- smudge = git-lfs smudge -- %f
+    process = git-lfs filter-process
+    required = true
+    clean = git-lfs clean -- %f
+    smudge = git-lfs smudge -- %f
 [core]
- autocrlf = input
+    autocrlf = input
+    pager = delta
+[interactive]
+    diffFilter = delta --color-only
+[delta]
+    navigate = true
+[merge]
+    conflictstyle = diff3
+[diff]
+    colorMoved = default
 [commit]
- gpgsign = true
+    gpgsign = true
 [gpg]
- format = ssh
+    format = ssh
 [tag]
- gpgsign = true
+    gpgsign = true
 [pull]
-	rebase = false
+    rebase = false
 [init]
-	defaultBranch = main
+    defaultBranch = main

.zshenv

@@ -17,5 +17,6 @@ export PATH="$HOME/.ghcup/bin:$PATH"
 export DYLD_LIBRARY_PATH="/opt/homebrew/lib:$DYLD_LIBRARY_PATH"
 export JAVA_HOME="/opt/homebrew/opt/openjdk@17/libexec/openjdk.jdk/Contents/Home"
 export PATH="$HOME/.miniforge3/bin:$PATH"
+export PATH="/opt/homebrew/opt/texlive/bin/:$PATH"
 eval "$(/opt/homebrew/bin/brew shellenv)"
 

.zshrc

@@ -120,15 +120,20 @@ source $ZSH/oh-my-zsh.sh
 
 # >>> conda initialize >>>
 # !! Contents within this block are managed by 'conda init' !!
-__conda_setup="$('/Users/afonso/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
+__conda_setup="$('/Users/afonso/.miniforge3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
 if [ $? -eq 0 ]; then
     eval "$__conda_setup"
 else
-    if [ -f "/Users/afonso/miniconda3/etc/profile.d/conda.sh" ]; then
-        . "/Users/afonso/miniconda3/etc/profile.d/conda.sh"
+    if [ -f "/Users/afonso/.miniforge3/etc/profile.d/conda.sh" ]; then
+        . "/Users/afonso/.miniforge3/etc/profile.d/conda.sh"
     else
-        export PATH="/Users/afonso/miniconda3/bin:$PATH"
+        export PATH="/Users/afonso/.miniforge3/bin:$PATH"
     fi
 fi
 unset __conda_setup
+
+if [ -f "/Users/afonso/.miniforge3/etc/profile.d/mamba.sh" ]; then
+    . "/Users/afonso/.miniforge3/etc/profile.d/mamba.sh"
+fi
 # <<< conda initialize <<<
+