nix: escape version string (#1353)

distro/nix/common.nix

@@ -19,7 +19,8 @@ in
   ]
   ++ lib.optional cfg.enableDynamicTheming pkgs.matugen
   ++ lib.optional cfg.enableAudioWavelength pkgs.cava
-  ++ lib.optional cfg.enableCalendarEvents pkgs.khal;
+  ++ lib.optional cfg.enableCalendarEvents pkgs.khal
+  ++ lib.optional cfg.enableClipboardPaste pkgs.wtype;
 
   plugins = lib.mapAttrs (name: plugin: {
     source = plugin.src;

distro/nix/options.nix

@@ -70,6 +70,12 @@ in
       description = "Add calendar events support via khal";
     };
 
+    enableClipboardPaste = lib.mkOption {
+      type = types.bool;
+      default = true;
+      description = "Adds needed dependencies for directly pasting items from the clipboard history.";
+    };
+
     quickshell = {
       package = lib.mkPackageOption dmsPkgs "quickshell" {
         extraDescription = "The quickshell package to use (defaults to be built from source, due to unreleased features used by DMS).";

flake.nix

@@ -61,11 +61,13 @@
               (builtins.substring 6 2 longDate)
             ];
           version =
-            pkgs.lib.removePrefix "v" (pkgs.lib.trim (builtins.readFile ./quickshell/VERSION))
-            + "+date="
-            + mkDate (self.lastModifiedDate or "19700101")
-            + "_"
-            + (self.shortRev or "dirty");
+            let
+              rawVersion = pkgs.lib.removePrefix "v" (pkgs.lib.trim (builtins.readFile ./quickshell/VERSION));
+              cleanVersion = builtins.replaceStrings [ " " ] [ "" ] rawVersion;
+              dateSuffix = "+date=" + mkDate (self.lastModifiedDate or "19700101");
+              revSuffix = "_" + (self.shortRev or "dirty");
+            in
+            "${cleanVersion}${dateSuffix}${revSuffix}";
         in
         {
           dms-shell = pkgs.buildGoModule (
@@ -83,7 +85,7 @@
               ldflags = [
                 "-s"
                 "-w"
-                "-X main.Version=${version}"
+                "-X 'main.Version=${version}'"
               ];
 
               nativeBuildInputs = with pkgs; [

quickshell/CODENAME

@@ -1 +1 @@
-Spicy Miso
+Saffron Bloom

quickshell/Modals/Changelog/ChangelogModal.qml

@@ -128,9 +128,7 @@ FloatingWindow {
                     iconName: "open_in_new"
                     backgroundColor: Theme.surfaceContainerHighest
                     textColor: Theme.surfaceText
-                    // ! TODO - replace with blog before  tag
-                    //onClicked: Qt.openUrlExternally("https://danklinux.com/blog/v1.2-release")
-                    onClicked: Qt.openUrlExternally("https://github.com/AvengeMedia/DankMaterialShell/compare/v1.0.3...master")
+                    onClicked: Qt.openUrlExternally("https://danklinux.com/blog/v1.2-release")
                 }
 
                 DankButton {

quickshell/Modules/DankBar/Widgets/RunningApps.qml

@@ -493,8 +493,10 @@ Item {
                                         const globalPos = delegateItem.mapToGlobal(delegateItem.width / 2, 0);
                                         const screenX = root.parentScreen ? root.parentScreen.x : 0;
                                         const relativeX = globalPos.x - screenX;
-                                        const yPos = root.barThickness + root.barSpacing - 7;
-                                        windowContextMenuLoader.item.showAt(relativeX, yPos, false, "top");
+                                        const screenHeight = root.parentScreen ? root.parentScreen.height : Screen.height;
+                                        const isBottom = root.axis?.edge === "bottom";
+                                        const yPos = isBottom ? (screenHeight - root.barThickness - root.barSpacing - 32 - Theme.spacingXS) : (root.barThickness + root.barSpacing + Theme.spacingXS);
+                                        windowContextMenuLoader.item.showAt(relativeX, yPos, false, root.axis?.edge);
                                     }
                                 }
                             } else if (mouse.button === Qt.MiddleButton) {
@@ -726,8 +728,10 @@ Item {
                                         const globalPos = delegateItem.mapToGlobal(delegateItem.width / 2, 0);
                                         const screenX = root.parentScreen ? root.parentScreen.x : 0;
                                         const relativeX = globalPos.x - screenX;
-                                        const yPos = root.barThickness + root.barSpacing - 7;
-                                        windowContextMenuLoader.item.showAt(relativeX, yPos, false, "top");
+                                        const screenHeight = root.parentScreen ? root.parentScreen.height : Screen.height;
+                                        const isBottom = root.axis?.edge === "bottom";
+                                        const yPos = isBottom ? (screenHeight - root.barThickness - root.barSpacing - 32 - Theme.spacingXS) : (root.barThickness + root.barSpacing + Theme.spacingXS);
+                                        windowContextMenuLoader.item.showAt(relativeX, yPos, false, root.axis?.edge);
                                     }
                                 }
                             }

quickshell/Modules/Notifications/Popup/NotificationPopupManager.qml

@@ -10,8 +10,9 @@ QtObject {
     readonly property bool compactMode: SettingsData.notificationCompactMode
     readonly property real cardPadding: compactMode ? Theme.spacingS : Theme.spacingM
     readonly property real popupIconSize: compactMode ? 48 : 63
-    readonly property real popupSpacing: Theme.spacingS
-    readonly property int baseNotificationHeight: cardPadding * 3 + popupIconSize + popupSpacing
+    readonly property real actionButtonHeight: compactMode ? 20 : 24
+    readonly property real popupSpacing: 4
+    readonly property int baseNotificationHeight: cardPadding * 2 + popupIconSize + actionButtonHeight + Theme.spacingS + popupSpacing
     property int maxTargetNotifications: 4
     property var popupWindows: [] // strong refs to windows (live until exitFinished)
     property var destroyingWindows: new Set()

quickshell/Services/ChangelogService.qml

@@ -11,7 +11,7 @@ Singleton {
     id: root
 
     readonly property string currentVersion: "1.2"
-    readonly property bool changelogEnabled: true
+    readonly property bool changelogEnabled: false
 
     readonly property string configDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation)) + "/DankMaterialShell"
     readonly property string changelogMarkerPath: configDir + "/.changelog-" + currentVersion

quickshell/VERSION

@@ -1 +1 @@
-v1.2-unstable
+v1.4-unstable