diff options
| -rw-r--r-- | .bashrc | 7 | ||||
| -rw-r--r-- | .config/fish/config.fish | 30 | ||||
| -rw-r--r-- | .config/fish/fish_plugins | 5 | ||||
| -rw-r--r-- | .config/nvim/lua/getchoo/config.lua | 25 | ||||
| -rw-r--r-- | .config/nvim/lua/getchoo/plugins.lua | 5 | ||||
| -rw-r--r-- | .config/shell/profile | 13 | ||||
| -rw-r--r-- | .config/zsh/.zsh_plugins.txt | 3 | ||||
| -rw-r--r-- | .config/zsh/.zshrc | 26 |
8 files changed, 48 insertions, 66 deletions
@@ -14,15 +14,16 @@ source "${HOME}/.bash_profile" # options shopt -s cdspell +shopt -s checkjobs shopt -s checkwinsize -shopt -s cmdhist +shopt -s dirspell shopt -s globstar -shopt -s nocaseglob +shopt -s histappend shopt -s no_empty_cmd_completion export HISTFILE="${XDG_STATE_HOME}/bash/history" -export HISTSIZE=100 export HISTFILESIZE=1000 +export HISTSIZE=100 # source aliases source "${XDG_CONFIG_HOME}/shell/aliases" diff --git a/.config/fish/config.fish b/.config/fish/config.fish index f443c23..2f44895 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -3,32 +3,13 @@ # function set_envvars + # source bash profile + bash2env source "$HOME/.config/shell/profile" + # add user bin directory to path if test -d "$HOME/.local/bin" fish_add_path "$HOME/.local/bin" end - - # xdg dirs - set -gx XDG_DATA_HOME "$HOME/.local/share" - set -gx XDG_CONFIG_HOME "$HOME/.config" - set -gx XDG_STATE_HOME "$HOME/.local/state" - set -gx XDG_CACHE_HOME "$HOME/.cache" - if not set -q XDG_DATA_DIRS - set -gx XDG_DATA_DIRS "/usr/local/share/:/usr/share/" - end - set -gx XDG_CONFIG_DIRS "/etc/xdg" - - # default programs - set -gx EDITOR 'nvim' - set -gx VISUAL 'nvim' - set -gx GPG_TTY (tty) - - # paths - set -gx CARGO_HOME "$XDG_DATA_HOME/cargo" - set -gx RUSTUP_HOME "$XDG_DATA_HOME/rustup" - set -gx LESSHISTFILE "$XDG_STATE_HOME/less/history" - set -gx NPM_CONFIG_USERCONFIG "$XDG_CONFIG_HOME/npm/npmrc" - end function load_plugins @@ -36,7 +17,10 @@ function load_plugins echo 'bootstrapping fisher' curl -sL https://git.io/fisher | source && fisher update end - fish_logo + + if command -q zoxide + zoxide init fish | source + end end if status is-login diff --git a/.config/fish/fish_plugins b/.config/fish/fish_plugins index f3407ae..0f0f3c6 100644 --- a/.config/fish/fish_plugins +++ b/.config/fish/fish_plugins @@ -1,4 +1,5 @@ jorgebucaran/fisher jorgebucaran/hydro -laughedelic/fish_logo -andreiborisov/sponge +ehfive/fish-bash2env +jorgebucaran/autopair.fish +nickeb96/puffer-fish diff --git a/.config/nvim/lua/getchoo/config.lua b/.config/nvim/lua/getchoo/config.lua index 529dade..150ebcb 100644 --- a/.config/nvim/lua/getchoo/config.lua +++ b/.config/nvim/lua/getchoo/config.lua @@ -12,31 +12,6 @@ M.bufferline = { semantic_letters = true, } -local db = require("dashboard") -db.custom_center = { - { - desc = "find a file", - action = "Telescope fd", - }, - { - desc = "update plugins", - action = "PackerSync", - }, - { - desc = "update treesitter parsers", - actions = "TSUpdate", - }, -} - -db.custom_header = { - " ███╗ ██╗ ███████╗ ██████╗ ██╗ ██╗ ██╗ ███╗ ███╗", - " ████╗ ██║ ██╔════╝██╔═══██╗ ██║ ██║ ██║ ████╗ ████║", - " ██╔██╗ ██║ █████╗ ██║ ██║ ██║ ██║ ██║ ██╔████╔██║", - " ██║╚██╗██║ ██╔══╝ ██║ ██║ ╚██╗ ██╔╝ ██║ ██║╚██╔╝██║", - " ██║ ╚████║ ███████╗╚██████╔╝ ╚████╔╝ ██║ ██║ ╚═╝ ██║", - " ╚═╝ ╚═══╝ ╚══════╝ ╚═════╝ ╚═══╝ ╚═╝ ╚═╝ ╚═╝", -} - M.lualine = { options = { theme = "nord", diff --git a/.config/nvim/lua/getchoo/plugins.lua b/.config/nvim/lua/getchoo/plugins.lua index 35df46f..fbf42a9 100644 --- a/.config/nvim/lua/getchoo/plugins.lua +++ b/.config/nvim/lua/getchoo/plugins.lua @@ -23,14 +23,12 @@ require("packer").startup(function(use) use("wbthomason/packer.nvim") -- comsetic plugins - use({ "nvim-lualine/lualine.nvim", requires = { "kyazdani42/nvim-web-devicons", opt = true } }) + use({ "nvim-lualine/lualine.nvim", requires = { "kyazdani42/nvim-web-devicons" } }) use("shaunsingh/nord.nvim") use({ "rose-pine/neovim", as = "rose-pine" }) - use("glepnir/dashboard-nvim") - -- general use plugins use({ "romgrk/barbar.nvim", @@ -81,6 +79,7 @@ require("packer").startup(function(use) }) use("lewis6991/gitsigns.nvim") + use("editorconfig/editorconfig-vim") end if Packer_bootstrap then diff --git a/.config/shell/profile b/.config/shell/profile index aeecfde..e727447 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -18,6 +18,19 @@ 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/.zsh_plugins.txt b/.config/zsh/.zsh_plugins.txt index 6d44543..c1ebdef 100644 --- a/.config/zsh/.zsh_plugins.txt +++ b/.config/zsh/.zsh_plugins.txt @@ -3,4 +3,5 @@ romkatv/powerlevel10k path:powerlevel10k.zsh-theme zsh-users/zsh-completions kind:fpath path:src -zsh-users/zsh-syntax-highlighting path:zsh-syntax-highlighting.plugin.zsh +zsh-users/zsh-autosuggestions path:zsh-autosuggestions.zsh +zdharma-continuum/fast-syntax-highlighting path:fast-syntax-highlighting.plugin.zsh diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 3857da9..976f267 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -25,42 +25,50 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]] fi # zmodules -autoload -Uz compinit colors "${antidote_dir}/antidote.zsh" +autoload -Uz bashcompinit compinit colors "${antidote_dir}/antidote.zsh" colors zmodload zsh/zutil zmodload zsh/complist -zstyle ':completion::*' completer _extensions _complete _approximate +zstyle ':completion::*' add-space 'false' +zstyle ':completion::*' completer _ignored _expand_alias _expand _extensions _complete _approximate zstyle ':completion::*' group-name '' zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS} -zstyle ':completion:*' list-dirs-first true -zstyle ':completion:*' menu select -zstyle ':completion::*' use-cache on +zstyle ':completion:*' menu 'true' 'select' +zstyle ':completion:*' single-ignored 'show' +zstyle ':completion:*' squeeze-slashes 'true' +zstyle ':completion::*' use-cache 'true' zstyle ':completion::*' cache-path "$zdump" # compile completion +bashcompinit compinit -d "$zdump" if [[ ! "${zdump}.zwc" -nt "$zdump" ]] then zcompile "$zdump" fi +unset zdump # load plugins source "$static_file" +unset antidote_dir plugins_file static_file +eval "$(zoxide init zsh)" # options +unsetopt beep unsetopt hist_beep +unsetopt ignore_braces unsetopt list_beep +setopt always_to_end +setopt emacs setopt hist_expire_dups_first +setopt hist_ignore_all_dups setopt hist_ignore_dups setopt hist_ignore_space setopt inc_append_history setopt prompt_subst setopt share_history -# binds -bindkey -e - -## clear backbuffer with ctrl-l +# clear backbuffer with ctrl-l function clear-screen-and-scrollback() { echoti civis >"$TTY" printf '%b' '\e[H\e[2J' >"$TTY" |