From f24626661980385996925f23566d6e852c55c999 Mon Sep 17 00:00:00 2001 From: cnst Date: Sat, 30 Nov 2024 12:36:05 +0100 Subject: [PATCH] flake lock and font refactor --- flake.lock | 120 ++++++++++++++++++------- modules/nixos/system/fonts/default.nix | 30 +++---- 2 files changed, 103 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index 3e2eacbe..36c95e25 100644 --- a/flake.lock +++ b/flake.lock @@ -82,12 +82,12 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1732715105, - "narHash": "sha256-WGf8bzwNEgbWjM9aTFv9ZCGrBQEfg0fYd4FSoVa2gDs=", - "rev": "8f153d013632e6036e8bec6377cc5ed7d2ad14df", - "revCount": 1530, + "lastModified": 1732922729, + "narHash": "sha256-vp02vUhYVA2yECXTPXifUgb3YtEPYaerpD6lts99010=", + "rev": "e581215cbee1ccf67a08f478d3c49808bc93a523", + "revCount": 1531, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1530%2Brev-8f153d013632e6036e8bec6377cc5ed7d2ad14df/01936de3-afc6-78a3-adb5-f73c67d8b9ef/source.tar.gz?rev=8f153d013632e6036e8bec6377cc5ed7d2ad14df&revCount=1530" + "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1531%2Brev-e581215cbee1ccf67a08f478d3c49808bc93a523/01937a42-9657-7647-a534-f2c7fb2bf814/source.tar.gz?rev=e581215cbee1ccf67a08f478d3c49808bc93a523&revCount=1531" }, "original": { "type": "tarball", @@ -416,11 +416,11 @@ ] }, "locked": { - "lastModified": 1732793095, - "narHash": "sha256-6TrknJ8CpvSSF4gviQSeD+wyj3siRcMvdBKhOXkEMKU=", + "lastModified": 1732884235, + "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f7739d01080feb4549524e8f6927669b61c6ee3", + "rev": "819f682269f4e002884702b87e445c82840c68f2", "type": "github" }, "original": { @@ -458,11 +458,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": { @@ -500,6 +500,64 @@ "type": "github" } }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprlock", + "hyprutils" + ], + "nixpkgs": [ + "hyprlock", + "nixpkgs" + ], + "systems": [ + "hyprlock", + "systems" + ] + }, + "locked": { + "lastModified": 1732808127, + "narHash": "sha256-jwqYmLVfvoLPu8UScEzZgdbbiNU3ioYcrsthjEEnGqI=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "4d927a52be7e15e0846456f2aa1b0ad76b5bf059", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, + "hyprgraphics_2": { + "inputs": { + "hyprutils": [ + "hyprpaper", + "hyprutils" + ], + "nixpkgs": [ + "hyprpaper", + "nixpkgs" + ], + "systems": [ + "hyprpaper", + "systems" + ] + }, + "locked": { + "lastModified": 1732808127, + "narHash": "sha256-jwqYmLVfvoLPu8UScEzZgdbbiNU3ioYcrsthjEEnGqI=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "4d927a52be7e15e0846456f2aa1b0ad76b5bf059", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, "hypridle": { "inputs": { "hyprlang": [ @@ -547,11 +605,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1732804303, - "narHash": "sha256-q0soDRlCqu6vSyu11IDTwn2gxOhI9clZbLjNQEu/hKc=", + "lastModified": 1732837919, + "narHash": "sha256-/GySPsuD3UpBLOpr0ZRteN2/zYmlAnrkfIZhvM32AvE=", "owner": "hyprwm", "repo": "hyprland", - "rev": "8b51eeb7aef8b25de35a0d460f28f4d67c017866", + "rev": "8f83d29f00bfa89d1e8fe94b4dda98fe898b6b0e", "type": "github" }, "original": { @@ -637,6 +695,7 @@ }, "hyprlock": { "inputs": { + "hyprgraphics": "hyprgraphics", "hyprlang": [ "hyprland", "hyprlang" @@ -655,11 +714,11 @@ ] }, "locked": { - "lastModified": 1732023353, - "narHash": "sha256-FbHP2io0nKSC0qEjTdAhrfmlqiv9oB1P/DcV3jFAnWY=", + "lastModified": 1732812191, + "narHash": "sha256-/gYMXqhjvOcjhaYjzb1iqjpoCDqO5lkkqjG93oMMo60=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "578246b9967dec77c56993dc55ca192d35ba9bb7", + "rev": "4667f721be47ff6f5cf2a7ee64513f818fb764a0", "type": "github" }, "original": { @@ -670,6 +729,7 @@ }, "hyprpaper": { "inputs": { + "hyprgraphics": "hyprgraphics_2", "hyprlang": [ "hyprland", "hyprlang" @@ -689,11 +749,11 @@ ] }, "locked": { - "lastModified": 1732281484, - "narHash": "sha256-0a+oP7iBgAsgMQ2Vz7LlZVfqfvj4W1iuyjHgIs0VEYM=", + "lastModified": 1732809500, + "narHash": "sha256-CW4r78WhaHtFJN6L+heBztj02ucxthBPgUzFeUZ+yVw=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "0b5e350011116f4bfa0d004a7b3b8c8e30425619", + "rev": "a3ceb20095c1fae9acb10c37713caf2df28f3ec9", "type": "github" }, "original": { @@ -838,11 +898,11 @@ ] }, "locked": { - "lastModified": 1732648910, - "narHash": "sha256-1F83DUfEHnCZpGY4UOlWaamWoDx8eZ9tHaUF51p2hng=", + "lastModified": 1732739177, + "narHash": "sha256-iL32+TA/8geCzcL1r3uthrH/GPvbUak5QE++WJUkaiI=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e86d2ad72094354326887bd6fe156f327d63d491", + "rev": "8d7b2149e618696d5100c2683af1ffa893f02a75", "type": "github" }, "original": { @@ -1116,11 +1176,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1732758367, + "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", "type": "github" }, "original": { @@ -1408,11 +1468,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1732657738, - "narHash": "sha256-41PtRA+Jt9CWdrdCRSTM8Lh/DNnRyPxNx09wFE1RJ9Y=", + "lastModified": 1732922421, + "narHash": "sha256-TX6B/mw1Trq1sPq86DFER59iECAaNaI2BykhldaBwDs=", "ref": "refs/heads/main", - "rev": "2c85618613f34412fac928ec5320f5074b76dd24", - "revCount": 855, + "rev": "3277b47c9f87ecf736e1df7ed65cc0e25466f9b2", + "revCount": 862, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/" diff --git a/modules/nixos/system/fonts/default.nix b/modules/nixos/system/fonts/default.nix index 998f2c93..28a71049 100644 --- a/modules/nixos/system/fonts/default.nix +++ b/modules/nixos/system/fonts/default.nix @@ -27,23 +27,19 @@ in { font-awesome recursive input-fonts - (pkgs.nerdfonts.override { - fonts = [ - "JetBrainsMono" - "FiraCode" - "FiraMono" - "Iosevka" - "3270" - "DroidSansMono" - "SourceCodePro" - "UbuntuMono" - "Overpass" - "Monoid" - "Mononoki" - "Hack" - "IBMPlexMono" - ]; - }) + source-code-pro + nerd-fonts.jetbrains-mono + ibm-plex + nerd-fonts.fira-code + nerd-fonts.fira-mono + nerd-fonts.iosevka + nerd-fonts._3270 + nerd-fonts.droid-sans-mono + nerd-fonts.ubuntu-mono + nerd-fonts.overpass + nerd-fonts.monoid + nerd-fonts.mononoki + nerd-fonts.hack ]; }; }