diff --git a/home/default.nix b/home/default.nix
index 5a488e92..3ec5faa5 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -3,7 +3,6 @@
 
     # Graphical setup
     ./ags # ToDo: get codin :3
-    # ./waybar
     ./hyprland
     ./rofi.nix
     ./dunst.nix
@@ -21,6 +20,7 @@
     ./packages.nix
     ./playerctld.nix
     ./sops.nix
+    ./ssh.nix
     ./thunderbird.nix
     ./zsh
   ];
diff --git a/home/ssh.nix b/home/ssh.nix
new file mode 100644
index 00000000..6aee5dcb
--- /dev/null
+++ b/home/ssh.nix
@@ -0,0 +1,4 @@
+{...}:{
+  services.ssh-agent.enable = true;
+}
+
diff --git a/home/waybar/default.nix b/home/waybar/default.nix
deleted file mode 100644
index 28ef2a43..00000000
--- a/home/waybar/default.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    pavucontrol
-    playerctl
-  ];
-
-  programs.waybar = {
-    enable = true;
-    systemd.enable = true;
-
-    settings = {
-      default = {
-        layer = "top";
-        position = "top";
-
-        module-left = ["clock" "hyprland/workspaces" "wlr/taskbar"];
-        modules-center = ["custom/playerctl"];
-        modules-right = ["hyprland/language" "tray" "pulseaudio" "temperature" "battery"];
-
-        clock = {
-          format = "{:%Y-%m-%d}";
-        };
-
-        "hyprland/workspaces" = {
-          active-only = false;
-          all-outputs = true;
-          disable-scroll = false;
-          on-scroll-up = "hyprctl dispatch workspace -1";
-          on-scroll-down = "hyprctl dispatch workspace +1";
-
-          format = "{number}";
-          on-click = "activate";
-
-          sort-by = "number";
-        };
-
-        "custom/playerctl" = {
-          format = "{text}";
-          return-type = "json";
-          max-length = 64;
-
-          on-click-middle = "playerctl play-pause";
-          on-click = "playerctl previous";
-          on-click-right = "playerctl next";
-
-          format-icons = {
-            Playing = "<span foreground='#E5B9C6'>󰒮 󰐌 󰒭</span>";
-            Paused = "<span foreground='#928374'>󰒮 󰏥 󰒭</span>";
-          };
-
-          interval = 5;
-
-          exec = ''
-            playerctl -a metadata --format '{"text": "{{artist}} - {{markup_escape(title)}}", "tooltip": "{{playerName}} : {{markup_escape(title)}}", "alt": "{{status}}", "class": "{{status}}"}'
-          '';
-        };
-
-        pulseaudio = {
-        format = "<span font='Font Awesome 5 Free 11'>{icon:2}</span> {volume:4}% - {desc}";
-        format-bluetooth = "<span font='Font Awesome 5 Free 11'> {icon:2}</span> {volume:4}% - {desc}";
-        format-alt = "<span font='Font Awesome 5 Free 11'>{icon:2}</span> {volume:4}%";
-        format-alt-click = "click-right";
-        format-muted = "<span font='Font Awesome 5 Free 11'></span>";
-        format-icons = {
-            headphone = [" " " " " " " "];
-            default = ["" "" "" ""];
-        };
-        scroll-step = 2;
-        on-click = "pavucontrol";
-        tooltip = false;
-        };
-
-        battery = {
-          states = {
-            good = 90;
-            warning = 30;
-            critical = 15;
-          };
-          format = "{icon} {capacity}%";
-          format-charging = " {icon}{capacity}%";
-          format-plugged = " {capacity}%";
-          format-alt = "{icon} {time}";
-          format-icons = ["󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
-        };
-
-        tray = {
-          "icon-size" = 18;
-          "spacing" = 18;
-        };
-      };
-    };
-  };  
-}