From 86a29e30b39f93dcfb9b6cf41933b441f6b9aef5 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Sat, 14 Aug 2021 05:14:59 +0000
Subject: [PATCH] Merge branch 'master' of github.com:Chizi123/Dotfiles
---
all-shells/.commonshell | 6 +++
aspell/.aspell.en.pws | 5 ++
emacs/.local/share/applications/emacsclient.desktop | 11 +++++
Makefile | 9 ++++
paru/.config/paru/paru.conf | 35 +++++++++++++++++
reddit-wallpaper-fetcher/.config/reddit-wallpaper-fetcher.conf | 2
6 files changed, 65 insertions(+), 3 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..a48c93e 100644
--- a/all-shells/.commonshell
+++ b/all-shells/.commonshell
@@ -30,3 +30,9 @@
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"
+
+# wsl display settings
+if [ -n "$(uname -a | grep -i 'microsoft')" ]; then
+ export DISPLAY=$(ip route | awk '{print $3; exit}'):0
+ export LIBGL_ALWAYS_INDIRECT=1
+fi
diff --git a/aspell/.aspell.en.pws b/aspell/.aspell.en.pws
index 3ce6b6e..964a02c 100644
--- a/aspell/.aspell.en.pws
+++ b/aspell/.aspell.en.pws
@@ -1,9 +1,10 @@
-personal_ws-1.1 en 48
+personal_ws-1.1 en 51
Adapter
DNS
FPGA
GPIO
Grunbaum
+Nyquist
SODIMM
abortifacient
achiral
@@ -11,12 +12,14 @@
adapters
bandpass
baseband
+additivity
chiral
conductivities
config
diagonalizable
dotfiles
exponentials
+electromechanical
fortifiable
highpass
impedances
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 417a34f..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" "Wallpaper")
+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