Merge branch 'main' of https://git.seriousbusiness.international/swaggboi/netbsd_dot_files

README.md

@@ -10,8 +10,3 @@ things that don't use `$HOME/.config`.
 `my_usr` represents `/usr`
 
 etc.
-
-## TODO
-
-- Login shell check to do fortune output (breaks `rsync`)
-- Make `mg` stop leaving those damn tilde files

my_etc/npf.conf

@@ -1,12 +1,7 @@
 # TODO: Allow in ICMP(v6) by message type
 # TODO: Rate-limit ssh
 
-# ICMP(v6)
+$services = { mdns, ssh }
-alg "icmp"
-
-group "services" in on vioif0 {
-      pass stateful proto tcp to any port ssh
-}
 
 group "localhost" in on lo0 {
       pass stateful all
@@ -16,6 +11,8 @@ group default {
       # Default rule
       block all
 
+      pass stateful in proto { tcp, udp } to any port $services
+
       # Let it goooooo
       pass stateful out all
 }

my_home/.emacs

@@ -118,5 +118,6 @@
 (setq js-switch-indent-offset 4)
 
 ;; Flycheck
-(add-hook 'after-init-hook #'global-flycheck-mode)
+(when (require 'flycheck nil 'noerror)
-(setq flycheck-perl-include-path '("$HOME/perl5/lib/perl5"))
+  (add-hook 'after-init-hook #'global-flycheck-mode)
+  (setq flycheck-perl-include-path '("$HOME/perl5/lib/perl5")))

my_home/.kshrc

@@ -2,13 +2,14 @@
 
 # Check login shell first
 if [ -t 0 ] && [ -x /usr/games/fortune ]; then
+    echo
     /usr/games/fortune
     echo
 fi
 
 # user specific aliases
-alias l='ls -lhF'
+alias l='ls -blhF'
-alias la='ls -lahF'
+alias la='ls -blahF'
 alias ..='cd ..'
 alias digg='dig +short +noshort'
 alias h='echo $HOME'
@@ -19,10 +20,15 @@ alias p='cat'
 alias n='cat -n'
 
 # exports
-export PS1='$USER:/${PWD#/}:!$ '
 export HISTFILE="$HOME/.sh_history"
 export PKG_PATH="http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/10.1/All/"
 
+if [ $USER = 'root' ]; then
+    export PS1='$USER:/${PWD#/}:!# '
+else
+    export PS1='$USER:/${PWD#/}:!$ '
+fi
+
 if command -v emacs > /dev/null 2>&1; then
 	export EDITOR='emacs -nw'
 elif command -v mg > /dev/null 2>&1; then