Merge branch 'main' of gitlab.com:gaiety/dotfiles

README.md

@@ -7,9 +7,11 @@ Designed for Linux (Arch) and MacOS.
 
 Several tools can find configs by setting the fish variable below:
 
+First [follow the steps to install and use the fish shell](./fish/README.md)
+
 ```bash
 set -Ux XDG_CONFIG_HOME {location_of_dotfiles}
-sudo pacman -S ripgrep
+sudo pacman -S ripgrep # brew install ripgrep
 sudo pacman -S sed
 ```
 

fish/README.md

@@ -7,8 +7,8 @@ A terminal shell
 ## Setup
 
 ```bash
-sudo pacman -S fish
-chsh -s `which fish`
+sudo pacman -S fish # brew install fish
+chsh -s `which fish` # chsh -s /usr/local/bin/fish
 echo "source {location_of_dotfiles}/fish/config.fish" >> ~/.config/fish/config.fish
 ```
 
@@ -21,12 +21,3 @@ fish_config
 1. Choose the `dracula` color scheme
 2. Choose the `Terlar` prompt
 
-Add the following to the `~/.config/fish/config.fish`
-
-```
-if status is-interactive
-and not set -q TMUX
-    exec tmux
-end
-```
-

fish/config.fish

@@ -1,3 +1,4 @@
+set fish_greeting
 if status is-interactive
 and not set -q TMUX
     exec tmux

fish/fish_variables

@@ -1,5 +1,6 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
+SETUVAR --export XDG_CONFIG_HOME:/Users/gaiety/dotfiles/
 SETUVAR __fish_initialized:3100
 SETUVAR fish_color_autosuggestion:BD93F9
 SETUVAR fish_color_cancel:\x2dr

kitty/README.md

@@ -7,7 +7,7 @@ Terminal for Arch
 ## Setup
 
 ```bash
-sudo pacman -S kitty
+sudo pacman -S kitty # brew install --cask kitty
 ```
 
 Edit `~/.config/kitty/kitty.conf` to have `include {location_of_dotfiles}/kitty/kitty.conf`

kitty/kitty.conf

@@ -1,7 +1,7 @@
 include ./dracula.conf
 
-font_family monoid
-font_size 30.0
+font_family Hack Nerd Font Mono
+font_size 20.0
 enable_audio_bell false
 
 placement_strategy top-center

tmux/README.md

@@ -7,7 +7,7 @@ A terminal multiplexer
 ## Setup
 
 ```bash
-sudo pacman -S tmux
+sudo pacman -S tmux # brew install tmux
 git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm # install tpm plugin manager
 echo "source-file {location_of_dotfiles}/tmux/.tmux.conf" > ~/.tmux.conf
 ```