diff --git a/.gitattributes b/.gitattributes index f43d699..c21640c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1 @@ ssh/config filter=git-crypt diff=git-crypt - diff --git a/.gitignore b/.gitignore index d33b762..047ec6f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,3 @@ config/zsh/.zcompcache config/zsh/.zcompdump config/zsh/.zsh_sessions config/iterm2 - diff --git a/README.md b/README.md index 21ad056..93704bf 100644 --- a/README.md +++ b/README.md @@ -24,4 +24,3 @@ repository. [git-crypt]: https://github.com/AGWA/git-crypt [gpg]: https://gnupg.org - diff --git a/bin/colorchart b/bin/colorchart index 8c8c37b..d501a77 100755 --- a/bin/colorchart +++ b/bin/colorchart @@ -24,4 +24,3 @@ cat <']], [[:.s/"/'/g | nohl]], opts([[Replace vim.keymap.set('n', [["]], [[:.s/'/"/g | nohl]], opts([[Replace: ' 󱦰 "]])) vim.keymap.set('x', [[']], [[:s/"/'/g | nohl]], opts([[Replace: " 󱦰 ']])) vim.keymap.set('x', [["]], [[:s/'/"/g | nohl]], opts([[Replace: ' 󱦰 "]])) - diff --git a/config/nvim/after/ftplugin/markdown.lua b/config/nvim/after/ftplugin/markdown.lua index b1c40fb..6f54b43 100644 --- a/config/nvim/after/ftplugin/markdown.lua +++ b/config/nvim/after/ftplugin/markdown.lua @@ -1,4 +1,3 @@ vim.bo.tabstop = 2 vim.opt.formatoptions:append('t') -- wrap text on 'textwidth' vim.opt.spell = true -- turn on spell checking - diff --git a/config/nvim/after/ftplugin/plantuml.lua b/config/nvim/after/ftplugin/plantuml.lua index 924cf6b..54246c0 100644 --- a/config/nvim/after/ftplugin/plantuml.lua +++ b/config/nvim/after/ftplugin/plantuml.lua @@ -1,2 +1 @@ vim.bo.tabstop = 2 - diff --git a/config/nvim/after/ftplugin/python.lua b/config/nvim/after/ftplugin/python.lua index 84bba40..0b1fdd3 100644 --- a/config/nvim/after/ftplugin/python.lua +++ b/config/nvim/after/ftplugin/python.lua @@ -1,3 +1,2 @@ vim.opt.foldmethod = 'indent' vim.opt.foldignore = '#' - diff --git a/config/nvim/after/ftplugin/sh.lua b/config/nvim/after/ftplugin/sh.lua index c363890..0ba6a7d 100644 --- a/config/nvim/after/ftplugin/sh.lua +++ b/config/nvim/after/ftplugin/sh.lua @@ -1,2 +1 @@ vim.opt.tabstop = 2 - diff --git a/config/nvim/after/ftplugin/text.lua b/config/nvim/after/ftplugin/text.lua index d960ad4..341401b 100644 --- a/config/nvim/after/ftplugin/text.lua +++ b/config/nvim/after/ftplugin/text.lua @@ -1,3 +1,2 @@ vim.opt.formatoptions:append('t') -- wrap text on 'textwidth' vim.opt.spell = true -- turn on spell checking - diff --git a/config/nvim/after/ftplugin/vim.lua b/config/nvim/after/ftplugin/vim.lua index 961ef23..cb1a1f0 100644 --- a/config/nvim/after/ftplugin/vim.lua +++ b/config/nvim/after/ftplugin/vim.lua @@ -1,2 +1 @@ vim.opt.foldmethod = 'marker' - diff --git a/config/nvim/after/ftplugin/zsh.lua b/config/nvim/after/ftplugin/zsh.lua index c363890..0ba6a7d 100644 --- a/config/nvim/after/ftplugin/zsh.lua +++ b/config/nvim/after/ftplugin/zsh.lua @@ -1,2 +1 @@ vim.opt.tabstop = 2 - diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 99b3a0e..259e158 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -55,4 +55,4 @@ "vim-commentary": { "branch": "master", "commit": "f67e3e67ea516755005e6cccb178bc8439c6d402" }, "vim-fugitive": { "branch": "master", "commit": "e7bf502a6ae492f42a91d231864e25630286319b" }, "virt-column.nvim": { "branch": "master", "commit": "b62b4ef0774d19452d4ed18e473e824c7a756f2f" } -} \ No newline at end of file +} diff --git a/config/nvim/lua/fschauen/plugins/lualine.lua b/config/nvim/lua/fschauen/plugins/lualine.lua index f3e7b60..52411bc 100644 --- a/config/nvim/lua/fschauen/plugins/lualine.lua +++ b/config/nvim/lua/fschauen/plugins/lualine.lua @@ -229,4 +229,3 @@ M.config = function(--[[plugin]]_, --[[opts]]_) end return M - diff --git a/config/nvim/spell/.gitignore b/config/nvim/spell/.gitignore index 02699ef..6d535c0 100644 --- a/config/nvim/spell/.gitignore +++ b/config/nvim/spell/.gitignore @@ -1,2 +1 @@ *.spl - diff --git a/config/nvim/stylua.toml b/config/nvim/stylua.toml index 254e2da..02cb825 100644 --- a/config/nvim/stylua.toml +++ b/config/nvim/stylua.toml @@ -4,4 +4,3 @@ indent_width = 2 quote_style = "AutoPreferDouble" call_parentheses = "NoSingleTable" collapse_simple_statement = "Never" - diff --git a/config/readline/inputrc b/config/readline/inputrc index c0bff7b..716ac80 100644 --- a/config/readline/inputrc +++ b/config/readline/inputrc @@ -260,4 +260,3 @@ Control-k: history-search-backward Control-l: clear-screen Control-a: beginning-of-line Control-e: end-of-line - diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf index 71c1d0e..c59e0c5 100644 --- a/config/tmux/tmux.conf +++ b/config/tmux/tmux.conf @@ -124,4 +124,3 @@ set -g pane-border-style fg=black set -g pane-active-border-style fg=brightblack set -g message-style fg=brightwhite,bg=black set -g message-command-style fg=yellow,bg=black - diff --git a/config/zsh/.zprofile b/config/zsh/.zprofile index 09553ff..adbe1ff 100644 --- a/config/zsh/.zprofile +++ b/config/zsh/.zprofile @@ -105,4 +105,3 @@ if [ -n "$(uname -r | sed -n 's/.*\( *Microsoft *\).*/\1/ip')" ]; then fi unset xdisplay fi - diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index dbbf2f4..354187d 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -28,4 +28,3 @@ stty stop undef # Allow comments in interactive use. setopt INTERACTIVE_COMMENTS - diff --git a/config/zsh/aliases.zsh b/config/zsh/aliases.zsh index db23a09..fba756a 100644 --- a/config/zsh/aliases.zsh +++ b/config/zsh/aliases.zsh @@ -46,4 +46,3 @@ if command -v nvim >/dev/null 2>&1; then vim="nvim" \ vimdiff="nvim -d" fi - diff --git a/config/zsh/broot.zsh b/config/zsh/broot.zsh index 9bbbf3b..413dc52 100644 --- a/config/zsh/broot.zsh +++ b/config/zsh/broot.zsh @@ -20,4 +20,3 @@ function br { # Shortcut to start neovim. bindkey -s '^b' '^ubr\r' - diff --git a/config/zsh/completion.zsh b/config/zsh/completion.zsh index a289024..3574220 100644 --- a/config/zsh/completion.zsh +++ b/config/zsh/completion.zsh @@ -71,4 +71,3 @@ bindkey -M menuselect 'G' end-of-history # Page down/up. bindkey -M menuselect 'f' vi-forward-word bindkey -M menuselect 'b' vi-backward-word - diff --git a/config/zsh/eza.zsh b/config/zsh/eza.zsh index 60c9330..d544250 100644 --- a/config/zsh/eza.zsh +++ b/config/zsh/eza.zsh @@ -104,4 +104,3 @@ colors=( export EZA_COLORS="${(pj.:.)colors}" unset colors - diff --git a/config/zsh/functions/mkcd b/config/zsh/functions/mkcd index 9661acf..af5ff59 100644 --- a/config/zsh/functions/mkcd +++ b/config/zsh/functions/mkcd @@ -7,4 +7,3 @@ case "$1" in ../*) (cd .. && mkdir -vp "${1#.}") && cd "$1" ;; *) mkdir -vp "./$1" && cd "./$1";; esac - diff --git a/config/zsh/fzf.zsh b/config/zsh/fzf.zsh index d377506..c2378ac 100644 --- a/config/zsh/fzf.zsh +++ b/config/zsh/fzf.zsh @@ -41,4 +41,3 @@ export FZF_CTRL_R_OPTS=--border-label='" History search "' export FZF_ALT_C_OPTS=--border-label='" Change directory "' unset fzf_colors fzf_bindings fzf_defaults - diff --git a/config/zsh/history.zsh b/config/zsh/history.zsh index a0c396a..9d2983a 100644 --- a/config/zsh/history.zsh +++ b/config/zsh/history.zsh @@ -6,4 +6,3 @@ setopt HIST_IGNORE_ALL_DUPS # Don't add duplicates to history. HISTFILE="${XDG_DATA_HOME:-$HOME/.local/share}/zsh/history" HISTSIZE=1000000 SAVEHIST=1000000 - diff --git a/config/zsh/line-editor.zsh b/config/zsh/line-editor.zsh index 924d7e7..c3c2e75 100644 --- a/config/zsh/line-editor.zsh +++ b/config/zsh/line-editor.zsh @@ -76,4 +76,3 @@ else bindkey -M isearch '^k' history-incremental-search-backward bindkey -M isearch '^y' accept-search fi - diff --git a/config/zsh/man-pages.zsh b/config/zsh/man-pages.zsh index db752cb..65b819e 100644 --- a/config/zsh/man-pages.zsh +++ b/config/zsh/man-pages.zsh @@ -67,4 +67,3 @@ customize_man_pages() { } customize_man_pages - diff --git a/config/zsh/prompt.zsh b/config/zsh/prompt.zsh index 7c9e2a3..9e2f8f6 100644 --- a/config/zsh/prompt.zsh +++ b/config/zsh/prompt.zsh @@ -199,4 +199,3 @@ prompt_setup() { } prompt_setup - diff --git a/home/.XCompose b/home/.XCompose index 940dba3..7bc5a43 100644 --- a/home/.XCompose +++ b/home/.XCompose @@ -78,4 +78,3 @@ # <^> <^> : "" # Superscript X (character to be punblished) # <^> <^> : "" # Superscript Y (character to be punblished) # <^> <^> : "" # Superscript Z (character to be punblished) - diff --git a/home/.zshenv b/home/.zshenv index a5b851f..06d412e 100644 --- a/home/.zshenv +++ b/home/.zshenv @@ -1,3 +1,2 @@ # Just find $ZDOTDIR here, everythng will be configured there. export ZDOTDIR="${ZDOTDIR:-${XDG_CONFIG_HOME:-$HOME/.config}/zsh}" - diff --git a/install.sh b/install.sh index c125cb1..db2fc9b 100755 --- a/install.sh +++ b/install.sh @@ -172,4 +172,3 @@ main() { } main "$@" - diff --git a/ssh/config b/ssh/config index 812d1a3..ee1b84d 100644 Binary files a/ssh/config and b/ssh/config differ diff --git a/utils/config.def.sh b/utils/config.def.sh index 455e34f..fb6f7a0 100644 --- a/utils/config.def.sh +++ b/utils/config.def.sh @@ -4,4 +4,3 @@ DESTDIR="$HOME" # Git user information. GIT_USER="Fernando Schauenburg" GIT_EMAIL="dev@schauenburg.me" - diff --git a/utils/debian.sh b/utils/debian.sh index 68af0e6..85ba65b 100755 --- a/utils/debian.sh +++ b/utils/debian.sh @@ -394,4 +394,3 @@ main() { } main "$@" - diff --git a/utils/terminal-italics.terminfo b/utils/terminal-italics.terminfo index a15022f..177213f 100755 --- a/utils/terminal-italics.terminfo +++ b/utils/terminal-italics.terminfo @@ -31,4 +31,3 @@ xterm-256color|xterm with 256 colors and italic, tmux-256color|tmux with 256 colors and italic, sitm=\e[3m, ritm=\e[23m, use=screen-256color, - diff --git a/utils/unlock.sh b/utils/unlock.sh index d11233a..f135130 100755 --- a/utils/unlock.sh +++ b/utils/unlock.sh @@ -12,4 +12,3 @@ GPG_TTY=$(tty) # Needed so we can decrypt from stdin. export GPG_TTY echo "$KEY" | base64 -d | gpg -d | git crypt unlock - -