diff --git a/fish/README.md b/fish/README.md deleted file mode 100644 index 3982b09..0000000 --- a/fish/README.md +++ /dev/null @@ -1,23 +0,0 @@ -# Gaiety's Dotfiles - -## fish - -A terminal shell - -## Setup - -```bash -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 -``` - -Log out, then back in - -```bash -fish_config -``` - -1. Choose the `dracula` color scheme -2. Choose the `Terlar` prompt - diff --git a/fish/config.fish b/fish/config.fish deleted file mode 100644 index dfc980b..0000000 --- a/fish/config.fish +++ /dev/null @@ -1,6 +0,0 @@ -set fish_greeting -if status is-interactive -and not set -q TMUX - exec tmux -end -source ~/.asdf/asdf.fish diff --git a/fish/fish_variables b/fish/fish_variables deleted file mode 100644 index e343a85..0000000 --- a/fish/fish_variables +++ /dev/null @@ -1,33 +0,0 @@ -# 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 -SETUVAR fish_color_command:F8F8F2 -SETUVAR fish_color_comment:6272A4 -SETUVAR fish_color_cwd:green -SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:50FA7B -SETUVAR fish_color_error:FFB86C -SETUVAR fish_color_escape:00a6b2 -SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:normal -SETUVAR fish_color_host_remote:yellow -SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue -SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:00a6b2 -SETUVAR fish_color_param:FF79C6 -SETUVAR fish_color_quote:F1FA8C -SETUVAR fish_color_redirection:8BE9FD -SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_status:red -SETUVAR fish_color_user:brgreen -SETUVAR fish_color_valid_path:\x2d\x2dunderline -SETUVAR fish_greeting:\x1d -SETUVAR fish_key_bindings:fish_default_key_bindings -SETUVAR fish_pager_color_completion:normal -SETUVAR fish_pager_color_description:B3A06D\x1eyellow -SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline -SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan diff --git a/fish/functions/fish_prompt.fish b/fish/functions/fish_prompt.fish deleted file mode 100644 index a947d88..0000000 --- a/fish/functions/fish_prompt.fish +++ /dev/null @@ -1,33 +0,0 @@ -function fish_prompt --description 'Write out the prompt' - set -l last_status $status - - # User - set_color $fish_color_user - echo -n $USER - set_color normal - - echo -n '@' - - # Host - set_color $fish_color_host - echo -n (prompt_hostname) - set_color normal - - echo -n ':' - - # PWD - set_color $fish_color_cwd - echo -n (prompt_pwd) - set_color normal - - __terlar_git_prompt - fish_hg_prompt - echo - - if not test $last_status -eq 0 - set_color $fish_color_error - end - - echo -n '➤ ' - set_color normal -end diff --git a/hack-font/README.md b/hack-font/README.md deleted file mode 100644 index 7c78208..0000000 --- a/hack-font/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# Gaiety's Dotfiles - -## [Hack Font (Ligatures with Nerd Font Icons)](https://github.com/pyrho/hack-font-ligature-nerd-font) - -Programming Font with Ligatures and Nerd Font Icons - -## Setup - -[Download](https://github.com/pyrho/hack-font-ligature-nerd-font) `.ttf` fonts, extract to `~/.local/share/fonts/` diff --git a/init b/init new file mode 100644 index 0000000..8f1a34a --- /dev/null +++ b/init @@ -0,0 +1,7 @@ +BASEDIR=$(cd $(dirname $0) && pwd) + +mkdir -p ~/.config/nvim +ln -sf $BASEDIR/nvim/init.vim ~/.config/nvim/init.vim + +rm -f ~/.zshrc +echo source $BASEDIR/.zshrc >> ~/.zshrc diff --git a/kitty/README.md b/kitty/README.md deleted file mode 100644 index 73a06a5..0000000 --- a/kitty/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# Gaiety's Dotfiles - -## Kitty - -Terminal for Arch - -## Setup - -```bash -sudo pacman -S kitty # brew install --cask kitty -``` - -Edit `~/.config/kitty/kitty.conf` to have `include {location_of_dotfiles}/kitty/kitty.conf` - diff --git a/kitty/dracula.conf b/kitty/dracula.conf deleted file mode 100644 index 8bee635..0000000 --- a/kitty/dracula.conf +++ /dev/null @@ -1,62 +0,0 @@ -# https://draculatheme.com/kitty -# -# Installation instructions: -# -# cp dracula.conf ~/.config/kitty/ -# echo "include dracula.conf" >> ~/.config/kitty/kitty.conf -# -# Then reload kitty for the config to take affect. -# Alternatively copy paste below directly into kitty.conf - -foreground #f8f8f2 -background #282a36 -selection_foreground #ffffff -selection_background #44475a - -url_color #8be9fd - -# black -color0 #21222c -color8 #6272a4 - -# red -color1 #ff5555 -color9 #ff6e6e - -# green -color2 #50fa7b -color10 #69ff94 - -# yellow -color3 #f1fa8c -color11 #ffffa5 - -# blue -color4 #bd93f9 -color12 #d6acff - -# magenta -color5 #ff79c6 -color13 #ff92df - -# cyan -color6 #8be9fd -color14 #a4ffff - -# white -color7 #f8f8f2 -color15 #ffffff - -# Cursor colors -cursor #f8f8f2 -cursor_text_color background - -# Tab bar colors -active_tab_foreground #282a36 -active_tab_background #f8f8f2 -inactive_tab_foreground #282a36 -inactive_tab_background #6272a4 - -# Marks -mark1_foreground #282a36 -mark1_background #ff5555 diff --git a/kitty/kitty.conf b/kitty/kitty.conf deleted file mode 100644 index 78fc6fd..0000000 --- a/kitty/kitty.conf +++ /dev/null @@ -1,11 +0,0 @@ -include ./dracula.conf - -font_family Hack Nerd Font Mono -font_size 20.0 -enable_audio_bell false - -placement_strategy top-center -remember_window_size false -initial_window_width 3840 -initial_window_height 1000 -clipboard_control no-append write-clipboard write-primary diff --git a/nvim/init.vim b/nvim/init.vim index 987ec0c..abb89b3 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -1,3 +1,2 @@ -source $XDG_CONFIG_HOME/nvim/config.vim -source $XDG_CONFIG_HOME/nvim/plugins.vim -source $XDG_CONFIG_HOME/nvim/keybindings.vim +set number +set relativenumber diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf deleted file mode 100644 index 07651ea..0000000 --- a/tmux/.tmux.conf +++ /dev/null @@ -1,30 +0,0 @@ -# status bar to top -set-option -g status-position top - -# enable focus events -set -g focus-events on - -# Correct numbering -set -g base-index 1 -set -g pane-base-index 1 -set -g renumber-windows on - -# Mappings -## |,- Split panes -bind-key \\ split-window -h -c '#{pane_current_path}' # Split panes horizontally -bind-key - split-window -v -c '#{pane_current_path}' # Split panes vertically -## h,j,k,l to switch pane -bind h select-pane -L -bind j select-pane -D -bind k select-pane -U -bind l select-pane -R - -# plugins -set -g @plugin 'tmux-plugins/tpm' -set -g @plugin 'tmux-plugins/tmux-sensible' -set -g @plugin 'christoomey/vim-tmux-navigator' -set -g @plugin 'dracula/tmux' -set -g @plugin 'tmux-plugins/tmux-sidebar' - -# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) -run '~/.tmux/plugins/tpm/tpm' diff --git a/tmux/README.md b/tmux/README.md deleted file mode 100644 index 8832d94..0000000 --- a/tmux/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# Gaiety's Dotfiles - -## Tmux - -A terminal multiplexer - -## Setup - -```bash -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 -``` - -`ctrl+b + I` to install plugins