From 518f283bcb047d9ae46b7d8f07132cc2acbdcc0d Mon Sep 17 00:00:00 2001 From: Adam Jeniski Date: Fri, 24 Feb 2023 14:42:33 -0500 Subject: [PATCH] clean up --- .config/nvim/lua/ajet/packer.lua | 202 ++++++++++++++++--------------- .config/nvim/lua/ajet/remap.lua | 3 +- .config/nvim/lua/ajet/set.lua | 3 +- .zshrc | 15 ++- 4 files changed, 122 insertions(+), 101 deletions(-) diff --git a/.config/nvim/lua/ajet/packer.lua b/.config/nvim/lua/ajet/packer.lua index 66cad2d..92b24a5 100755 --- a/.config/nvim/lua/ajet/packer.lua +++ b/.config/nvim/lua/ajet/packer.lua @@ -1,103 +1,111 @@ vim.cmd([[packadd packer.nvim]]) return require('packer').startup(function(use) - use 'wbthomason/packer.nvim' - use('nvim-telescope/telescope.nvim', { - tag = '0.1.0', - requires = { - { 'nvim-lua/plenary.nvim' } - } - }) - use('tpope/vim-repeat') - --use('EdenEast/nightfox.nvim') - use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) - use('nvim-treesitter/playground') - use('theprimeagen/harpoon') - use('mbbill/undotree') - use('kdheepak/lazygit.nvim') - use('tpope/vim-surround') - use({ - 'VonHeikemen/lsp-zero.nvim', - requires = { - -- LSP Support - { 'neovim/nvim-lspconfig' }, - { 'williamboman/mason.nvim' }, - { 'williamboman/mason-lspconfig.nvim' }, - - -- Autocompletion - { 'hrsh7th/nvim-cmp' }, - { 'hrsh7th/cmp-buffer' }, - { 'hrsh7th/cmp-path' }, - { 'saadparwaiz1/cmp_luasnip' }, - { 'hrsh7th/cmp-nvim-lsp' }, - { 'hrsh7th/cmp-nvim-lua' }, - - -- Snippets - { 'L3MON4D3/LuaSnip' }, - { 'rafamadriz/friendly-snippets' }, - } - }) - use("folke/zen-mode.nvim") - use({ - 'phaazon/hop.nvim', - branch = 'v2', -- optional but strongly recommended - config = function() - require 'hop'.setup { keys = 'etovdygfblhckisuran' } - end - }) - use('tribela/vim-transparent') - use('evanleck/vim-svelte', - { branch = 'main' }, - { requires = { - { 'othree/html5.vim' }, - { 'pangloss/vim-javascript' } - } - }) - use({ - "iamcco/markdown-preview.nvim", - run = function() vim.fn["mkdp#util#install"]() end, - }) - use({ - 'simrat39/rust-tools.nvim', - requires = { - { 'neovim/nvim-lspconfig' } - }, - }) - use({ "nvim-lualine/lualine.nvim", - requires = { 'kyazdani42/nvim-web-devicons', opt = true } - }) - use({ "nvim-tree/nvim-tree.lua", requires = { "nvim-tree/nvim-web-devicons" } }) - use { "catppuccin/nvim", as = "catppuccin" } - use('Olical/conjure') - use('walterl/conjure-macroexpand') - use('PaterJason/cmp-conjure') - use("folke/trouble.nvim", { - requires = { "nvim-tree/nvim-web-devicons" }, - config = function() - require("trouble").setup {} - require 'nvim-web-devicons'.setup {} - end - }) - use { - 'numToStr/Comment.nvim', - config = function() - require('Comment').setup() - end + use 'wbthomason/packer.nvim' + use('nvim-telescope/telescope.nvim', { + tag = '0.1.0', + requires = { + { 'nvim-lua/plenary.nvim' } } - use { - 'tjdevries/sg.nvim', - run = "cargo build --workspace", - requires = { "nvim-lua/plenary.nvim" }, - config = function() - require("sg").setup {} - end + }) + use('tpope/vim-repeat') + --use('EdenEast/nightfox.nvim') + use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) + use('nvim-treesitter/playground') + use('theprimeagen/harpoon') + use('mbbill/undotree') + use('kdheepak/lazygit.nvim') + use('tpope/vim-surround') + use({ + 'VonHeikemen/lsp-zero.nvim', + requires = { + -- LSP Support + { 'neovim/nvim-lspconfig' }, + { 'williamboman/mason.nvim' }, + { 'williamboman/mason-lspconfig.nvim' }, + + -- Autocompletion + { 'hrsh7th/nvim-cmp' }, + { 'hrsh7th/cmp-buffer' }, + { 'hrsh7th/cmp-path' }, + { 'saadparwaiz1/cmp_luasnip' }, + { 'hrsh7th/cmp-nvim-lsp' }, + { 'hrsh7th/cmp-nvim-lua' }, + + -- Snippets + { 'L3MON4D3/LuaSnip' }, + { 'rafamadriz/friendly-snippets' }, } - use('TravonteD/tree-sitter-fennel') - use({ 'tpope/vim-sexp-mappings-for-regular-people', requires = { 'guns/vim-sexp' } }) - use({ 'chentoast/marks.nvim', config = function() - require('marks').setup() - end }) - use('Konfekt/vim-alias') - use('f-person/git-blame.nvim') - use('lewis6991/gitsigns.nvim') + }) + use("folke/zen-mode.nvim") + use({ + 'phaazon/hop.nvim', + branch = 'v2', -- optional but strongly recommended + config = function() + require 'hop'.setup { keys = 'etovdygfblhckisuran' } + end + }) + use('tribela/vim-transparent') + use('evanleck/vim-svelte', + { branch = 'main' }, + { + requires = { + { 'othree/html5.vim' }, + { 'pangloss/vim-javascript' } + } + }) + use({ + "iamcco/markdown-preview.nvim", + run = function() vim.fn["mkdp#util#install"]() end, + }) + use({ + 'simrat39/rust-tools.nvim', + requires = { + { 'neovim/nvim-lspconfig' } + }, + }) + use({ + "nvim-lualine/lualine.nvim", + requires = { 'kyazdani42/nvim-web-devicons', opt = true } + }) + use({ "nvim-tree/nvim-tree.lua", requires = { "nvim-tree/nvim-web-devicons" } }) + use { "catppuccin/nvim", as = "catppuccin" } + use('Olical/conjure') + use('walterl/conjure-macroexpand') + use('PaterJason/cmp-conjure') + use("folke/trouble.nvim", { + requires = { "nvim-tree/nvim-web-devicons" }, + config = function() + require 'nvim-web-devicons'.setup {} + require("trouble").setup { + icons = false, + use_lsp_diagnostic_signs = true, + } + end + }) + use { + 'numToStr/Comment.nvim', + config = function() + require('Comment').setup() + end + } + use { + 'tjdevries/sg.nvim', + run = "cargo build --workspace", + requires = { "nvim-lua/plenary.nvim" }, + config = function() + require("sg").setup {} + end + } + use('TravonteD/tree-sitter-fennel') + use({ 'tpope/vim-sexp-mappings-for-regular-people', requires = { 'guns/vim-sexp' } }) + use({ + 'chentoast/marks.nvim', + config = function() + require('marks').setup() + end + }) + use('Konfekt/vim-alias') + use('f-person/git-blame.nvim') + use('lewis6991/gitsigns.nvim') end) diff --git a/.config/nvim/lua/ajet/remap.lua b/.config/nvim/lua/ajet/remap.lua index c7cb05b..c63cd98 100644 --- a/.config/nvim/lua/ajet/remap.lua +++ b/.config/nvim/lua/ajet/remap.lua @@ -6,6 +6,7 @@ vim.keymap.set("n", "cc", vim.cmd.cclose) vim.keymap.set("n", "co", vim.cmd.copen) vim.keymap.set("n", "", vim.cmd.w) +vim.keymap.set("n", "", vim.cmd.bd) vim.keymap.set("v", "J", ":m '>+1gv=gv") vim.keymap.set("v", "K", ":m '<-2gv=gv") @@ -53,4 +54,4 @@ end) vim.keymap.set("n", "tr", ":set rnu!") vim.keymap.set("n", "tb", ":GitBlameToggle") -vim.keymap.set("n", "tp", ":TransparentToggle:GitBlameToggle:set rnu!") +vim.keymap.set("n", "tp", ":TransparentToggleset rnu!") diff --git a/.config/nvim/lua/ajet/set.lua b/.config/nvim/lua/ajet/set.lua index 72178b3..dabbc91 100755 --- a/.config/nvim/lua/ajet/set.lua +++ b/.config/nvim/lua/ajet/set.lua @@ -10,7 +10,7 @@ vim.opt.softtabstop = 2 vim.opt.shiftwidth = 2 vim.opt.expandtab = true -vim.opt.foldlevel = 5 +vim.opt.foldlevel = 30 vim.opt.foldmethod = "expr" vim.opt.foldexpr = "nvim_treesitter#foldexpr()" @@ -37,3 +37,4 @@ vim.opt.timeoutlen = 1000 vim.opt.colorcolumn = "85" +vim.cmd[[let g:gitblame_enabled = 0]] diff --git a/.zshrc b/.zshrc index eaaa030..8d91f00 100644 --- a/.zshrc +++ b/.zshrc @@ -40,15 +40,26 @@ alias v="nvim" TMUX_CONFIG="~/.config/tmux/.tmux.conf" TODO_ON_CLEAR=true +#upgrade the commands +alias cat="bat" +alias ls="exa" + #development shortcuts +#git things alias lg="lazygit" alias cfg="lazygit --git-dir=$HOME/.cfg --work-tree=$HOME" +#terminal multiplexing things alias tn="tmux -u -f $TMUX_CONFIG new" alias ta="tmux -u -f $TMUX_CONFIG attach" alias tl="tmux list-sessions" +alias zj="zellij" +#vim searcher alias o="rg --files . | fzf | xargs nvim" +#being lazy alias r="ranger" -alias c='clear; $TODO_ON_CLEAR && cat ~/todo' +alias c='clear; $TODO_ON_CLEAR && tail -n 10 ~/todo' + +#todo things alias todooff="TODO_ON_CLEAR=false" alias todoon="TODO_ON_CLEAR=true" alias shreload="source ~/.zshrc" @@ -86,5 +97,5 @@ _bb_tasks() { } compdef _bb_tasks bb -cat ~/todo +tail -n 10 ~/todo eval "$(starship init zsh)"