Merge branch 'master' of github.com:JoeSharp/kickstart.nvim

This commit is contained in:
Joe Sharp 2024-01-17 18:43:46 +00:00
commit 0decf1a304
2 changed files with 15 additions and 2 deletions

View File

@ -8,6 +8,12 @@ wget https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20R
wget https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20Bold.ttf wget https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20Bold.ttf
wget https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20Italic.ttf wget https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20Italic.ttf
wget https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20Bold%20Italic.ttf wget https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20Bold%20Italic.ttf
# Place fonts in
/usr/local/share/fonts/
# Then run
sudo fc-cache -fv
``` ```
## Install command line stuff ## Install command line stuff
@ -18,8 +24,9 @@ tmux
# Shell # Shell
## ZSH (standard with mac) ## ZSH (standard with mac)
https://github.com/ohmyzsh/ohmyzsh/wiki/Installing-ZSH https://github.com/ohmyzsh/ohmyzsh/wiki/Installing-ZSH
=======
| OS | PATH | | OS | PATH |
| :- | :--- | | :- | :--- |
| Linux | `$XDG_CONFIG_HOME/nvim`, `~/.config/nvim` | | Linux | `$XDG_CONFIG_HOME/nvim`, `~/.config/nvim` |
@ -35,6 +42,7 @@ https://github.com/ohmyzsh/ohmyzsh
sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
``` ```
## Powerlevel10k ## Powerlevel10k
https://github.com/romkatv/powerlevel10k#oh-my-zsh https://github.com/romkatv/powerlevel10k#oh-my-zsh
@ -79,10 +87,13 @@ The installation of these should be covered by the included .tmux.conf
To install plugins, use prefix + I (capital ) To install plugins, use prefix + I (capital )
https://draculatheme.com/tmux https://draculatheme.com/tmux
# Once ZSH is setup, then add this to the bottom of ~/.zshrc to open tmux with new terminals. # Tmux Default
Once ZSH is setup, then add this to the bottom of ~/.zshrc to open tmux with new terminals.
```bash
if command -v tmux &> /dev/null && [ -n "$PS1" ] && [[ ! "$TERM" =~ screen ]] && [[ ! "$TERM" =~ tmux ]] && [ -z "$TMUX" ]; then if command -v tmux &> /dev/null && [ -n "$PS1" ] && [[ ! "$TERM" =~ screen ]] && [[ ! "$TERM" =~ tmux ]] && [ -z "$TMUX" ]; then
exec tmux new-session -A -s main exec tmux new-session -A -s main
fi fi
```
# Editor # Editor

View File

@ -672,4 +672,6 @@ vim.wo.relativenumber = true
require("oil").setup() require("oil").setup()
vim.keymap.set("n", "-", "<CMD>Oil<CR>", { desc = "Open parent directory" }) vim.keymap.set("n", "-", "<CMD>Oil<CR>", { desc = "Open parent directory" })
-- Setup treesitter
require("nvim-treesitter.install").prefer_git = true
-- Setup Java Debugging -- Setup Java Debugging