Skip to content

Commit

Permalink
Fix nvim subfolder issue
Browse files Browse the repository at this point in the history
  • Loading branch information
nvsd committed Jun 26, 2023
1 parent 6485b83 commit 0d025c8
Show file tree
Hide file tree
Showing 28 changed files with 59 additions and 6 deletions.
15 changes: 15 additions & 0 deletions config/.config/gh/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# What protocol to use when performing git operations. Supported values: ssh, https
git_protocol: https
# What editor gh should run when creating issues, pull requests, etc. If blank, will refer to environment.
editor:
# When to interactively prompt. This is a global config that cannot be overridden by hostname. Supported values: enabled, disabled
prompt: enabled
# A pager program to send command output to, e.g. "less". Set the value to "cat" to disable the pager.
pager:
# Aliases allow you to create nicknames for gh commands
aliases:
co: pr checkout
# The path to a unix socket through which send HTTP connections. If blank, HTTP traffic will be handled by net/http.DefaultTransport.
http_unix_socket:
# What web browser gh should use when opening URLs. If blank, will refer to environment.
browser:
3 changes: 3 additions & 0 deletions config/.config/gh/hosts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
github.com:
user: nvsd
git_protocol: ssh
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@ return {
local lspconfig = require("lspconfig")
local telescope = require('telescope.builtin')

local MY_FQBN = "arduino:avr:nano"
lspconfig.arduino_language_server.setup {
filetypes = { "ino", "cpp", "h" },
cmd = {
"arduino-language-server",
"-cli-config", "~/arduino-cli.yaml",
"-fqbn",
MY_FQBN
}
}
require('luasnip.loaders.from_vscode').lazy_load()
lspconfig.lua_ls.setup(lsp.nvim_lua_ls())

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ return {
branch = 'v2.x',
lazy = true,
config = function()
require('lsp-zero.settings').preset({
local lsp = require('lsp-zero.settings')
lsp.preset({
manage_nvim_cmp = {
set_basic_mappings = true,
set_extra_mappings = true,
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions config/.config/tmuxinator/lifted.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: lifted
root: ~/Projects/lifted
windows:
- editor: nvim .
- utils:
8 changes: 8 additions & 0 deletions config/.config/tmuxinator/tracker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# /Users/zack/.config/tmuxinator/tracker.yml

name: tracker
root: ~/Projects/tracker

windows:
- editor: nvim .
- util:
21 changes: 16 additions & 5 deletions zsh/.zshrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
source /opt/homebrew/opt/spaceship/spaceship.zsh
# Git auto-complete
autoload -Uz compinit && compinit

export PATH="$HOME/.cargo/bin:$PATH"
export PATH=$PATH:$HOME/.local/bin

alias db:psql="psql postgresql://postgres:postgres@localhost:5432"
alias db="pgcli postgresql://postgres:postgres@localhost:5432"
alias ll='ls -al'
Expand All @@ -17,6 +19,7 @@ alias che='chezmoi'
alias changevim="nvim ~/.config/nvim/init.lua"
alias wez="nvim ~/.wezterm.lua"
alias dot="z dotfiles"
alias ard="arduino-cli"

# Git
alias pull="git fetch origin main:main"
Expand All @@ -29,14 +32,22 @@ alias update="source ~/.zshrc"

export EDITOR='nvim'

export ZSH_HIGHLIGHT_HIGHLIGHTERS_DIR=/opt/homebrew/share/zsh-syntax-highlighting/highlighters
source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
source /opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh

export ZSH_HIGHLIGHT_HIGHLIGHTERS_DIR=/opt/homebrew/share/zsh-syntax-highlighting/highlighters
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
export PATH=/Users/zacknovosad/.nvm/versions/node/v20.0.0/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/zacknovosad/.nvm/versions/node/v20.0.0/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/Users/zacknovosad/.cargo/bin:/Users/zacknovosad/.dotnet:/Users/zacknovosad/.dotnet/tools:/Users/zacknovosad/.dotnet:/Users/zacknovosad/.dotnet/tools:~/Projects/nand2tetris/tools
eval "$(zoxide init zsh)"

source /opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh
source /opt/homebrew/opt/spaceship/spaceship.zsh

eval "$(zoxide init zsh)"
# pnpm
export PNPM_HOME="/Users/zack/Library/pnpm"
case ":$PATH:" in
*":$PNPM_HOME:"*) ;;
*) export PATH="$PNPM_HOME:$PATH" ;;
esac
# pnpm end
export PATH="/opt/homebrew/opt/llvm/bin:$PATH"

0 comments on commit 0d025c8

Please sign in to comment.