From adc2a50a92b51b4a2d73273fc966cd09f3a134b3 Mon Sep 17 00:00:00 2001 From: Zackarias Montell Date: Thu, 1 May 2025 11:44:56 +0200 Subject: [PATCH] vue setup --- .bashrc | 65 ++++++++-------- .config/nvim/lazy-lock.json | 27 ++++++- .config/nvim/lazyvim.json | 26 ++++++- .config/nvim/lua/config/lazy.lua | 10 +-- .config/nvim/lua/plugins/mason.lua | 12 +-- .config/nvim/lua/plugins/wholteza.lua | 104 ++++++++++---------------- 6 files changed, 133 insertions(+), 111 deletions(-) diff --git a/.bashrc b/.bashrc index 1720e7d..70756a2 100644 --- a/.bashrc +++ b/.bashrc @@ -4,8 +4,8 @@ # If not running interactively, don't do anything case $- in - *i*) ;; - *) return;; +*i*) ;; +*) return ;; esac # don't put duplicate lines or lines starting with space in the history. @@ -32,12 +32,12 @@ shopt -s checkwinsize # set variable identifying the chroot you work in (used in the prompt below) if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) + debian_chroot=$(cat /etc/debian_chroot) fi # set a fancy prompt (non-color, unless we know we "want" color) case "$TERM" in - xterm-color|*-256color) color_prompt=yes;; +xterm-color | *-256color) color_prompt=yes ;; esac # uncomment for a colored prompt, if the terminal has the capability; turned @@ -46,42 +46,41 @@ esac #force_color_prompt=yes if [ -n "$force_color_prompt" ]; then - if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then - # We have color support; assume it's compliant with Ecma-48 - # (ISO/IEC-6429). (Lack of such support is extremely rare, and such - # a case would tend to support setf rather than setaf.) - color_prompt=yes - else - color_prompt= - fi + if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then + # We have color support; assume it's compliant with Ecma-48 + # (ISO/IEC-6429). (Lack of such support is extremely rare, and such + # a case would tend to support setf rather than setaf.) + color_prompt=yes + else + color_prompt= + fi fi if [ "$color_prompt" = yes ]; then - PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' + PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' else - PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' + PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' fi unset color_prompt force_color_prompt # If this is an xterm set the title to user@host:dir case "$TERM" in -xterm*|rxvt*) - PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" - ;; -*) - ;; +xterm* | rxvt*) + PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" + ;; +*) ;; esac # enable color support of ls and also add handy aliases if [ -x /usr/bin/dircolors ]; then - test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" - alias ls='ls --color=auto' - #alias dir='dir --color=auto' - #alias vdir='vdir --color=auto' + test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" + alias ls='ls --color=auto' + #alias dir='dir --color=auto' + #alias vdir='vdir --color=auto' - alias grep='grep --color=auto' - alias fgrep='fgrep --color=auto' - alias egrep='egrep --color=auto' + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' fi # colored GCC warnings and errors @@ -102,7 +101,7 @@ alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo # See /usr/share/doc/bash-doc/examples in the bash-doc package. if [ -f ~/.bash_aliases ]; then - . ~/.bash_aliases + . ~/.bash_aliases fi # enable programmable completion features (you don't need to enable @@ -128,8 +127,8 @@ export PASSBOOK_ROOT_DIRECTORY="/home/wholteza/.password-store" ### NVM setup 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 +[ -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 ### Ngrok aliases alias ngdo='ngrok http --domain=devops-extension.ngrok.dev 3000' @@ -154,8 +153,12 @@ alias mount-bigboi-zackarias='~/.config/mnt/bigboi-zackarias.sh' alias mount-bigboi-lilleback='~/.config/mnt/bigboi-lilleback.sh' alias mount-bigboi-warez='~/.config/mnt/bigboi-warez.sh' -alias edit-bash='nano ~/.bashrc && source ~/.bashrc' -alias edit-requirements='nano ~/.config/requirements/install.sh' +alias vim='nvim' +alias nv='nvim' + +alias edit-bash='vim ~/.bashrc && source ~/.bashrc' +alias edit-requirements='vim ~/.config/requirements/install.sh' +alias edit-vim='cd ~/.config/nvim && vim .' hostname=$(cat ~/hostname) if [[ $hostname == "arch-bepis" ]]; then diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index bc0d097..d027b7f 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -2,14 +2,23 @@ "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, "LazyVim": { "branch": "main", "commit": "3f034d0a7f58031123300309f2efd3bb0356ee21" }, "SchemaStore.nvim": { "branch": "main", "commit": "d521e71f9d5ac1c29a7653528d4e5c66ffe229c5" }, - "blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" }, + "cmake-tools.nvim": { "branch": "master", "commit": "1ee065c33ca777c0e03cd7c358010202ee70bb88" }, + "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, + "cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" }, + "cmp-git": { "branch": "main", "commit": "b24309c386c9666c549a1abaedd4956541676d06" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, + "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, "conform.nvim": { "branch": "master", "commit": "372fc521f8421b7830ea6db4d6ea3bae1c77548c" }, + "copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" }, + "copilot.lua": { "branch": "master", "commit": "a5c390f8d8e85b501b22dcb2f30e0cbbd69d5ff0" }, + "dial.nvim": { "branch": "master", "commit": "2c7e2750372918f072a20f3cf754d845e143d7c9" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "gitsigns.nvim": { "branch": "main", "commit": "ee28ba3e70ecea811b8f6d7b51d81976e94b121c" }, "grug-far.nvim": { "branch": "main", "commit": "6ff8a205a29db3a9b08e5debe09452b4d6fd6591" }, + "inc-rename.nvim": { "branch": "main", "commit": "77accd33ef57c974213cf3bf131688796eced8cf" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, @@ -19,20 +28,27 @@ "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mini.ai": { "branch": "main", "commit": "e139eb1101beb0250fea322f8c07a42f0f175688" }, "mini.animate": { "branch": "main", "commit": "9b518c39c0e25b7b5e4e61db3f1407f7b4889f4e" }, + "mini.hipatterns": { "branch": "main", "commit": "e5083df391171dc9d8172645606f8496d9443374" }, "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" }, "mini.nvim": { "branch": "main", "commit": "0420076298c4457f200c2de468f65d080597a347" }, "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, + "mini.starter": { "branch": "main", "commit": "d8038690eadf203a40863c3a9423df880a901d39" }, "neotest": { "branch": "master", "commit": "6267dcd577aa519c828d2526b05844770d3a2c6a" }, + "neotest-golang": { "branch": "main", "commit": "bea3921363c04d576fcc9a4bd151fff4b48517c6" }, "neotest-jest": { "branch": "main", "commit": "514fd4eae7da15fd409133086bb8e029b65ac43f" }, "neotest-python": { "branch": "master", "commit": "a2861ab3c9a0bf75a56b11835c2bfc8270f5be7e" }, "neotest-vim-test": { "branch": "master", "commit": "75c4228882ae4883b11bfce9b8383e637eb44192" }, "neotest-vitest": { "branch": "main", "commit": "a6099e1fb55a2c2851da3dd0f4d510af9a234c92" }, "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, "nui.nvim": { "branch": "main", "commit": "8d5b0b568517935d3c84f257f272ef004d9f5a59" }, + "nuxt-goto.nvim": { "branch": "main", "commit": "af44dc734efc60f21138876bd65ea5e4d72ad1ea" }, + "nvim-ansible": { "branch": "main", "commit": "bba61168b7aef735e7f950fdfece5ef6c388eacf" }, + "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-dev-container": { "branch": "main", "commit": "ba9666bdaec23cfe8087c0b6bb0a15c93ec8ba87" }, "nvim-lint": { "branch": "master", "commit": "9dfb77ef6c5092a19502883c02dc5a02ec648729" }, "nvim-lspconfig": { "branch": "master", "commit": "94d0fec9135719e046903bbbbf8f39e3d3436d4e" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, + "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" }, "nvim-treesitter": { "branch": "master", "commit": "94ea4f436d2b59c80f02e293466c374584f03b8c" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ed373482db797bbf71bdff37a15c7555a84dce47" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, @@ -40,11 +56,18 @@ "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "render-markdown.nvim": { "branch": "main", "commit": "8c33733b9af902250731539b2fe3920c76993765" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, + "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" }, "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" }, + "venv-selector.nvim": { "branch": "regexp", "commit": "c677caa1030808a9f90092e522de7cc20c1390dd" }, + "vim-dadbod": { "branch": "master", "commit": "fa31d0ffeebaa59cf97a81e7f92194cced54a13f" }, + "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" }, + "vim-dadbod-ui": { "branch": "master", "commit": "460432301a5cb280ea265ddfa15c9f3dcd1d26b7" }, + "vim-helm": { "branch": "master", "commit": "ae1ebc160d2b9b90108477ab10df7a4fc501e358" }, "vim-test": { "branch": "master", "commit": "b0c3e13249699a522c8b472ff79eff40d2935476" }, - "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }, + "yanky.nvim": { "branch": "main", "commit": "04775cc6e10ef038c397c407bc17f00a2f52b378" } } diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json index 1ce5862..b61f4b7 100644 --- a/.config/nvim/lazyvim.json +++ b/.config/nvim/lazyvim.json @@ -1,11 +1,35 @@ { "extras": [ + "lazyvim.plugins.extras.ai.copilot", + "lazyvim.plugins.extras.coding.nvim-cmp", + "lazyvim.plugins.extras.coding.yanky", + "lazyvim.plugins.extras.editor.dial", + "lazyvim.plugins.extras.editor.inc-rename", + "lazyvim.plugins.extras.formatting.black", + "lazyvim.plugins.extras.formatting.prettier", + "lazyvim.plugins.extras.lang.ansible", + "lazyvim.plugins.extras.lang.cmake", + "lazyvim.plugins.extras.lang.docker", "lazyvim.plugins.extras.lang.git", + "lazyvim.plugins.extras.lang.go", + "lazyvim.plugins.extras.lang.helm", + "lazyvim.plugins.extras.lang.json", "lazyvim.plugins.extras.lang.markdown", + "lazyvim.plugins.extras.lang.nix", + "lazyvim.plugins.extras.lang.php", + "lazyvim.plugins.extras.lang.python", + "lazyvim.plugins.extras.lang.sql", + "lazyvim.plugins.extras.lang.tailwind", "lazyvim.plugins.extras.lang.toml", "lazyvim.plugins.extras.lang.vue", "lazyvim.plugins.extras.lang.yaml", - "lazyvim.plugins.extras.util.gitui" + "lazyvim.plugins.extras.linting.eslint", + "lazyvim.plugins.extras.test.core", + "lazyvim.plugins.extras.ui.mini-animate", + "lazyvim.plugins.extras.ui.mini-starter", + "lazyvim.plugins.extras.util.dot", + "lazyvim.plugins.extras.util.gitui", + "lazyvim.plugins.extras.util.mini-hipatterns" ], "install_version": 8, "news": { diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua index bfd5691..aaa35a0 100644 --- a/.config/nvim/lua/config/lazy.lua +++ b/.config/nvim/lua/config/lazy.lua @@ -21,11 +21,11 @@ require("lazy").setup({ "LazyVim/LazyVim", import = "lazyvim.plugins" }, -- import any extra plugins colorscheme - { import = "lazyvim.plugins.extras.lang.typescript" }, - { import = "lazyvim.plugins.extras.lang.json" }, - { import = "lazyvim.plugins.extras.ui.mini-animate" }, - { import = "lazyvim.plugins.extras.test.core" }, - { import = "lazyvim.plugins.extras.linting.eslint" }, + -- { import = "lazyvim.plugins.extras.lang.typescript" }, + -- { import = "lazyvim.plugins.extras.lang.json" }, + -- { import = "lazyvim.plugins.extras.ui.mini-animate" }, + --{ import = "lazyvim.plugins.extras.test.core" }, + --{ import = "lazyvim.plugins.extras.linting.eslint" }, -- import/override with your plugins { import = "plugins" }, }, diff --git a/.config/nvim/lua/plugins/mason.lua b/.config/nvim/lua/plugins/mason.lua index 21e92ee..4b3140f 100644 --- a/.config/nvim/lua/plugins/mason.lua +++ b/.config/nvim/lua/plugins/mason.lua @@ -9,9 +9,9 @@ return { "isort", "mypy", "pylint", - "typescript-language-server", - "vue-language-server", - "eslint-lsp", + -- "typescript-language-server", + -- "vue-language-server", + -- "eslint-lsp", }, }, }, @@ -24,9 +24,9 @@ return { "shfmt", "flake8", "pyright", - "typescript-language-server", - "vue-language-server", - "eslint-lsp", + -- "typescript-language-server", + -- "vue-language-server", + -- "eslint-lsp", }, }, }, diff --git a/.config/nvim/lua/plugins/wholteza.lua b/.config/nvim/lua/plugins/wholteza.lua index 846d6cc..5181230 100644 --- a/.config/nvim/lua/plugins/wholteza.lua +++ b/.config/nvim/lua/plugins/wholteza.lua @@ -1,35 +1,5 @@ return { { 'echasnovski/mini.nvim', version = '*' }, - -- Testing out a nuxt setup - --{ - -- 'catgoose/vue-goto-definition.nvim', - -- event = "BufReadPre", - -- opts = { - -- filters = { - -- auto_imports = true, - -- auto_components = true, - -- import_same_file = true, - -- declaration = true, - -- duplicate_filename = true, - -- }, - -- filetypes = { "vue", "typescript" }, - -- detection = { - -- nuxt = function() - -- return vim.fn.glob(".nuxt/") ~= "" - -- end, - -- vue3 = function() - -- return vim.fn.filereadable("vite.config.ts") == 1 or vim.fn.filereadable("src/App.vue") == 1 - -- end, - -- priority = { "nuxt", "vue3" }, - -- }, - -- lsp = { - -- override_definition = true, -- override vim.lsp.buf.definition - -- }, - -- debounce = 200 - -- } - --}, - -- { "rushjs1/nuxt-goto.nvim", ft = "vue" }, - -- end of nuxt setup { "https://codeberg.org/esensar/nvim-dev-container", dependencies = "nvim-treesitter/nvim-treesitter", @@ -67,9 +37,11 @@ return { "hrsh7th/nvim-cmp", dependencies = { "hrsh7th/cmp-emoji" }, ---@param opts cmp.ConfigSchema - opts = function(_, opts) - table.insert(opts.sources, { name = "emoji" }) - end, + opts = { + sources = { + { name = "emoji" } + }, + } }, -- change some telescope options and a keymap to browse plugin files @@ -102,40 +74,40 @@ return { opts = { servers = { pyright = {}, - eslint = {}, + -- eslint = {}, volar = {}, - tsserver = { - enabled = true, - opts = { - init_options = { - plugins = { - { - name = '@vue/typescript-plugin', - location = vim.fn.stdpath 'data' .. - '/mason/packages/vue-language-server/node_modules/@vue/language-server', - languages = { 'vue' }, - }, - }, - }, - filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" } - }, - }, - ts_ls = { - enabled = true, - opts = { - init_options = { - plugins = { - { - name = '@vue/typescript-plugin', - location = vim.fn.stdpath 'data' .. - '/mason/packages/vue-language-server/node_modules/@vue/language-server', - languages = { 'vue' }, - }, - }, - }, - filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" } - }, - }, + --tsserver = { + -- enabled = true, + -- opts = { + -- init_options = { + -- plugins = { + -- { + -- name = '@vue/typescript-plugin', + -- location = vim.fn.stdpath 'data' .. + -- '/mason/packages/vue-language-server/node_modules/@vue/language-server', + -- languages = { 'vue' }, + -- }, + -- }, + -- }, + -- filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" } + -- }, + --}, + --ts_ls = { + -- enabled = true, + -- opts = { + -- init_options = { + -- plugins = { + -- { + -- name = '@vue/typescript-plugin', + -- location = vim.fn.stdpath 'data' .. + -- '/mason/packages/vue-language-server/node_modules/@vue/language-server', + -- languages = { 'vue' }, + -- }, + -- }, + -- }, + -- filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" } + -- }, + --}, }, }, },