diff --git a/nix-os/account.nix b/nix-os/account.nix
index b1693ad..e7bb85c 100644
--- a/nix-os/account.nix
+++ b/nix-os/account.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, unstablePkgs, ... }:
+{ config, lib, pkgs, unstablePkgs, ... }:
 
 {
   imports = [
@@ -11,8 +11,7 @@
     extraGroups = [
       "users"
       "wheel"
-      (if config.programs.adb.enable then "adbusers" else null)
-    ];
+    ] ++ lib.optional config.programs.adb.enable "adbusers";
     linger = true;
     initialPassword = "nixos";
     packages = with pkgs; [
diff --git a/nix-os/dconf-common.nix b/nix-os/dconf-common.nix
index 2993f98..967d28f 100644
--- a/nix-os/dconf-common.nix
+++ b/nix-os/dconf-common.nix
@@ -65,15 +65,11 @@
           "color-picker@tuberry"
         ];
         favorite-apps = [
-          (if builtins.elem pkgs.kitty config.environment.systemPackages then
-            "kitty.desktop"
-          else none)
+          "kitty.desktop"
           "vivaldi-stable.desktop"
           "code.desktop"
           "org.gnome.Nautilus.desktop"
-          (if config.programs.steam.enable then
-            "steam.desktop"
-          else none)
+          "steam.desktop"
           "pavucontrol.desktop"
         ];
       };