From f440e6a2ace8bdfdefda4379771afa9d64aea75d Mon Sep 17 00:00:00 2001 From: Samuel Tschiedel Date: Mon, 16 Sep 2024 09:36:19 -0300 Subject: [PATCH 1/3] style: whitespace (nixpkgs-fmt) --- modules/system/defaults/dock.nix | 106 ++++++++++++++++--------------- 1 file changed, 54 insertions(+), 52 deletions(-) diff --git a/modules/system/defaults/dock.nix b/modules/system/defaults/dock.nix index d88b6afa..1b67e51b 100644 --- a/modules/system/defaults/dock.nix +++ b/modules/system/defaults/dock.nix @@ -5,7 +5,8 @@ with lib; let # Should only be used with options that previously used floats defined as strings. inherit (config.lib.defaults.types) floatWithDeprecationError; -in { +in +{ imports = [ (mkRenamedOptionModule [ "system" "defaults" "dock" "expose-group-by-app" ] [ "system" "defaults" "dock" "expose-group-apps" ]) ]; @@ -128,36 +129,37 @@ in { }; system.defaults.dock.persistent-apps = mkOption { - 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; - }; + 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; }; + simpleType = types.either types.str types.path; + toTagged = path: { app = path; }; in - types.nullOr (types.listOf (types.coercedTo simpleType toTagged taggedType)); + types.nullOr (types.listOf (types.coercedTo simpleType toTagged taggedType)); default = null; example = [ { app = "/Applications/Safari.app"; } @@ -170,30 +172,31 @@ in { Persistent applications, spacers, files, and folders in the dock. ''; 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; + 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 { @@ -364,6 +367,5 @@ in { * `14`: Quick Note ''; }; - - }; + }; } From 112b4e44bced4895306040d8fca08d44687d1713 Mon Sep 17 00:00:00 2001 From: Samuel Tschiedel Date: Sun, 15 Sep 2024 20:55:00 -0300 Subject: [PATCH 2/3] docs: don't use tildes on dock.persistent-others examples It no longer works on Sonoma 14.6.1, leaving a `?` instead of the desired folder. --- modules/system/defaults/dock.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/system/defaults/dock.nix b/modules/system/defaults/dock.nix index 1b67e51b..bc080bf2 100644 --- a/modules/system/defaults/dock.nix +++ b/modules/system/defaults/dock.nix @@ -202,9 +202,10 @@ in system.defaults.dock.persistent-others = mkOption { type = types.nullOr (types.listOf (types.either types.path types.str)); default = null; - example = [ "~/Documents" "~/Downloads" ]; + example = [ "/Users/my_user_name/Documents" "/Users/my_user_name/Downloads" ]; description = '' Persistent folders in the dock. + Note: tilde(`~`) does not get reliably expanded. ''; apply = value: if !(isList value) From 47f73531b632b07f8ba9deea382e95db9a8650d0 Mon Sep 17 00:00:00 2001 From: Samuel Tschiedel Date: Sun, 15 Sep 2024 21:27:53 -0300 Subject: [PATCH 3/3] feat: add dock item property overrides This allows configuring things like "Sort by", "Display as" and "View content as" by mirroring the exact value observed on a `defaults read`. The existing options and values weren't formalized in the schema as I have no expectations of stability across OS versions. --- modules/system/defaults/dock.nix | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/modules/system/defaults/dock.nix b/modules/system/defaults/dock.nix index bc080bf2..c037f569 100644 --- a/modules/system/defaults/dock.nix +++ b/modules/system/defaults/dock.nix @@ -200,17 +200,32 @@ in }; system.defaults.dock.persistent-others = mkOption { - type = types.nullOr (types.listOf (types.either types.path types.str)); + type = types.nullOr (types.listOf (types.oneOf [ types.path types.str types.attrs ])); default = null; - example = [ "/Users/my_user_name/Documents" "/Users/my_user_name/Downloads" ]; + example = [ + "/Users/my_user_name/Documents" + { name = "/Users/my_user_name/Downloads"; tile-data = { arrangement = 2; showas = 1; }; } + ]; description = '' Persistent folders in the dock. Note: tilde(`~`) does not get reliably expanded. ''; apply = value: - if !(isList value) - then value - else map (folder: { tile-data = { file-data = { _CFURLString = "file://" + folder; _CFURLStringType = 15; }; }; tile-type = if strings.hasInfix "." (last (splitString "/" folder)) then "file-tile" else "directory-tile"; }) value; + if !(isList value) then value else + let + pathToConfig = (path: { + tile-data = { file-data = { _CFURLString = "file://" + path; _CFURLStringType = 15; }; }; + tile-type = if strings.hasInfix "." (last (splitString "/" path)) then "file-tile" else "directory-tile"; + }); + in + map + (folder: + if (isString folder) + then pathToConfig folder + else + (lib.recursiveUpdate (builtins.removeAttrs folder [ "name" ]) + (pathToConfig folder.name))) + value; }; system.defaults.dock.scroll-to-open = mkOption {