From 2331f85e38ee839d35580c336062ba3e61e0b1d3 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Thu, 15 Sep 2022 08:54:51 +0200 Subject: Added zsh ctrl-r shortcut to search back --- config/zsh/.zshrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index a1211cd..9d79a25 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -41,6 +41,7 @@ bindkey -M menuselect 'k' vi-up-line-or-history bindkey -M menuselect 'l' vi-forward-char bindkey -M menuselect 'j' vi-down-line-or-history bindkey -v '^?' backward-delete-char +bindkey '^r' history-incremental-search-backward # vim keybindings in prompt bindkey -v @@ -104,7 +105,7 @@ export YSU_MESSAGE_POSITION="after" # you-should # install pkgfile package on Arch Linux # run `pkgfile --update` -if [ "$(uname)" = 'Linux' ] +if [ "$(uname)" = 'Linux' ] && grep -q Arch /etc/lsb-release > /dev/null then . /usr/share/doc/pkgfile/command-not-found.zsh if [ -d /opt/ros2/galactic ] -- cgit From ed841feabf23c119fa571b89fed023e3172be45d Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Thu, 15 Sep 2022 08:55:08 +0200 Subject: Switching to gruvbox theme for alacritty on macos --- config/alacritty/alacritty.darwin.yml | 88 +++++++++++++++++------------------ 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/config/alacritty/alacritty.darwin.yml b/config/alacritty/alacritty.darwin.yml index bedd44d..709115d 100644 --- a/config/alacritty/alacritty.darwin.yml +++ b/config/alacritty/alacritty.darwin.yml @@ -29,54 +29,54 @@ key_bindings: - { key: Q, mods: Command, chars: "" } # Colors (Nord) -colors: - primary: - background: '0x2E3440' - foreground: '0xD8DEE9' - normal: - black: '0x3B4252' - red: '0xBF616A' - green: '0xA3BE8C' - yellow: '0xEBCB8B' - blue: '0x81A1C1' - magenta: '0xB48EAD' - cyan: '0x88C0D0' - white: '0xE5E9F0' - bright: - black: '0x4C566A' - red: '0xBF616A' - green: '0xA3BE8C' - yellow: '0xEBCB8B' - blue: '0x81A1C1' - magenta: '0xB48EAD' - cyan: '0x8FBCBB' - white: '0xECEFF4' - -# gruvbox_dark: https://github.com/eendroroy/alacritty-theme/blob/master/schemes.yaml # colors: # primary: -# # hard contrast: background = '0x1d2021' -# background: '0x282828' -# # soft contrast: background = '0x32302f' -# foreground: '0xebdbb2' +# background: '0x2E3440' +# foreground: '0xD8DEE9' # normal: -# black: '0x282828' -# red: '0xcc241d' -# green: '0x98971a' -# yellow: '0xd79921' -# blue: '0x458588' -# magenta: '0xb16286' -# cyan: '0x689d6a' -# white: '0xa89984' +# black: '0x3B4252' +# red: '0xBF616A' +# green: '0xA3BE8C' +# yellow: '0xEBCB8B' +# blue: '0x81A1C1' +# magenta: '0xB48EAD' +# cyan: '0x88C0D0' +# white: '0xE5E9F0' # bright: -# black: '0x928374' -# red: '0xfb4934' -# green: '0xb8bb26' -# yellow: '0xfabd2f' -# blue: '0x83a598' -# magenta: '0xd3869b' -# cyan: '0x8ec07c' -# white: '0xebdbb2' +# black: '0x4C566A' +# red: '0xBF616A' +# green: '0xA3BE8C' +# yellow: '0xEBCB8B' +# blue: '0x81A1C1' +# magenta: '0xB48EAD' +# cyan: '0x8FBCBB' +# white: '0xECEFF4' + +# gruvbox_dark: https://github.com/eendroroy/alacritty-theme/blob/master/schemes.yaml +colors: + primary: + # hard contrast: background = '0x1d2021' + background: '0x282828' + # soft contrast: background = '0x32302f' + foreground: '0xebdbb2' + normal: + black: '0x282828' + red: '0xcc241d' + green: '0x98971a' + yellow: '0xd79921' + blue: '0x458588' + magenta: '0xb16286' + cyan: '0x689d6a' + white: '0xa89984' + bright: + black: '0x928374' + red: '0xfb4934' + green: '0xb8bb26' + yellow: '0xfabd2f' + blue: '0x83a598' + magenta: '0xd3869b' + cyan: '0x8ec07c' + white: '0xebdbb2' # # colorscheme (Dracula) -- cgit From 3faca14937f5b180641b02763a5ef37f56424588 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Thu, 15 Sep 2022 09:42:58 +0200 Subject: Moving zsh env variables to zshenv instead of zprofile --- config/alacritty/alacritty.darwin.yml | 6 +++ config/zsh/.zshenv | 81 +++++++++++++++++++++++++++++++++++ config/zsh/zprofile | 81 ----------------------------------- 3 files changed, 87 insertions(+), 81 deletions(-) create mode 100644 config/zsh/.zshenv diff --git a/config/alacritty/alacritty.darwin.yml b/config/alacritty/alacritty.darwin.yml index 709115d..417c54a 100644 --- a/config/alacritty/alacritty.darwin.yml +++ b/config/alacritty/alacritty.darwin.yml @@ -2,6 +2,12 @@ # alacritty # ############# +shell: + program: /bin/zsh + args: + - '-c' + - 'source ~/.config/zsh/.zshenv && zsh' + # font font: size: 12 diff --git a/config/zsh/.zshenv b/config/zsh/.zshenv new file mode 100644 index 0000000..273827a --- /dev/null +++ b/config/zsh/.zshenv @@ -0,0 +1,81 @@ +if [ "$(uname)" = 'Linux' ] +then + export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$HOME/.local/bin" + export MAIL='me@cacharle.xyz' + export SUDO='doas' +elif [ "$(uname)" = 'Darwin' ] +then + export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" + export PATH="$PATH:$HOME/.brew/bin:$HOME/git/dotfiles/bin:$HOME/bin:/usr/local/anaconda3/bin" + export PATH="$PATH:$HOME/.local/share/go/bin" + export PATH="$PATH:$HOME/.local/bin" + export MAIL='charles.cabergs@colruytgroup.com' + export SUDO='sudo' + export LC_CTYPE='en_US.UTF-8' +fi + +# applications +export EDITOR='nvim' +export TERMINAL='alacritty' +export BROWSER='qutebrowser' +export BROWSERCLI='w3m' + +[ -z "$TMUX" ] && export TERM='xterm-256color' + +# XDG all the things +export XDG_CONFIG_HOME="$HOME/.config" +export XDG_DATA_HOME="$HOME/.local/share" +export XDG_CACHE_HOME="$HOME/.cache" +# config +export XMONAD_CONFIG_HOME="$XDG_CONFIG_HOME/xmonad" +export XMONAD_DATA_HOME="$XDG_DATA_HOME/xmonad" +export XMONAD_CACHE_HOME="$XDG_CACHE_HOME/xmonad" +export ZDOTDIR="$XDG_CONFIG_HOME/zsh" +export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc" +export INPUTRC="$XDG_CONFIG_HOME/readline/inputrc" +export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/startup.py" +export ASPELL_CONF="per-conf $XDG_CONFIG_HOME/aspell/aspell.conf; personal $XDG_CONFIG_HOME/aspell/en.pws; repl $XDG_CONFIG_HOME/aspell/en.prepl" +export BUNDLE_USER_CONFIG="$XDG_CONFIG_HOME"/bundle +export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc" +# shellcheck disable=SC2016 +export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC' +export IPYTHONDIR="$XDG_CONFIG_HOME/ipython" +export JUPYTER_CONFIG_DIR="$XDG_CONFIG_HOME/jupyter" +export SCREENRC="$XDG_CONFIG_HOME/screen/screenrc" +# data +export GNUPGHOME="$XDG_DATA_HOME/gnupg" +export GOPATH="$XDG_DATA_HOME/go" +export CARGO_HOME="$XDG_DATA_HOME/cargo" +export BUNDLE_USER_PLUGIN="$XDG_DATA_HOME"/bundle +export JULIA_DEPOT_PATH="$XDG_DATA_HOME/julia:$JULIA_DEPOT_PATH" +export RLWRAP_HOME="$XDG_DATA_HOME/rlwrap" +export STARDICT_DATA_DIR="$XDG_DATA_HOME/stardict" # put dictionaries in a 'dic' subdirectory +# cache +export HISTFILE="$XDG_CACHE_HOME/zsh/history" +export LESSHISTFILE='-' # no ~/.lesshst +export PYTHON_EGG_CACHE="$XDG_CACHE_HOME/python-eggs" +export BUNDLE_USER_CACHE="$XDG_CACHE_HOME/bundle" +# runtime +export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" + +# shellcheck disable=SC2155 +# color in man (less pager) +export LESS_TERMCAP_mb="$(printf '%b' '\e[1;32m')" +export LESS_TERMCAP_md="$(printf '%b' '\e[1;32m')" +export LESS_TERMCAP_me="$(printf '%b' '\e[0m')" +export LESS_TERMCAP_se="$(printf '%b' '\e[0m')" +export LESS_TERMCAP_so="$(printf '%b' '\e[01;33m')" +export LESS_TERMCAP_ue="$(printf '%b' '\e[0m')" +export LESS_TERMCAP_us="$(printf '%b' '\e[1;4;31m')" +export LESS_TERMCAP_mr="$(tput rev)" +export LESS_TERMCAP_mh="$(tput dim)" +export LESS_TERMCAP_ZN="$(tput ssubm)" +export LESS_TERMCAP_ZV="$(tput rsubm)" +export LESS_TERMCAP_ZO="$(tput ssupm)" +export LESS_TERMCAP_ZW="$(tput rsupm)" + +export MINIKUBE_IN_STYLE=false # disable cringe minikube emojies + +export CLOUT_SYNC_DIR="clout-sync/" +export CLOUT_SYNC_PATH="${XDG_DATA_HOME:-$HOME/.sync}/$CLOUT_SYNC_DIR" + diff --git a/config/zsh/zprofile b/config/zsh/zprofile index f05d43e..c9b2007 100755 --- a/config/zsh/zprofile +++ b/config/zsh/zprofile @@ -1,86 +1,5 @@ #!/bin/zsh -if [ "$(uname)" = 'Linux' ] -then - export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$HOME/.local/bin" - export MAIL='me@cacharle.xyz' - export SUDO='doas' -elif [ "$(uname)" = 'Darwin' ] -then - export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" - export PATH="$PATH:$HOME/.brew/bin:$HOME/git/dotfiles/bin:$HOME/bin:/usr/local/anaconda3/bin" - export PATH="$PATH:$HOME/.local/share/go/bin" - export PATH="$PATH:$HOME/.local/bin" - export MAIL='charles.cabergs@colruytgroup.com' - export SUDO='sudo' - export LC_CTYPE='en_US.UTF-8' -fi - -# applications -export EDITOR='nvim' -export TERMINAL='alacritty' -export BROWSER='qutebrowser' -export BROWSERCLI='w3m' - -export TERM='xterm-256color' - -# XDG all the things -export XDG_CONFIG_HOME="$HOME/.config" -export XDG_DATA_HOME="$HOME/.local/share" -export XDG_CACHE_HOME="$HOME/.cache" -# config -export XMONAD_CONFIG_HOME="$XDG_CONFIG_HOME/xmonad" -export XMONAD_DATA_HOME="$XDG_DATA_HOME/xmonad" -export XMONAD_CACHE_HOME="$XDG_CACHE_HOME/xmonad" -export ZDOTDIR="$XDG_CONFIG_HOME/zsh" -export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc" -export INPUTRC="$XDG_CONFIG_HOME/readline/inputrc" -export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/startup.py" -export ASPELL_CONF="per-conf $XDG_CONFIG_HOME/aspell/aspell.conf; personal $XDG_CONFIG_HOME/aspell/en.pws; repl $XDG_CONFIG_HOME/aspell/en.prepl" -export BUNDLE_USER_CONFIG="$XDG_CONFIG_HOME"/bundle -export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc" -# shellcheck disable=SC2016 -export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC' -export IPYTHONDIR="$XDG_CONFIG_HOME/ipython" -export JUPYTER_CONFIG_DIR="$XDG_CONFIG_HOME/jupyter" -export SCREENRC="$XDG_CONFIG_HOME/screen/screenrc" -# data -export GNUPGHOME="$XDG_DATA_HOME/gnupg" -export GOPATH="$XDG_DATA_HOME/go" -export CARGO_HOME="$XDG_DATA_HOME/cargo" -export BUNDLE_USER_PLUGIN="$XDG_DATA_HOME"/bundle -export JULIA_DEPOT_PATH="$XDG_DATA_HOME/julia:$JULIA_DEPOT_PATH" -export RLWRAP_HOME="$XDG_DATA_HOME/rlwrap" -export STARDICT_DATA_DIR="$XDG_DATA_HOME/stardict" # put dictionaries in a 'dic' subdirectory -# cache -export HISTFILE="$XDG_CACHE_HOME/zsh/history" -export LESSHISTFILE='-' # no ~/.lesshst -export PYTHON_EGG_CACHE="$XDG_CACHE_HOME/python-eggs" -export BUNDLE_USER_CACHE="$XDG_CACHE_HOME/bundle" -# runtime -export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" - -# shellcheck disable=SC2155 -# color in man (less pager) -export LESS_TERMCAP_mb="$(printf '%b' '\e[1;32m')" -export LESS_TERMCAP_md="$(printf '%b' '\e[1;32m')" -export LESS_TERMCAP_me="$(printf '%b' '\e[0m')" -export LESS_TERMCAP_se="$(printf '%b' '\e[0m')" -export LESS_TERMCAP_so="$(printf '%b' '\e[01;33m')" -export LESS_TERMCAP_ue="$(printf '%b' '\e[0m')" -export LESS_TERMCAP_us="$(printf '%b' '\e[1;4;31m')" -export LESS_TERMCAP_mr="$(tput rev)" -export LESS_TERMCAP_mh="$(tput dim)" -export LESS_TERMCAP_ZN="$(tput ssubm)" -export LESS_TERMCAP_ZV="$(tput rsubm)" -export LESS_TERMCAP_ZO="$(tput ssupm)" -export LESS_TERMCAP_ZW="$(tput rsupm)" - -export MINIKUBE_IN_STYLE=false # disable cringe minikube emojies - -export CLOUT_SYNC_DIR="clout-sync/" -export CLOUT_SYNC_PATH="${XDG_DATA_HOME:-$HOME/.sync}/$CLOUT_SYNC_DIR" - if [ "$(uname)" = 'Linux' ] && [ "$(tty)" = '/dev/tty1' ] then # https://wiki.archlinux.org/title/Xorg/Keyboard_configuration -- cgit From abce2fe2e0ce615192f9ed73f6981a347d015bab Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Thu, 15 Sep 2022 10:09:10 +0200 Subject: Added nvim pylsp default flake8 configuration --- config/nvim/lua/plugins.lua | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 6eae912..e454139 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -111,7 +111,20 @@ return require("packer").startup(function() -- lspconfig.clangd.setup { on_attach = on_attach } -- lspconfig.rust_analyzer.setup { on_attach = on_attach } -- need python-lsp-server and pyls-flake8 - lspconfig.pylsp.setup { on_attach = on_attach, capabilities = capabilities } + lspconfig.pylsp.setup { + on_attach = on_attach, + capabilities = capabilities, + settings = { + pylsp = { + plugins = { + flake8 = { + ignore = {'E501', 'E221', 'W503', 'E241'}, + maxLineLength = 100, + }, + }, + }, + }, + } -- brew install haskell-language-server lspconfig.hls.setup {} -- cgit From 8e8c44d2f9f39ca522723c810c928a3b132712ee Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Thu, 15 Sep 2022 16:24:46 +0200 Subject: Added nvim telescope prompt shortcut --- config/nvim/lua/plugins.lua | 78 ++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index e454139..53495fe 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -311,7 +311,7 @@ return require("packer").startup(function() -- status line use { "nvim-lualine/lualine.nvim", - requires = {"kyazdani42/nvim-web-devicons", opt = true}, + requires = {"kyazdani42/nvim-web-devicons"}, config = function() require("lualine").setup { options = { @@ -355,7 +355,7 @@ return require("packer").startup(function() "nvim-telescope/telescope.nvim", requires = { {"nvim-lua/plenary.nvim"}, - {"kyazdani42/nvim-web-devicons", opt = true}, + {"kyazdani42/nvim-web-devicons"}, { "nvim-telescope/telescope-fzf-native.nvim", run = "make", @@ -370,6 +370,7 @@ return require("packer").startup(function() i = { [""] = actions.move_selection_next, [""] = actions.move_selection_previous, + [""] = actions.delete_buffer, [""] = actions.close, ["kj"] = actions.close, } @@ -384,7 +385,6 @@ return require("packer").startup(function() map("n", "g", "Telescope live_grep", {}) map("n", "G", "Telescope grep_string", {}) end - } -- todos,fix,etc.. highlight and list @@ -399,44 +399,44 @@ return require("packer").startup(function() } -- remote files and lsp - use { - "chipsenkbeil/distant.nvim", - config = function() - -- local on_attach = function(client, bufnr) - -- local opts = { noremap = true, silent = true } - -- local map = function(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end - -- map("n", "[", "lua vim.lsp.buf.declaration()", opts) - -- map("n", "]", "lua vim.lsp.buf.definition()", opts) - -- map("n", "K", "lua vim.lsp.buf.hover()", opts) - -- map("n", "[d", "lua vim.diagnostic.goto_prev()", opts) - -- map("n", "]d", "lua vim.diagnostic.goto_next()", opts) - -- map("n", "q", "Telescope lsp_workspace_diagnostics", opts) - -- map("n", "rn", "lua vim.lsp.buf.rename()", opts) - -- end - require("distant").setup { - ["*"] = require("distant.settings").chip_default() - } - -- TODO: extend with job_distant_config.lua - end, - run = ":DistantInstall" - } + -- use { + -- "chipsenkbeil/distant.nvim", + -- config = function() + -- -- local on_attach = function(client, bufnr) + -- -- local opts = { noremap = true, silent = true } + -- -- local map = function(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end + -- -- map("n", "[", "lua vim.lsp.buf.declaration()", opts) + -- -- map("n", "]", "lua vim.lsp.buf.definition()", opts) + -- -- map("n", "K", "lua vim.lsp.buf.hover()", opts) + -- -- map("n", "[d", "lua vim.diagnostic.goto_prev()", opts) + -- -- map("n", "]d", "lua vim.diagnostic.goto_next()", opts) + -- -- map("n", "q", "Telescope lsp_workspace_diagnostics", opts) + -- -- map("n", "rn", "lua vim.lsp.buf.rename()", opts) + -- -- end + -- require("distant").setup { + -- ["*"] = require("distant.settings").chip_default() + -- } + -- -- TODO: extend with job_distant_config.lua + -- end, + -- run = ":DistantInstall" + -- } -- jupyter kernel in nvim (with images, needs ueberzug) - use { - "dccsillag/magma-nvim", - -- ft = { "python" }, -- doesn"t work - run = ":UpdateRemotePlugins", - config = function() - local map = vim.api.nvim_set_keymap - map("n", "m", "nvim_exec('MagmaEvaluateOperator', v:true)", { expr = true}) - map("n", "mm", "MagmaEvaluateLine", {}) - map("x", "m", "MagmaEvaluateVisual", {}) - map("n", "mc", "MagmaReevaluateCell", {}) - map("n", "md", "MagmaDelete", {}) - map("n", "mo", "MagmaShowOutput", {}) - end - } + -- use { + -- "dccsillag/magma-nvim", + -- -- ft = { "python" }, -- doesn"t work + -- run = ":UpdateRemotePlugins", + -- config = function() + -- local map = vim.api.nvim_set_keymap + -- map("n", "m", "nvim_exec('MagmaEvaluateOperator', v:true)", { expr = true}) + -- map("n", "mm", "MagmaEvaluateLine", {}) + -- map("x", "m", "MagmaEvaluateVisual", {}) + -- map("n", "mc", "MagmaReevaluateCell", {}) + -- map("n", "md", "MagmaDelete", {}) + -- map("n", "mo", "MagmaShowOutput", {}) + -- end + -- } - use { "nvim-treesitter/playground", opt = true, cmd = { "TSPlaygroundToggle" } } + -- use { "nvim-treesitter/playground", opt = true, cmd = { "TSPlaygroundToggle" } } -- use { "~/git/argwrap.nvim", opt = true } end) -- cgit