diff --git a/hosts/nyx/configuration.nix b/hosts/nyx/configuration.nix
index c5b3155..9f98811 100644
--- a/hosts/nyx/configuration.nix
+++ b/hosts/nyx/configuration.nix
@@ -19,12 +19,35 @@
       };
       efi.canTouchEfiVariables = true;
     };
-    kernelPackages = pkgs.linuxPackages_zen;
+    kernelPackages = pkgs.linuxPackages_cachyos;
+    kernel = {
+      sysctl ={
+        "vm.max_map_count" = 2147483642;
+      };
+    };
+  };
+
+  zramSwap = {
+    enable = true;
+    algorithm = "zstd";
+    memoryPercent = 75;
   };
 
   networking = {
     hostName = "nyx";
     networkmanager.enable = true;
+    stevenblack = {
+      enable = true;
+      block = [
+      "fakenews"
+      "gambling"
+      ];
+    };
+    nameservers = [
+      "1.1.1.1"
+      "1.0.0.1"
+      "9.9.9.9"
+    ];
   };
 
   time.timeZone = "Europe/Helsinki";
@@ -69,12 +92,13 @@
   users.users.pingu = {
     isNormalUser = true;
     description = "Elissa";
-    extraGroups = [ "networkmanager" "wheel" "docker" ];
+    extraGroups = [ "networkmanager" "wheel" ];
     shell = pkgs.fish;
     packages = with pkgs; [
       floorp
       vesktop
-
+      alacritty
+      kitty
     ];
   };
 
@@ -83,13 +107,12 @@
     useGlobalPkgs = true;
     useUserPackages = true;
     verbose = true;
+    backupFileExtension = "bak";
     users = {
       "pingu" = import ./home.nix;
     };
   };
 
-  virtualisation.docker.enable = true;
-
   systemd = {
     user.services.polkit-gnome-authentication-agent-1 = {
     description = "polkit-gnome-authentication-agent-1";
@@ -111,7 +134,7 @@
     firefox.enable = true;
     
     fish.enable = true;
-    
+
     hyprland = {
       enable = true;
       package = inputs.hyprland.packages."${pkgs.system}".hyprland;
@@ -125,7 +148,10 @@
     nh = {
       enable = true;
       flake = "/home/pingu/.config/nixos";
-
+      clean = {
+	enable = true;
+	extraArgs = "--keep-since 5d --keep 5";
+      };
     };
 
     nix-ld.enable = true;
@@ -140,32 +166,22 @@
   nixpkgs.config.allowUnfree = true;
 
   nix = {
+    package = pkgs.lix;
     settings = {
-      experimental-features = [ "nix-command" "flakes" ];
+      experimental-features = [ "nix-command" "flakes" "auto-allocate-uids" ];
+      max-jobs = "auto";
+      sandbox = true;
       auto-optimise-store = true;
-      substituters = [
-        "https://hyprland.cachix.org"
-        "https://cache.nixos.org"
-        "https://nixpkgs-wayland.cachix.org"
-        "https://nix-community.cachix.org"
-      ];
-      trusted-public-keys = [
-        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-        "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        ];
+      keep-going = true;
+      warn-dirty = false;
+      use-xdg-base-directories = true;
       trusted-users = [ "@wheel" "pingu" "root" ];
     };
-    gc = {
-      automatic = true;
-      persistent = true;
-      dates = "daily";
-      options = "--delete-older-than +5";
-    };
   };
 
   environment.systemPackages = with pkgs; [
+    gnome-tweaks # TODO remove
+    btrfs-progs
     hyprcursor
     grimblast  
     neovim
@@ -181,6 +197,9 @@
     ripgrep
     clang
     go
+    lua
+    lua-language-server
+    nil
     nixfmt-classic
     zip
     nodejs
@@ -191,7 +210,7 @@
     bibata-cursors
     spotify
     jq
-    gnome.gnome-control-center
+    gnome-control-center
     pavucontrol
     icon-library
     bat
@@ -201,27 +220,9 @@
     glib
     cliphist
     playerctl
-    socat
-    adwaita-qt6
     material-icons
     material-design-icons
     material-symbols
-    ddcutil
-    (python311.withPackages (ps: with ps; [ 
-      pillow
-      material-color-utilities
-      materialyoucolor
-      wheel
-      setuptools-scm
-      libsass
-      pywayland
-      psutil
-      numpy
-      requests
-      pyxdg
-    ]))
-    pywal
-    dart-sass
     imagemagick
   ];
 
@@ -235,6 +236,7 @@
     google-fonts
     material-symbols
     material-icons
+    maple-mono
   ];
 
   programs.gnupg.agent = {
diff --git a/hosts/nyx/hardware-configuration.nix b/hosts/nyx/hardware-configuration.nix
index c262e48..488829d 100644
--- a/hosts/nyx/hardware-configuration.nix
+++ b/hosts/nyx/hardware-configuration.nix
@@ -9,12 +9,12 @@
     ];
 
   boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "usbhid" "uas" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.initrd.kernelModules = [ "amdgpu" ];
+  boot.kernelModules = [ "kvm-amd" "amd-pstate" "amdgpu" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/465cd1e9-3e0f-4800-a28e-bde99c2fc6f8";
+    { device = "/dev/disk/by-uuid/4f1b81d9-6ca7-486c-bf85-72dcc72f525d";
       fsType = "ext4";
     };
 
@@ -24,10 +24,16 @@
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
-  #fileSystems."/var/lib/docker/overlay2/7494aad14765ade76a2ecf82e21a3d20996943b4b3260e74feeeb01734c9db41/merged" =
-  #  { device = "overlay";
-  #    fsType = "overlay";
-  #  };
+  fileSystems."/media" =
+    { device = "/dev/disk/by-uuid/ec917008-d804-4134-82b6-f277b6ff9d77";
+      fsType = "btrfs";
+      options = [ "async" "auto" "noatime" "rw" "subvolid=5" "subvol=/" ];
+    };
+
+  fileSystems."/mnt/arch" =
+    { device = "/dev/disk/by-uuid/beb59913-0dd6-40e5-bd0b-b004b891d9d3";
+      fsType = "ext4";
+    };
 
   fileSystems."/mnt/ext" =
     { device = "/dev/disk/by-uuid/43280a82-cf9a-452e-9bdc-a8cc66ccd7c8";
@@ -35,13 +41,6 @@
       options = [ "async" "auto" "nofail" "noatime" ];
     };
 
-  fileSystems."/mnt/ext/storage" =
-    { device = "/dev/disk/by-uuid/349dd615-0054-453e-b6bd-a15938bf8366";
-      fsType = "btrfs";
-      options = [ "async" "auto" "nofail" "noatime" ];
-      depends = [ "/mnt/ext" ];
-    };
-
   swapDevices =
     [ { device = "/dev/disk/by-uuid/df753d88-0883-4084-acb3-e8a1d3192603"; }
     ];
@@ -51,10 +50,9 @@
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.docker0.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp13s0.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp14s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode = true;
 }