From de466c2b8f7cc168c2f3bf9a8e29f2af640ef7fa Mon Sep 17 00:00:00 2001 From: Tobias Manske Date: Tue, 17 Jan 2023 23:39:15 +0100 Subject: [PATCH] Manage dotfiles with dotter --- .dotter/global.toml | 36 +++++++++++++++++++++++++ .dotter/pre_deploy.sh | 7 +++++ .gitignore | 3 +++ .gitattributes => git/.gitattributes | 0 .gitconfig => git/.gitconfig | 4 +-- .gitmessage => git/.gitmessage | 0 polybar/config | 1 + redshift.conf => redshift/redshift.conf | 0 .zimrc => zsh/.zimrc | 0 .zshrc => zsh/.zshrc | 0 10 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 .dotter/global.toml create mode 100755 .dotter/pre_deploy.sh rename .gitattributes => git/.gitattributes (100%) rename .gitconfig => git/.gitconfig (93%) rename .gitmessage => git/.gitmessage (100%) create mode 120000 polybar/config rename redshift.conf => redshift/redshift.conf (100%) rename .zimrc => zsh/.zimrc (100%) rename .zshrc => zsh/.zshrc (100%) diff --git a/.dotter/global.toml b/.dotter/global.toml new file mode 100644 index 0000000..2c19b80 --- /dev/null +++ b/.dotter/global.toml @@ -0,0 +1,36 @@ +[zsh.files] +"zsh/.zshrc" = { target = "~/.zshrc", type = "symbolic" } +"zsh/.zimrc" = { target = "~/.zimrc", type = "symbolic" } + +[nvim.files] +"nvim/init.lua" = { target = "~/.config/nvim/init.lua", type = "symbolic" } + +[git.files] +"git/.gitconfig" = { target = "~/.config/git/config", type = "symbolic" } +"git/.gitmessage" = { target = "~/.config/git/message", type = "symbolic" } +"git/.gitattributes" = { target = "~/.config/git/attributes", type = "symbolic" } + +[grobi.files] +"grobi/grobi.conf" = { target = "~/.config/grobi.conf", type = "symbolic" } + +[gnupg.files] +"gnupg/gpg.conf" = { target = "~/.gnupg/gpg.conf", type = "symbolic" } +"gnupg/gpg-agent.conf" = { target = "~/.gnupg/gpg-agent.conf", type = "symbolic" } + +[i3.files] +"i3/config" = { target = "~/.config/i3/config", type = "symbolic" } +"i3/layouts" = { target = "~/.config/i3/layouts", type = "symbolic" } +"i3/scripts" = { target = "~/.config/i3/scripts", type = "symbolic" } + +[picom.files] +"picom/picom.conf" = { target = "~/.config/picom.conf", type = "symbolic" } + +[polybar.files] +"polybar/config.ini" = { target = "~/.config/polybar/config", type = "symbolic" } + +[redshift.files] +"redshift/redshift.conf" = { target = "~/.config/redshift/redshift.conf", type = "symbolic" } + +[tmux.files] +"tmux/.tmux.conf" = { target = "~/.tmux.conf", type = "symbolic" } +"tmux" = { target = "~/.tmux", type = "symbolic" } diff --git a/.dotter/pre_deploy.sh b/.dotter/pre_deploy.sh new file mode 100755 index 0000000..c7b0f80 --- /dev/null +++ b/.dotter/pre_deploy.sh @@ -0,0 +1,7 @@ +#!/bin/bash +set -e +set -u + +# Build i3 config +cd i3/conf +./build.sh diff --git a/.gitignore b/.gitignore index 3483614..c2ee2b5 100644 --- a/.gitignore +++ b/.gitignore @@ -145,3 +145,6 @@ vim/autoload/plug.vim albert.conf albert/albert.conf albert/last_used/version +.dotter/local.toml +.dotter/cache.toml +.dotter/cache/ diff --git a/.gitattributes b/git/.gitattributes similarity index 100% rename from .gitattributes rename to git/.gitattributes diff --git a/.gitconfig b/git/.gitconfig similarity index 93% rename from .gitconfig rename to git/.gitconfig index 74bb254..65f1523 100644 --- a/.gitconfig +++ b/git/.gitconfig @@ -10,10 +10,10 @@ ignore = "!gi() { curl -L -s https://www.gitignore.io/api/$@ ; } ; gi" [commit] gpgsign = true - template = ~/.gitmessage + template = ~/.config/git/message [core] autocrlf = input - attributesFile = ~/.dotfiles/.gitattributes + attributesFile = ~/.config/git/attributes pager = delta [github] user = rad4day diff --git a/.gitmessage b/git/.gitmessage similarity index 100% rename from .gitmessage rename to git/.gitmessage diff --git a/polybar/config b/polybar/config new file mode 120000 index 0000000..2d6c4ed --- /dev/null +++ b/polybar/config @@ -0,0 +1 @@ +/home/rad4day/.dotfiles/polybar/config.ini \ No newline at end of file diff --git a/redshift.conf b/redshift/redshift.conf similarity index 100% rename from redshift.conf rename to redshift/redshift.conf diff --git a/.zimrc b/zsh/.zimrc similarity index 100% rename from .zimrc rename to zsh/.zimrc diff --git a/.zshrc b/zsh/.zshrc similarity index 100% rename from .zshrc rename to zsh/.zshrc