diff --git a/home-manager/dots/river.nix b/home-manager/dots/river.nix
index 77c42af..c239655 100644
--- a/home-manager/dots/river.nix
+++ b/home-manager/dots/river.nix
@@ -17,9 +17,10 @@
         # Autostart
         riverctl spawn "kanshi"
         riverctl spawn "wallpaper.sh -r"
+        riverctl spawn "waybar"
+        riverctl spawn "mako"
         riverctl spawn "wl-paste --type text --watch cliphist store"
         riverctl spawn "wl-paste --type image --watch cliphist store"
-        riverctl spawn "mako"
         riverctl spawn "mullvad-gui"
         
         # Theme
@@ -156,7 +157,7 @@
         # Global Configuration Settings
         riverctl default-layout rivertile
         rivertile -view-padding 10 -outer-padding 10 &
-        riverctl attach-mode bottom
+        riverctl attach-mode top
         riverctl hide-cursor timeout 10000
         riverctl hide-cursor when-typing enabled
         riverctl set-cursor-warp on-focus-change
diff --git a/home-manager/dots/waybar.nix b/home-manager/dots/waybar.nix
new file mode 100644
index 0000000..3ec3c8a
--- /dev/null
+++ b/home-manager/dots/waybar.nix
@@ -0,0 +1,111 @@
+{ pkgs, config, ... }:
+{
+  programs.waybar = {
+    enable = true;
+    settings = [
+      {
+        mainBar = {
+      	  exclusive = false;
+      	  position = "top";
+      	  height = 22;
+      	  spacing = 16;
+      	  fixed-center = false;
+        };
+      	modules-left = [
+      	  "user"
+      	  "cpu"
+      	  "memory"
+      	  "network"
+      	  "disk#root"
+      	  "disk#home"
+      	  "river/mode"
+      	];
+      	modules-center = [
+      		"cava"
+      	];
+      	modules-right = [
+      		"tray"
+      		"clock"
+      	];
+      	user = {
+      	  format = " {work_d}:{work_H}:{work_M}:{work_S} uptime";
+      	  interval = 1;
+      	};
+      	cpu = {
+      	  interval = 1;
+      	  format = "cpu {load} {icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}{icon16}{icon17}{icon18}{icon19}{icon20}{icon21}{icon22}{icon23}";
+      	  format-icons = [
+      	    "<span color='#${config.colorScheme.colors.base0A}'>▁</span>"
+      	    "<span color='#${config.colorScheme.colors.base0D}'>▂</span>"
+      	    "<span color='#${config.colorScheme.colors.base07}'>▃</span>"
+      	    "<span color='#${config.colorScheme.colors.base07}'>▄</span>"
+      	    "<span color='#${config.colorScheme.colors.base0B}'>▅</span>"
+      	    "<span color='#${config.colorScheme.colors.base0B}'>▆</span>"
+      	    "<span color='#${config.colorScheme.colors.base09}'>▇</span>"
+      	    "<span color='#${config.colorScheme.colors.base09}'>█</span>"
+          ];
+      	};
+      	memory = {
+      	  interval = 30;
+      	  format = "mem {used:0.1f}G / {total:0.1f}G";
+      	};
+      	network = {
+      	  interval = 10;
+      	  interface = "enp4s0";
+      	  format = "{ifname} {bandwidthUpBits} up / {bandwidthDownBits} down";
+      	  format-disconnected = "";
+      	  tooltip-format = "{ipaddr}/{cidr} via {gwaddr}";
+      	};
+      	"disk#root" = {
+      	  interval = 60;
+      	  format = "{free} free on {path}";
+      	  path = "/";
+      	};
+      	"disk#home" = {
+      	  interval = 60;
+      	  format = "{free} free on {path}";
+      	  path = "/home";
+      	};
+      	cava = {
+      	  cava_config = "$XDG_CONFIG_HOME/cava/config";
+      	  framerate = 30;
+      	  autosens = 1;
+      	  bars = 64;
+      	  lower_cutoff_freq = 50;
+      	  higher_cutoff_freq = 10000;
+      	  method = "pulse";
+      	  source = "auto";
+      	  stereo = true;
+      	  reverse = false;
+      	  bar_delimiter = 0;
+      	  monstercat = false;
+      	  waves = false;
+      	  noise_reduction = 0.77;
+      	  input_delay = 1;
+      	  format-icons = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
+      	};
+      	tray = {
+      	  icon-size = 18;
+      	  spacing = 4;
+      	};
+      	clock = {
+      	  format = "{:%H:%M:%S}";
+      	  tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
+          format-alt = "{:%Y-%m-%d}";
+      	  interval = 1;
+      	};
+      }
+    ];
+    style = ''
+      * {
+        border: none;
+        border-radius: 0;
+        font-family: Comic Mono 12;
+      }
+      window#waybar {
+        background: "#${config.colorScheme.colors.base00}";
+        foreground: "#${config.colorScheme.colors.base07}";
+      }
+    '';
+  };
+}
diff --git a/home-manager/wayland.nix b/home-manager/wayland.nix
index 3c155ef..54667ac 100644
--- a/home-manager/wayland.nix
+++ b/home-manager/wayland.nix
@@ -10,6 +10,7 @@
     ./dots/special.nix
     ./dots/swappy.nix
     ./dots/swaylock.nix
+    ./dots/waybar.nix
   ];
   # themes can be found here: https://github.com/tinted-theming/base16-schemes
   colorScheme = inputs.nix-colors.colorSchemes.dracula;
diff --git a/nixos/cli.nix b/nixos/cli.nix
index da9082f..95f2495 100644
--- a/nixos/cli.nix
+++ b/nixos/cli.nix
@@ -114,6 +114,7 @@
     oed
     pdfgrep
     phetch
+    pinentry
     profanity
     recutils
     senpai
diff --git a/nixos/wayland.nix b/nixos/wayland.nix
index cac2482..1011f54 100644
--- a/nixos/wayland.nix
+++ b/nixos/wayland.nix
@@ -34,11 +34,13 @@
         imv
         kanshi
         mako
+        pinentry-bemenu
         slurp
         swappy
         swaylock
         swww
         tessen
+        waybar
         wf-recorder
         wl-clipboard
         wtype
diff --git a/todos/20240114221429.todo.md b/todos/20240114221429.todo.md
index 87d957f..1003230 100644
--- a/todos/20240114221429.todo.md
+++ b/todos/20240114221429.todo.md
@@ -5,3 +5,4 @@
 - [Homeage Git Repo](https://github.com/jordanisaacs/homeage)
 - [Handling Secrets in NixOS](https://lgug2z.com/articles/handling-secrets-in-nixos-an-overview/)
 - [NixOS Secrets Management](https://onion.tube/watch?v=G5f6GC7SnhU)
+- https://www.youtube.com/watch?v=G5f6GC7SnhU