diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 27857f7..378089b 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -27,8 +27,6 @@ include monokai.conf allow_remote_control yes wayland_titlebar_color system -map kitty_mod+k clear_terminal reset active -map kitty_mod+F5 launch --location=hsplit --cwd=current -map kitty_mod+F6 launch --location=vsplit --cwd=current -map ctrl+insert copy_to_clipboard -map shift+insert paste_from_clipboard +map kitty_mod+k clear_terminal reset active +map kitty_mod+F5 launch --location=hsplit --cwd=current +map kitty_mod+F6 launch --location=vsplit --cwd=current diff --git a/nvim/init.lua b/nvim/init.lua index 0b47056..306c8ed 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -11,9 +11,9 @@ vim.g.maplocalleader = " " vim.cmd([[packadd packer.nvim]]) require("options") -require("plugins") require("keymaps") require("autocommands") +require("plugins") require("lsp") require("dap") diff --git a/nvim/lua/autocommands.lua b/nvim/lua/autocommands.lua index 4a565db..efdace8 100644 --- a/nvim/lua/autocommands.lua +++ b/nvim/lua/autocommands.lua @@ -67,13 +67,14 @@ vim.api.nvim_create_autocmd("BufWinEnter", { end, }) +local treeapi = require("nvim-tree.api") + vim.api.nvim_create_autocmd("BufEnter", { callback = function() if vim.bo.filetype == "NvimTree" or vim.fn.expand("%") == "" then return end vim.schedule(function() - local treeapi = require("nvim-tree.api") treeapi.tree.find_file({ update_root = false, focus = false, diff --git a/nvim/lua/plugins/format.lua b/nvim/lua/plugins/format.lua index e226ab6..435222d 100644 --- a/nvim/lua/plugins/format.lua +++ b/nvim/lua/plugins/format.lua @@ -6,6 +6,7 @@ conform.setup({ typescript = { "prettier" }, javascriptreact = { "prettier" }, typescriptreact = { "prettier" }, + svelte = { "prettier" }, css = { "prettier" }, html = { "prettier" }, json = { "prettier" }, diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua index 623e808..ff02ec4 100644 --- a/nvim/lua/plugins/treesitter.lua +++ b/nvim/lua/plugins/treesitter.lua @@ -1,47 +1,5 @@ -require("nvim-treesitter.configs").setup({ - highlight = { enable = true }, - ensure_installed = { - "c", - "lua", - "python", - "bash", - "go", - "html", - "css", - "javascript", - "typescript", - "git_config", - "git_rebase", - "gitattributes", - "gitcommit", - "gitignore", - "gomod", - "gosum", - "gotmpl", - "gowork", - "hjson", - "ini", - "json", - "json5", - "jsonnet", - "latex", - "make", - "markdown", - "markdown_inline", - "nginx", - "proto", - "rust", - "templ", - "todotxt", - "toml", - "tsx", - "typescript", - "vim", - "vimdoc", - "xml", - "yaml", - "sql", - "ssh_config", - }, - ignore_install = { "gdhsader", "phpdoc" }, -}) +require('nvim-treesitter.configs').setup{ + ensure_installed = 'all', + ignore_install = { 'phpdoc' }, + highlight = { enable = true } +} diff --git a/zsh/zshrc b/zsh/zshrc index 9e23f22..b71c129 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -24,7 +24,7 @@ antigen apply # Exports #export GOPROXY=https://proxy.neonxp.ru -export GOPRIVATE=devopar.hippoparking.ru,gitlab.sovcombank.group +export GOPRIVATE=devopar.hippoparking.ru export EDITOR="nvim" #export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock export ANDROID_HOME=$HOME/projects/android/