From 0cf44018131aa4d550aee8783d24a7e58225280f Mon Sep 17 00:00:00 2001 From: DerGrumpf Date: Sun, 31 May 2026 10:26:19 +0200 Subject: [PATCH] Moved: fonts management to home manager; Removed: dulicated fonts.nix for nixos & darwin configurations --- darwin/default.nix | 1 - home/default.nix | 1 + {darwin => home}/fonts.nix | 6 ++++-- home/neovim/live-server.nix | 1 - home/shell.nix | 1 - nixos/default.nix | 1 - nixos/fonts.nix | 9 --------- 7 files changed, 5 insertions(+), 15 deletions(-) rename {darwin => home}/fonts.nix (58%) delete mode 100644 nixos/fonts.nix diff --git a/darwin/default.nix b/darwin/default.nix index 6b428c3..ab27ea2 100644 --- a/darwin/default.nix +++ b/darwin/default.nix @@ -8,7 +8,6 @@ ./settings.nix ./homebrew.nix ./yabai.nix - ./fonts.nix ]; home-manager.users.${primaryUser}.targets.darwin = { diff --git a/home/default.nix b/home/default.nix index 46fb29d..9ca3f85 100644 --- a/home/default.nix +++ b/home/default.nix @@ -17,6 +17,7 @@ ./xdg.nix ./neovim ./python.nix + ./fonts.nix inputs.sops-nix.homeManagerModules.sops ] ++ lib.optionals (!isDarwin && !isServer) [ diff --git a/darwin/fonts.nix b/home/fonts.nix similarity index 58% rename from darwin/fonts.nix rename to home/fonts.nix index cfa4602..966a083 100644 --- a/darwin/fonts.nix +++ b/home/fonts.nix @@ -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 ]; + } diff --git a/home/neovim/live-server.nix b/home/neovim/live-server.nix index a976eb5..89dd816 100644 --- a/home/neovim/live-server.nix +++ b/home/neovim/live-server.nix @@ -1,4 +1,3 @@ -# TODO: Remove; nodePackages is unmaintained inside nixpkgs { pkgs, ... }: { # Live Server: Auto-reload browser for web development diff --git a/home/shell.nix b/home/shell.nix index fb9df28..eb13853 100644 --- a/home/shell.nix +++ b/home/shell.nix @@ -160,7 +160,6 @@ ]; }; - # TODO: Install OpenCode programs.nushell = { enable = true; diff --git a/nixos/default.nix b/nixos/default.nix index b11f5d2..4be2797 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -9,7 +9,6 @@ }: { imports = [ - ./fonts.nix ./sops.nix ./locale.nix ./tailscale.nix diff --git a/nixos/fonts.nix b/nixos/fonts.nix deleted file mode 100644 index cfa4602..0000000 --- a/nixos/fonts.nix +++ /dev/null @@ -1,9 +0,0 @@ -# TODO: Duplicate file -{ pkgs, ... }: -{ - fonts.packages = with pkgs; [ - nerd-fonts.fira-code - nerd-fonts.fira-mono - nerd-fonts.hack - ]; -}