From 77bcf98c5641412f640de937294ab94b0b0522ad Mon Sep 17 00:00:00 2001 From: Joel Grunbaum <joelgrun@gmail.com> Date: Tue, 05 Oct 2021 02:45:37 +0000 Subject: [PATCH] Merge branch 'master' of https://github.com/Chizi123/dotfiles --- all-shells/.commonshell | 4 ++ aspell/.aspell.en.pws | 14 ++++++ emacs/.local/share/applications/emacsclient.desktop | 11 +++++ Makefile | 9 ++++ paru/.config/paru/paru.conf | 35 +++++++++++++++++ reddit-wallpaper-fetcher/.config/reddit-wallpaper-fetcher.conf | 2 emacs/.emacs.d | 2 emacs/.config/systemd/user/emacs.service | 15 +++++++ 8 files changed, 88 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5ac56b6..22f3f9e 100644 --- a/Makefile +++ b/Makefile @@ -21,8 +21,9 @@ UTILS = emacs git aspell FUN = mpd ncmpcpp mailcap rtv DESKTOP = libinput-gestures reddit-wallpaper-fetcher +ARCH = paru -CONFIGS = $(SHELLS) $(UTILS) $(FUN) $(DESKTOP) +CONFIGS = $(SHELLS) $(UTILS) $(FUN) $(DESKTOP) $(ARCH) all: help @@ -71,6 +72,12 @@ .PHONY: desktop-uninstall desktop-uninstall: $(DESKTOP:=-del) +.PHONY: arch +arch: $(ARCH) + +.PHONY: arch-uninstall +arch-uninstall: $(ARCH:=-del) + .PHONY: $(INSTALL_TARGETS) $(INSTALL_TARGETS): $(CONFIGS) diff --git a/all-shells/.commonshell b/all-shells/.commonshell index c11cc45..ab9ea20 100644 --- a/all-shells/.commonshell +++ b/all-shells/.commonshell @@ -30,3 +30,7 @@ export PATH=$PATH:~/.local/bin [ -r /usr/bin/ruby ] && PATH="$PATH:$(ruby -e 'puts Gem.user_dir')/bin" [ -d ~/.cargo ] && PATH="$PATH:$HOME/.cargo/bin" + +# Update dotfiles +(git -C ~/.dotfiles pull &) &>/dev/null +[ -d ~/.emacs.d ] && (git -C ~/.emacs.d pull &) &>/dev/null diff --git a/aspell/.aspell.en.pws b/aspell/.aspell.en.pws index 045ed92..89802eb 100644 --- a/aspell/.aspell.en.pws +++ b/aspell/.aspell.en.pws @@ -1,32 +1,44 @@ -personal_ws-1.1 en 40 +personal_ws-1.1 en 52 Adapter DNS FPGA GPIO Grunbaum +Nyquist SODIMM abortifacient achiral adapter adapters additivity +bandpass +baseband +capacitive chiral conductivities config diagonalizable dotfiles +electromechanical +exponentials fortifiable +highpass impedances inductor inductor's inductors invariance invertible +iteratively +jacobian journaling linearised +lowpass makefile math optimality +orthonormal +phasor polymorphically polymorphism preconfigured diff --git a/emacs/.config/systemd/user/emacs.service b/emacs/.config/systemd/user/emacs.service new file mode 100644 index 0000000..a571d68 --- /dev/null +++ b/emacs/.config/systemd/user/emacs.service @@ -0,0 +1,15 @@ +[Unit] +Description=Emacs text editor +Documentation=info:emacs man:emacs(1) https://gnu.org/software/emacs/ + +[Service] +Type=notify +ExecStart=/usr/bin/emacs --fg-daemon +ExecStop=/usr/bin/emacsclient --eval "(kill-emacs)" +# The location of the SSH auth socket varies by distribution, and some +# set it from PAM, so don't override by default. +# Environment=SSH_AUTH_SOCK=%t/keyring/ssh +Restart=on-failure + +[Install] +WantedBy=default.target diff --git a/emacs/.emacs.d b/emacs/.emacs.d index 27d33bc..e8a4cbe 160000 --- a/emacs/.emacs.d +++ b/emacs/.emacs.d @@ -1 +1 @@ -Subproject commit 27d33bcdb6196199cee3334a9e8e440b5f3ed996 +Subproject commit e8a4cbe0d290f4432f76568dbaccac6805920008 diff --git a/emacs/.local/share/applications/emacsclient.desktop b/emacs/.local/share/applications/emacsclient.desktop new file mode 100644 index 0000000..63223f9 --- /dev/null +++ b/emacs/.local/share/applications/emacsclient.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Emacs (Client) +GenericName=Text Editor +Comment=Edit text +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; +Exec=emacsclient -c -a "emacs" %F +Icon=emacs +Type=Application +Terminal=false +Categories=Development;TextEditor;Utility; +StartupWMClass=Emacs diff --git a/paru/.config/paru/paru.conf b/paru/.config/paru/paru.conf new file mode 100644 index 0000000..1ad9c59 --- /dev/null +++ b/paru/.config/paru/paru.conf @@ -0,0 +1,35 @@ +# +# $PARU_CONF +# /etc/paru.conf +# ~/.config/paru/paru.conf +# +# See the paru.conf(5) manpage for options + +# +# GENERAL OPTIONS +# +[options] +PgpFetch +Devel +Provides +DevelSuffixes = -git -cvs -svn -bzr -darcs -always +BottomUp +#RemoveMake +#SudoLoop +#UseAsk +#CombinedUpgrade +#CleanAfter +#UpgradeMenu +#NewsOnUpgrade + +#LocalRepo +#Chroot +#MovePkgs + +# +# Binary OPTIONS +# +#[bin] +#FileManager = vifm +#MFlags = --skippgpcheck +#Sudo = doas diff --git a/reddit-wallpaper-fetcher/.config/reddit-wallpaper-fetcher.conf b/reddit-wallpaper-fetcher/.config/reddit-wallpaper-fetcher.conf index d2a87e5..10590a7 100644 --- a/reddit-wallpaper-fetcher/.config/reddit-wallpaper-fetcher.conf +++ b/reddit-wallpaper-fetcher/.config/reddit-wallpaper-fetcher.conf @@ -1,5 +1,5 @@ #List of subreddits to check -SUBREDDITS=("EarthPorn" "CityPorn" "SpacePorn" "Wallpapers") +SUBREDDITS=("EarthPorn" "CityPorn" "SpacePorn" "Wallpapers" "CarPorn" "ArchitecturePorn" "Wallpaper") #What sort fetch list by, will choose the latest SORT=new #User-agent, shouldn't have to change -- Gitblit v1.9.3