diff --git a/hosts/gorgon/default.nix b/hosts/gorgon/default.nix
index 45aefc4..ca8203b 100644
--- a/hosts/gorgon/default.nix
+++ b/hosts/gorgon/default.nix
@@ -26,10 +26,10 @@ in
   dadada = {
     admin.enable = false;
     steam.enable = true;
-    fido2 = {
-      credential = "04ea2813a116f634e90f9728dbbb45f1c0f93b7811941a5a14fb75e711794df0c26552dae2262619c1da2be7562ec9dd94888c71a9326fea70dfe16214b5ea8ec01473070000";
-      enablePam = true;
-    };
+    #fido2 = {
+    #  credential = "04ea2813a116f634e90f9728dbbb45f1c0f93b7811941a5a14fb75e711794df0c26552dae2262619c1da2be7562ec9dd94888c71a9326fea70dfe16214b5ea8ec01473070000";
+    #  enablePam = true;
+    #};
     luks.uuid = "3d0e5b93-90ca-412a-b4e0-3e6bfa47d3f4";
     networking = {
       enableBsShare = true;
@@ -95,7 +95,7 @@ in
 
   services.xserver.enable = true;
   services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome3.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
 
   programs.sway = {
     enable = true;
diff --git a/hosts/gorgon/home/default.nix b/hosts/gorgon/home/default.nix
index d9c6321..e106248 100644
--- a/hosts/gorgon/home/default.nix
+++ b/hosts/gorgon/home/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, unstable, lib, ... }:
+{ config, pkgs, lib, ... }:
 let
   this = import ../../.. { inherit pkgs; };
   useFeatures = [
@@ -16,7 +16,6 @@ let
     "xdg"
     "zsh"
   ];
-  unstable = import <nixpkgs-unstable> {};
 in
 {
   nixpkgs.overlays = [
@@ -60,5 +59,5 @@ in
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 
-  home.packages = import ./pkgs.nix { pkgs = pkgs; unstable = unstable; };
+  home.packages = import ./pkgs.nix { inherit pkgs; };
 }
diff --git a/hosts/gorgon/home/pkgs.nix b/hosts/gorgon/home/pkgs.nix
index 7f1de33..bf21924 100644
--- a/hosts/gorgon/home/pkgs.nix
+++ b/hosts/gorgon/home/pkgs.nix
@@ -1,4 +1,4 @@
-{ pkgs, unstable }:
+{ pkgs }:
 with pkgs; [
   anki
   aspell
@@ -24,10 +24,6 @@ with pkgs; [
   fzf
   gdb
   gimp
-  gnome4.gnome-tweak-tool
-  gnome4.nautilus
-  gnome4.vinagre
-  gnomeExtensions.paperwm
   gnucash
   gnumake
   gnupg
@@ -69,7 +65,6 @@ with pkgs; [
   python3
   python38Packages.dateutil
   python38Packages.managesieve
-  python38Packages.solo-python
   recipemd
   ripgrep
   rustup
@@ -92,5 +87,4 @@ with pkgs; [
   git-lfs
   gitAndTools.hub
   gitAndTools.lab
-  unstable.android-studio
 ]
diff --git a/modules/home/gtk.nix b/modules/home/gtk.nix
index 779dfd3..b75c7c7 100644
--- a/modules/home/gtk.nix
+++ b/modules/home/gtk.nix
@@ -17,9 +17,5 @@ in
       font.package = pkgs.cantarell-fonts;
       font.name = "Cantarell";
     };
-    qt = {
-      enable = true;
-      platformTheme = "gnome";
-    };
   };
 }
diff --git a/modules/networking.nix b/modules/networking.nix
index 757d6ec..46d02af 100644
--- a/modules/networking.nix
+++ b/modules/networking.nix
@@ -23,21 +23,26 @@ in
     networking.resolvconf.useLocalResolver = mkIf cfg.useLocalResolver true;
     services.unbound = mkIf cfg.useLocalResolver {
       enable = true;
-      allowedAccess = [
-        "127.0.0.1/8"
-        "::1"
-      ];
-      extraConfig = ''
-        tls-upstream: yes
-        tls-cert-bundle: "/etc/ssl/certs/ca-bundle.crt"
-        forward-zone:
-        name: .
-        forward-tls-upstream: yes
-        forward-addr: 2606:4700:4700::1001@853#cloudflare-dns.com
-        forward-addr: 2606:4700:4700::1111@853#cloudflare-dns.com
-        forward-addr: 1.1.1.1@853#cloudflare-dns.com
-        forward-addr: 1.0.0.1@853#cloudflare-dns.com
-      '';
+      settings = {
+        server.interface = [
+          "127.0.0.1"
+          "::1"
+        ];
+        tls-upstream = "yes";
+        tls-cert-bundle = "/etc/ssl/certs/ca-bundle.crt";
+        forward-zone = [
+          {
+            name = ".";
+            forward-tls-upstream = "yes";
+            forward-addr = [
+              "2606:4700:4700::1001@853#cloudflare-dns.com"
+              "2606:4700:4700::1111@853#cloudflare-dns.com"
+              "1.1.1.1@853#cloudflare-dns.com"
+              "1.0.0.1@853#cloudflare-dns.com"
+            ];
+          }
+        ];
+      };
     };
 
     networking.useDHCP = false;
diff --git a/modules/profiles/laptop/default.nix b/modules/profiles/laptop/default.nix
index 5a7ec7e..18f8feb 100644
--- a/modules/profiles/laptop/default.nix
+++ b/modules/profiles/laptop/default.nix
@@ -3,6 +3,9 @@ with lib;
 {
   #nixpkgs.overlays = attrValues (import ../../../overlays);
 
+  # conflicts with power-management
+  services.tlp.enable = false;
+
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
   networking.domain = mkDefault "dadada.li";
diff --git a/pkgs/deploy.nix b/pkgs/deploy.nix
index 84be481..8df97d7 100644
--- a/pkgs/deploy.nix
+++ b/pkgs/deploy.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , git
 , openssh
 , bash
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
       install $script $out/bin/
     done
   '';
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "deploy scripts";
     license = licenses.publicDomain;
     platforms = platforms.linux;
diff --git a/pkgs/keys/default.nix b/pkgs/keys/default.nix
index 6b3552a..faee440 100644
--- a/pkgs/keys/default.nix
+++ b/pkgs/keys/default.nix
@@ -1,4 +1,4 @@
-{ stdenv }:
+{ stdenv, lib }:
 
 stdenv.mkDerivation rec {
   name = "dadadaKeys";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     cp * $out
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Public keys for my infrastructure";
     license = licenses.publicDomain;
     platforms = platforms.all;
diff --git a/pkgs/python-pkgs/recipemd/default.nix b/pkgs/python-pkgs/recipemd/default.nix
index 86ed301..009277f 100644
--- a/pkgs/python-pkgs/recipemd/default.nix
+++ b/pkgs/python-pkgs/recipemd/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     pythonPackages.pytestcov
   ];
 
-  #doCheck = true;
+  doCheck = false;
 
   meta = with lib; {
     description = "Markdown recipe manager, reference implementation of RecipeMD";
diff --git a/pkgs/scripts.nix b/pkgs/scripts.nix
index 98ca55e..f1dfe42 100644
--- a/pkgs/scripts.nix
+++ b/pkgs/scripts.nix
@@ -1,9 +1,9 @@
-{ stdenv }:
+{ pkgs, stdenv, lib }:
 
 (import
-  (builtins.fetchGit {
+  (pkgs.fetchgit {
     url = "https://git.dadada.li/dadada/scripts.git";
-    ref = "main";
-    rev = "3393073cd3511d43f622972b891a20ba069fa052";
+    sha256 = "0pspybphfqmccl9w97dr89g47dbxk8ly05x8x7c313a5i3pzd5lm";
+    rev = "e1a887a658da130c2a513d4c770d5026565c4e69";
   })
-  { inherit stdenv; })
+  { stdenv = stdenv; lib = lib; })