diff --git a/modules/profiles/autorandr/default.nix b/modules/profiles/autorandr/default.nix
index ba7a682..7dc89ed 100644
--- a/modules/profiles/autorandr/default.nix
+++ b/modules/profiles/autorandr/default.nix
@@ -38,11 +38,11 @@ in
         };
         config = {
           eDP-1 = {
+            inherit (eDP-1.${config.networking.hostName}) mode;
             enable = true;
             primary = true;
             crtc = 0;
             position = "0x0";
-            mode = eDP-1.${config.networking.hostName}.mode;
           };
         };
       };
@@ -76,10 +76,10 @@ in
             position = "1920x0";
           };
           eDP-1 = {
+            inherit (eDP-1.${config.networking.hostName}) mode;
             enable = true;
             crtc = 1;
             position = "0x480";
-            mode = eDP-1.${config.networking.hostName}.mode;
           };
         };
       };
diff --git a/modules/profiles/desktop/default.nix b/modules/profiles/desktop/default.nix
index 241822a..8760d03 100644
--- a/modules/profiles/desktop/default.nix
+++ b/modules/profiles/desktop/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  username = config.mj.username;
+  inherit (config.mj) username;
   firefox =
     if (pkgs.stdenv.hostPlatform.system == "x86_64-linux") then pkgs.firefox-bin else pkgs.firefox;
 in
diff --git a/modules/services/photoprism/default.nix b/modules/services/photoprism/default.nix
index 50f4e59..972f01c 100644
--- a/modules/services/photoprism/default.nix
+++ b/modules/services/photoprism/default.nix
@@ -12,9 +12,9 @@ in
 
   config = lib.mkIf cfg.enable {
     services.photoprism = {
+      inherit (cfg) passwordFile;
       enable = true;
       originalsPath = "/var/cache/photoprism/userdata";
-      passwordFile = cfg.passwordFile;
     };
 
     systemd = {