From 6c9f5d45061ea4b2aa5f83ca950ca4ef49f660b5 Mon Sep 17 00:00:00 2001 From: Johannes Knopp Date: Mon, 22 Jun 2026 01:46:24 +0200 Subject: [PATCH] update conf --- roles/hyprland/files/hypr/hyprland.conf | 8 ++++++- .../lua/config/plugins/lsp/lspconfig.lua | 21 ++++++++----------- .../files/lua/config/plugins/telescope.lua | 6 ++++-- roles/zsh/files/.zshrc | 8 +++---- roles/zsh/files/hosts/{work.zsh => jk-nb.zsh} | 0 .../files/hosts/{personal.zsh => jk-pc.zsh} | 4 +++- 6 files changed, 26 insertions(+), 21 deletions(-) rename roles/zsh/files/hosts/{work.zsh => jk-nb.zsh} (100%) rename roles/zsh/files/hosts/{personal.zsh => jk-pc.zsh} (60%) diff --git a/roles/hyprland/files/hypr/hyprland.conf b/roles/hyprland/files/hypr/hyprland.conf index f7c09c5..bc01a36 100644 --- a/roles/hyprland/files/hypr/hyprland.conf +++ b/roles/hyprland/files/hypr/hyprland.conf @@ -30,7 +30,13 @@ exec-once = quickshell exec-once = dunst exec-once = firefox exec-once = hyprpaper -exec-once = [workspace 9 silent] gtk-launch deezer-pwa +exec-once = gtk-launch deezer-pwa +# hl.window_rule({ +# name = "deezer-workspace" +# match = { initialTitle = "Deezer" } +# +# workspace = "9 silent" +# }) # exec-once = ./scripts/close-monokai-popup.sh # gnome keyring secret service diff --git a/roles/nvim/files/lua/config/plugins/lsp/lspconfig.lua b/roles/nvim/files/lua/config/plugins/lsp/lspconfig.lua index d8f3d4a..b332605 100644 --- a/roles/nvim/files/lua/config/plugins/lsp/lspconfig.lua +++ b/roles/nvim/files/lua/config/plugins/lsp/lspconfig.lua @@ -62,18 +62,15 @@ return { }) -- ts_ls: TypeScript/JavaScript/JSX/TSX - vim.lsp.config('ts_ls', { - cmd = { 'typescript-language-server', '--stdio' }, - filetypes = { - 'javascript', - 'javascriptreact', - 'typescript', - 'typescriptreact', - }, - init_options = { - hostInfo = 'neovim', - }, - }) + -- vim.lsp.config('ts_ls', { + -- cmd = { 'typescript-language-server', '--stdio' }, + -- filetypes = { + -- 'javascript', + -- 'javascriptreact', + -- 'typescript', + -- 'typescriptreact', + -- }, + -- }) -- 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 dfd4759..1e44ec6 100644 --- a/roles/nvim/files/lua/config/plugins/telescope.lua +++ b/roles/nvim/files/lua/config/plugins/telescope.lua @@ -17,7 +17,6 @@ return { telescope.setup({ defaults = { path_display = { 'smart' }, - file_ignore_patterns = ignore_patterns, }, }) @@ -28,10 +27,13 @@ return { local keymap = vim.keymap local builtin = require('telescope.builtin') - keymap.set('n', 'ff', function() builtin.find_files({ hidden = true }) end, opts) + keymap.set('n', 'ff', function() + builtin.find_files({ hidden = true, no_ignore = true, file_ignore_patterns = ignore_patterns }) + 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 6c9e12c..d5006a9 100644 --- a/roles/zsh/files/.zshrc +++ b/roles/zsh/files/.zshrc @@ -42,13 +42,11 @@ 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 -if [[ -n "$MACHINE_TYPE" && -f "$HOME/dotfiles/zsh/hosts/$MACHINE_TYPE.zsh" ]]; then - source "$HOME/dotfiles/zsh/hosts/$MACHINE_TYPE.zsh" +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" 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/work.zsh b/roles/zsh/files/hosts/jk-nb.zsh similarity index 100% rename from roles/zsh/files/hosts/work.zsh rename to roles/zsh/files/hosts/jk-nb.zsh diff --git a/roles/zsh/files/hosts/personal.zsh b/roles/zsh/files/hosts/jk-pc.zsh similarity index 60% rename from roles/zsh/files/hosts/personal.zsh rename to roles/zsh/files/hosts/jk-pc.zsh index 577a22a..6bbcb76 100644 --- a/roles/zsh/files/hosts/personal.zsh +++ b/roles/zsh/files/hosts/jk-pc.zsh @@ -1,4 +1,6 @@ -eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" +# eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" + +export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock export ANDROID_HOME=/home/johannes/Android/Sdk