Merge branch 'main' into feature-email-msmtpfeature-email-msmtp

1 files changed, 33 insertions, 22 deletions

diff --git a/common/variables.nix b/common/variables.nix
index f4af0f1..3e76916 100644
--- a/common/variables.nix
+++ b/common/variables.nix
@@ -1,27 +1,33 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
+{ config
+, pkgs
+, lib
+, ...
+}:
+let
   monitorMaxBrightness = "255";
   monitorMinBrightness = "32";
-in {
+in
+{
   # Type definitions for nix variables used in this configuration
   options = with lib;
-  with types; {
-    defaultApplications = {fileManager = mkOption {type = str;};};
-    myWallPaperPath = mkOption {type = path;};
-    myUserName = mkOption {type = str;};
-    myHostName = mkOption {type = str;};
-    myWallPaperPathString = mkOption {type = str;};
-    myDisplayName = mkOption {type = str;};
-    myEmail = mkOption {type = str;};
-    displayScale = mkOption {type = int;};
-    myAutostartCommands = mkOption {type = listOf str;};
-    myConfigLocation = mkOption {type = str;};
-    desktopFontFullName = mkOption {type = str;};
-  };
+    with types; {
+      usingMusicPlayerDaemon = mkOption { type = bool; };
+      defaultApplications = {
+        fileManager = mkOption { type = str; };
+        appLauncher = mkOption { type = str; };
+        terminal = mkOption { type = str; };
+      };
+      myWallPaperPath = mkOption { type = path; };
+      myUserName = mkOption { type = str; };
+      myHostName = mkOption { type = str; };
+      myWallPaperPathString = mkOption { type = str; };
+      myDisplayName = mkOption { type = str; };
+      myEmail = mkOption { type = str; };
+      displayScale = mkOption { type = int; };
+      myAutostartCommands = mkOption { type = listOf str; };
+      myConfigLocation = mkOption { type = str; };
+      desktopFontFullName = mkOption { type = str; };
+    };
 
   # Default values for this configuration
   config = rec {
@@ -33,7 +39,7 @@ in {
     myDisplayName = "Zhongheng Liu";
     myEmail = "z.liu@outlook.com.gr";
     specialisation."powersave".configuration = {
-      myAutostartCommands = ["${pkgs.brightnessctl}/bin/brightnessctl s ${monitorMinBrightness}"];
+      myAutostartCommands = [ "${pkgs.brightnessctl}/bin/brightnessctl s ${monitorMinBrightness}" ];
     };
     myConfigLocation = "/home/${myUserName}/nix-conf";
     desktopFontFullName = "IntoneMono NFM:style=Regular";
@@ -45,6 +51,11 @@ in {
       "${pkgs.pa-notify}/bin/pa-notify"
       "${pkgs.networkmanagerapplet}/bin/nm-applet"
     ];
-    defaultApplications.fileManager = "${pkgs.nemo}/bin/nemo";
+    defaultApplications = {
+      terminal = "${pkgs.foot}/bin/footclient";
+      fileManager = "${pkgs.nemo}/bin/nemo";
+      appLauncher = "${pkgs.walker}/bin/walker";
+    };
+    usingMusicPlayerDaemon = true;
   };
 }