diff --git a/home/ags/default.nix b/home/ags/default.nix
index 970968ad..8968c5e9 100644
--- a/home/ags/default.nix
+++ b/home/ags/default.nix
@@ -1,6 +1,12 @@
 { ags, pkgs, ...}: {
   imports = [ ags.homeManagerModules.default ];  
 
+  home.packages = with pkgs; [
+    libdbusmenu-gtk3
+    networkmanager
+    pipewire-pulse
+  ];
+
   programs.ags = {
     enable = true;
     configDir = ./.; 
diff --git a/home/default.nix b/home/default.nix
index ab7444c0..91a881f9 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,22 +1,26 @@
 {
   user = [
-    ./ags
+
+    # Graphical setup
+    ./ags # ToDo: get codin :3
+    # ./waybar.nix
+    ./hyprland
+    ./rofi.nix
+    ./dunst.nix
+    ./stylix.nix
+    
     ./alacritty.nix
     ./clipman.nix
     ./common.nix
     ./direnv.nix
-    ./dunst.nix
     ./firefox.nix
     ./fzf.nix
     ./git.nix
     ./gpg.nix
     ./helix.nix
-    ./hyprland
     ./packages.nix
     ./playerctld.nix
-    ./rofi.nix
     ./sops.nix
-    ./stylix.nix
     ./thunderbird.nix
     ./zsh
   ];
diff --git a/system/common.nix b/system/common.nix
index 1c59a26c..d14a77db 100644
--- a/system/common.nix
+++ b/system/common.nix
@@ -8,6 +8,7 @@
     compsize
     duf
     eza
+    bat
     file
     htop
     btop
diff --git a/system/default.nix b/system/default.nix
index a1418012..a09cf3f2 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -31,6 +31,7 @@ in {
     modules = [
       ./common.nix
       ./options.nix
+      ./packages.nix
 
       conf.extraConfig
       conf.hardware-configuration
diff --git a/system/packages.nix b/system/packages.nix
new file mode 100644
index 00000000..d7c6988b
--- /dev/null
+++ b/system/packages.nix
@@ -0,0 +1,5 @@
+{pkgs, ...}: {
+  environment.packages = with pkgs; [
+    gnome-bluetooth
+  ];
+}
diff --git a/system/ssh.nix b/system/ssh.nix
index 0e47ec24..3aeb7287 100644
--- a/system/ssh.nix
+++ b/system/ssh.nix
@@ -1,6 +1,8 @@
 {...}: {
+  networking.firewall.allowedTCPPorts = [22];
   services.openssh = {
     enable = true;
+    ports = [22];
     settings = {
       PermitRootLogin = "no";
       PasswordAuthentication = false;