From 4dff6612a80ca1c4c0eba7fdbd1ec7fa9c7eebc6 Mon Sep 17 00:00:00 2001 From: Buddy Sandidge Date: Thu, 25 May 2023 13:02:44 -0700 Subject: [PATCH] Move stow base package to chezmoi --- .chezmoiignore | 1 - base/.bashrc => dot_bashrc | 0 .../bash/bashrc.d/aliases.sh | 0 .../bash/bashrc.d/bash.sh | 0 .../bash/bashrc.d/completion.sh | 0 .../bash/bashrc.d/functions.sh | 0 .../bash/bashrc.d/jetbrains.sh | 0 .../bash/bashrc.d/opts.sh | 0 .../bash/env.d/bash.env | 0 {base/.config => dot_config}/bash/prompt.sh | 0 .../.config => dot_config}/ideavim/ideavimrc | 0 dot_config/kitty/current-theme.conf | 21 +++++++++++++++++++ dot_config/kitty/kitty.conf | 8 +++++++ .../profile/env.d/base.env | 0 .../profile/profile.d/base.sh | 0 .../zsh/zshrc.d/base.zsh | 0 {base/.jq => dot_jq}/colors.jq | 0 {base/.jq => dot_jq}/env.jq | 0 {base/.jq => dot_jq}/github.jq | 0 .../share/buddy-up/includes/github.sh | 0 .../share/buddy-up/includes/utils.sh | 0 base/.profile => dot_profile | 0 base/.zprofile => dot_zprofile | 0 base/.zshrc => dot_zshrc | 0 24 files changed, 29 insertions(+), 1 deletion(-) rename base/.bashrc => dot_bashrc (100%) rename {base/.config => dot_config}/bash/bashrc.d/aliases.sh (100%) rename {base/.config => dot_config}/bash/bashrc.d/bash.sh (100%) rename {base/.config => dot_config}/bash/bashrc.d/completion.sh (100%) rename {base/.config => dot_config}/bash/bashrc.d/functions.sh (100%) rename {base/.config => dot_config}/bash/bashrc.d/jetbrains.sh (100%) rename {base/.config => dot_config}/bash/bashrc.d/opts.sh (100%) rename {base/.config => dot_config}/bash/env.d/bash.env (100%) rename {base/.config => dot_config}/bash/prompt.sh (100%) rename {base/.config => dot_config}/ideavim/ideavimrc (100%) create mode 100644 dot_config/kitty/current-theme.conf create mode 100644 dot_config/kitty/kitty.conf rename {base/.config => dot_config}/profile/env.d/base.env (100%) rename {base/.config => dot_config}/profile/profile.d/base.sh (100%) rename {base/.config => dot_config}/zsh/zshrc.d/base.zsh (100%) rename {base/.jq => dot_jq}/colors.jq (100%) rename {base/.jq => dot_jq}/env.jq (100%) rename {base/.jq => dot_jq}/github.jq (100%) rename {base/.local => dot_local}/share/buddy-up/includes/github.sh (100%) rename {base/.local => dot_local}/share/buddy-up/includes/utils.sh (100%) rename base/.profile => dot_profile (100%) rename base/.zprofile => dot_zprofile (100%) rename base/.zshrc => dot_zshrc (100%) diff --git a/.chezmoiignore b/.chezmoiignore index 20bf244..cbdc26c 100644 --- a/.chezmoiignore +++ b/.chezmoiignore @@ -1,6 +1,5 @@ /base-linux/ /base-osx/ -/base/ /bat/ /deno/ /direnv/ diff --git a/base/.bashrc b/dot_bashrc similarity index 100% rename from base/.bashrc rename to dot_bashrc diff --git a/base/.config/bash/bashrc.d/aliases.sh b/dot_config/bash/bashrc.d/aliases.sh similarity index 100% rename from base/.config/bash/bashrc.d/aliases.sh rename to dot_config/bash/bashrc.d/aliases.sh diff --git a/base/.config/bash/bashrc.d/bash.sh b/dot_config/bash/bashrc.d/bash.sh similarity index 100% rename from base/.config/bash/bashrc.d/bash.sh rename to dot_config/bash/bashrc.d/bash.sh diff --git a/base/.config/bash/bashrc.d/completion.sh b/dot_config/bash/bashrc.d/completion.sh similarity index 100% rename from base/.config/bash/bashrc.d/completion.sh rename to dot_config/bash/bashrc.d/completion.sh diff --git a/base/.config/bash/bashrc.d/functions.sh b/dot_config/bash/bashrc.d/functions.sh similarity index 100% rename from base/.config/bash/bashrc.d/functions.sh rename to dot_config/bash/bashrc.d/functions.sh diff --git a/base/.config/bash/bashrc.d/jetbrains.sh b/dot_config/bash/bashrc.d/jetbrains.sh similarity index 100% rename from base/.config/bash/bashrc.d/jetbrains.sh rename to dot_config/bash/bashrc.d/jetbrains.sh diff --git a/base/.config/bash/bashrc.d/opts.sh b/dot_config/bash/bashrc.d/opts.sh similarity index 100% rename from base/.config/bash/bashrc.d/opts.sh rename to dot_config/bash/bashrc.d/opts.sh diff --git a/base/.config/bash/env.d/bash.env b/dot_config/bash/env.d/bash.env similarity index 100% rename from base/.config/bash/env.d/bash.env rename to dot_config/bash/env.d/bash.env diff --git a/base/.config/bash/prompt.sh b/dot_config/bash/prompt.sh similarity index 100% rename from base/.config/bash/prompt.sh rename to dot_config/bash/prompt.sh diff --git a/base/.config/ideavim/ideavimrc b/dot_config/ideavim/ideavimrc similarity index 100% rename from base/.config/ideavim/ideavimrc rename to dot_config/ideavim/ideavimrc diff --git a/dot_config/kitty/current-theme.conf b/dot_config/kitty/current-theme.conf new file mode 100644 index 0000000..d4616fc --- /dev/null +++ b/dot_config/kitty/current-theme.conf @@ -0,0 +1,21 @@ +background #171717 +foreground #ded9ce +cursor #bbbbbb +selection_background #453a39 +color0 #000000 +color8 #313131 +color1 #ff605a +color9 #f58b7f +color2 #b1e869 +color10 #dcf88f +color3 #ead89c +color11 #eee5b2 +color4 #5da9f6 +color12 #a5c7ff +color5 #e86aff +color13 #ddaaff +color6 #82fff6 +color14 #b6fff9 +color7 #ded9ce +color15 #fefffe +selection_foreground #171717 diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf new file mode 100644 index 0000000..0cc6333 --- /dev/null +++ b/dot_config/kitty/kitty.conf @@ -0,0 +1,8 @@ +# BEGIN_KITTY_THEME +# Wombat +include current-theme.conf +# END_KITTY_THEME + +enable_audio_bell no +visual_bell_duration 0.0 +cursor_shape block diff --git a/base/.config/profile/env.d/base.env b/dot_config/profile/env.d/base.env similarity index 100% rename from base/.config/profile/env.d/base.env rename to dot_config/profile/env.d/base.env diff --git a/base/.config/profile/profile.d/base.sh b/dot_config/profile/profile.d/base.sh similarity index 100% rename from base/.config/profile/profile.d/base.sh rename to dot_config/profile/profile.d/base.sh diff --git a/base/.config/zsh/zshrc.d/base.zsh b/dot_config/zsh/zshrc.d/base.zsh similarity index 100% rename from base/.config/zsh/zshrc.d/base.zsh rename to dot_config/zsh/zshrc.d/base.zsh diff --git a/base/.jq/colors.jq b/dot_jq/colors.jq similarity index 100% rename from base/.jq/colors.jq rename to dot_jq/colors.jq diff --git a/base/.jq/env.jq b/dot_jq/env.jq similarity index 100% rename from base/.jq/env.jq rename to dot_jq/env.jq diff --git a/base/.jq/github.jq b/dot_jq/github.jq similarity index 100% rename from base/.jq/github.jq rename to dot_jq/github.jq diff --git a/base/.local/share/buddy-up/includes/github.sh b/dot_local/share/buddy-up/includes/github.sh similarity index 100% rename from base/.local/share/buddy-up/includes/github.sh rename to dot_local/share/buddy-up/includes/github.sh diff --git a/base/.local/share/buddy-up/includes/utils.sh b/dot_local/share/buddy-up/includes/utils.sh similarity index 100% rename from base/.local/share/buddy-up/includes/utils.sh rename to dot_local/share/buddy-up/includes/utils.sh diff --git a/base/.profile b/dot_profile similarity index 100% rename from base/.profile rename to dot_profile diff --git a/base/.zprofile b/dot_zprofile similarity index 100% rename from base/.zprofile rename to dot_zprofile diff --git a/base/.zshrc b/dot_zshrc similarity index 100% rename from base/.zshrc rename to dot_zshrc