diff options
| -rw-r--r-- | config/alacritty/alacritty.linux.yml | 11 | ||||
| -rw-r--r-- | config/nvim/lua/plugins.lua | 7 | ||||
| -rw-r--r-- | config/nvim/lua/telescope-config.lua | 12 | ||||
| -rwxr-xr-x | config/zsh/zprofile | 28 | ||||
| -rwxr-xr-x | install | 1 | ||||
| -rwxr-xr-x | test | 34 |
6 files changed, 51 insertions, 42 deletions
diff --git a/config/alacritty/alacritty.linux.yml b/config/alacritty/alacritty.linux.yml index 7ca4f80..fc50a27 100644 --- a/config/alacritty/alacritty.linux.yml +++ b/config/alacritty/alacritty.linux.yml @@ -4,7 +4,8 @@ env: TERM: xterm-256color - WINIT_X11_SCALE_FACTOR: '1' + # https://wiki.archlinux.org/title/Alacritty#Different_font_size_on_multiple_monitors + WINIT_X11_SCALE_FACTOR: "1" # font font: @@ -13,13 +14,13 @@ font: x: 0 y: 0 normal: - family: Fira Code + family: FiraCode style: Regular italic: - family: FiraMono - style: Italic + family: FiraCode + style: Light bold: - family: Fira Code + family: FiraCode style: Bold use_thin_strokes: false diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index ebaedec..97dc63b 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -318,9 +318,8 @@ return require("packer").startup(function() -- theme = "gruvbox", theme = "nord", icons_enabled = true, - section_separators = "", - component_separators = "", - -- globalstatus = true, + section_separators = '', + component_separators = '', } } end @@ -376,7 +375,7 @@ return require("packer").startup(function() }, } local map = vim.api.nvim_set_keymap - map("n", "<C-p>", "<cmd>Telescope git_files<cr>", {}) + map('n', '<C-p>', '<CMD>lua require"telescope-config".project_files()<CR>', { noremap = true, silent = true }) map("n", "<leader>H", "<cmd>Telescope help_tags<cr>", {}) map("n", "<leader>;", "<cmd>Telescope commands<cr>", {}) map("n", "<leader>p", "<cmd>Telescope tags<cr>", {}) diff --git a/config/nvim/lua/telescope-config.lua b/config/nvim/lua/telescope-config.lua new file mode 100644 index 0000000..fbb0c79 --- /dev/null +++ b/config/nvim/lua/telescope-config.lua @@ -0,0 +1,12 @@ +-- from: https://github.com/nvim-telescope/telescope.nvim/wiki/Configuration-Recipes#falling-back-to-find_files-if-git_files-cant-find-a-git-directory +local M = {} + +M.project_files = function() + local opts = {} -- define here if you want to define something + local ok = pcall(require"telescope.builtin".git_files, opts) + if not ok then + require"telescope.builtin".find_files(opts) + end +end + +return M diff --git a/config/zsh/zprofile b/config/zsh/zprofile index 0230140..6476dd7 100755 --- a/config/zsh/zprofile +++ b/config/zsh/zprofile @@ -37,7 +37,7 @@ 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 +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" @@ -61,19 +61,19 @@ 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 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 @@ -136,6 +136,7 @@ echo 'INFO: Run this script as root if you want to install the root contab' # dictionaries ############################################################################### +# command is sdcv echo '---------------------------- INSTALL DICTIONARY --------------------------' install_dict() { url="$1" @@ -1,34 +1,30 @@ #!/bin/sh -set -o xtrace - -ret=0 +set -xe # SHELLCHECK -shellcheck install || ret=$? -shellcheck test || ret=$? -shellcheck local/bin/* || ret=$? -shellcheck -s sh config/zsh/.zshrc || ret=$? -shellcheck -s sh config/zsh/aliases.zsh || ret=$? -shellcheck -s sh -e SC2155 config/zsh/zprofile || ret=$? -shellcheck -s sh config/x11/xinitrc || ret=$? +shellcheck install +shellcheck test +shellcheck local/bin/* +shellcheck -s sh config/zsh/.zshrc +shellcheck -s sh config/zsh/aliases.zsh +shellcheck -s sh -e SC2155 config/zsh/zprofile +shellcheck -s sh config/x11/xinitrc # VINT -# vint -s config/vim/vimrc || ret=$? -# vint -s config/vim/pluggins.vim || ret=$? +# vint -s config/vim/vimrc +# vint -s config/vim/pluggins.vim # FLAKE8 -flake8 --ignore F821,E501,W504,N816,E241 config/qutebrowser/config.py || ret=$? -flake8 --ignore W504,CCR001 config/python/startup.py || ret=$? +flake8 --ignore F821,E501,W504,N816,E241 config/qutebrowser/config.py +flake8 --ignore W504,CCR001 config/python/startup.py # CRONTAB if crontab -h 2>&1 | grep -q '.*-T.*' then - crontab -T crontab/root.crontab || ret=$? - crontab -T crontab/user.crontab || ret=$? + crontab -T crontab/root.crontab + crontab -T crontab/user.crontab fi # XMONAD -[ ! "$CI" = 'true' ] && { xmonad --recompile || ret=$?; } - -exit $ret +[ ! "$CI" = 'true' ] && xmonad --recompile |