diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 377e55c..407cd7e 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -26,7 +26,10 @@
     inputs.ucodenix.nixosModules.default
   ];
 
-
+  services.ucodenix = {
+    enable = true;
+    cpuModelId = "00A20F12"; # AMD 5900X
+  };
 
   # Use the latest linux Kernel
   boot.kernelPackages = pkgs.linuxPackages_latest;
@@ -181,7 +184,6 @@
       fzf
       nixfmt-rfc-style
       dwarfs
-      unrar
 
       wineWowPackages.stable
       winetricks
@@ -264,7 +266,16 @@
   # List services that you want to enable:
 
   # Enable the OpenSSH daemon.
-  
+  services.openssh.enable = true;
+  services.flatpak.enable = true;
+  services.pcscd.enable = true;
+
+  services.sunshine = {
+    enable = true;
+    autoStart = true;
+    capSysAdmin = true;
+    openFirewall = true;
+  };
 
   virtualisation.docker.enable = true;
   virtualisation.docker.storageDriver = "btrfs";
@@ -279,6 +290,46 @@
   # Or disable the firewall altogether.
   networking.firewall.enable = false;
 
+  # services.blocky = {
+  #   enable = true;
+  #   settings = {
+  #     ports.dns = 53; # Port for incoming DNS Queries.
+  #     upstreams.groups.default = [
+  #       "https://one.one.one.one/dns-query" # Using Cloudflare's DNS over HTTPS server for resolving queries.
+  #     ];
+  #     # For initially solving DoH/DoT Requests when no system Resolver is available.
+  #     bootstrapDns = {
+  #       upstream = "https://one.one.one.one/dns-query";
+  #       ips = [ "1.1.1.1" "1.0.0.1" ];
+  #     };
+  #     #Enable Blocking of certian domains.
+  #     blocking = {
+  #       blackLists = {
+  #         #Adblocking
+  #         ads = [
+  #           "https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts"
+  #           "https://adaway.org/hosts.txt"
+  #           "https://v.firebog.net/hosts/AdguardDNS.txt"
+  #           ];
+  #         #Another filter for blocking adult sites
+  #         adult = ["https://blocklistproject.github.io/Lists/porn.txt"];
+  #         #You can add additional categories
+  #       };
+  #       #Configure what block categories are used
+  #       clientGroupsBlock = {
+  #         default = [ "ads" ];
+  #         # kids-ipad = ["ads" "adult"];
+  #       };
+  #     };
+  #     customDNS = {
+  #       customTTL = "1h";
+  #       mapping = {
+  #         "upload.aria.coffee" = "192.168.20.2";
+  #       };
+  #     };
+  #   };
+  # };
+
   networking.hosts = {
     "192.168.20.2" = [
       "upload.aria.coffee"
@@ -308,10 +359,7 @@
   environment.sessionVariables = {
     # === Prefer RADV driver ===
     AMD_VULKAN_ICD = "RADV";
-
     FLAKE = "/home/buymymojo/etc/nixos/";
-
-    MANGOHUD = "1";
   };
 
   # This value determines the NixOS release from which the default
diff --git a/nixos/flake.nix b/nixos/flake.nix
index d2ba3cb..82b32df 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -34,7 +34,6 @@
         };
         modules = [
           ./configuration.nix
-          ./services.nix
         ];
 
       };
diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix
index 722bfb9..1f5bad1 100644
--- a/nixos/hardware-configuration.nix
+++ b/nixos/hardware-configuration.nix
@@ -194,7 +194,7 @@
     graphics = {
       enable = true;
       enable32Bit = true;
-
+      
       # === amdvlk driver ===
       extraPackages = with pkgs; [
         amdvlk
diff --git a/nixos/services.nix b/nixos/services.nix
deleted file mode 100644
index 8a43595..0000000
--- a/nixos/services.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  config,
-  pkgs,
-  unstable,
-  inputs,
-  ...
-}:
-
-{
-
-  services = {
-    openssh.enable = true;
-    flatpak.enable = true;
-    pcscd.enable = true;
-
-    sunshine = {
-      enable = true;
-      autoStart = true;
-      capSysAdmin = true;
-      openFirewall = true;
-    };
-
-    ucodenix = {
-      enable = true;
-      #     cpuModelId = "00A20F12"; # AMD 5900X
-    };
-
-    syncthing = {
-        enable = true;
-        group = "users";
-        user = "buymymojo";
-        dataDir = "/home/buymymojo/Documents/Syncthing";    # Default folder for new synced folders
-        configDir = "/home/buymymojo/Documents/.config/syncthing";   # Folder for Syncthing's settings and keys
-    };
-
-
-
-
-      # services.blocky = {
-  #   enable = true;
-  #   settings = {
-  #     ports.dns = 53; # Port for incoming DNS Queries.
-  #     upstreams.groups.default = [
-  #       "https://one.one.one.one/dns-query" # Using Cloudflare's DNS over HTTPS server for resolving queries.
-  #     ];
-  #     # For initially solving DoH/DoT Requests when no system Resolver is available.
-  #     bootstrapDns = {
-  #       upstream = "https://one.one.one.one/dns-query";
-  #       ips = [ "1.1.1.1" "1.0.0.1" ];
-  #     };
-  #     #Enable Blocking of certian domains.
-  #     blocking = {
-  #       blackLists = {
-  #         #Adblocking
-  #         ads = [
-  #           "https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts"
-  #           "https://adaway.org/hosts.txt"
-  #           "https://v.firebog.net/hosts/AdguardDNS.txt"
-  #           ];
-  #         #Another filter for blocking adult sites
-  #         adult = ["https://blocklistproject.github.io/Lists/porn.txt"];
-  #         #You can add additional categories
-  #       };
-  #       #Configure what block categories are used
-  #       clientGroupsBlock = {
-  #         default = [ "ads" ];
-  #         # kids-ipad = ["ads" "adult"];
-  #       };
-  #     };
-  #     customDNS = {
-  #       customTTL = "1h";
-  #       mapping = {
-  #         "upload.aria.coffee" = "192.168.20.2";
-  #       };
-  #     };
-  #   };
-  # };
-  };
-
-}