Optional simplified configuration syntax

.github/workflows/ci.yml

@@ -14,5 +14,5 @@ jobs:
       with:
         extra_nix_config: "system-features = kvm nixos-test"
     - run: nix flake check -L --keep-going
-    - run: nix flake check -L --keep-going ./examples/homeManagerFlake
-    - run: nix flake check -L --keep-going ./examples/systemFlake
+    - run: nix flake check -L --keep-going --override-input plasma-manager . ./examples/homeManagerFlake
+    - run: nix flake check -L --keep-going --override-input plasma-manager . ./examples/systemFlake

examples/.gitignore

@@ -0,0 +1 @@
+*/flake.lock

examples/home.nix

@@ -86,8 +86,8 @@
     # Some low-level settings:
     #
     configFile = {
-      "baloofilerc"."Basic Settings"."Indexing-Enabled".value = false;
-      "kwinrc"."org.kde.kdecoration2"."ButtonsOnLeft".value = "SF";
+      "baloofilerc"."Basic Settings"."Indexing-Enabled" = false;
+      "kwinrc"."org.kde.kdecoration2"."ButtonsOnLeft" = "SF";
       "kwinrc"."Desktops"."Number" = {
         value = 8;
         # Forces kde to not change this value (even through the settings app).

examples/homeManager/home.nix

@@ -70,8 +70,8 @@
     # Some low-level settings:
     #
     configFile = {
-      "baloofilerc"."Basic Settings"."Indexing-Enabled".value = false;
-      "kwinrc"."org.kde.kdecoration2"."ButtonsOnLeft".value = "SF";
+      "baloofilerc"."Basic Settings"."Indexing-Enabled" = false;
+      "kwinrc"."org.kde.kdecoration2"."ButtonsOnLeft" = "SF";
       "kwinrc"."Desktops"."Number" = {
         value = 8;
         # Forces kde to not change this value (even through the settings app).

examples/homeManagerFlake/flake.nix

@@ -2,9 +2,9 @@
   description = "Plasma Manager Example with standalone home-manager flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     plasma-manager = {

examples/systemFlake/flake.nix

@@ -2,9 +2,9 @@
   description = "Plasma Manager Example with system configuration flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     plasma-manager = {

lib/types.nix

@@ -37,8 +37,11 @@ let
       };
     };
   });
+  coercedSettingsType = with lib.types;
+    coercedTo basicSettingsType (value: { inherit value; }) advancedSettingsType;
 in
 {
   inherit basicSettingsType;
   inherit advancedSettingsType;
+  inherit coercedSettingsType;
 }

modules/apps/kate/default.nix

@@ -114,23 +114,23 @@ in
 
   config.programs.plasma.configFile."katerc" = lib.mkIf cfg.enable {
     "KTextEditor Document" = {
-      "Auto Detect Indent".value = cfg.editor.indent.autodetect;
-      "Indentation Width".value = cfg.editor.indent.width;
-      "Tab Handling".value = (tabHandlingMode cfg.editor.indent);
-      "Tab Width".value = cfg.editor.tabWidth;
-      "Keep Extra Spaces".value = cfg.editor.indent.keepExtraSpaces;
-      "ReplaceTabsDyn".value = cfg.editor.indent.replaceWithSpaces;
+      "Auto Detect Indent" = cfg.editor.indent.autodetect;
+      "Indentation Width" = cfg.editor.indent.width;
+      "Tab Handling" = (tabHandlingMode cfg.editor.indent);
+      "Tab Width" = cfg.editor.tabWidth;
+      "Keep Extra Spaces" = cfg.editor.indent.keepExtraSpaces;
+      "ReplaceTabsDyn" = cfg.editor.indent.replaceWithSpaces;
     };
 
     "KTextEditor Renderer" = {
-      "Show Indentation Lines".value = cfg.editor.indent.showLines;
+      "Show Indentation Lines" = cfg.editor.indent.showLines;
 
 
       # COLORTHEME (cannot define this below)
       # Do pick the theme if the user chose one,
       # Do not touch the theme settings otherwise
-      "Auto Color Theme Selection".value = lib.mkIf (cfg.editor.theme.name != "") false;
-      "Color Theme".value = lib.mkIf (cfg.editor.theme.name != "") cfg.editor.theme.name;
+      "Auto Color Theme Selection" = lib.mkIf (cfg.editor.theme.name != "") false;
+      "Color Theme" = lib.mkIf (cfg.editor.theme.name != "") cfg.editor.theme.name;
     };
   };
 

modules/apps/konsole.nix

@@ -97,7 +97,7 @@ in
     programs.plasma.configFile."konsolerc" = lib.mkMerge [
       (
         lib.mkIf (cfg.defaultProfile != null) {
-          "Desktop Entry"."DefaultProfile".value = "${cfg.defaultProfile}.profile";
+          "Desktop Entry"."DefaultProfile" = "${cfg.defaultProfile}.profile";
         }
       )
       (

modules/files.nix

@@ -3,7 +3,7 @@
 
 let
   inherit (import ../lib/writeconfig.nix { inherit lib pkgs config; }) writeConfig;
-  inherit (import ../lib/types.nix { inherit lib; }) advancedSettingsType;
+  inherit (import ../lib/types.nix { inherit lib; }) coercedSettingsType;
 
   # Helper function to prepend the appropriate path prefix (e.g. XDG_CONFIG_HOME) to file
   prependPath = prefix: attrset:
@@ -16,7 +16,7 @@ let
     (prependPath config.xdg.configHome plasmaCfg.configFile) //
     (prependPath config.xdg.dataHome plasmaCfg.dataFile);
 
-  fileSettingsType = with lib.types; attrsOf (attrsOf (attrsOf advancedSettingsType));
+  fileSettingsType = with lib.types; attrsOf (attrsOf (attrsOf coercedSettingsType));
 
   ##############################################################################
   # Generate a script that will use write_config.py to update all

modules/fonts.nix

@@ -1,10 +1,10 @@
-{
-  lib,
-  config,
-  ...
-}: let
+{ lib
+, config
+, ...
+}:
+let
   inherit (lib) mkIf mkOption types;
-  qfont = import ../lib/qfont.nix {inherit lib;};
+  qfont = import ../lib/qfont.nix { inherit lib; };
 
   styleStrategyType = types.submodule {
     options = with qfont.styleStrategy; {
@@ -180,7 +180,7 @@
       };
       styleStrategy = mkOption {
         type = styleStrategyType;
-        default = {};
+        default = { };
         description = ''
           The strategy for matching similar fonts to this font.
 
@@ -200,7 +200,8 @@
 
   inherit (config.programs.plasma) enable;
   cfg = lib.filterAttrs (_: v: v != null) config.programs.plasma.fonts;
-in {
+in
+{
   options.programs.plasma.fonts = {
     general = mkOption {
       type = types.nullOr fontType;
@@ -270,16 +271,18 @@ in {
     };
   };
 
-  config.programs.plasma.configFile.kdeglobals = let
-    mkFont = f: mkIf (enable && builtins.hasAttr f cfg) (qfont.fontToString cfg.${f});
-  in {
-    General = {
-      font.value = mkFont "general";
-      fixed.value = mkFont "fixedWidth";
-      smallestReadableFont.value = mkFont "small";
-      toolBarFont.value = mkFont "toolbar";
-      menuFont.value = mkFont "menu";
+  config.programs.plasma.configFile.kdeglobals =
+    let
+      mkFont = f: mkIf (enable && builtins.hasAttr f cfg) (qfont.fontToString cfg.${f});
+    in
+    {
+      General = {
+        font = mkFont "general";
+        fixed = mkFont "fixedWidth";
+        smallestReadableFont = mkFont "small";
+        toolBarFont = mkFont "toolbar";
+        menuFont = mkFont "menu";
+      };
+      WM.activeFont = mkFont "windowTitle";
     };
-    WM.activeFont.value = mkFont "windowTitle";
-  };
 }

modules/hotkeys.nix

@@ -94,19 +94,17 @@ in
       };
 
       programs.plasma.configFile."kglobalshortcutsrc"."${group.desktop}" = {
-        _k_friendly_name.value = group.description;
+        _k_friendly_name = group.description;
       } // lib.mapAttrs
         (_: command:
           let
             keys = command.keys ++ lib.optionals (command.key != "") [ command.key ];
           in
-          {
-            value = lib.concatStringsSep "," [
-              (lib.concatStringsSep "\t" (map (lib.escape [ "," ]) keys))
-              "" # List of default keys, not needed.
-              command.comment
-            ];
-          })
+          lib.concatStringsSep "," [
+            (lib.concatStringsSep "\t" (map (lib.escape [ "," ]) keys))
+            "" # List of default keys, not needed.
+            command.comment
+          ])
         cfg.hotkeys.commands;
     };
 }