.config/bash/bashrc

@@ -1,9 +1,8 @@
 #!/bin/bash
 
-# if not interactive, don't do anything
-[ -z "$PS1" ] && return
-
 # some housekeeping
+shopt -s autocd
+set -o vi # vim mode
 alias ls="ls --color=auto"
 alias ll="ls -lah --color=auto"
 function cd() {
@@ -15,45 +14,32 @@ HISTCONTROL=ignorespace:ignoredups:erasedups
 HISTFILESIZE=9999999999
 HISTSIZE=9999999999
 
-# bash specific settings
-set -o vi # vim mode
-shopt -s autocd
 shopt -s cmdhist
 shopt -s histreedit
 shopt -s histappend
 shopt -s histverify
 
-PS1="\w\$ "
-
-if [ -n "$IN_NIX_SHELL" ]; then
-	NIX_SHELL_PS1="nix:"
-fi
-
-if [ "$USER" = "root" ]; then
-	USER_PREFIX="\[\033[41m\]root:\[\033[0;0m\]"
-elif [ "$USER" != "usr" ]; then
-	USER_PREFIX="$USER:"
-fi
+PS1="\h:\w\$ "
 
 # hostname shenanigans
 case "$HOSTNAME" in
 	"aristotle")
-		PS1="$USER_PREFIX\[\033[36;1m\]${NIX_SHELL_PS1}arist:$PS1\[\033[0;0m\]"
+		PS1="\[\033[36;1m\]$PS1\[\033[0;0m\]"
 		;;
 	"copernicus")
-		PS1="$USER_PREFIX\[\033[97;1m\]${NIX_SHELL_PS1}coper:$PS1\[\033[0;0m\]"
+		PS1="\[\033[92;1m\]$PS1\[\033[0;0m\]"
 		;;
 	"x230t")
-		PS1="$USER_PREFIX\[\033[93;1m\]${NIX_SHELL_PS1}x230t:$PS1\[\033[0;0m\]"
+		PS1="\[\033[93;1m\]$PS1\[\033[0;0m\]"
 		;;
 	"mlg")
-		PS1="$USER_PREFIX\[\033[94;1m\]${NIX_SHELL_PS1}mlg:$PS1\[\033[0;0m\]"
+		PS1="\[\033[94;1m\]$PS1\[\033[0;0m\]"
 		;;
 	"netbox")
-		PS1="$USER_PREFIX\[\033[95;1m\]${NIX_SHELL_PS1}net:$PS1\[\033[0;0m\]"
+		PS1="\[\033[95;1m\]$PS1\[\033[0;0m\]"
 		;;
 	*)
-		PS1="$USER_PREFIX\[\033[96;1m\]${NIX_SHELL_PS1}unk:$PS1\[\033[0;0m\]"
+		PS1="\[\033[96;1m\]$PS1\[\033[0;0m\]"
 		;;
 esac
 

.config/bash/profile

@@ -55,9 +55,6 @@ export ELINKS_CONFDIR="$HOME/.config/elinks"
 # dbus configuration
 export DBUS_SESSION_BUS_ADDRESS="unix:path=$XDG_RUNTIME_DIR/bus"
 
-# make nix-shell respect our PS1
-export NIX_SHELL_PRESERVE_PROMPT=1
-
 # source the bashrc(s)
 [ -f $HOME/.config/bash/bashrc ] && . $HOME/.config/bash/bashrc
 [ -f $HOME/.bashrc ] && . $HOME/.bashrc

boxes/copernicus/services/photoprism.nix

@@ -4,10 +4,10 @@
   services.photoprism = {
     enable = true;
     originalsPath = "/var/lib/photoprism/originals";
+    passwordFile = "/home/usr/wg-keys/photoprism-password";
     address = "10.100.0.2";
     settings = {
       PHOTOPRISM_ADMIN_USER = "usr";
-      PHOTOPRISM_ADMIN_PASSWORD = "testing"; # THIS IS AN INITIAL PASSWORD -- changed later
       PHOTOPRISM_SITE_TITLE = "photos.beepboop.systems";
       PHOTOPRISM_SITE_URL = "https://photos.beepboop.systems";
       PHOTOPRISM_DEFAULT_LOCALE = "en";