move PS1 part from render.py to zsh-init

render.py

@@ -474,28 +474,6 @@ class StatsPart(Part):
 				self.fragments.append(space_string(stor_free) %(stor_free_si[0], stor_free_si[1]))
 				self.fragments.append(style_reset())
 
-class InputPart(Part):
-	"""
-	$
-	or
-	❌42:$
-	
-	$ is either a literal "$" (user) or a "#" (root)
-	"""
-	
-	def __init__(self, settings):
-		Part.__init__(self)
-		self.fragments.append("\n")
-		
-		if settings.return_value:
-			self.fragments.append("%d" %(settings.return_value))
-			self.fragments.append(":")
-		
-		self.fragments.append(style_color(COLOR_PROMPT_ERROR if settings.return_value else COLOR_PROMPT_OK))
-		self.fragments.append("#" if settings.is_root else "$")
-		self.fragments.append(style_reset())
-		self.fragments.append(" ")
-
 if __name__ == "__main__":
 	settings = Settings(sys.argv)
 	sysload = Sysload()
@@ -506,13 +484,12 @@ if __name__ == "__main__":
 	pad = Padding(settings.term_width)
 	sp = StatsPart(settings, sysload)
 	
-	top_line = [lp, pp, gp, pad, sp]
+	line = [lp, pp, gp, pad, sp]
-	prompt = InputPart(settings)
 	
-	pp.shrink_fit(top_line)
+	pp.shrink_fit(line)
-	pad.expand_fit(top_line)
+	pad.expand_fit(line)
 	
-	top_line_str = " ".join(str(part) for part in top_line)
+	line_str = " ".join(str(part) for part in line)
-	sys.stderr.write(top_line_str)
+	sys.stderr.write(line_str)
-	sys.stderr.write(str(prompt))
+	sys.stderr.write("\n")
 	sys.stderr.flush()

zsh-init

@@ -20,11 +20,10 @@ function preexec {
 }
 
 function precmd {
-	python3 ./render.py $? $COLUMNS 1.25 2.5 0.15 0.05
-	
 	set_title "${PWD}"
+	python3 ./render.py $? $COLUMNS 1.25 2.5 0.15 0.05
+	PS1="$(print "%(?.%{\e[1;36m%}.%{\e[1;31m%}%?%{\e[0m%}:%{\e[1;31m%})%(\!.#.$)%{\e[0m%} ")"
 }
 
 unset OVER_PROMPT_CFG
-unset PS1
 unset RPS1