diff --git a/home/.config/starship.toml b/home/.config/starship.toml
new file mode 100644
index 0000000..f8f762c
--- /dev/null
+++ b/home/.config/starship.toml
@@ -0,0 +1,61 @@
+# --- Basic prompt structure ---
+add_newline = false
+format = "$python$username$context$directory$git_branch$git_status$git_state$rust$cmd_duration$character"
+right_format = "$status"
+
+# --- Username and root color ---
+[username]
+show_always = true
+style_user = "green"
+style_root = "red"
+format = "[$user]($style) "
+disabled = false
+
+# --- Context (ssh / chroot) ---
+[hostname]
+ssh_only = true
+format = "[@$hostname](orange)"
+
+# --- Working directory ---
+[directory]
+style = "blue"
+truncation_length = 4
+truncation_symbol = "…/"
+truncate_to_repo = false
+
+# --- Git integration ---
+[git_branch]
+symbol = ""
+style = "214"
+format = "[$branch]($style)"
+
+[git_status]
+format = "[$all_status$ahead_behind]($style) "
+style = "bright-red"
+stashed = ""
+
+[python]
+format = '[${symbol}${pyenv_prefix}(\($virtualenv\) )]($style)'
+version_format = "${raw}"
+symbol = ""
+style = ""
+
+# --- Command duration ---
+[cmd_duration]
+min_time = 100
+format = "[took $duration]($style) "
+style = "bright-blue"
+disabled = false
+
+# --- Character (final symbol) ---
+[character]
+success_symbol = "[\\$](105)"
+error_symbol = "[\\$](105)"
+vicmd_symbol = "[\\$](105)"
+
+# --- Exit status on right prompt ---
+[status]
+disabled = false
+format = "[$status ↵]($style)"
+style = "red"
+map_symbol = true
diff --git a/home/.config/zsh/.zshrc b/home/.config/zsh/.zshrc
index 2a89692..68f5188 100755
--- a/home/.config/zsh/.zshrc
+++ b/home/.config/zsh/.zshrc
@@ -5,10 +5,16 @@ source ~/.config/zsh/rc/history.zsh
 source ~/.config/zsh/rc/opts.zsh
 source ~/.config/zsh/rc/completion.zsh
 source ~/.config/zsh/rc/keybinds.zsh
-source ~/.config/zsh/rc/prompt.zsh
 source ~/.config/zsh/rc/cmd_not_found.zsh
 source ~/.config/zsh/rc/auto_cleanup.zsh
 
+# Prefer starship if available
+if command -v starship >/dev/null; then
+  eval "$(starship init zsh)"
+else
+  source ~/.config/zsh/rc/prompt.zsh
+fi
+
 # Setup aliases
 [ -f ~/.config/shell/aliases ] && source ~/.config/shell/aliases
 
diff --git a/root/usr/lib/NetworkManager/conf.d/dns.conf b/root/usr/lib/NetworkManager/conf.d/dns.conf
new file mode 100644
index 0000000..c81a643
--- /dev/null
+++ b/root/usr/lib/NetworkManager/conf.d/dns.conf
@@ -0,0 +1,2 @@
+[main]
+dns=systemd-resolved
diff --git a/root/usr/lib/systemd/journald.conf.d/00-journal-size.conf b/root/usr/lib/systemd/journald.conf.d/00-journal-size.conf
new file mode 100644
index 0000000..523f571
--- /dev/null
+++ b/root/usr/lib/systemd/journald.conf.d/00-journal-size.conf
@@ -0,0 +1,2 @@
+[Journal]
+SystemMaxUse=100M
diff --git a/root/usr/lib/systemd/system.conf.d/00-timeout.conf b/root/usr/lib/systemd/system.conf.d/00-timeout.conf
new file mode 100644
index 0000000..120bfb8
--- /dev/null
+++ b/root/usr/lib/systemd/system.conf.d/00-timeout.conf
@@ -0,0 +1,3 @@
+[Manager]
+DefaultTimeoutStartSec=15s
+DefaultTimeoutStopSec=10s
diff --git a/root/usr/lib/systemd/timesyncd.conf.d/10-timesyncd.conf b/root/usr/lib/systemd/timesyncd.conf.d/10-timesyncd.conf
new file mode 100644
index 0000000..a019288
--- /dev/null
+++ b/root/usr/lib/systemd/timesyncd.conf.d/10-timesyncd.conf
@@ -0,0 +1,9 @@
+[Time]
+NTP=time.cloudflare.com
+FallbackNTP=time.google.com 0.arch.pool.ntp.org 1.arch.pool.ntp.org 2.arch.pool.ntp.org 3.arch.pool.ntp.org
+#RootDistanceMaxSec=5
+#PollIntervalMinSec=32
+#PollIntervalMaxSec=2048
+#ConnectionRetrySec=30
+#SaveIntervalSec=60
+