diff options
| -rwxr-xr-x | deploy.sh | 1 | ||||
| -rw-r--r-- | emacs/.emacs.d/drobillized-theme.el | 16 | ||||
| -rw-r--r-- | emacs/.emacs.d/init.el | 2 | ||||
| -rw-r--r-- | git/.gitconfig | 23 | ||||
| -rwxr-xr-x | undeploy.sh | 1 |
5 files changed, 42 insertions, 1 deletions
@@ -7,6 +7,7 @@ stow bspwm stow conky stow emacs stow evolution +stow git stow nextcloud stow rofi stow sxhkd diff --git a/emacs/.emacs.d/drobillized-theme.el b/emacs/.emacs.d/drobillized-theme.el index d8c4e0f..538ceb8 100644 --- a/emacs/.emacs.d/drobillized-theme.el +++ b/emacs/.emacs.d/drobillized-theme.el @@ -58,6 +58,22 @@ Reload the theme after changing anything in this group." 'drobillized `(Man-overstrike ((t (:inherit bold :foreground ,green)))) `(Man-underline ((t (:foreground ,yellow)))) + `(ansi-color-black ((t (:background "#141414" :foreground "#141414")))) + `(ansi-color-blue ((t (:background ,blue :foreground ,blue)))) + `(ansi-color-bright-black ((t (:background "#242424" :foreground "#242424")))) + `(ansi-color-bright-blue ((t (:background ,blue-l :foreground ,blue-l)))) + `(ansi-color-bright-cyan ((t (:background ,cyan-l :foreground ,cyan-l)))) + `(ansi-color-bright-green ((t (:background ,green-l :foreground ,green-l)))) + `(ansi-color-bright-magenta ((t (:background ,magenta-l :foreground ,magenta-l)))) + `(ansi-color-bright-red ((t (:background ,red-l :foreground ,red-l)))) + `(ansi-color-bright-white ((t (:background "#FFF" :foreground "#FFF")))) + `(ansi-color-bright-yellow ((t (:background ,yellow-l :foreground ,yellow-l)))) + `(ansi-color-cyan ((t (:background ,cyan :foreground ,cyan)))) + `(ansi-color-green ((t (:background ,green :foreground ,green)))) + `(ansi-color-magenta ((t (:background ,magenta :foreground ,magenta)))) + `(ansi-color-red ((t (:background ,red :foreground ,red)))) + `(ansi-color-white ((t (:background "#EEE" :foreground "#EEE")))) + `(ansi-color-yellow ((t (:background ,yellow :foreground ,yellow)))) `(bold ((t (:weight bold)))) `(compilation-column-number ((t (:foreground "grey40")))) `(cursor ((t (:background "grey80")))) diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index ed1a017..398eeef 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -182,7 +182,7 @@ '(cursor-in-non-selected-windows 'hollow) '(custom-enabled-themes '(drobillized)) '(custom-safe-themes - '("6882409e05d462b9dd7cc649c30f9b5784e20d3728fbeab13f3f7a7c31e81023" default)) + '("6a3f8d576a7d94e2eb1b46fcea914a514e11253949b7860f88a020bc47e0cc25" default)) '(delete-old-versions t) '(delete-selection-mode t) '(dired-omit-files "^\\.?#\\|^\\.$\\|^\\.\\.\\|^\\..*$") diff --git a/git/.gitconfig b/git/.gitconfig new file mode 100644 index 0000000..b5e501d --- /dev/null +++ b/git/.gitconfig @@ -0,0 +1,23 @@ +[user] + email = d@drobilla.net + name = David Robillard +[merge] + conflictstyle = zdiff3 +[pull] + ff = only +[init] + defaultBranch = main +[rerere] + enabled = true + autoupdate = true +[diff] + colorMoved = plain + mnemonicPrefix = true + renames = true + algorithm = histogram +[tag] + sort = version:refname +[branch] + sort = -committerdate +[advice] + mergeConflict = false diff --git a/undeploy.sh b/undeploy.sh index d4874e1..52b4860 100755 --- a/undeploy.sh +++ b/undeploy.sh @@ -7,6 +7,7 @@ rm ~/.config/bspwm rm ~/.conkyrc rm ~/.emacs.d rm ~/.config/evolution +rm ~/.gitconfig rm ~/.config/nextcloud rm ~/.config/rofi rm ~/.config/sxhkd |