cleanup

README.md

@@ -1,12 +1,14 @@
 # dotfiles
+
 My dotfiles, used on Ubuntu, Arch and macOS systems.
 
 ## Requirements
+
 - ZSH
   - macOS: `brew install zsh && chsh -s $(which zsh)`
   - Ubuntu: `sudo apt install zsh && chsh -s $(which zsh)`
   - Arch: `sudo pacman -S zsh && chsh -s $(which zsh)`
-- Git 
+- Git
   - macOS: `brew install git`
   - Ubuntu: `sudo apt install git`
   - Arch: `sudo pacman -S git`
@@ -16,24 +18,25 @@ My dotfiles, used on Ubuntu, Arch and macOS systems.
   - Arch: `sudo pacman -S neovim` or `sudo pacman -S neovim-nightly-bin` for latest development version
 
 ## Installation
+
 1. `git clone [email protected]:codepuncher/dotfiles.git ~/.dotfiles`
-3. `~/.dotfiles/setup.sh`
+2. `~/.dotfiles/setup.sh`
 3. Choose `y` to symlink the dotfiles
 4. The script will finish and run `command zsh` for you, loading the new dotfiles
 
 ## Features
-1. Many [aliases](https://github.com/codepuncher/dotfiles/blob/master/bash/bash_aliases)
+
+1. Many [aliases](https://github.com/codepuncher/dotfiles/blob/master/shell/aliases)
 2. Supports loading any alias files from `~/.aliases`
-3. Supports loading [`~/.env`](https://github.com/codepuncher/dotfiles/blob/master/.env.example) for secrets
-4. Automatically installs [Zinit](https://github.com/zdharma/zinit/)
+3. Supports loading [`~/.env`](https://github.com/codepuncher/dotfiles/blob/master/.shell_env.example) for secrets
+4. Automatically installs [Zinit](https://github.com/zdharma-continuum/zinit)
 5. [zsh-users/zsh-history-substring-search](https://github.com/zsh-users/zsh-history-substring-search)
 6. [zsh-users/zsh-autosuggestions](https://github.com/zsh-users/zsh-autosuggestions)
 7. [zsh-users/zsh-completions](https://github.com/zsh-users/zsh-completions)
 8. [zdharma/fast-syntax-highlighting](https://github.com/zdharma/fast-syntax-highlighting)
-9. [lukechilds/zsh-nvm](https://github.com/lukechilds/zsh-nvm)
-    1. [Auto Use](https://github.com/lukechilds/zsh-nvm#auto-use)
-10. [OMZP::npm](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/npm)
-11. [denysdovhan/spaceship-prompt](https://github.com/denysdovhan/spaceship-prompt)
+9. [OMZP::npm](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/npm)
+10. [OMZP::composer](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/composer)
+11. [spaceship-prompt/spaceship-prompt](https://github.com/spaceship-prompt/spaceship-prompt)
 12. [trellis-cli](https://github.com/roots/trellis-cli) `virtualenv` integration
 13. iTerm2 shell integration (macOS only)
 14. Alacritty config (JetBrains Mono Font, TokyoNight colours)

nvim/lua/lsp/servers/jsonls.lua

@@ -9,7 +9,7 @@ _M.setup = function(on_attach, capabilities)
     },
     settings = {
       json = {
-        -- Schemas https://www.schemastore.org
+        -- Schemas https://www.schemastore.org/json/
         schemas = {
           { fileMatch = { 'package.json' }, url = 'https://json.schemastore.org/package.json' },
           { fileMatch = { 'tsconfig*.json' }, url = 'https://json.schemastore.org/tsconfig.json' },

nvim/lua/plugins/init.lua

@@ -4,7 +4,7 @@ if not vim.loop.fs_stat(lazypath) then
     'git',
     'clone',
     '--filter=blob:none',
-    'https://github.com/folke/lazy.nvim.git',
+    'https://github.com/folke/lazy.nvim',
     '--branch=stable',
     lazypath,
   })

shell/zshrc

@@ -169,7 +169,7 @@ export PATH="${PATH}:${HOME}/.yarn/bin"
 
 # Trellis
 if ! type trellis &>/dev/null; then
-	curl -sL https://roots.io/trellis/cli/get | bash -s -- -b ~/.local/bin
+	curl -sL https://raw.githubusercontent.com/roots/trellis-cli/master/scripts/get | bash -s -- -b ~/.local/bin
 fi
 eval "$(trellis shell-init zsh)"