From bec6a91a34c69fcad068c4ad8d79416fa29ea129 Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Sat, 30 Nov 2024 22:57:11 +0100 Subject: [PATCH] treewide: update flake inputs and use nerd-fonts. --- flake.lock | 60 +++++++++++++++++++------------------- system/programs/fonts.nix | 3 +- system/services/kmscon.nix | 4 +-- 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 2751e8c..a895b64 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1732680201, - "narHash": "sha256-3PA+AlonG9xzJrT1NvnD0Id2dBvIVNrSijVwlIinzNo=", + "lastModified": 1732939398, + "narHash": "sha256-fz8GXwXgvRwFsKYb0TNungjbKv/KxpbMWFjWz/c0OlA=", "owner": "rycee", "repo": "nur-expressions", - "rev": "77e347b8897e917e99bf2929a7178d8caa6fd473", + "rev": "63e16a9448014071e78224afe0d6157a47fe4f2b", "type": "gitlab" }, "original": { @@ -399,11 +399,11 @@ ] }, "locked": { - "lastModified": 1732482255, - "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", + "lastModified": 1732884235, + "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", + "rev": "819f682269f4e002884702b87e445c82840c68f2", "type": "github" }, "original": { @@ -536,11 +536,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1732659819, - "narHash": "sha256-Z1KdUhm4IQAVEodkl19XvPdZyWbU36bBKnregIffxsw=", + "lastModified": 1732994406, + "narHash": "sha256-mXF8//CnCtl+o7MZU/wAqY0xrKiMbq17dd8V+prapUw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "b1ccd1e910af3f72ba02d64f61121b42b4c3184e", + "rev": "6d5abeaaa64f4d2815cd412859ff0ec21b72418b", "type": "github" }, "original": { @@ -569,11 +569,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1732647766, - "narHash": "sha256-ZUcQN/2bqL4BK+ifHX9Om4HJOZQAMefK7iziO/ZeEDo=", + "lastModified": 1732946256, + "narHash": "sha256-6t73BeNVkSVLjXBKxOROITomX3M/emxbSR491Y/gUbM=", "owner": "YaLTeR", "repo": "niri", - "rev": "4c480a1ea3280733bc428d9cb38150bfc1a7c36c", + "rev": "8b84afbd38e057c6dd378bdd42b9467d8a7baa24", "type": "github" }, "original": { @@ -675,11 +675,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1732749044, + "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", "type": "github" }, "original": { @@ -739,11 +739,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1732837521, + "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "type": "github" }, "original": { @@ -755,11 +755,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1732837521, + "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "type": "github" }, "original": { @@ -953,11 +953,11 @@ ] }, "locked": { - "lastModified": 1732639391, - "narHash": "sha256-kFtXjoCIqx9xe0ZryPXpqS6l/HVg71aNcuL8Y5e8+pI=", + "lastModified": 1732998741, + "narHash": "sha256-U8QVGspeW/vUJMkp2gYJyk8Nn4f2dwhetkXm9FO+Wjk=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "06e3209d11797d9c741e25df06ab61048746bf93", + "rev": "02350cd23af955b7c858d4c640a5faa3eddcee29", "type": "github" }, "original": { @@ -2866,11 +2866,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1732643199, - "narHash": "sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps=", + "lastModified": 1732894027, + "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "84637a7ab04179bdc42aa8fd0af1909fba76ad0c", + "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", "type": "github" }, "original": { @@ -2920,11 +2920,11 @@ ] }, "locked": { - "lastModified": 1732816234, - "narHash": "sha256-fQgzlRyLH6T5JrPQTyfBqjiQzHzSj7B2Eg08rogxs50=", + "lastModified": 1732983219, + "narHash": "sha256-RSMIhgR9T1ceDYtcHzUvaF7Lcuto8eHfjwCilvyFZAM=", "owner": "abenz1267", "repo": "walker", - "rev": "de49f0b8c93d7df373463dc65dba1d90770e02f2", + "rev": "22107b2c922cb20245158e0f95d7586319b8b6d3", "type": "github" }, "original": { diff --git a/system/programs/fonts.nix b/system/programs/fonts.nix index ad7064a..7136175 100644 --- a/system/programs/fonts.nix +++ b/system/programs/fonts.nix @@ -7,7 +7,8 @@ pkgs.noto-fonts-extra pkgs.intel-one-mono pkgs.noto-fonts-color-emoji - (pkgs.nerdfonts.override {fonts = ["0xProto" "NerdFontsSymbolsOnly"];}) + pkgs.nerd-fonts._0xproto + pkgs.nerd-fonts.symbols-only ]; fontconfig = { diff --git a/system/services/kmscon.nix b/system/services/kmscon.nix index db2e1b7..7e02b6e 100644 --- a/system/services/kmscon.nix +++ b/system/services/kmscon.nix @@ -3,8 +3,8 @@ enable = true; fonts = [ { - name = "IntoneMono NF"; - package = pkgs.nerdfonts.override {fonts = ["IntelOneMono"];}; + name = "0xProto NF"; + package = pkgs.nerd-fonts._0xproto; } ]; extraConfig = ''