diff --git a/systems/BASED.nix b/systems/BASED.nix
index 05554d0..819f2be 100644
--- a/systems/BASED.nix
+++ b/systems/BASED.nix
@@ -22,11 +22,7 @@
 
     nix.package = lib.mkIf (config.networking.hostName == "NOcomputer") pkgs.lixPackageSets.stable.lix;
 
-    programs.pmount.enable = true;
-    services.eternal-terminal.enable = true;
-    programs.mosh.enable = true;
     environment.systemPackages = with pkgs; [
-        eternal-terminal
         # keep-sorted start
         bat
         bottom
@@ -61,7 +57,10 @@
         # keep-sorted end
     ];
     programs.partition-manager.enable = lib.mkDefault true;
+    programs.pmount.enable = lib.mkDefault true;
+    programs.mosh.enable = lib.mkDefault true;
 
+    fonts.fontDir.enable = true;
     fonts.packages = with pkgs; [
         # keep-sorted start
         cooper-hewitt
@@ -77,27 +76,27 @@
         noto-fonts-color-emoji
         # keep-sorted end
     ];
-    system.userActivationScripts = {
-        copy-fonts-local-share = {
-            text = ''
-                rm -rf ~/.local/share/fonts
-                mkdir -p ~/.local/share/fonts
-                cp ${pkgs.cooper-hewitt}/share/fonts/truetype/* ~/.local/share/fonts/
-                cp ${pkgs.ibm-plex}/share/fonts/truetype/* ~/.local/share/fonts/
-                cp ${pkgs.inconsolata}/share/fonts/truetype/* ~/.local/share/fonts/
-                cp ${pkgs.iosevka}/share/fonts/truetype/* ~/.local/share/fonts/
-                cp ${pkgs.libertine}/share/fonts/truetype/* ~/.local/share/fonts/
-                cp ${pkgs.linux-libertine-g}/share/fonts/truetype/* ~/.local/share/fonts/
-                cp ${pkgs.nerd-fonts.fira-code}/share/fonts/truetype/* ~/.local/share/fonts/
-                cp ${pkgs.nerd-fonts.iosevka-term}/share/fonts/truetype/* ~/.local/share/fonts/
-                cp ${pkgs.noto-fonts-cjk-sans}/share/fonts/truetype/* ~/.local/share/fonts/
-                cp ${pkgs.noto-fonts-cjk-serif}/share/fonts/truetype/* ~/.local/share/fonts/
-                cp ${pkgs.noto-fonts-color-emoji}/share/fonts/truetype/* ~/.local/share/fonts/
-                chmod 544 ~/.local/share/fonts
-                chmod 444 ~/.local/share/fonts/*
-            '';
-        };
-    };
+    # system.userActivationScripts = {
+    #     copy-fonts-local-share = {
+    #         text = ''
+    #             rm -rf ~/.local/share/fonts
+    #             mkdir -p ~/.local/share/fonts
+    #             # cp ${pkgs.cooper-hewitt}/share/fonts/truetype/* ~/.local/share/fonts/
+    #             # cp ${pkgs.ibm-plex}/share/fonts/truetype/* ~/.local/share/fonts/
+    #             # cp ${pkgs.inconsolata}/share/fonts/truetype/* ~/.local/share/fonts/
+    #             # cp ${pkgs.iosevka}/share/fonts/truetype/* ~/.local/share/fonts/
+    #             # cp ${pkgs.libertine}/share/fonts/truetype/* ~/.local/share/fonts/
+    #             # cp ${pkgs.linux-libertine-g}/share/fonts/truetype/* ~/.local/share/fonts/
+    #             # cp ${pkgs.nerd-fonts.fira-code}/share/fonts/truetype/* ~/.local/share/fonts/
+    #             # cp ${pkgs.nerd-fonts.iosevka-term}/share/fonts/truetype/* ~/.local/share/fonts/
+    #             # cp ${pkgs.noto-fonts-color-emoji}/share/fonts/truetype/* ~/.local/share/fonts/
+    #             cp ${pkgs.noto-fonts-cjk-sans}/share/fonts/opentype/* ~/.local/share/fonts/
+    #             cp ${pkgs.noto-fonts-cjk-serif}/share/fonts/opentype/* ~/.local/share/fonts/
+    #             chmod 544 ~/.local/share/fonts
+    #             chmod 444 ~/.local/share/fonts/*
+    #         '';
+    #     };
+    # };
 
     hardware.graphics.enable = true;
     # hardware.opengl = {
diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix
index 95e5639..45d31ae 100644
--- a/systems/NOlaptop.nix
+++ b/systems/NOlaptop.nix
@@ -17,10 +17,12 @@
     # ];
 
     environment.systemPackages = with pkgs; [
-        fw-ectool
+        # keep-sorted start
         framework-tool
-        nvtopPackages.amd
+        fw-ectool
         lact
+        nvtopPackages.amd
+        # keep-sorted end
     ];
 
     services.lact.enable = true;
@@ -46,12 +48,9 @@
         "amdgpu"
     ];
 
-    # boot.kernelPackages = pkgs.linuxPackages_latest;
-    boot.kernelPackages = pkgs.nur.repos.Ev357.linux-patched;
+    boot.kernelPackages = pkgs.linuxPackages_latest;
     boot.kernelParams = [
         "amdgpu.abmlevel=1"
-        # amd doesn't have deep
-        # "mem_sleep_default=deep"
     ];
     boot.kernelModules = ["amdgpu"];
     powerManagement.cpuFreqGovernor = "powersave";