diff --git a/flake.nix b/flake.nix
index 904eca8..4fd7b2c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,16 +59,6 @@
         in
         {
             nixosConfigurations = {
-                creatorforge-vm = mkComputer
-                    ./machines/proxmox-vm.nix #machine specific configuration
-                    "speccon18" #default user
-                    [
-                        ./hosts/proton.nix
-                        ./modules/system/services/docker.nix
-                        ./modules/system/services/openssh.nix
-                        ./modules/system/desktop-environments/gnome.nix
-                    ] #extra modules to load
-                    []; #extra modules to be loaded by home-manager
                 katana = mkComputer
                     ./machines/katana.nix #machine specific configuration
                     "speccon18"  #default user
@@ -82,6 +72,7 @@
                         ./modules/system/services/openssh.nix
                         ./modules/system/desktop-environments/gnome.nix
                         ./modules/system/desktop-environments/hyprland.nix
+                        ./modules/system/services/syncthing.nix
                         
                     ] #extra modules to load
                     [
diff --git a/hosts/katana/default.nix b/hosts/katana/default.nix
index 5283845..2bbb0dd 100644
--- a/hosts/katana/default.nix
+++ b/hosts/katana/default.nix
@@ -48,4 +48,20 @@
       jack.enable = true;
     };
   };
+  nix = {
+    # Sets flakes to unstable track instead of stable #
+    package = pkgs.nixUnstable; # or versioned attributes like nix_2_4
+    # Enable flakes and nix-command
+    extraOptions = ''experimental-features = nix-command flakes'';
+    # Auto maintainence
+    settings.auto-optimise-store = lib.mkDefault true;
+    # Prevent tampering of the pkgstore
+    readOnlyStore = true;
+    # Garbage collection
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 7d";
+    };
+  };
 }
\ No newline at end of file
diff --git a/hosts/katana/system-pkgs.nix b/hosts/katana/system-pkgs.nix
index 35d3363..d2cf26f 100644
--- a/hosts/katana/system-pkgs.nix
+++ b/hosts/katana/system-pkgs.nix
@@ -25,5 +25,6 @@
     sops #file based secrets operations
     direnv #used for development environments
     python39  
+    gcc
   ];
 }
\ No newline at end of file
diff --git a/modules/home-manager/alacritty.nix b/modules/home-manager/alacritty.nix
index 7704f5d..3eb1366 100644
--- a/modules/home-manager/alacritty.nix
+++ b/modules/home-manager/alacritty.nix
@@ -8,7 +8,7 @@
             columns = 120;
             lines = 25;
           };
-          decorations = "none";
+          decorations = "full";
           opacity = 0.9;
           title = "Alacritty";
         };
diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix
new file mode 100644
index 0000000..547eb9b
--- /dev/null
+++ b/modules/home-manager/waybar.nix
@@ -0,0 +1,4 @@
+ { pkgs, config, lib, ...}:
+{
+  wa
+}
\ No newline at end of file
diff --git a/modules/system/desktop-environments/hyprland.nix b/modules/system/desktop-environments/hyprland.nix
index 07bd827..50629db 100644
--- a/modules/system/desktop-environments/hyprland.nix
+++ b/modules/system/desktop-environments/hyprland.nix
@@ -5,5 +5,7 @@
     libsForQt5.qt5.qtwayland
     qt6.qtwayland
     eww-wayland
+    waybar
+    hyprpaper
   ];
 }
\ No newline at end of file
diff --git a/modules/system/services/syncthing.nix b/modules/system/services/syncthing.nix
new file mode 100644
index 0000000..ccfa3c9
--- /dev/null
+++ b/modules/system/services/syncthing.nix
@@ -0,0 +1,21 @@
+{config, lib, pkgs, modulesPath, ... }:
+{
+  services.syncthing = {
+    enable = true;
+    dataDir = "/home/speccon18";
+    openDefaultPorts = true;
+    configDir = "/home/speccon18/.config/syncthing";
+    user = "speccon18";
+    group = "users";
+    extraOptions.gui = {
+      user = "admin";
+      password = "Strife-Rerun-Lily-Pushover-Alongside-Raider0-Freebase";
+    };
+    guiAddress = "0.0.0.0:8384";
+    overrideDevices = true;
+    overrideFolders = true;
+    devices = {
+      "syncthing_server" = { id = "N3UGNP6-ZU6JHBX-WNJDEUF-FV5DOWA-VAGFDYN-FIIMFRR-C3HGQHU-WOEIUQ6"; };
+    };
+  };
+}
\ No newline at end of file
diff --git a/users/speccon18/home.nix b/users/speccon18/home.nix
index 80fcdf8..05f53e9 100644
--- a/users/speccon18/home.nix
+++ b/users/speccon18/home.nix
@@ -9,23 +9,17 @@
       freecad
       prismlauncher
       calibre
-      w3m
       bitwarden
       firefox
       discord
       nodejs-18_x
       nerdfonts
       fira-code
-      libreoffice
-      asciinema
-      postman
       gimp
       obsidian
       neofetch
       vlc
       remmina
-      signal-desktop
-      just
       bacon
       bottom
       broot