From 7767ff77ba919a3f5c54ddc0fdfde4b706b2e017 Mon Sep 17 00:00:00 2001
From: worble <worble@worble.xyz>
Date: Wed, 28 May 2025 17:44:07 +0100
Subject: [PATCH] fix emoji on firefox; use unstable joplin

---
 configuration/base/fonts.nix | 15 +++++++++------
 flake.nix                    |  4 ++--
 home-manager/base.nix        |  4 ++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/configuration/base/fonts.nix b/configuration/base/fonts.nix
index 70a7003..7b599f4 100644
--- a/configuration/base/fonts.nix
+++ b/configuration/base/fonts.nix
@@ -1,12 +1,15 @@
 { pkgs, ... }:
 
 {
-  fonts.enableDefaultPackages = true;
-  fonts.packages = with pkgs; [
-    noto-fonts
-    noto-fonts-cjk-sans
-    noto-fonts-cjk-serif
-  ];
+  fonts = {
+    enableDefaultPackages = true;
+    fontconfig.useEmbeddedBitmaps = true;
+    packages = with pkgs; [
+      noto-fonts
+      noto-fonts-cjk-sans
+      noto-fonts-cjk-serif
+    ];
+  };
 
   # Select internationalisation properties.
   i18n = {
diff --git a/flake.nix b/flake.nix
index a8a895a..a26382f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,8 +1,8 @@
 {
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05?shallow=1";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1";
-    # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".[package name]
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".[package name]
+
     home-manager = {
       url = "github:nix-community/home-manager/release-25.05?shallow=1";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/home-manager/base.nix b/home-manager/base.nix
index 7ead140..ac8d987 100644
--- a/home-manager/base.nix
+++ b/home-manager/base.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, inputs, ... }:
 
 {
   imports = [
@@ -13,7 +13,7 @@
     keepassxc
     qbittorrent
     libreoffice-qt
-    joplin-desktop
+    inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".joplin-desktop
 
     # comms   
     teamspeak_client