This commit is contained in:
Adam Jeniski 2023-02-24 14:42:33 -05:00
parent 7ddd679f38
commit 518f283bcb
4 changed files with 122 additions and 101 deletions

View File

@ -48,7 +48,8 @@ return require('packer').startup(function(use)
use('tribela/vim-transparent') use('tribela/vim-transparent')
use('evanleck/vim-svelte', use('evanleck/vim-svelte',
{ branch = 'main' }, { branch = 'main' },
{ requires = { {
requires = {
{ 'othree/html5.vim' }, { 'othree/html5.vim' },
{ 'pangloss/vim-javascript' } { 'pangloss/vim-javascript' }
} }
@ -63,7 +64,8 @@ return require('packer').startup(function(use)
{ 'neovim/nvim-lspconfig' } { 'neovim/nvim-lspconfig' }
}, },
}) })
use({ "nvim-lualine/lualine.nvim", use({
"nvim-lualine/lualine.nvim",
requires = { 'kyazdani42/nvim-web-devicons', opt = true } requires = { 'kyazdani42/nvim-web-devicons', opt = true }
}) })
use({ "nvim-tree/nvim-tree.lua", requires = { "nvim-tree/nvim-web-devicons" } }) use({ "nvim-tree/nvim-tree.lua", requires = { "nvim-tree/nvim-web-devicons" } })
@ -74,8 +76,11 @@ return require('packer').startup(function(use)
use("folke/trouble.nvim", { use("folke/trouble.nvim", {
requires = { "nvim-tree/nvim-web-devicons" }, requires = { "nvim-tree/nvim-web-devicons" },
config = function() config = function()
require("trouble").setup {}
require 'nvim-web-devicons'.setup {} require 'nvim-web-devicons'.setup {}
require("trouble").setup {
icons = false,
use_lsp_diagnostic_signs = true,
}
end end
}) })
use { use {
@ -94,9 +99,12 @@ return require('packer').startup(function(use)
} }
use('TravonteD/tree-sitter-fennel') use('TravonteD/tree-sitter-fennel')
use({ 'tpope/vim-sexp-mappings-for-regular-people', requires = { 'guns/vim-sexp' } }) use({ 'tpope/vim-sexp-mappings-for-regular-people', requires = { 'guns/vim-sexp' } })
use({ 'chentoast/marks.nvim', config = function() use({
'chentoast/marks.nvim',
config = function()
require('marks').setup() require('marks').setup()
end }) end
})
use('Konfekt/vim-alias') use('Konfekt/vim-alias')
use('f-person/git-blame.nvim') use('f-person/git-blame.nvim')
use('lewis6991/gitsigns.nvim') use('lewis6991/gitsigns.nvim')

View File

@ -6,6 +6,7 @@ vim.keymap.set("n", "<leader>cc", vim.cmd.cclose)
vim.keymap.set("n", "<leader>co", vim.cmd.copen) vim.keymap.set("n", "<leader>co", vim.cmd.copen)
vim.keymap.set("n", "<C-s>", vim.cmd.w) vim.keymap.set("n", "<C-s>", vim.cmd.w)
vim.keymap.set("n", "<C-w>", vim.cmd.bd)
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv") vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv") vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
@ -53,4 +54,4 @@ end)
vim.keymap.set("n", "<leader>tr", ":set rnu!<CR>") vim.keymap.set("n", "<leader>tr", ":set rnu!<CR>")
vim.keymap.set("n", "<leader>tb", ":GitBlameToggle<CR>") vim.keymap.set("n", "<leader>tb", ":GitBlameToggle<CR>")
vim.keymap.set("n", "<leader>tp", ":TransparentToggle<CR>:GitBlameToggle<CR>:set rnu!<cr>") vim.keymap.set("n", "<leader>tp", ":TransparentToggle<CR>set rnu!<cr>")

View File

@ -10,7 +10,7 @@ vim.opt.softtabstop = 2
vim.opt.shiftwidth = 2 vim.opt.shiftwidth = 2
vim.opt.expandtab = true vim.opt.expandtab = true
vim.opt.foldlevel = 5 vim.opt.foldlevel = 30
vim.opt.foldmethod = "expr" vim.opt.foldmethod = "expr"
vim.opt.foldexpr = "nvim_treesitter#foldexpr()" vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
@ -37,3 +37,4 @@ vim.opt.timeoutlen = 1000
vim.opt.colorcolumn = "85" vim.opt.colorcolumn = "85"
vim.cmd[[let g:gitblame_enabled = 0]]

15
.zshrc
View File

@ -40,15 +40,26 @@ alias v="nvim"
TMUX_CONFIG="~/.config/tmux/.tmux.conf" TMUX_CONFIG="~/.config/tmux/.tmux.conf"
TODO_ON_CLEAR=true TODO_ON_CLEAR=true
#upgrade the commands
alias cat="bat"
alias ls="exa"
#development shortcuts #development shortcuts
#git things
alias lg="lazygit" alias lg="lazygit"
alias cfg="lazygit --git-dir=$HOME/.cfg --work-tree=$HOME" alias cfg="lazygit --git-dir=$HOME/.cfg --work-tree=$HOME"
#terminal multiplexing things
alias tn="tmux -u -f $TMUX_CONFIG new" alias tn="tmux -u -f $TMUX_CONFIG new"
alias ta="tmux -u -f $TMUX_CONFIG attach" alias ta="tmux -u -f $TMUX_CONFIG attach"
alias tl="tmux list-sessions" alias tl="tmux list-sessions"
alias zj="zellij"
#vim searcher
alias o="rg --files . | fzf | xargs nvim" alias o="rg --files . | fzf | xargs nvim"
#being lazy
alias r="ranger" 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 todooff="TODO_ON_CLEAR=false"
alias todoon="TODO_ON_CLEAR=true" alias todoon="TODO_ON_CLEAR=true"
alias shreload="source ~/.zshrc" alias shreload="source ~/.zshrc"
@ -86,5 +97,5 @@ _bb_tasks() {
} }
compdef _bb_tasks bb compdef _bb_tasks bb
cat ~/todo tail -n 10 ~/todo
eval "$(starship init zsh)" eval "$(starship init zsh)"