Fixed firefox emoji issue (finally lmao)

6 files changed, 31 insertions, 36 deletions

diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 1c3f532..82df081 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -345,7 +345,7 @@ plugin {
         bar_height = 28
         bar_color = rgb(1e1e1e)
         bar_precedence_over_border = true
-        bar_text_font = JetBrainsMono NF
+        #bar_text_font = JetBrainsMono Nerd Font
 
         # hyprbars-button = color, size, on-click
         hyprbars-button = rgb(f16265), 18, , hyprctl dispatch killactive
diff --git a/flake.lock b/flake.lock
index 6693b79..6859834 100644
--- a/flake.lock
+++ b/flake.lock
@@ -507,22 +507,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-emoji-pin": {
-      "locked": {
-        "lastModified": 1727390236,
-        "narHash": "sha256-X2LaWM0WwoxUfu7cQmKyVbkYn0xwdRvBA+vkLg/OgnI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ab7b6889ae9d484eed2876868209e33eb262511d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ab7b6889ae9d484eed2876868209e33eb262511d",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1756266583,
@@ -586,7 +570,6 @@
         "hyprland": "hyprland",
         "hyprland-plugins": "hyprland-plugins",
         "nixpkgs": "nixpkgs_3",
-        "nixpkgs-emoji-pin": "nixpkgs-emoji-pin",
         "sops-nix": "sops-nix",
         "zen-browser": "zen-browser"
       }
diff --git a/flake.nix b/flake.nix
index e05e3cb..0c2eee9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,6 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs-emoji-pin.url = "github:NixOS/nixpkgs/ab7b6889ae9d484eed2876868209e33eb262511d";
 
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -35,7 +34,7 @@
     dolphin-overlay.url = "github:rumboon/dolphin-overlay";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-emoji-pin, ... }@inputs: {
+  outputs = { self, nixpkgs, ... }@inputs: {
     nixosConfigurations = {
       laptop = nixpkgs.lib.nixosSystem {
         specialArgs = { inherit inputs; };
@@ -49,9 +48,9 @@
           ./hosts/lapsktop.nix
         ];
       };
-      kyren-desktop = nixpkgs.lib.nixosSystem rec {
+      kyren-desktop = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        specialArgs = { inherit inputs; pkgs-emoji-pin = import nixpkgs-emoji-pin { inherit system; config.allowUnfree = true; }; };
+        specialArgs = { inherit inputs; };
         modules = [
           ./hosts/desktop.nix
         ];
diff --git a/hosts/configuration.nix b/hosts/configuration.nix
index cd52a0f..2ab084a 100644
--- a/hosts/configuration.nix
+++ b/hosts/configuration.nix
@@ -3,7 +3,6 @@
   imports = [
     inputs.sops-nix.nixosModules.sops
     ../modules/apps.nix
-    ../modules/overrides.nix
     ../modules/display.nix
     ../modules/networking.nix
     ../modules/development.nix
@@ -40,6 +39,31 @@
     "en_IL/UTF-8"
   ];
 
+  # Fonts
+  fonts = {
+    packages = with pkgs; [
+      noto-fonts
+      noto-fonts-emoji
+      noto-fonts-color-emoji
+      liberation_ttf
+      fira-code
+      fira-code-symbols
+      font-awesome
+      nerd-fonts.jetbrains-mono
+    ];
+
+    fontconfig = {
+      defaultFonts = {
+        # serif = [  "Liberation Serif" "Vazirmatn" ];
+        # sansSerif = [ "Ubuntu" "Vazirmatn" ];
+        monospace = [ "JetBrainsMono Nerd Font" ];
+      };
+    };
+  };
+
+  # Fix for noto color emoji not rendering in firefox-based browsers
+  fonts.fontconfig.useEmbeddedBitmaps = true;
+
   # Allow sudo without a password if in "wheel" group.
   security.sudo.wheelNeedsPassword = false;
 
diff --git a/modules/apps.nix b/modules/apps.nix
index 5ba04ce..582fc36 100644
--- a/modules/apps.nix
+++ b/modules/apps.nix
@@ -27,11 +27,8 @@
       libnotify
       wl-clipboard
       jdk
-      noto-fonts
 
-      dejavu_fonts
-      font-awesome
-      material-design-icons
+      nerd-fonts.jetbrains-mono
 
       libratbag # Mouse software (GHUB replacement)
       piper # ^ GUI frontend
@@ -70,6 +67,7 @@
       kdePackages.gwenview
       kdePackages.ark
       kdePackages.xwaylandvideobridge
+      grim
 
       # Communication
       wasistlos # Whatsapp
@@ -79,7 +77,6 @@
       # Terminal
       ghostty
       kitty # Temp for hyprland
-      nerd-fonts.jetbrains-mono
       oh-my-posh
       tmux
       neovim
diff --git a/modules/overrides.nix b/modules/overrides.nix
deleted file mode 100644
index 3894cd3..0000000
--- a/modules/overrides.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs-emoji-pin, ... }: {
-
-  environment.systemPackages = [
-    pkgs-emoji-pin.noto-fonts-color-emoji
-    pkgs-emoji-pin.librewolf
-  ];
-
-}