more updates

platforms/nixos/modules/nmasur/presets/services/lightdm.nix

@@ -1,5 +1,6 @@
 {
   config,
+  pkgs,
   lib,
   ...
 }:
@@ -16,6 +17,13 @@ in
       type = lib.types.path;
       description = "Wallpaper background image file";
     };
+    gtk.theme = {
+      name = lib.mkOption {
+        type = lib.types.str;
+        default = "Adwaita-dark";
+      };
+      package = lib.mkPackageOption pkgs "gnome-themes-extra" { };
+    };
   };
 
   config = lib.mkIf cfg.enable {
@@ -34,6 +42,13 @@ in
           extraSeatDefaults = ''
             greeter-hide-users = false
           '';
+
+          # Make the login screen dark
+          greeters.gtk.theme = {
+            name = cfg.gtk.theme.name;
+            package = cfg.gtk.theme.package;
+          };
+
         };
       };
     };

platforms/nixos/modules/nmasur/presets/services/nix-autoupgrade.nix

@@ -11,7 +11,14 @@ in
 
 {
 
-  options.nmasur.presets.services.nix-autoupgrade.enable = lib.mkEnableOption "Nix auto upgrade";
+  options.nmasur.presets.services.nix-autoupgrade = {
+    enable = lib.mkEnableOption "Nix auto upgrade";
+    repo = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Git URL of the flake repository to use for upgrades";
+      default = "git@github.com:nmasur/dotfiles";
+    };
+  };
 
   config = lib.mkIf cfg.enable {
 
@@ -19,7 +26,7 @@ in
     system.autoUpgrade = {
       enable = true;
       dates = "09:33";
-      flake = "git+${config.dotfilesRepo}";
+      flake = "git+${cfg.repo}";
       randomizedDelaySec = "25min";
       operation = "switch";
       allowReboot = true;
@@ -46,8 +53,8 @@ in
           set +e
           systemctl status $SERVICE_ID >> $TEMPFILE
           set -e
-          ${pkgs.msmtp}/bin/msmtp \
-              --file=${config.homePath}/.config/msmtp/config \
+          ${lib.getExe pkgs.msmtp} \
+              --file=${config.home-manager.users.${config.user}.xdg.configDir}/msmtp/config \
               --account=system \
               ${address} < $TEMPFILE
         '';

platforms/nixos/modules/nmasur/presets/services/notes-git-sync.nix

@@ -25,9 +25,9 @@ in
       Unit.Description = "Get latest notes.";
       Service = {
         Type = "oneshot";
-        ExecStartPre = "${pkgs.git}/bin/git -C /data/git/notes reset --hard master";
-        ExecStart = "${pkgs.git}/bin/git -C /data/git/notes pull";
-        WorkingDirectory = config.homePath;
+        ExecStartPre = "${lib.getExe pkgs.git} -C /data/git/notes reset --hard master";
+        ExecStart = "${lib.getExe pkgs.git} -C /data/git/notes pull";
+        WorkingDirectory = config.home-manager.users.${config.user}.home.homeDirectory;
         Environment = "PATH=${pkgs.openssh}/bin";
       };
     };

platforms/nixos/modules/nmasur/profiles/gui.nix

@@ -82,15 +82,10 @@ in
     services.dbus.packages = [ pkgs.dconf ];
     programs.dconf.enable = true;
 
-    # Make the login screen dark
-    services.xserver.displayManager.lightdm.greeters.gtk.theme = {
-      name = config.gtk.theme.name;
-      package = config.gtk.theme.package;
-    };
-
-    environment.sessionVariables = {
-      GTK_THEME = config.gtk.theme.name;
-    };
+    # TODO: can we get rid of this?
+    # environment.sessionVariables = {
+    #   GTK_THEME = config.gtk.theme.name;
+    # };
 
   };
 }

platforms/nixos/modules/services/betterlockscreen.nix

@@ -7,7 +7,6 @@
 
 let
   cfg = config.services.betterlockscreen;
-  lockCmd = "${pkgs.betterlockscreen}/bin/betterlockscreen --lock --display 1 --blur 0.5 --span";
 in
 
 {
@@ -29,7 +28,7 @@ in
         Type = "simple";
         Environment = "DISPLAY=:0";
         TimeoutSec = "infinity";
-        ExecStart = lockCmd;
+        ExecStart = "${lib.getExe pkgs.betterlockscreen} --lock --display 1 --blur 0.5 --span";
         ExecStartPost = "${pkgs.coreutils-full}/bin/sleep 1";
       };
       wantedBy = [