Merge branch 'master' of github.com:js0ny/dotfiles

common/lazygit.yaml

@@ -3,9 +3,10 @@
 # Author: js0ny
 
 # Location:
-# macOS: ~/Library/Application Support/lazygit/config.yml
-# Linux: ~/.config/lazygit/config.yml
+# *nix: ~/.config/lazygit/config.yml
 # Windows: %APPDATA%\lazygit\config.yml
+# Linking:
+# ln -sf ~/.dotfiles/common/lazygit.yaml ~/.config/lazygit/config.yml
 
 yaml-language-server: $schema=https://raw.githubusercontent.com/jesseduffield/lazygit/master/schema/config.json
 # Config relating to the Lazygit UI

tools/fish/conf.d/0init.fish

@@ -31,6 +31,9 @@ else if test -d /home/linuxbrew/.linuxbrew/bin # Linux
     set -gx PATH /home/linuxbrew/.linuxbrew/bin $PATH
 end
 
+if command -v brew > /dev/null
+    set -gx HOMEBREW_NO_ENV_HINTS
+end
 
 # Azure CLI
 if command -v az > /dev/null

tools/fish/conf.d/alias.fish

@@ -67,3 +67,7 @@ if command -v pacman > /dev/null
     abbr --add pacr "sudo pacman -R"
     abbr --add pacu "sudo pacman -Syu"
 end
+
+if test "$TERM" = "xterm-ghostty" -o "$TERM" = "xterm-kitty"
+    abbr --add icat "kitten icat"
+end

tools/fish/config.fish

@@ -15,6 +15,15 @@ if status is-interactive
         # macOS Specific
         abbr --add clip pbcopy
         abbr --add paste pbpaste
+        # Use GNU Coreutils
+        alias cp=gcp
+        alias ln=gln
+        alias mkdir=gmkdir
+        alias mv=gmv
+        alias rm=grm
+        alias rmdir=grmdir
+        alias touch=gtouch
+
     case "Linux"
         # Linux Specific
     case '*'

tools/nvim/lua/plugins/mod/obsidian-nvim.lua

@@ -21,7 +21,7 @@ return {
     workspaces = {
       {
         name = "personal",
-        path = "~/winhome/Obsidian",
+        path = "~/Obsidian",
       },
     },
     completion = {

tools/wezterm/wezterm.lua

@@ -251,6 +251,8 @@ if os_type == "Windows" then
       args = { "wsl.exe", "-d", "Arch", "zsh" },
     },
   }
+elseif os_type == "macOS" then
+  config.default_prog = { "/opt/homebrew/bin/fish", "-l"}
 else
   config.default_prog = { "fish" }
   config.launch_menu = {