Misc updates to multiple config files

4 files changed, 138 insertions, 14 deletions

diff --git a/mkshrc b/mkshrc
index 0ea8be6..15b76e2 100644
--- a/mkshrc
+++ b/mkshrc
@@ -162,6 +162,20 @@ debugstarttls() {
 # |_|  |_|_|___/\___| |_|   \__,_|_| |_|\___|\__|_|\___/|_| |_|___/
 #                                                                  
 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+# First argument is the interface on which to scan
+ipv6_local_hosts() {
+if ! [ -z $1 ] ; then
+	interface="$1"
+	ping6 -c 3 ff02::2%$interface \
+		| grep 'bytes from' \
+		| awk '{print $4}' \
+		| sort \
+		| uniq \
+		| sed -e's/:$//'
+else
+	echo "You need to specify an interface"
+fi
+}
 set_nocaps() {
 	setxkbmap -option ctrl:nocaps
 }
@@ -246,7 +260,7 @@ else
         # When we detach from it, kill the session
         tmux kill-session -t $session_id
     fi
-fi 
+fi
 ' > $location && chmod +x $location && echo "Installed to: $location"
 
 }
@@ -290,17 +304,17 @@ startup_zram() {
 }
 # Sometimes useful function for unmounting a chroot dir on Linux
 umount_recursive() {
-	case $1 in 
+	case $1 in
 		-h|--help|"")
 			cat <<-EOF
 				Specifiy the full path to the mountpoint
-				and this function will do it's best to 
+				and this function will do it's best to
 				unmount all child filesystems and the path
 				specified
 				Example:
 					$0 /path/to/filesystem/with/lots/of/mountpoints
 				Options:
-					-f|--force 
+					-f|--force
 			EOF
 		;;
 		-f|--force)
@@ -539,7 +553,7 @@ export CA_CERT="/srv/ssl/root.pem"
 export CA_KEY="/srv/ssl/root.key"
 
 
-# Load our system profile 
+# Load our system profile
 . /etc/profile
 
 # Load pre config
diff --git a/pacman.conf b/pacman.conf
new file mode 100644
index 0000000..d924522
--- /dev/null
+++ b/pacman.conf
@@ -0,0 +1,102 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#TotalDownload
+CheckSpace
+#VerbosePkgLists
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[core]
+Server = http://mirror.rygel.us/archlinux/$repo/os/$arch
+# Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Server = http://mirror.rygel.us/archlinux/$repo/os/$arch
+# Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[community]
+Server = http://mirror.rygel.us/archlinux/$repo/os/$arch
+# Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repositories as required here.
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
diff --git a/ssh/config b/ssh/config
index 97c25d7..c7d653f 100644
--- a/ssh/config
+++ b/ssh/config
@@ -6,6 +6,11 @@ host riedstra.us
 	user mitch
 	port 49000
 
+host rygel.us
+	hostname rygel.us
+	user mitch
+	port 49000
+
 # Primary Digital Ocean Server
 host main
 	hostname 104.131.110.187
@@ -14,9 +19,10 @@ host main
 
 # Secondary Digital Ocean Server
 host ns1
-	hostname 104.236.216.98
-	user root
-	port 22
+	# hostname 104.236.216.98
+	hostname ns1.rygel.us
+	user mitch
+	port 49000
 
 
 # Home servers
@@ -118,14 +124,14 @@ host dev
 	user mitch
 
 host romulus
-	# hostname romulus.yourareacode.com
-	hostname 74.204.50.35
+	hostname romulus.yourareacode.com
+	# hostname 74.204.50.35
 	user mitch
-	port 22
+	port 49000
 
-host rromulus
-	hostname yourareacode.com
-	user root
+host romulus-nginx
+	hostname romulus.yourareacode.com
+	user mitch
 	port 22
 
 # Unused
diff --git a/tmux.conf b/tmux.conf
index a94f717..c2c4f48 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -35,5 +35,7 @@ set -g mouse on
 # set-option -g mouse-select-pane on
 # set-option -g mouse-select-window on
 
+set -sg escape-time 0
+
 
 source ~/.tmux.conf.local