Moved: fonts management to home manager; Removed: dulicated fonts.nix for nixos & darwin configurations

2026-05-31 10:26:19 +02:00
parent 888264a491
commit 0cf4401813
7 changed files with 5 additions and 15 deletions
@@ -8,7 +8,6 @@
    ./settings.nix
    ./homebrew.nix
    ./yabai.nix
-    ./fonts.nix
  ];

  home-manager.users.${primaryUser}.targets.darwin = {
@@ -17,6 +17,7 @@
    ./xdg.nix
    ./neovim
    ./python.nix
+    ./fonts.nix
    inputs.sops-nix.homeManagerModules.sops
  ]
  ++ lib.optionals (!isDarwin && !isServer) [
@@ -1,9 +1,11 @@
-# TODO: Duplicate file
 { pkgs, ... }:
 {
-  fonts.packages = with pkgs; [
+  fonts.fontconfig.enable = true;
+
+  home.packages = with pkgs; [
    nerd-fonts.fira-code
    nerd-fonts.fira-mono
    nerd-fonts.hack
  ];
+
 }
@@ -1,4 +1,3 @@
-# TODO: Remove; nodePackages is unmaintained inside nixpkgs
 { pkgs, ... }:
 {
  # Live Server: Auto-reload browser for web development
@@ -160,7 +160,6 @@
    ];
  };

-  # TODO: Install OpenCode
  programs.nushell = {
    enable = true;

@@ -9,7 +9,6 @@
 }:
 {
  imports = [
-    ./fonts.nix
    ./sops.nix
    ./locale.nix
    ./tailscale.nix
@@ -1,9 +0,0 @@
-# TODO: Duplicate file
-{ pkgs, ... }:
-{
-  fonts.packages = with pkgs; [
-    nerd-fonts.fira-code
-    nerd-fonts.fira-mono
-    nerd-fonts.hack
-  ];
-}