From 887507a022def42f5ef968a578bd592cda41993f Mon Sep 17 00:00:00 2001 From: ooks-io Date: Fri, 17 Jan 2025 19:47:56 +1100 Subject: [PATCH] appearance: add berkeley font --- flake.lock | 27 +++++++++++++++++++ flake.nix | 8 ++++++ .../workstation/appearance/qt/default.nix | 2 +- modules/nixos/workstation/themes/minimal.nix | 13 ++++----- 4 files changed, 43 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index c19d353..a5bf59a 100644 --- a/flake.lock +++ b/flake.lock @@ -3286,6 +3286,7 @@ "nvf": "nvf", "ooknet-website": "ooknet-website", "ooks-scripts": "ooks-scripts", + "secrets": "secrets", "systems": "systems_7", "vpn-confinement": "vpn-confinement", "zjstatus": "zjstatus" @@ -3334,6 +3335,32 @@ "type": "github" } }, + "secrets": { + "inputs": { + "flake-parts": [ + "flake-parts" + ], + "nixpkgs": [ + "nixpkgs" + ], + "systems": [ + "systems" + ] + }, + "locked": { + "lastModified": 1737094724, + "narHash": "sha256-PeNJWuk+zNrqCsrSbElfFmMP+R5E0uFaAgW9tWG03ag=", + "ref": "refs/heads/master", + "rev": "dbbf390c798a14bb316681e62fe56355d9ea88f6", + "revCount": 4, + "type": "git", + "url": "ssh://git@github.com/ooks-io/kunzen" + }, + "original": { + "type": "git", + "url": "ssh://git@github.com/ooks-io/kunzen" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 582e514..63152d2 100644 --- a/flake.nix +++ b/flake.nix @@ -34,6 +34,14 @@ url = "git+ssh://git@github.com/ooks-io/website"; inputs.nixpkgs.follows = "nixpkgs"; }; + secrets = { + url = "git+ssh://git@github.com/ooks-io/kunzen"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-parts.follows = "flake-parts"; + systems.follows = "systems"; + }; + }; nvf = { url = "github:notashelf/nvf"; diff --git a/modules/home/workstation/appearance/qt/default.nix b/modules/home/workstation/appearance/qt/default.nix index 42010af..0a1e3d6 100644 --- a/modules/home/workstation/appearance/qt/default.nix +++ b/modules/home/workstation/appearance/qt/default.nix @@ -16,7 +16,7 @@ in { qt = { enable = true; - platformTheme.name = "gtk3"; + platformTheme.name = "qtct"; style = { name = "kvantum"; }; diff --git a/modules/nixos/workstation/themes/minimal.nix b/modules/nixos/workstation/themes/minimal.nix index ee687a8..73f3484 100644 --- a/modules/nixos/workstation/themes/minimal.nix +++ b/modules/nixos/workstation/themes/minimal.nix @@ -3,6 +3,7 @@ lib, pkgs, hozen, + inputs', ... }: let inherit (lib) mkIf; @@ -13,14 +14,14 @@ in { ooknet.appearance = { fonts = { monospace = { - package = pkgs.nerd-fonts.jetbrains-mono; + package = inputs'.secrets.packages.berkeley-nerd-mono; size = 16; - family = "JetBrainsMono NF"; + family = "BerkeleyMono Nerd Font"; variants = { - regular = "JetBrainsMono NF:style=Regular"; - bold = "JetBrainsMono NF:style=Bold"; - italic = "JetBrainsMono NF:style=Italic"; - boldItalic = "JetBrainsMono NF:style=Bold Italic"; + regular = "BerkeleyMono Nerd Font:style=Regular"; + bold = "BerkeleyMono Nerd Font:style=Bold"; + italic = "BerkeleyMono Nerd Font:style=Italic"; + boldItalic = "BerkeleyMono Nerd Font:style=Bold Italic"; }; }; regular = {