diff --git a/flake.lock b/flake.lock index 2c8d824..8f8a5c7 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1732645828, - "narHash": "sha256-+4U2I2653JvPFxcux837ulwYS864QvEueIljUkwytsk=", + "lastModified": 1733168902, + "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", "owner": "nix-community", "repo": "disko", - "rev": "869ba3a87486289a4197b52a6c9e7222edf00b3e", + "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1732025103, - "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", + "lastModified": 1733175814, + "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", "owner": "nix-community", "repo": "home-manager", - "rev": "a46e702093a5c46e192243edbd977d5749e7f294", + "rev": "bf23fe41082aa0289c209169302afd3397092f22", "type": "github" }, "original": { @@ -43,11 +43,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731797098, - "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "lastModified": 1733139194, + "narHash": "sha256-PVQW9ovo0CJbhuhCsrhFJGGdD1euwUornspKpBIgdok=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "rev": "c6c90887f84c02ce9ebf33b95ca79ef45007bf88", "type": "github" }, "original": { @@ -59,11 +59,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1733015953, + "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", "type": "github" }, "original": { @@ -75,11 +75,11 @@ }, "nixpkgs-2405": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1733016324, + "narHash": "sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "7e1ca67996afd8233d9033edd26e442836cc2ad6", "type": "github" }, "original": { diff --git a/nix/lib/theme/default.nix b/nix/lib/theme/default.nix index e8c934f..a23f823 100644 --- a/nix/lib/theme/default.nix +++ b/nix/lib/theme/default.nix @@ -1,12 +1,2 @@ -{ pkgs, ... }: -{ - fonts = { - monospace = { - name = "MesloLGSDZ Nerd Font Mono"; - # fc-list : family | sort | grep "Nerd Font" - - package = pkgs.nerdfonts.override { fonts = [ "Meslo" ]; }; - size = "10"; - }; - }; -} +# TODO Remove this file. +{ ... }: { } diff --git a/nix/modules/home-manager/features/desktop/alacritty.nix b/nix/modules/home-manager/features/desktop/alacritty.nix index 656ce56..52fc722 100644 --- a/nix/modules/home-manager/features/desktop/alacritty.nix +++ b/nix/modules/home-manager/features/desktop/alacritty.nix @@ -1,16 +1,9 @@ { config, lib, - pkgs, - self, ... }: -let - inherit (lib) strings; - inherit (strings) toInt; - theme = import "${self}/nix/lib/theme" { inherit pkgs; }; -in { options.features.desktop.alacritty.enable = lib.mkEnableOption "Enable Alacritty"; @@ -29,11 +22,10 @@ in }; font = { - size = toInt "${theme.fonts.monospace.size}"; + size = 14; bold.style = "Regular"; - normal.family = "${theme.fonts.monospace.name}"; - + normal.family = "JetBrainsMono Nerd Font Mono"; }; terminal.shell = { diff --git a/nix/modules/nixos/fonts.nix b/nix/modules/nixos/fonts.nix index 8bf189d..712fd56 100644 --- a/nix/modules/nixos/fonts.nix +++ b/nix/modules/nixos/fonts.nix @@ -4,33 +4,16 @@ let theme = import ../../lib/theme { inherit pkgs; }; in { - environment.systemPackages = with pkgs; [ - terminus_font - terminus_font_ttf - ]; - fonts = { fontconfig = { enable = true; defaultFonts = { - monospace = [ theme.fonts.monospace.name ]; + # monospace = []; }; }; - packages = - with pkgs; - [ - (nerdfonts.override { - fonts = [ - "AnonymousPro" - "FiraCode" - "GeistMono" - "IntelOneMono" - "Iosevka" - "JetBrainsMono" - ]; - }) - ] - ++ [ theme.fonts.monospace.package ]; + packages = with pkgs; [ + nerd-fonts.jetbrains-mono + ]; }; } diff --git a/nix/modules/nixos/i3.nix b/nix/modules/nixos/i3.nix index 1fc2b3f..35323ac 100644 --- a/nix/modules/nixos/i3.nix +++ b/nix/modules/nixos/i3.nix @@ -192,8 +192,6 @@ in } ]; - fonts.names = [ "${theme.fonts.monospace.name}" ]; - gaps = { smartBorders = "on"; smartGaps = true;