Skip to content

Commit 0decf1a

Browse files
committed
Merge branch 'master' of github.com:JoeSharp/kickstart.nvim
2 parents 295ed5f + 36f77da commit 0decf1a

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

README.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ wget https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20R
88
wget https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20Bold.ttf
99
wget https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20Italic.ttf
1010
wget https://github.com/romkatv/powerlevel10k-media/raw/master/MesloLGS%20NF%20Bold%20Italic.ttf
11+
12+
# Place fonts in
13+
/usr/local/share/fonts/
14+
15+
# Then run
16+
sudo fc-cache -fv
1117
```
1218

1319
## Install command line stuff
@@ -18,8 +24,9 @@ tmux
1824
# Shell
1925

2026
## ZSH (standard with mac)
27+
2128
https://github.com/ohmyzsh/ohmyzsh/wiki/Installing-ZSH
22-
=======
29+
2330
| OS | PATH |
2431
| :- | :--- |
2532
| Linux | `$XDG_CONFIG_HOME/nvim`, `~/.config/nvim` |
@@ -35,6 +42,7 @@ https://github.com/ohmyzsh/ohmyzsh
3542
sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
3643
```
3744

45+
3846
## Powerlevel10k
3947
https://github.com/romkatv/powerlevel10k#oh-my-zsh
4048

@@ -79,10 +87,13 @@ The installation of these should be covered by the included .tmux.conf
7987
To install plugins, use prefix + I (capital )
8088
https://draculatheme.com/tmux
8189

82-
# Once ZSH is setup, then add this to the bottom of ~/.zshrc to open tmux with new terminals.
90+
# Tmux Default
91+
Once ZSH is setup, then add this to the bottom of ~/.zshrc to open tmux with new terminals.
92+
```bash
8393
if command -v tmux &> /dev/null && [ -n "$PS1" ] && [[ ! "$TERM" =~ screen ]] && [[ ! "$TERM" =~ tmux ]] && [ -z "$TMUX" ]; then
8494
exec tmux new-session -A -s main
8595
fi
96+
```
8697

8798
# Editor
8899

init.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -672,4 +672,6 @@ vim.wo.relativenumber = true
672672
require("oil").setup()
673673
vim.keymap.set("n", "-", "<CMD>Oil<CR>", { desc = "Open parent directory" })
674674

675+
-- Setup treesitter
676+
require("nvim-treesitter.install").prefer_git = true
675677
-- Setup Java Debugging

0 commit comments

Comments
 (0)