mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-01-24 21:42:51 -05:00
Merge branch 'master' of github.com:bbedward/DankMaterialShell
This commit is contained in:
@@ -670,7 +670,7 @@ Singleton {
|
||||
wifiConnector.connectionSucceeded = false
|
||||
root.isConnecting = false
|
||||
root.connectingSSID = ""
|
||||
refreshNetworkState()
|
||||
doRefreshNetworkState()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -693,7 +693,7 @@ Singleton {
|
||||
root.currentWifiSSID = ""
|
||||
root.connectionStatus = ""
|
||||
}
|
||||
refreshNetworkState()
|
||||
doRefreshNetworkState()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -727,7 +727,7 @@ Singleton {
|
||||
}
|
||||
root.wifiNetworks = updated
|
||||
root.networksUpdated()
|
||||
refreshNetworkState()
|
||||
doRefreshNetworkState()
|
||||
}
|
||||
root.forgetSSID = ""
|
||||
}
|
||||
@@ -756,7 +756,7 @@ Singleton {
|
||||
if (exitCode === 0) {
|
||||
ToastService.showInfo(targetState === "on" ? "WiFi enabled" : "WiFi disabled")
|
||||
}
|
||||
refreshNetworkState()
|
||||
doRefreshNetworkState()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -802,7 +802,7 @@ Singleton {
|
||||
onExited: {
|
||||
root.changingPreference = false
|
||||
root.targetPreference = ""
|
||||
refreshNetworkState()
|
||||
doRefreshNetworkState()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -930,7 +930,7 @@ Singleton {
|
||||
} else {
|
||||
ToastService.showError("Failed to enable WiFi")
|
||||
}
|
||||
refreshNetworkState()
|
||||
doRefreshNetworkState()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -955,7 +955,7 @@ Singleton {
|
||||
running: false
|
||||
|
||||
onExited: function (exitCode) {
|
||||
refreshNetworkState()
|
||||
doRefreshNetworkState()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -965,7 +965,7 @@ Singleton {
|
||||
running: false
|
||||
|
||||
onExited: function (exitCode) {
|
||||
refreshNetworkState()
|
||||
doRefreshNetworkState()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10,11 +10,19 @@
|
||||
in {
|
||||
imports = [
|
||||
(lib.mkRemovedOptionModule ["programs" "dankMaterialShell" "enableNightMode"] "Night mode is now always available.")
|
||||
(lib.mkRenamedOptionModule ["programs" "dankMaterialShell" "enableSystemd"] ["programs" "dankMaterialShell" "systemd" "enable"])
|
||||
];
|
||||
options.programs.dankMaterialShell = with lib.types; {
|
||||
enable = lib.mkEnableOption "DankMaterialShell";
|
||||
|
||||
enableSystemd = lib.mkEnableOption "DankMaterialShell systemd startup";
|
||||
systemd = {
|
||||
enable = lib.mkEnableOption "DankMaterialShell systemd startup";
|
||||
restartIfChanged = lib.mkOption {
|
||||
type = bool;
|
||||
default = true;
|
||||
description = "Auto-restart dms.service when dankMaterialShell changes";
|
||||
};
|
||||
};
|
||||
enableSystemMonitoring = lib.mkOption {
|
||||
type = bool;
|
||||
default = true;
|
||||
@@ -105,11 +113,12 @@ in {
|
||||
configs.dms = "${dmsPkgs.dankMaterialShell}/etc/xdg/quickshell/dms";
|
||||
};
|
||||
|
||||
systemd.user.services.dms = lib.mkIf cfg.enableSystemd {
|
||||
systemd.user.services.dms = lib.mkIf cfg.systemd.enable {
|
||||
Unit = {
|
||||
Description = "DankMaterialShell";
|
||||
PartOf = [ config.wayland.systemd.target ];
|
||||
After = [ config.wayland.systemd.target ];
|
||||
X-Restart-Triggers = lib.optional cfg.systemd.restartIfChanged config.programs.quickshell.configs.dms;
|
||||
};
|
||||
|
||||
Service = {
|
||||
|
||||
Reference in New Issue
Block a user