diff --git a/flake.lock b/flake.lock index d6225d3..ac6b0a6 100644 --- a/flake.lock +++ b/flake.lock @@ -214,6 +214,25 @@ "type": "github" } }, + "iosevka-hashcube": { + "inputs": { + "nixpkgs": "nixpkgs_7", + "systems": "systems_3" + }, + "locked": { + "lastModified": 1782431860, + "narHash": "sha256-kx/ouLSJMpNoqo/BFUAvSi916cgDfMTiMJ/Jtq8VUyQ=", + "ref": "refs/heads/main", + "rev": "88d689440be16aa766b53e5dee01c9c7f611f339", + "revCount": 7, + "type": "git", + "url": "https://tangled.org/did:plc:efquyxtdunysezeo27wkrw5l" + }, + "original": { + "type": "git", + "url": "https://tangled.org/did:plc:efquyxtdunysezeo27wkrw5l" + } + }, "jovian": { "inputs": { "nix-github-actions": "nix-github-actions_2", @@ -256,7 +275,7 @@ "inputs": { "luajit-src": "luajit-src", "millennium-src": "millennium-src", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "dir": "packages/nix", @@ -295,7 +314,7 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -423,6 +442,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1780243769, + "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1780336545, "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=", @@ -438,7 +473,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1774106199, "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", @@ -454,7 +489,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1775710090, "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", @@ -470,7 +505,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1777954456, "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", @@ -486,7 +521,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { "lastModified": 1779560665, "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", @@ -580,15 +615,15 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1770115704, - "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=", - "owner": "nixos", + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -596,15 +631,15 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1780243769, - "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", - "owner": "NixOS", + "lastModified": 1770115704, + "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", + "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -629,8 +664,8 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_10", - "systems": "systems_3" + "nixpkgs": "nixpkgs_11", + "systems": "systems_4" }, "locked": { "lastModified": 1781034432, @@ -674,7 +709,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4", + "systems": "systems_5", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -716,8 +751,8 @@ }, "protonmail-bridge": { "inputs": { - "nixpkgs": "nixpkgs_11", - "systems": "systems_5" + "nixpkgs": "nixpkgs_12", + "systems": "systems_6" }, "locked": { "lastModified": 1774487486, @@ -741,10 +776,11 @@ "elephant": "elephant", "frc-nix": "frc-nix", "home-manager": "home-manager_2", + "iosevka-hashcube": "iosevka-hashcube", "jovian": "jovian", "millennium": "millennium", "niri": "niri", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "nixvim": "nixvim", "noctalia": "noctalia", "noctalia-qs": "noctalia-qs", @@ -786,6 +822,21 @@ } }, "systems_3": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_4": { "locked": { "lastModified": 1774449309, "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", @@ -801,7 +852,7 @@ "type": "github" } }, - "systems_4": { + "systems_5": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -816,7 +867,7 @@ "type": "github" } }, - "systems_5": { + "systems_6": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -831,7 +882,7 @@ "type": "github" } }, - "systems_6": { + "systems_7": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -846,7 +897,7 @@ "type": "github" } }, - "systems_7": { + "systems_8": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -887,8 +938,8 @@ "elephant": [ "elephant" ], - "nixpkgs": "nixpkgs_12", - "systems": "systems_6" + "nixpkgs": "nixpkgs_13", + "systems": "systems_7" }, "locked": { "lastModified": 1777789924, @@ -939,8 +990,8 @@ }, "ytpm": { "inputs": { - "nixpkgs": "nixpkgs_13", - "systems": "systems_7" + "nixpkgs": "nixpkgs_14", + "systems": "systems_8" }, "locked": { "lastModified": 1779737843, @@ -959,7 +1010,7 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_15" }, "locked": { "lastModified": 1780512239, diff --git a/flake.nix b/flake.nix index cbc8499..8ed2547 100644 --- a/flake.nix +++ b/flake.nix @@ -40,6 +40,7 @@ ytpm.url = "git+https://tangled.org/did:plc:o3dguei6niggn2uohnr2ir2i"; millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix"; + iosevka-hashcube.url = "git+https://tangled.org/did:plc:efquyxtdunysezeo27wkrw5l"; }; outputs = { @@ -58,6 +59,7 @@ protonmail-bridge, ytpm, millennium, + iosevka-hashcube, ... }@inputs:{ nixosConfigurations = @@ -70,6 +72,8 @@ (import ./overlays) ]; nixpkgsOpts = { + overlays = [ + ]; config.allowUnfree = true; system = "x86_64-linux"; }; diff --git a/overlays/default.nix b/overlays/default.nix index 1ee0341..1d0c9a1 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,7 @@ -{ ... }: +{ inputs, ... }: { nixpkgs.overlays = [ - (import ./iosevka) + inputs.iosevka-hashcube.overlays.iosevka-hashcube ]; } diff --git a/overlays/iosevka/default.nix b/overlays/iosevka/default.nix deleted file mode 100644 index f2dc1d2..0000000 --- a/overlays/iosevka/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -(self: super: { - iosevka-hashcube = ((super.iosevka.overrideAttrs (_:{ - nativeBuildInputs = [ super.nerd-font-patcher ] ++ super.iosevka.nativeBuildInputs; - postInstall = '' - mkdir -p $out/share/fonts/truetype/{iosevka,iosevka-nerd} - mv $out/share/fonts/truetype/*.ttf $out/share/fonts/truetype/iosevka/ - for f in $out/share/fonts/truetype/iosevka/*.ttf; do - nerd-font-patcher --complete -s --outputdir $out/share/fonts/truetype/iosevka-nerd/ "$f" - done - ''; - })).override { - privateBuildPlan = { - family = "Iosevka Hashcube"; - spacing = "term"; - serifs = "sans"; - noCvSs = true; - exportGlyphNames = true; - - variants.inherits = "ss14"; - ligations.inherits = "dlig"; - weights = { - Regular = { - shape = 400; - menu = 400; - css = 400; - }; - Bold = { - shape = 700; - menu = 700; - css = 700; - }; - }; - slopes = { - Upright = { - angle = 0; - shape = "upright"; - menu = "upright"; - css = "normal" ; - }; - Italic = { - angle = 9.4; - shape = "italic"; - menu = "italic"; - css = "italic"; - }; - }; - }; - }); -})