diff --git a/system/default.nix b/system/default.nix
index 9657b3b..fbeebdd 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -9,12 +9,26 @@
     ./virtualisation.nix
   ];
 
+  boot.cleanTmpDir = true;
   console.useXkbConfig = true;
 
   environment.sessionVariables = {
     NIXOS_OZONE_WL = "1";
   };
 
+  fonts = {
+    enableDefaultFonts = true;
+    fontDir.enable = true;
+    fonts = with pkgs; [
+      cantarell-fonts
+      liberation_ttf
+      (nerdfonts.override { fonts = [ "FiraCode" ]; })
+      noto-fonts
+      noto-fonts-cjk
+      noto-fonts-emoji
+    ];
+  };
+
   i18n = {
     defaultLocale = "en_US.UTF-8";
     extraLocaleSettings = {
@@ -82,14 +96,11 @@
   };
 
   sound.enable = true;
-
   time.timeZone = "Asia/Kolkata";
 
-  xdg = {
-    portal = {
+  xdg.portal = {
       enable = true;
       extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-hyprland ];
-    };
   };
 
   system.stateVersion = "23.05";
diff --git a/system/packages.nix b/system/packages.nix
index 3c75950..92391ce 100644
--- a/system/packages.nix
+++ b/system/packages.nix
@@ -1,18 +1,5 @@
 { pkgs, ... }: {
-  fonts = {
-    enableDefaultFonts = true;
-    fontDir.enable = true;
-    fonts = with pkgs; [
-      cantarell-fonts
-      liberation_ttf
-      (nerdfonts.override { fonts = [ "FiraCode" ]; })
-      noto-fonts
-      noto-fonts-cjk
-      noto-fonts-emoji
-    ];
-  };
 
-  hardware.gpgSmartcards.enable = true;
   programs = {
     dconf.enable = true;
     git.enable = true;