diff --git a/modules/system/defaults/dock.nix b/modules/system/defaults/dock.nix
index bba0afb..d88b6af 100644
--- a/modules/system/defaults/dock.nix
+++ b/modules/system/defaults/dock.nix
@@ -128,16 +128,72 @@ in {
};
system.defaults.dock.persistent-apps = mkOption {
- type = types.nullOr (types.listOf (types.either types.path types.str));
+ type = let
+ taggedType = types.attrTag {
+ app = mkOption {
+ description = "An application to be added to the dock.";
+ type = types.str;
+ };
+ file = mkOption {
+ description = "A file to be added to the dock.";
+ type = types.str;
+ };
+ folder = mkOption {
+ description = "A folder to be added to the dock.";
+ type = types.str;
+ };
+ spacer = mkOption {
+ description = "A spacer to be added to the dock. Can be small or regular size.";
+ type = types.submodule {
+ options.small = mkOption {
+ description = "Whether the spacer is small.";
+ type = types.bool;
+ default = false;
+ };
+ };
+ };
+ };
+
+ simpleType = types.either types.str types.path;
+ toTagged = path: { app = path; };
+ in
+ types.nullOr (types.listOf (types.coercedTo simpleType toTagged taggedType));
default = null;
- example = [ "/Applications/Safari.app" "/System/Applications/Utilities/Terminal.app" ];
+ example = [
+ { app = "/Applications/Safari.app"; }
+ { spacer = { small = false; }; }
+ { spacer = { small = true; }; }
+ { folder = "/System/Applications/Utilities"; }
+ { file = "/User/example/Downloads/test.csv"; }
+ ];
description = ''
- Persistent applications in the dock.
+ Persistent applications, spacers, files, and folders in the dock.
'';
- apply = value:
- if !(isList value)
- then value
- else map (app: { tile-data = { file-data = { _CFURLString = app; _CFURLStringType = 0; }; }; }) value;
+ apply =
+ let
+ toTile = item: if item ? app then {
+ tile-data.file-data = {
+ _CFURLString = item.app;
+ _CFURLStringType = 0;
+ };
+ } else if item ? spacer then {
+ tile-data = { };
+ tile-type = if item.spacer.small then "small-spacer-tile" else "spacer-tile";
+ } else if item ? folder then {
+ tile-data.file-data = {
+ _CFURLString = "file://" + item.folder;
+ _CFURLStringType = 15;
+ };
+ tile-type = "directory-tile";
+ } else if item ? file then {
+ tile-data.file-data = {
+ _CFURLString = "file://" + item.file;
+ _CFURLStringType = 15;
+ };
+ tile-type = "file-tile";
+ } else item;
+ in
+ value: if value == null then null else map toTile value;
};
system.defaults.dock.persistent-others = mkOption {
diff --git a/tests/fixtures/system-defaults-write/activate-user.txt b/tests/fixtures/system-defaults-write/activate-user.txt
index eda3753..7162a41 100644
--- a/tests/fixtures/system-defaults-write/activate-user.txt
+++ b/tests/fixtures/system-defaults-write/activate-user.txt
@@ -255,7 +255,7 @@ defaults write com.apple.dock 'persistent-apps' $'file-data
_CFURLString
- MyApp.app
+ /Applications/MyApp.app
_CFURLStringType
0
@@ -267,12 +267,56 @@ defaults write com.apple.dock 'persistent-apps' $'file-data
_CFURLString
- Cool.app
+ /Applications/Cool.app
_CFURLStringType
0
+
+ tile-data
+
+
+
+ tile-type
+ small-spacer-tile
+
+
+ tile-data
+
+
+
+ tile-type
+ spacer-tile
+
+
+ tile-data
+
+ file-data
+
+ _CFURLString
+ file:///Applications/Utilities
+ _CFURLStringType
+ 15
+
+
+ tile-type
+ directory-tile
+
+
+ tile-data
+
+ file-data
+
+ _CFURLString
+ file:///Users/example/Downloads/test.csv
+ _CFURLStringType
+ 15
+
+
+ tile-type
+ file-tile
+
'
defaults write com.apple.dock 'persistent-others' $'
diff --git a/tests/system-defaults-write.nix b/tests/system-defaults-write.nix
index 0b8bc03..19ce3c4 100644
--- a/tests/system-defaults-write.nix
+++ b/tests/system-defaults-write.nix
@@ -50,7 +50,14 @@
system.defaults.dock.appswitcher-all-displays = false;
system.defaults.dock.autohide-delay = 0.24;
system.defaults.dock.orientation = "left";
- system.defaults.dock.persistent-apps = ["MyApp.app" "Cool.app"];
+ system.defaults.dock.persistent-apps = [
+ "/Applications/MyApp.app"
+ { app = "/Applications/Cool.app"; }
+ { spacer = { small = true; }; }
+ { spacer = { small = false; }; }
+ { folder = "/Applications/Utilities"; }
+ { file = "/Users/example/Downloads/test.csv"; }
+ ];
system.defaults.dock.persistent-others = ["~/Documents" "~/Downloads/file.txt"];
system.defaults.dock.scroll-to-open = false;
system.defaults.finder.AppleShowAllFiles = true;