diff --git a/base/users.nix b/base/users.nix
index e6f84cb..298c65c 100644
--- a/base/users.nix
+++ b/base/users.nix
@@ -24,7 +24,7 @@ in
             groups = [ "wheel" ];
             commands = [
                 {
-                    command = "/run/current-system/sw/bin/nixos-rebuild";
+                    command = "${pkgs.nixos-rebuild}/bin/nixos-rebuild *";
                     options = [ "NOPASSWD" ];
                 }
             ];
diff --git a/hosts/gnome.nix b/hosts/gnome.nix
index 08b1aca..41ab98f 100644
--- a/hosts/gnome.nix
+++ b/hosts/gnome.nix
@@ -11,7 +11,6 @@
     autoLogin.user = "fruchti";
   };
   security.pam.services.gdm.enableGnomeKeyring = true;
-  services.gnome.gnome-keyring.enable = true;
 
   services.touchegg.enable = true;
   services.gnome.gnome-settings-daemon.enable = true;
diff --git a/overlays/default.nix b/overlays/default.nix
index eab7738..7cd1fd2 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -2,6 +2,5 @@
 {
     imports = [
         ./burp.nix
-        ./horizon-eda.nix
     ];
 }
diff --git a/overlays/horizon-eda.nix b/overlays/horizon-eda.nix
deleted file mode 100644
index 3022fdf..0000000
--- a/overlays/horizon-eda.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, ... }:
-{
-    nixpkgs.overlays = [
-        (self: super: {
-            horizon-eda = (super.horizon-eda.overrideAttrs (old: {
-                # Add an environment variable to fix redraw issues on Intel Graphics
-                patches = [
-                    ./horizon_software_draw_surface.patch
-                ];
-            }));
-        })
-    ];
-}
diff --git a/overlays/horizon_software_draw_surface.patch b/overlays/horizon_software_draw_surface.patch
deleted file mode 100644
index c44c667..0000000
--- a/overlays/horizon_software_draw_surface.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/org.horizon_eda.HorizonEDA.desktop b/org.horizon_eda.HorizonEDA.desktop
-index 7551df54..d8df7800 100644
---- a/org.horizon_eda.HorizonEDA.desktop
-+++ b/org.horizon_eda.HorizonEDA.desktop
-@@ -5,4 +5,4 @@ Categories=Development;Engineering;Electronics;
- Type=Application
- Terminal=false
- Icon=org.horizon_eda.HorizonEDA
--Exec=horizon-eda %U
-+Exec=env GDK_GL=software-draw-surface horizon-eda %U