diff --git a/flake.nix b/flake.nix
index d41db6d..c89a4cf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -123,8 +123,9 @@
             inherit inputs;
           };
           modules = [
-            (pkgsForSystem + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
+            (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
             ./systems/nixbook/configuration.nix
+            nixos-hardware.nixosModules.dell-inspiron-7405
           ];
         };
         syl = lib.nixosSystem {
diff --git a/home/home.nix b/home/home.nix
index 6390f84..6881303 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -278,6 +278,10 @@ in {
     plugins = [ pkgs.obs-studio-plugins.obs-move-transition ];
   };
 
+  programs.zed-editor = {
+    enable = true;
+  };
+
   # home.file.".config/mpv" = {
   #   source = ../.config/mpv;
   # };
diff --git a/home/modules/niri.nix b/home/modules/niri.nix
index e02987b..0db5e42 100644
--- a/home/modules/niri.nix
+++ b/home/modules/niri.nix
@@ -103,7 +103,7 @@ in
         "Super+Space".action.spawn = ["${pkgs.fish}/bin/fish" "-c" "rofi -no-lazy-grab -modi combi -show combi -combi-modi drun,run"];
         "Super+Shift+W".action.spawn = "rofi -i -show window";
         "Super+V".action = spawn ["${pkgs.fish}/bin/fish" "-c" "${pkgs.cliphist}/bin/cliphist list | ${pkgs.rofi}/bin/rofi -p '󱃔 ' -dmenu | ${pkgs.cliphist}/bin/cliphist decode | ${pkgs.wl-clipboard}/bin/wl-copy"];
-        "Super+I".action.spawn = ["alacritty" "--class" "btm" "-e" "btm"];
+        "Super+I".action.spawn = ["alacritty" "--class" "btm" "-e" "btop"];
         "Super+Alt+B".action.spawn = ["alacritty" "--class" "bluetui" "-e" "bluetui"];
         "Super+Alt+W".action.spawn = ["alacritty" "--class" "impala" "-e" "impala"];
         "Super+A".action.spawn = ["alacritty" "--class" "pulsemixer" "-e" "${pkgs.wiremix}/bin/wiremix"];
diff --git a/systems/nixbook/configuration.nix b/systems/nixbook/configuration.nix
index 4d8e6d5..d3797ce 100644
--- a/systems/nixbook/configuration.nix
+++ b/systems/nixbook/configuration.nix
@@ -2,8 +2,8 @@
 
 {
   imports = [
-    ./hardware-configuration.nix
-    ../../pkgs/base-packages.nix
+    # ./hardware-configuration.nix
+    # ../../pkgs/base-packages.nix
     ./pkgs.nix
     ../../modules/base.nix
   ];
@@ -27,7 +27,7 @@
   boot.supportedFilesystems = [ "ntfs" ];
 
   services = {
-    desktopManager.cosmic.enable = true;
+    desktopManager.plasma6.enable = true;
   };
 
   programs.nix-ld.enable = true;
@@ -66,8 +66,9 @@
     greetd.enableKwallet = true;
   };
 
-  services.displayManager.cosmic-greeter = {
+  services.displayManager.sddm = {
     enable = true;
+    wayland.enable = true;
   };
 
   xdg.portal = {
@@ -142,44 +143,41 @@
   services.usbmuxd.enable = true;
   services.fstrim.enable = true;
 
-  virtualisation.libvirtd = {
-    enable = true;
-    qemu = {
-      runAsRoot = false;
-      ovmf = {
-        enable = true;
-        packages = [
-          pkgs.OVMFFull.fd
-          pkgs.pkgsCross.aarch64-multiplatform.OVMF.fd
-        ];
-      };
-      swtpm.enable = true;
-    };
-  };
-  services.samba-wsdd.enable = true;
-  services.samba = {
-    enable = true;
-    shares = {
-      public = {
-        path = "/home/abbie";
-        "read only" = false;
-        browsable = true;
-        "guest ok" = true;
-        comment = "Share";
-      };
-    };
-  };
+  # virtualisation.libvirtd = {
+  #   enable = true;
+  #   qemu = {
+  #     runAsRoot = false;
+  #     ovmf = {
+  #       enable = true;
+  #       packages = [
+  #         pkgs.OVMFFull.fd
+  #         pkgs.pkgsCross.aarch64-multiplatform.OVMF.fd
+  #       ];
+  #     };
+  #     swtpm.enable = true;
+  #   };
+  # };
+  # services.samba-wsdd.enable = true;
+  # services.samba = {
+  #   enable = true;
+  #   shares = {
+  #     public = {
+  #       path = "/home/abbie";
+  #       "read only" = false;
+  #       browsable = true;
+  #       "guest ok" = true;
+  #       comment = "Share";
+  #     };
+  #   };
+  # };
 
   # nixpkgs.config.packageOverrides = pkgs: {
   #   vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
   # };
 
-  services.xserver.videoDrivers = [ "intel" ];
   hardware.graphics = {
     enable = true;
     extraPackages = with pkgs; [
-      intel-media-driver # LIBVA_DRIVER_NAME=iHD
-      vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
       libvdpau-va-gl
     ];
   };
diff --git a/systems/nixbook/pkgs.nix b/systems/nixbook/pkgs.nix
index da319e8..c1c0d31 100644
--- a/systems/nixbook/pkgs.nix
+++ b/systems/nixbook/pkgs.nix
@@ -38,7 +38,7 @@
     samba
     pinentry
     pinentry-qt
-    caffeine-ng
+    # caffeine-ng
     hunspell
     hunspellDicts.en_US-large
     openssh
@@ -53,15 +53,18 @@
     kdePackages.kdegraphics-thumbnailers
     kdePackages.kdesdk-thumbnailers
     kdePackages.okular
-    scribus
+    kdePackages.discover
+    kdePackages.sddm-kcm
+    hardinfo2
+    # scribus
     brightnessctl
     mpc-cli
-    ungoogled-chromium
+    # ungoogled-chromium
     brave
     kdePackages.kwallet-pam
     aria2
     kdePackages.kwallet
-    nerd-fonts.victor-mono
+    # nerd-fonts.victor-mono
     kdePackages.plasma-browser-integration
     glxinfo
     vulkan-tools
@@ -71,8 +74,8 @@
     phinger-cursors
     kdePackages.kde-cli-tools
     gzip
-    virt-viewer
-    inkscape
+    # virt-viewer
+    # inkscape
     libreoffice-qt6-fresh
     vlc
     any-nix-shell
@@ -83,14 +86,14 @@
     mediainfo
     libmediainfo
     rubberband
-    texlive.combined.scheme-full
+    # texlive.combined.scheme-full
     pamixer
     playerctl
-    gimp
+    # gimp
     power-profiles-daemon
     python3
     kdePackages.plasma-sdk
     wireguard-tools
-    cosmic-settings
+    # cosmic-settings
   ];
 }