From 6209d7889dcfdd85638c3696626189bffdd0b0d5 Mon Sep 17 00:00:00 2001 From: AngeD Date: Tue, 27 Dec 2022 22:20:12 +0100 Subject: [PATCH] feat: simpler zsh, tex/gitcommit vi conf, cleanup --- .config/nvim/ftplugin/gitcommit.lua | 6 ++ .config/nvim/ftplugin/tex.lua | 8 +++ .config/nvim/pack/plugins/opt/lspconfig | 2 +- .config/nvim/pack/plugins/opt/treesitter | 2 +- .config/nvim/pack/plugins/opt/which-key | 2 +- .config/zsh/.zshrc | 89 +----------------------- .config/zsh/ohmyzsh | 2 +- .zshenv | 3 +- bin/scanpdf | 4 +- 9 files changed, 23 insertions(+), 95 deletions(-) create mode 100644 .config/nvim/ftplugin/gitcommit.lua create mode 100644 .config/nvim/ftplugin/tex.lua diff --git a/.config/nvim/ftplugin/gitcommit.lua b/.config/nvim/ftplugin/gitcommit.lua new file mode 100644 index 0000000..847519d --- /dev/null +++ b/.config/nvim/ftplugin/gitcommit.lua @@ -0,0 +1,6 @@ +-- packages + +-- variables +vim.opt_local.colorcolumn = "50" + +-- keybindings diff --git a/.config/nvim/ftplugin/tex.lua b/.config/nvim/ftplugin/tex.lua new file mode 100644 index 0000000..717fe69 --- /dev/null +++ b/.config/nvim/ftplugin/tex.lua @@ -0,0 +1,8 @@ +-- packages + +-- variables +vim.opt_local.shiftwidth = 2 +vim.opt_local.tabstop = 2 +vim.opt_local.spelllang = "fr" + +-- keybindings diff --git a/.config/nvim/pack/plugins/opt/lspconfig b/.config/nvim/pack/plugins/opt/lspconfig index 25f0c65..42ca8ce 160000 --- a/.config/nvim/pack/plugins/opt/lspconfig +++ b/.config/nvim/pack/plugins/opt/lspconfig @@ -1 +1 @@ -Subproject commit 25f0c65bd8fddadbafd0048a68560bf160ceb98c +Subproject commit 42ca8ce0f2252be795da4789fadfa91f6c3f7464 diff --git a/.config/nvim/pack/plugins/opt/treesitter b/.config/nvim/pack/plugins/opt/treesitter index eaeedfb..fb36ed4 160000 --- a/.config/nvim/pack/plugins/opt/treesitter +++ b/.config/nvim/pack/plugins/opt/treesitter @@ -1 +1 @@ -Subproject commit eaeedfb80419e8145760d95d1840996a2746af7c +Subproject commit fb36ed4c9e962d9fbfa608cd4a5d9313b1e8a8b1 diff --git a/.config/nvim/pack/plugins/opt/which-key b/.config/nvim/pack/plugins/opt/which-key index 61553ae..8682d30 160000 --- a/.config/nvim/pack/plugins/opt/which-key +++ b/.config/nvim/pack/plugins/opt/which-key @@ -1 +1 @@ -Subproject commit 61553aeb3d5ca8c11eea8be6eadf478062982ac9 +Subproject commit 8682d3003595017cd8ffb4c860a07576647cc6f8 diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 19fd147..e181742 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -1,100 +1,13 @@ -# If you come from bash you might have to change your $PATH. -# export PATH=$HOME/bin:/usr/local/bin:$PATH - -# Path to your oh-my-zsh installation. -export ZSH="$ZDOTDIR/ohmyzsh" - -# Set name of the theme to load --- if set to "random", it will -# load a random theme each time oh-my-zsh is loaded, in which case, -# to know which specific one was loaded, run: echo $RANDOM_THEME -# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes ZSH_THEME="powerlevel10k/powerlevel10k" -#ZSH_THEME="mytheme" - -# Set list of themes to pick from when loading at random -# Setting this variable when ZSH_THEME=random will cause zsh to load -# a theme from this variable instead of looking in $ZSH/themes/ -# If set to an empty array, this variable will have no effect. -# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) - -# Uncomment the following line to use case-sensitive completion. CASE_SENSITIVE="true" +zstyle ':omz:update' mode disabled -# Uncomment the following line to use hyphen-insensitive completion. -# Case-sensitive completion must be off. _ and - will be interchangeable. -# HYPHEN_INSENSITIVE="true" - -# Uncomment one of the following lines to change the auto-update behavior -zstyle ':omz:update' mode disabled # disable automatic updates -# zstyle ':omz:update' mode auto # update automatically without asking -# zstyle ':omz:update' mode reminder # just remind me to update when it's time - -# Uncomment the following line to change how often to auto-update (in days). -# zstyle ':omz:update' frequency 13 - -# Uncomment the following line if pasting URLs and other text is messed up. -# DISABLE_MAGIC_FUNCTIONS="true" - -# Uncomment the following line to disable colors in ls. -# DISABLE_LS_COLORS="true" - -# Uncomment the following line to disable auto-setting terminal title. -# DISABLE_AUTO_TITLE="true" - -# Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" - -# Uncomment the following line to display red dots whilst waiting for completion. -# You can also set it to another string to have that shown instead of the default red dots. -# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" -# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) -# COMPLETION_WAITING_DOTS="true" - -# Uncomment the following line if you want to disable marking untracked files -# under VCS as dirty. This makes repository status check for large repositories -# much, much faster. -# DISABLE_UNTRACKED_FILES_DIRTY="true" - -# Uncomment the following line if you want to change the command execution time -# stamp shown in the history command output. -# You can set one of the optional three formats: -# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -# or set a custom format using the strftime function format specifications, -# see 'man strftime' for details. -# HIST_STAMPS="mm/dd/yyyy" - -# Would you like to use another custom folder than $ZSH/custom? -# ZSH_CUSTOM=/path/to/new-custom-folder - -# Which plugins would you like to load? -# Standard plugins can be found in $ZSH/plugins/ -# Custom plugins may be added to $ZSH_CUSTOM/plugins/ -# Example format: plugins=(rails git textmate ruby lighthouse) -# Add wisely, as too many plugins slow down shell startup. plugins=(vi-mode colored-man-pages git gitignore) . "$ZSH"/oh-my-zsh.sh -# User configuration - -# export MANPATH="/usr/local/man:$MANPATH" - -# You may need to manually set your language environment -# export LANG=en_US.UTF-8 - -# Preferred editor for local and remote sessions -# if [[ -n $SSH_CONNECTION ]]; then -# export EDITOR='vim' -# else -# export EDITOR='mvim' -# fi - -# Compilation flags -# export ARCHFLAGS="-arch x86_64" - . "$ZDOTDIR"/.docker_aliases . "$ZDOTDIR"/.kubectl_aliases . "$ZDOTDIR"/.zsh_aliases -# To customize prompt, run `p10k configure` or edit ~/.config/zsh/.p10k.zsh. ! [ -f "$ZDOTDIR/.p10k.zsh" ] || . "$ZDOTDIR/.p10k.zsh" diff --git a/.config/zsh/ohmyzsh b/.config/zsh/ohmyzsh index 9c2d1af..a3c579b 160000 --- a/.config/zsh/ohmyzsh +++ b/.config/zsh/ohmyzsh @@ -1 +1 @@ -Subproject commit 9c2d1af8afa02b5439e8ccc81a160e62e1e59617 +Subproject commit a3c579bf27b34942d4c6ad64e7cfd75788b05ea3 diff --git a/.zshenv b/.zshenv index a6d4328..c43d136 100644 --- a/.zshenv +++ b/.zshenv @@ -7,7 +7,8 @@ export XDG_STATE_HOME="$HOME/.local/state" export XDG_CONFIG_DIRS=/etc/xdg export XDG_DATA_DIRS='/usr/local/share:/usr/share' -export ZDOTDIR="$HOME/.config/zsh" +export ZDOTDIR="$XDG_CONFIG_HOME/zsh" +export ZSH="$ZDOTDIR/ohmyzsh" export ZSH_CUSTOM="$ZDOTDIR/custom" export HISTFILE="$XDG_STATE_HOME/zsh/history" export ZLE_RPROMPT_INDENT=0 diff --git a/bin/scanpdf b/bin/scanpdf index 2d763c3..c5d6b1c 100755 --- a/bin/scanpdf +++ b/bin/scanpdf @@ -3,10 +3,10 @@ set -e usage() { echo "USAGE: $0 FILE.pdf" - exit 0 + exit } -if [ "$1" == '-h' ] || [[ "$1" != *.pdf ]]; then +if [ "$1" != *.pdf ]; then usage fi