diff options
| -rw-r--r-- | .bash_profile | 2 | ||||
| -rw-r--r-- | .bashrc | 3 | ||||
| -rw-r--r-- | .config/nvim/plugin/packer_compiled.lua | 214 | ||||
| -rw-r--r-- | .config/shell/profile | 23 | ||||
| -rw-r--r-- | .config/zsh/.zshrc | 10 |
5 files changed, 12 insertions, 240 deletions
diff --git a/.bash_profile b/.bash_profile index 663182a..a3447f9 100644 --- a/.bash_profile +++ b/.bash_profile @@ -10,3 +10,5 @@ if [ -d "${HOME}/.local/bin" ] then export PATH="${HOME}/.local/bin:${PATH}" fi + +source "${HOME}/.bashrc" @@ -3,9 +3,6 @@ # getchoo's bashrc # -# always source profile -source "${HOME}/.bash_profile" - # drop into fish ## if [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z ${BASH_EXECUTION_STRING} ]] ## then diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua deleted file mode 100644 index e51b7cc..0000000 --- a/.config/nvim/plugin/packer_compiled.lua +++ /dev/null @@ -1,214 +0,0 @@ --- Automatically generated packer.nvim plugin loader code - -if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then - vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') - return -end - -vim.api.nvim_command('packadd packer.nvim') - -local no_errors, error_msg = pcall(function() - -_G._packer = _G._packer or {} -_G._packer.inside_compile = true - -local time -local profile_info -local should_profile = false -if should_profile then - local hrtime = vim.loop.hrtime - profile_info = {} - time = function(chunk, start) - if start then - profile_info[chunk] = hrtime() - else - profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 - end - end -else - time = function(chunk, start) end -end - -local function save_profiles(threshold) - local sorted_times = {} - for chunk_name, time_taken in pairs(profile_info) do - sorted_times[#sorted_times + 1] = {chunk_name, time_taken} - end - table.sort(sorted_times, function(a, b) return a[2] > b[2] end) - local results = {} - for i, elem in ipairs(sorted_times) do - if not threshold or threshold and elem[2] > threshold then - results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' - end - end - if threshold then - table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)') - end - - _G._packer.profile_output = results -end - -time([[Luarocks path setup]], true) -local package_path_str = "/home/seth/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/seth/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/seth/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/seth/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/seth/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" -if not string.find(package.path, package_path_str, 1, true) then - package.path = package.path .. ';' .. package_path_str -end - -if not string.find(package.cpath, install_cpath_pattern, 1, true) then - package.cpath = package.cpath .. ';' .. install_cpath_pattern -end - -time([[Luarocks path setup]], false) -time([[try_loadstring definition]], true) -local function try_loadstring(s, component, name) - local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) - if not success then - vim.schedule(function() - vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) - end) - end - return result -end - -time([[try_loadstring definition]], false) -time([[Defining packer_plugins]], true) -_G.packer_plugins = { - LuaSnip = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/LuaSnip", - url = "https://github.com/L3MON4D3/LuaSnip" - }, - ["barbar.nvim"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/barbar.nvim", - url = "https://github.com/romgrk/barbar.nvim" - }, - ["cmp-buffer"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/cmp-buffer", - url = "https://github.com/hrsh7th/cmp-buffer" - }, - ["cmp-nvim-lsp"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", - url = "https://github.com/hrsh7th/cmp-nvim-lsp" - }, - ["cmp-path"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/cmp-path", - url = "https://github.com/hrsh7th/cmp-path" - }, - ["cmp-vsnip"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/cmp-vsnip", - url = "https://github.com/hrsh7th/cmp-vsnip" - }, - cmp_luasnip = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/cmp_luasnip", - url = "https://github.com/saadparwaiz1/cmp_luasnip" - }, - ["editorconfig-vim"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/editorconfig-vim", - url = "https://github.com/editorconfig/editorconfig-vim" - }, - ["gitsigns.nvim"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/gitsigns.nvim", - url = "https://github.com/lewis6991/gitsigns.nvim" - }, - ["lightspeed.nvim"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/lightspeed.nvim", - url = "https://github.com/ggandor/lightspeed.nvim" - }, - ["lualine.nvim"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/lualine.nvim", - url = "https://github.com/nvim-lualine/lualine.nvim" - }, - ["nord.nvim"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/nord.nvim", - url = "https://github.com/shaunsingh/nord.nvim" - }, - ["null-ls.nvim"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/null-ls.nvim", - url = "https://github.com/jose-elias-alvarez/null-ls.nvim" - }, - ["nvim-cmp"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/nvim-cmp", - url = "https://github.com/hrsh7th/nvim-cmp" - }, - ["nvim-lspconfig"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", - url = "https://github.com/neovim/nvim-lspconfig" - }, - ["nvim-tree.lua"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/nvim-tree.lua", - url = "https://github.com/kyazdani42/nvim-tree.lua" - }, - ["nvim-treesitter"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/nvim-treesitter", - url = "https://github.com/nvim-treesitter/nvim-treesitter" - }, - ["nvim-web-devicons"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", - url = "https://github.com/kyazdani42/nvim-web-devicons" - }, - ["packer.nvim"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/packer.nvim", - url = "https://github.com/wbthomason/packer.nvim" - }, - ["plenary.nvim"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/plenary.nvim", - url = "https://github.com/nvim-lua/plenary.nvim" - }, - ["rose-pine"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/rose-pine", - url = "https://github.com/rose-pine/neovim" - }, - ["telescope.nvim"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/telescope.nvim", - url = "https://github.com/nvim-telescope/telescope.nvim" - }, - ["trouble.nvim"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/trouble.nvim", - url = "https://github.com/folke/trouble.nvim" - }, - ["vim-vsnip"] = { - loaded = true, - path = "/home/seth/.local/share/nvim/site/pack/packer/start/vim-vsnip", - url = "https://github.com/hrsh7th/vim-vsnip" - } -} - -time([[Defining packer_plugins]], false) - -_G._packer.inside_compile = false -if _G._packer.needs_bufread == true then - vim.cmd("doautocmd BufRead") -end -_G._packer.needs_bufread = false - -if should_profile then save_profiles() end - -end) - -if not no_errors then - error_msg = error_msg:gsub('"', '\\"') - vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') -end diff --git a/.config/shell/profile b/.config/shell/profile index e727447..53c7fd8 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -1,10 +1,10 @@ # xdg dirs -export XDG_DATA_HOME="${HOME}/.local/share" -export XDG_CONFIG_HOME="${HOME}/.config" -export XDG_STATE_HOME="${HOME}/.local/state" -export XDG_CACHE_HOME="${HOME}/.cache" +export XDG_DATA_HOME="${XDG_DATA_HOME:-${HOME}/.local/share}" +export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-${HOME}/.config}" +export XDG_STATE_HOME="${XDG_STATE_HOME:-${HOME}/.local/state}" +export XDG_CACHE_HOME="${XDG_CACHE_HOME:-${HOME}/.cache}" export XDG_DATA_DIRS="${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}" -export XDG_CONFIG_DIRS="/etc/xdg" +export XDG_CONFIG_DIRS="${XDG_CONFIG_DIRS:-/etc/xdg}" # default programs export EDITOR='nvim' @@ -18,19 +18,6 @@ export LESSHISTFILE="${XDG_STATE_HOME}/less/history" export NPM_CONFIG_USERCONFIG="${XDG_CONFIG_HOME}/npm/npmrc" export VIMINIT='let $MYVIMRC = !has("nvim") ? "$XDG_CONFIG_HOME/vim/vimrc" : "$XDG_CONFIG_HOME/nvim/init.lua" | so $MYVIMRC' -# flags -export CFLAGS="-O2 -flto=auto -ffat-lto-objects -fexceptions \ - -g -grecord-gcc-switches -pipe -Wall -Werror=format-security \ - -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS \ - -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong \ - -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic \ - -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection" -export CXXFLAGS="$CFLAGS" -export LDFLAGS="-Wl,-z,relro -Wl,--as-needed -Wl,-z,now \ - -specs=/usr/lib/rpm/redhat/redhat-hardened-ld \ - -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1" -MAKEFLAGS="-j12" - dir_colors="${XDG_CONFIG_HOME}/shell/dir_colors" [[ -f "$dir_colors" ]] && eval $(dircolors "$dir_colors") unset dir_colors diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 0503459..8f76874 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -23,7 +23,6 @@ autoload -Uz bashcompinit compinit # colors promptinit # promptinit; prompt walters zmodload zsh/zutil zmodload zsh/complist -zstyle ':completion::*' add-space 'false' zstyle ':completion::*' group-name '' zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS} zstyle ':completion:*' menu 'select' @@ -31,6 +30,11 @@ zstyle ':completion:*' squeeze-slashes 'true' zstyle ':completion::*' use-cache 'true' zstyle ':completion::*' cache-path "$zdump" +# load plugins +antidote load +## eval "$(zoxide init zsh)" +unset antidote_dir + # compile completion bashcompinit compinit -d "$zdump" @@ -40,10 +44,6 @@ then fi unset zdump -# load plugins -antidote load -## eval "$(zoxide init zsh)" -unset antidote_dir # options unsetopt beep |