diff --git a/configuration.nix b/configuration.nix
index 06f6712..4c797bb 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -7,7 +7,10 @@
 {
   imports =
     [ # Include the results of the hardware scan.
+      <framework/16-inch/common>
       ./hardware-configuration.nix
+      ./framework-lid-workaround.nix
+      # Presumably need to re-add the Nix home-manager channel before adding this back.
       # <home-manager/nixos>
     ];
 
@@ -26,7 +29,7 @@
     btop
     calibre
     contrast
-    cruft
+    # cruft
     curl
     ddev
     diffr
@@ -43,13 +46,12 @@
     floorp
     fsearch
     getxbook
-    # gimp-with-plugins # Currently breaks bulid
+    # gimp-with-plugins # Currently breaks build, but works if in nix shell solo
     git
     git-open
     gnucash
     gnumake
-    dig
-    handbrake # converting video, https://handbrake.fr/
+    # handbrake # converting video, https://handbrake.fr/
     htop
     hunspell
     hunspellDicts.en_US-large
@@ -73,12 +75,12 @@
     kdePackages.krecorder
     kdePackages.kruler
     kdePackages.kweather
-    kdePackages.neochat # For matrix but relying on insecure olm-3.2.16
+    # kdePackages.neochat # For matrix but relying on insecure olm-3.2.16
     kdePackages.partitionmanager
     keepassxc
     kirc
-    kiwix
-    kiwix-tools
+    # kiwix
+    # kiwix-tools
     kupfer # a nice launcher, installed because my main desktop screen is broken and i needed a way to see what apps i was picking
     libinput
     libreoffice-qt6-still # this is basically unusable, graphics all mis-aligned
@@ -91,9 +93,10 @@
     meld
     mkcert
     mmv
+    ncdu
     neovim # aka nvim
     nextcloud-client
-    nheko # For matrix but relying on insecure olm-3.2.16
+    # nheko # For matrix but relying on insecure olm-3.2.16
     # nfs-utils
     nix-search-cli
     onlyoffice-desktopeditors
@@ -145,6 +148,7 @@
     xorg.xkill
     # xpdf # Simple PDF viewer - currently marked insecure
     yt-dlp
+    zed-editor
     zoxide
     zulip
     zulip-term
@@ -307,10 +311,9 @@
   nixpkgs.config.allowUnfree = true;
 
   # TODO remove this when Logseq gets its act together
-  nixpkgs.config.permittedInsecurePackages = [
-    "electron-27.3.11"
-    "olm-3.2.16"
-  ];
+  # nixpkgs.config.permittedInsecurePackages = [
+  #  "olm-3.2.16"
+  # ];
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.