diff --git a/roles/nvim/files/lua/config/plugins/lsp/lspconfig.lua b/roles/nvim/files/lua/config/plugins/lsp/lspconfig.lua index b332605..d8f3d4a 100644 --- a/roles/nvim/files/lua/config/plugins/lsp/lspconfig.lua +++ b/roles/nvim/files/lua/config/plugins/lsp/lspconfig.lua @@ -62,15 +62,18 @@ return { }) -- ts_ls: TypeScript/JavaScript/JSX/TSX - -- vim.lsp.config('ts_ls', { - -- cmd = { 'typescript-language-server', '--stdio' }, - -- filetypes = { - -- 'javascript', - -- 'javascriptreact', - -- 'typescript', - -- 'typescriptreact', - -- }, - -- }) + vim.lsp.config('ts_ls', { + cmd = { 'typescript-language-server', '--stdio' }, + filetypes = { + 'javascript', + 'javascriptreact', + 'typescript', + 'typescriptreact', + }, + init_options = { + hostInfo = 'neovim', + }, + }) -- eslint: linting for JS/TS/React projects vim.lsp.config('eslint', { diff --git a/roles/nvim/files/lua/config/plugins/telescope.lua b/roles/nvim/files/lua/config/plugins/telescope.lua index 1e44ec6..dfd4759 100644 --- a/roles/nvim/files/lua/config/plugins/telescope.lua +++ b/roles/nvim/files/lua/config/plugins/telescope.lua @@ -17,6 +17,7 @@ return { telescope.setup({ defaults = { path_display = { 'smart' }, + file_ignore_patterns = ignore_patterns, }, }) @@ -27,13 +28,10 @@ return { local keymap = vim.keymap local builtin = require('telescope.builtin') - keymap.set('n', 'ff', function() - builtin.find_files({ hidden = true, no_ignore = true, file_ignore_patterns = ignore_patterns }) - end, opts) + keymap.set('n', 'ff', function() builtin.find_files({ hidden = true }) end, opts) keymap.set('n', 'fh', builtin.oldfiles, opts) keymap.set('n', 'fs', function () builtin.live_grep({ - additional_args = { "--no-ignore" }, file_ignore_patterns = vim.list_extend(vim.deepcopy(ignore_patterns), { "supabase/migrations/" }) }) end, opts) diff --git a/roles/zsh/files/.zshrc b/roles/zsh/files/.zshrc index d5006a9..6c9e12c 100644 --- a/roles/zsh/files/.zshrc +++ b/roles/zsh/files/.zshrc @@ -42,11 +42,13 @@ 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 -MACHINE_TYPE=$(uname -n) -if [[ -n "$MACHINE_TYPE" && -f "$HOME/dotfiles/roles/zsh/files/hosts/$MACHINE_TYPE.zsh" ]]; then - source "$HOME/dotfiles/roles/zsh/files/hosts/$MACHINE_TYPE.zsh" +if [[ -n "$MACHINE_TYPE" && -f "$HOME/dotfiles/zsh/hosts/$MACHINE_TYPE.zsh" ]]; then + source "$HOME/dotfiles/zsh/hosts/$MACHINE_TYPE.zsh" fi + +alias drun='docker run -it --network=host --device=/dev/kfd --device=/dev/dri --group-add=video --ipc=host --cap-add=SYS_PTRACE --security-opt seccomp=unconfined' + export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh" bindkey '^H' backward-kill-word diff --git a/roles/zsh/files/hosts/jk-nb.zsh b/roles/zsh/files/hosts/jk-nb.zsh deleted file mode 100644 index 360da47..0000000 --- a/roles/zsh/files/hosts/jk-nb.zsh +++ /dev/null @@ -1 +0,0 @@ -. "$HOME/.local/bin/env" diff --git a/roles/zsh/files/hosts/jk-pc.zsh b/roles/zsh/files/hosts/jk-pc.zsh deleted file mode 100644 index 6bbcb76..0000000 --- a/roles/zsh/files/hosts/jk-pc.zsh +++ /dev/null @@ -1,9 +0,0 @@ -# eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" - -export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock - -export ANDROID_HOME=/home/johannes/Android/Sdk - -export PATH=$HOME/.local/bin:$PATH -export PATH=$PATH:$ANDROID_HOME/emulator -export PATH=$PATH:$ANDROID_HOME/platform-tools