diff --git a/flake.lock b/flake.lock index fdc9eaa5..8f3b599b 100644 --- a/flake.lock +++ b/flake.lock @@ -139,11 +139,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1779560665, - "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", + "lastModified": 1780243769, + "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", + "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", "type": "github" }, "original": { diff --git a/flake/dev/flake.lock b/flake/dev/flake.lock index 23986730..e9539fdd 100644 --- a/flake/dev/flake.lock +++ b/flake/dev/flake.lock @@ -45,11 +45,11 @@ }, "dev-nixpkgs": { "locked": { - "lastModified": 1779560665, - "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", + "lastModified": 1780243769, + "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", + "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", "type": "github" }, "original": { diff --git a/modules/kmscon/nixos.nix b/modules/kmscon/nixos.nix index 03b52795..9f0ee638 100644 --- a/modules/kmscon/nixos.nix +++ b/modules/kmscon/nixos.nix @@ -4,47 +4,44 @@ mkTarget { ( { fonts }: { - services.kmscon = { - fonts = [ fonts.monospace ]; - extraConfig = "font-size=${toString fonts.sizes.terminal}"; + services.kmscon.config = { + font-name = fonts.monospace.name; + font-size = fonts.sizes.terminal; }; } ) ( { colors }: - { - services.kmscon.extraConfig = + let + formatBase = + name: let - formatBase = - name: - let - getComponent = comp: colors."${name}-rgb-${comp}"; - in - "${getComponent "r"},${getComponent "g"},${getComponent "b"}"; + getComponent = comp: colors."${name}-rgb-${comp}"; in - '' - palette=custom - - palette-black=${formatBase "base00"} - palette-red=${formatBase "base08"} - palette-green=${formatBase "base0B"} - palette-yellow=${formatBase "base0A"} - palette-blue=${formatBase "base0D"} - palette-magenta=${formatBase "base0E"} - palette-cyan=${formatBase "base0C"} - palette-light-grey=${formatBase "base05"} - palette-dark-grey=${formatBase "base03"} - palette-light-red=${formatBase "base08"} - palette-light-green=${formatBase "base0B"} - palette-light-yellow=${formatBase "base0A"} - palette-light-blue=${formatBase "base0D"} - palette-light-magenta=${formatBase "base0E"} - palette-light-cyan=${formatBase "base0C"} - palette-white=${formatBase "base07"} - - palette-background=${formatBase "base00"} - palette-foreground=${formatBase "base05"} - ''; + "${getComponent "r"},${getComponent "g"},${getComponent "b"}"; + in + { + services.kmscon.config = { + palette = "custom"; + palette-black = formatBase "base00"; + palette-red = formatBase "base08"; + palette-green = formatBase "base0B"; + palette-yellow = formatBase "base0A"; + palette-blue = formatBase "base0D"; + palette-magenta = formatBase "base0E"; + palette-cyan = formatBase "base0C"; + palette-light-grey = formatBase "base05"; + palette-dark-grey = formatBase "base03"; + palette-light-red = formatBase "base08"; + palette-light-green = formatBase "base0B"; + palette-light-yellow = formatBase "base0A"; + palette-light-blue = formatBase "base0D"; + palette-light-magenta = formatBase "base0E"; + palette-light-cyan = formatBase "base0C"; + palette-white = formatBase "base07"; + palette-background = formatBase "base00"; + palette-foreground = formatBase "base05"; + }; } ) ];