From cd3ca3fcd2e5121b197fc67504b637b301c30044 Mon Sep 17 00:00:00 2001 From: Joel Grunbaum <joelgrun@gmail.com> Date: Mon, 01 Jun 2020 12:33:02 +0000 Subject: [PATCH] Broke the makefile into groups, added bashrc --- README.org | 2 ++ all-shells/.commonshell | 0 aspell/.aspell.en.pws | 4 +++- Makefile | 35 ++++++++++++++++++++++++++++++++++- bash/.bashrc | 7 +++++++ emacs/.emacs.d | 2 +- 6 files changed, 47 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 690ec6d..0575e03 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,12 @@ UNINSTALL_TARGETS = $(TARGETS:=-uninstall) # List of all applications with stored dotfiles -CONFIGS = aspell emacs git libinput-gestures mailcap mpd ncmpcpp rtv shells wallpaper-reddit zsh +SHELLS = bash zsh all-shells +UTILS = emacs git aspell +FUN = mpd ncmpcpp mailcap rtv +DESKTOP = libinput-gestures wallpaper-reddit + +CONFIGS = $(SHELLS) $(UTILS) $(FUN) $(DESKTOP) all: help @@ -28,6 +33,30 @@ .PHONY: $(CONFIGS:=-del) $(CONFIGS:=-del): $(STOW) --delete -t $(HOME) $(@:-del=) + +.PHONY: shells +shells: $(SHELLS) + +.PHONY: shells-uninstall +shells-uninstall: $(SHELLS:=-del) + +.PHONY: utils +utils: $(UTILS) + +.PHONY: utils-uninstall +utils-uninstall: $(UTILS:=-del) + +.PHONY: fun +fun: $(FUN) + +.PHONY: fun-uninstall +fun-uninstall: $(FUN:=-del) + +.PHONY: desktop +desktop: $(DESKTOP) + +.PHONY: desktop-uninstall +desktop-uninstall: $(DESKTOP:=-del) .PHONY: $(INSTALL_TARGETS) $(INSTALL_TARGETS): $(CONFIGS) @@ -40,3 +69,7 @@ $(ECHO) 'use make "target"' $(ECHO) 'targets:' $(ECHO) ' home(-uninstall)' + $(ECHO) ' shells(-uninstall)' + $(ECHO) ' utils(-uninstall)' + $(ECHO) ' fun(-uninstall)' + $(ECHO) ' desktop(-uninstall)' diff --git a/README.org b/README.org index 37be105..55cb15c 100644 --- a/README.org +++ b/README.org @@ -10,4 +10,6 @@ The dotfiles are managed using GNU Stow and can be restored using make. Just use ~make home~ to set up the files. +If only part of the dotfiles are wanted, they are grouped into various parts I think make sense. +Have a look at the makefile for the groups. Credit to Peter Zuger for the idea, his dotfiles can be found [[https://gitlab.com/peterzuger/dotfiles][here]]. diff --git a/shells/.commonshell b/all-shells/.commonshell similarity index 100% rename from shells/.commonshell rename to all-shells/.commonshell diff --git a/aspell/.aspell.en.pws b/aspell/.aspell.en.pws index 40e38d4..49b4277 100644 --- a/aspell/.aspell.en.pws +++ b/aspell/.aspell.en.pws @@ -1,10 +1,11 @@ -personal_ws-1.1 en 20 +personal_ws-1.1 en 22 DNS FPGA GPIO Grunbaum SODIMM config +dotfiles fortifiable impedances inductor @@ -12,6 +13,7 @@ inductors invariance journaling +makefile math optimality preconfigured diff --git a/bash/.bashrc b/bash/.bashrc new file mode 100644 index 0000000..05d5d2f --- /dev/null +++ b/bash/.bashrc @@ -0,0 +1,7 @@ +# Prompt, no colours to differentiate it from zsh +PS1="[\u@\h \W]\$ " +PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"' + +source /home/joel/.commonshell +source /usr/share/doc/pkgfile/command-not-found.bash +[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion diff --git a/emacs/.emacs.d b/emacs/.emacs.d index a428a29..b0ee5f8 160000 --- a/emacs/.emacs.d +++ b/emacs/.emacs.d @@ -1 +1 @@ -Subproject commit a428a2903e6a94c5f08a57599b6e2c6861c85107 +Subproject commit b0ee5f8ba34e6a7521727c090476fbe2f5b78b1f -- Gitblit v1.9.3