From 85c7807e5c6b7a8b0846a8d23949da466c2019c2 Mon Sep 17 00:00:00 2001 From: Max Richter Date: Mon, 30 Oct 2023 13:33:53 +0100 Subject: [PATCH] fix: remove lazy-lock.json --- .config/nvim/lazy-lock.json | 71 --------------------- .config/nvim/lua/max/plugins/lsp.lua | 12 ++-- .config/nvim/lua/max/plugins/typescript.lua | 6 -- .config/zsh/functions/conf.zsh | 7 +- .zprofile | 10 ++- 5 files changed, 16 insertions(+), 90 deletions(-) delete mode 100644 .config/nvim/lazy-lock.json delete mode 100644 .config/nvim/lua/max/plugins/typescript.lua diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json deleted file mode 100644 index 5fe3a11..0000000 --- a/.config/nvim/lazy-lock.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "LuaSnip": { "branch": "master", "commit": "cdbf6f41381e5ee4810b4b09284b603d8f18365d" }, - "alpha-nvim": { "branch": "main", "commit": "234822140b265ec4ba3203e3e0be0e0bb826dff5" }, - "arduino-helper.nvim": { "branch": "master", "commit": "5ec57de680a94f8e948e2e0c6328939b9b63a598" }, - "autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" }, - "barbar.nvim": { "branch": "master", "commit": "283bceab39f549c5e5228212661750704fcfcd9e" }, - "boole.nvim": { "branch": "main", "commit": "7b4a3dae28e3b2497747aa840439e9493cabdc49" }, - "catppuccin": { "branch": "main", "commit": "fc537040147f0374a22b88142a20eb6781141f0b" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, - "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "1a8032ae496916ccc7a7a52ee79194fbef29f462" }, - "flit.nvim": { "branch": "main", "commit": "498b3a4864e697f1ed1145e518c4c78c776c55d8" }, - "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, - "git-conflict.nvim": { "branch": "main", "commit": "4e0191c9a0ae05d7fbdcdc7f15cd358f56d23bfb" }, - "gitsigns.nvim": { "branch": "main", "commit": "ff01d34daaed72f271a8ffa088a7e839a60c640f" }, - "lazy.nvim": { "branch": "main", "commit": "84d13c1d7e9a887a89525196dababdaad5021c93" }, - "leap.nvim": { "branch": "main", "commit": "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c" }, - "lsp-format.nvim": { "branch": "master", "commit": "e8782a5468a4849ae440a1531be559d85aebe142" }, - "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, - "lspsaga.nvim": { "branch": "main", "commit": "79f80724f5b47cb6f515d96b5b4c176feacfb677" }, - "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" }, - "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "ddefe5ab051e7ca6a7b374754f0920c44668b54f" }, - "mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" }, - "mini.nvim": { "branch": "main", "commit": "8b43796d93b09c9f63076c69664e585d7ef28b62" }, - "neo-tree.nvim": { "branch": "main", "commit": "6f8c49956c89e9fefae6acdfe1d57c6293b0a03d" }, - "neoai.nvim": { "branch": "main", "commit": "248c2001d0b24e58049eeb6884a79860923cfe13" }, - "neotest": { "branch": "master", "commit": "1e67a504d03def3a6a1125d934cb511680f72555" }, - "neotest-jest": { "branch": "main", "commit": "ae559fbd405084ee38dd711eede6d74f3dc1d463" }, - "neotest-vitest": { "branch": "main", "commit": "d6577b191e16c174bffbec1eadfcd65c22fdcc0d" }, - "noice.nvim": { "branch": "main", "commit": "fcd01710ff6918d4d3ef90c8e36f3addacba13bf" }, - "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, - "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, - "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "e79007c6d7a24db3ad19ea9196f1f0b2840e8ae7" }, - "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, - "nvim-lspconfig": { "branch": "master", "commit": "2b361e043810d5587d9af0787f8ce40da92ec5e9" }, - "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, - "nvim-recorder": { "branch": "main", "commit": "e6ecc8ba0b950df9ac0ef7507dc95cb0037bead1" }, - "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" }, - "nvim-toggleterm.lua": { "branch": "main", "commit": "c80844fd52ba76f48fabf83e2b9f9b93273f418d" }, - "nvim-treesitter": { "branch": "master", "commit": "0eb1a0ad1c82e080e77e7b9d7a5e42632cefb543" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "76c7a89b41de77a4f83fb77fa072c5ad7605fe3b" }, - "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "7241635869b7a8115893ffa67bab3907756caf4f" }, - "nvim-web-devicons": { "branch": "master", "commit": "a1e6268779411048a87f767a27380089362a0ce2" }, - "oil.nvim": { "branch": "master", "commit": "f72b9b2637eec2b3db8255c196aa4bf11231af81" }, - "persisted.nvim": { "branch": "main", "commit": "315cd1a8a501ca8e0c1d55f0c245b9cc0e1ffa01" }, - "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" }, - "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, - "rest.nvim": { "branch": "main", "commit": "8b62563cfb19ffe939a260504944c5975796a682" }, - "sniprun": { "branch": "master", "commit": "1c152ee5d883db7233e3891012bc4f0f9437a82b" }, - "statuscol.nvim": { "branch": "main", "commit": "98d02fc90ebd7c4674ec935074d1d09443d49318" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, - "telescope.nvim": { "branch": "master", "commit": "5a747a9587e4bfc4ae086a38cc679fe54f983b69" }, - "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, - "translate.nvim": { "branch": "main", "commit": "30cc9e9f339b61e7bd40bc1ba7af73ea193bf589" }, - "trouble.nvim": { "branch": "main", "commit": "02219b557d4726a789be58c5d6bd6e139c46a9fe" }, - "typescript-tools.nvim": { "branch": "master", "commit": "ebddb35900bbf5fa41fffa0463b676bf08e474e6" }, - "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" }, - "vim-dadbod": { "branch": "master", "commit": "ee7e3bb5377d43cb31a101718dd0cfc09bb87d4b" }, - "vim-dadbod-completion": { "branch": "master", "commit": "fc7321a17f4c55db11fae89a884ddf4724020bae" }, - "vim-dadbod-ui": { "branch": "master", "commit": "95fd22469507e86b78aa55d868c14108adee2881" }, - "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" } -} \ No newline at end of file diff --git a/.config/nvim/lua/max/plugins/lsp.lua b/.config/nvim/lua/max/plugins/lsp.lua index f8111c5..c8f4e46 100644 --- a/.config/nvim/lua/max/plugins/lsp.lua +++ b/.config/nvim/lua/max/plugins/lsp.lua @@ -6,7 +6,9 @@ return { "jose-elias-alvarez/null-ls.nvim", "williamboman/mason-lspconfig.nvim", "onsails/lspkind.nvim", - "lukas-reineke/lsp-format.nvim" + "lukas-reineke/lsp-format.nvim", + + "pmizio/typescript-tools.nvim", }, event = "BufReadPost", config = function() @@ -41,7 +43,7 @@ return { }) local function on_attach(client) - local active_clients = vim.lsp.get_active_clients() + local active_clients = vim.lsp.buf_get_clients() if client.name == 'denols' then for _, client_ in pairs(active_clients) do -- stop tsserver if denols is already active @@ -207,9 +209,9 @@ return { }, } - -- custom_lsp.glslls = require("max.plugins.lsp.glsl"); - - lsp.glslls.setup {} + require("typescript-tools").setup({ + on_attach = on_attach + }) custom_lsp.ltex = { settings = { diff --git a/.config/nvim/lua/max/plugins/typescript.lua b/.config/nvim/lua/max/plugins/typescript.lua deleted file mode 100644 index ca468ae..0000000 --- a/.config/nvim/lua/max/plugins/typescript.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "pmizio/typescript-tools.nvim", - ft = { "typescript", "typescriptreact" }, - dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" }, - opts = {}, -} diff --git a/.config/zsh/functions/conf.zsh b/.config/zsh/functions/conf.zsh index fcf3f08..2d3de33 100644 --- a/.config/zsh/functions/conf.zsh +++ b/.config/zsh/functions/conf.zsh @@ -8,18 +8,15 @@ function conf(){ cd $HOME/.ssh/ nvim config else - cd ~/.dotfiles/ + cd ~/.config/ if [ "$1" != "" ]; then - cd configs cd $1 fi if [[ -f ".zshrc" ]]; then - nvim .zshrc + nvim ~/.zshrc source ~/.zshrc - elif [[ -f "config" ]]; then - nvim config else nvim . fi diff --git a/.zprofile b/.zprofile index ca8f168..1d2569a 100644 --- a/.zprofile +++ b/.zprofile @@ -68,10 +68,8 @@ alias pls='sudo -E env "PATH=$PATH"' alias online="ping 1.1.1.1" -alias vim="_run_prog nvim" -alias v="_run_prog nvim" +alias v="nvim" -alias gcm="git commit -m " alias D="run dev" alias B="run build" @@ -91,6 +89,10 @@ else alias dc="sudo docker-compose" fi +if podman-compose &> /dev/null; then + alias pc="podman-compose" +fi + alias d="sudo docker" @@ -106,3 +108,5 @@ fi if type bat &> /dev/null; then alias cat="bat" fi + +alias gcm="git commit -m "