diff --git a/.bashrc b/.bashrc index 1c7ae1f..86b1bcf 100644 --- a/.bashrc +++ b/.bashrc @@ -46,16 +46,18 @@ COMMANDS_="${COMMANDS_-} PROMPT_COMMAND PS0 PS1 PS2 PS3 PS4" [ -z "${PS1-}" ] && return set -o emacs tabs -4 -shopt -s histappend -shopt -s checkwinsize -shopt -s extglob shopt -u histverify +shopt -s extglob shopt -s autocd + +shopt -s histappend +shopt -s histreedit +shopt -s checkwinsize HISTSIZE='-1' HISTFILESIZE='-1' -HISTFILE="${HOME}"/.bash_history +HISTFILE="${HOME}"/.tosu_bash_history HISTTIMEFORMAT=$'\033[m%F %T: ' -HISTCONTROL='ignoreboth:erasedups' +HISTCONTROL='ignoreboth' # PROMPT_COMMAND="history -n; history -w; history -c; history -r" [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" @@ -73,7 +75,6 @@ elif 2>/dev/null 1>&2 command -v nvi; then elif 2>/dev/null 1>&2 command -v vi; then alias v='vi' fi - alias tapo_bright='ssh -t pt bash -ic tapo_bright' alias tapo_color_ambience='ssh -t pt bash -ic tapo_color_ambience' alias tapo_color_ambience2='ssh -t pt bash -ic tapo_color_ambience2' @@ -180,7 +181,7 @@ function paruuu () { && [ ! "${ssid-}" = "Silmaril 4 (2.4)" ] \ && [ -n "${ssid-}" ] \ && : ; then - read -p "[31mYou're connected to '${ssid-}', update anyway (Y|n)?[m" choice + read -p "You're connected to '${ssid-}', update anyway (Y|n)?" choice if [ ! "${choice}" = "y" -a ! "${choice}" = "Y" -a -n "${choice}" ]; then exit fi @@ -553,3 +554,4 @@ aocload () { xmodmap ~/.Xmodmap alias q='docker run --rm -it ghcr.io/natesales/q' +alias make='compiledb make' diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua index 05c52aa..84b9496 100644 --- a/.config/nvim/after/plugin/lsp.lua +++ b/.config/nvim/after/plugin/lsp.lua @@ -86,7 +86,7 @@ null_ls.setup({ } }) --- require("norme").setup({ --- -- Your configuration --- cmd = os.getenv('HOME') .. '/.local/bin/norminette' --- }) +require("norme").setup({ + -- Your configuration + cmd = os.getenv('HOME') .. '/.local/bin/norminette' +}) diff --git a/.config/nvim/after/plugin/treesitter.lua b/.config/nvim/after/plugin/treesitter.lua index 1ea991f..26eb6a6 100644 --- a/.config/nvim/after/plugin/treesitter.lua +++ b/.config/nvim/after/plugin/treesitter.lua @@ -1,32 +1,32 @@ ---- require 'nvim-treesitter.configs'.setup { ---- -- A list of parser names, or "all" (the five listed parsers should always be installed) ---- ensure_installed = { "vimdoc", "javascript", "typescript", "python", "bash", "c", "lua", "vim", "vimdoc", "query" }, ---- ---- -- Install parsers synchronously (only applied to `ensure_installed`) ---- sync_install = false, ---- ---- -- Automatically install missing parsers when entering buffer ---- -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally ---- auto_install = true, ---- ---- -- List of parsers to ignore installing (for "all") ---- ignore_install = { "help" }, ---- ---- highlight = { ---- enable = true, ---- ---- -- Setting this to true will run `:h syntax` and tree-sitter at the same time. ---- -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). ---- -- Using this option may slow down your editor, and you may see some duplicate highlights. ---- -- Instead of true it can also be a list of languages ---- additional_vim_regex_highlighting = false, ---- }, ---- ---- incremental_selection = { ---- enable = true, ---- keymaps = { ---- node_incremental = "v", ---- node_decremental = "V", ---- }, ---- }, ---- } +require 'nvim-treesitter.configs'.setup { + -- A list of parser names, or "all" (the five listed parsers should always be installed) + ensure_installed = { "vimdoc", "javascript", "typescript", "python", "bash", "c", "lua", "vim", "vimdoc", "query" }, + + -- Install parsers synchronously (only applied to `ensure_installed`) + sync_install = false, + + -- Automatically install missing parsers when entering buffer + -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally + auto_install = true, + + -- List of parsers to ignore installing (for "all") + ignore_install = { "help" }, + + highlight = { + enable = true, + + -- Setting this to true will run `:h syntax` and tree-sitter at the same time. + -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). + -- Using this option may slow down your editor, and you may see some duplicate highlights. + -- Instead of true it can also be a list of languages + additional_vim_regex_highlighting = false, + }, + + incremental_selection = { + enable = true, + keymaps = { + node_incremental = "v", + node_decremental = "V", + }, + }, +} diff --git a/.config/nvim/lua/tosu/packer.lua b/.config/nvim/lua/tosu/packer.lua index 7f88b3c..7f19318 100644 --- a/.config/nvim/lua/tosu/packer.lua +++ b/.config/nvim/lua/tosu/packer.lua @@ -7,48 +7,48 @@ return require('packer').startup(function(use) -- Packer can manage itself use 'wbthomason/packer.nvim' - use { - 'nvim-telescope/telescope.nvim', tag = '0.1.2', - -- or , branch = '0.1.x', - requires = { { 'nvim-lua/plenary.nvim' } } - } - - use({ 'rose-pine/neovim', as = 'rose-pine' }) - use({ 'ellisonleao/gruvbox.nvim', as = 'gruvbox' }) - use({ 'patstockwell/vim-monokai-tasty', as = 'monokai' }) - - use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) - use('nvim-treesitter/playground') - use('ThePrimeagen/harpoon') - use('mbbill/undotree') - use('tpope/vim-fugitive') - use('vim-airline/vim-airline') - use('vim-airline/vim-airline-themes') - use('cacharle/c_formatter_42.vim') - -- use('m4xshen/autoclose.nvim') - use('takac/vim-hardtime') - use({ - 'VonHeikemen/lsp-zero.nvim', - branch = 'v2.x', - requires = { - -- LSP Support - { 'neovim/nvim-lspconfig' }, -- Required - { -- Optional - 'williamboman/mason.nvim', - run = function() - pcall(vim.api.nvim_command, 'MasonUpdate') - end, - }, - { 'williamboman/mason-lspconfig.nvim' }, -- Optional - - -- Autocompletion - { 'hrsh7th/nvim-cmp' }, -- Required - { 'hrsh7th/cmp-nvim-lsp' }, -- Required - { 'L3MON4D3/LuaSnip' }, -- Required + use { + 'nvim-telescope/telescope.nvim', tag = '0.1.2', + -- or , branch = '0.1.x', + requires = { { 'nvim-lua/plenary.nvim' } } } - }) - use({ - 'vinicius507/norme.nvim', - requires = { 'jose-elias-alvarez/null-ls.nvim' } - }) + + use({ 'rose-pine/neovim', as = 'rose-pine' }) + use({ 'ellisonleao/gruvbox.nvim', as = 'gruvbox' }) + use({ 'patstockwell/vim-monokai-tasty', as = 'monokai' }) + + use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) + use('nvim-treesitter/playground') + use('ThePrimeagen/harpoon') + use('mbbill/undotree') + use('tpope/vim-fugitive') + use('vim-airline/vim-airline') + use('vim-airline/vim-airline-themes') + use('cacharle/c_formatter_42.vim') + -- use('m4xshen/autoclose.nvim') + use('takac/vim-hardtime') + use({ + 'VonHeikemen/lsp-zero.nvim', + branch = 'v2.x', + requires = { + -- LSP Support + { 'neovim/nvim-lspconfig' }, -- Required + { -- Optional + 'williamboman/mason.nvim', + run = function() + pcall(vim.api.nvim_command, 'MasonUpdate') + end, + }, + { 'williamboman/mason-lspconfig.nvim' }, -- Optional + + -- Autocompletion + { 'hrsh7th/nvim-cmp' }, -- Required + { 'hrsh7th/cmp-nvim-lsp' }, -- Required + { 'L3MON4D3/LuaSnip' }, -- Required + } + }) + use({ + 'vinicius507/norme.nvim', + requires = { 'jose-elias-alvarez/null-ls.nvim' } + }) end) diff --git a/.tmux.conf b/.tmux.conf index c37ae64..431c77a 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -57,4 +57,4 @@ bind-key -T prefix C-u popup -E '~/.local/bin/tmux_urls.py' set-option -g set-titles on -run-shell ~/repos/tmux-copycat/copycat.tmux +# run-shell ~/repos/tmux-copycat/copycat.tmux