From f394ec67f7508044357f853ff78509b5f2fbfe75 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Mon, 22 Jan 2024 14:41:36 +0100 Subject: [PATCH 1/2] Add tmux resurrect and continuum plugins --- dot_config/starship.toml | 1 + dot_tmux.conf.tmpl | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dot_config/starship.toml b/dot_config/starship.toml index 686fe96..a1fd572 100644 --- a/dot_config/starship.toml +++ b/dot_config/starship.toml @@ -1,3 +1,4 @@ +command_timeout = 10000 [golang] symbol = " " diff --git a/dot_tmux.conf.tmpl b/dot_tmux.conf.tmpl index 0025a80..1a30299 100644 --- a/dot_tmux.conf.tmpl +++ b/dot_tmux.conf.tmpl @@ -95,8 +95,10 @@ set -g @catppuccin_directory_text "#{pane_current_path}" # List of plugins set -g @plugin 'tmux-plugins/tmux-pain-control' set -g @plugin 'tmux-plugins/tmux-logging' +set -g @plugin 'tmux-plugins/tmux-resurrect' +set -g @plugin 'tmux-plugins/tmux-continuum' set -g @plugin 'olimorris/tmux-pomodoro-plus' -set -g @plugin "jlipps/tmux-safekill" +set -g @plugin 'jlipps/tmux-safekill' set -g @plugin 'catppuccin/tmux' {{- if eq .chezmoi.os "openbsd" }} set -g @plugin 'tmux-plugins/tmux-battery' From 19c959f1b04ba25d749d1821b810b1932c5b626e Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Mon, 22 Jan 2024 17:26:01 +0100 Subject: [PATCH 2/2] nvim mrkdown autocmds. chezmoi aliases --- dot_config/nvim/lua/config/autocmds.lua | 13 +++++++++++++ dot_zshrc.tmpl | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/dot_config/nvim/lua/config/autocmds.lua b/dot_config/nvim/lua/config/autocmds.lua index 5f87d5a..5b11f88 100644 --- a/dot_config/nvim/lua/config/autocmds.lua +++ b/dot_config/nvim/lua/config/autocmds.lua @@ -8,3 +8,16 @@ vim.api.nvim_create_autocmd("FileType", { vim.opt_local.spell = true end, }) + +vim.api.nvim_create_autocmd("FileType", { + pattern = { "markdown" }, + callback = function() + vim.opt_local.textwidth = 80 + vim.opt_local.wrap = true + vim.opt_local.spell = true + vim.opt_local.tabstop = 2 + vim.opt_local.softtabstop = 2 + vim.opt_local.shiftwidth = 2 + vim.opt_local.expandtab = true + end, +}) diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl index 121a6c5..f0e1c7c 100644 --- a/dot_zshrc.tmpl +++ b/dot_zshrc.tmpl @@ -20,6 +20,11 @@ export KEYTIMEOUT=1 plugins={{ .plugins }} +#chezmoi aliases +alias ccd= 'chezmoi cd' +alias cdi= 'chezmoi diff' +alias cap= 'chezmoi apply' + source $ZSH/oh-my-zsh.sh export PATH=/usr/local/bin:/usr/local/sbin:$PATH