diff --git a/flake.lock b/flake.lock index d7125fe..91b4c8b 100644 --- a/flake.lock +++ b/flake.lock @@ -223,21 +223,6 @@ "type": "github" } }, - "flake-root": { - "locked": { - "lastModified": 1713493429, - "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", - "owner": "srid", - "repo": "flake-root", - "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "flake-root", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -303,11 +288,11 @@ ] }, "locked": { - "lastModified": 1715077503, - "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", + "lastModified": 1714981474, + "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e277d9566de9976f47228dd8c580b97488734d4", + "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", "type": "github" }, "original": { @@ -324,11 +309,11 @@ ] }, "locked": { - "lastModified": 1715077503, - "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", + "lastModified": 1714679908, + "narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e277d9566de9976f47228dd8c580b97488734d4", + "rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848", "type": "github" }, "original": { @@ -510,11 +495,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1715293995, - "narHash": "sha256-L7nQt7J3KCMO1vy1lzzmgKE6cx4xR1LZwIuUkzWsXVY=", + "lastModified": 1715045898, + "narHash": "sha256-g1gF70riJKXyo1EQyY6e6KxwDJvtcbtg3VrN9zQtzWs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cc40af1ab3e545191fe25aeef2e82df3c9f79417", + "rev": "f969f5fa62b5c745ad473d04cab7c74b51dc5a4a", "type": "github" }, "original": { @@ -526,11 +511,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1715106579, - "narHash": "sha256-gZMgKEGiK6YrwGBiccZ1gemiUwjsZ1Zv49KYOgmX2fY=", + "lastModified": 1714971268, + "narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8be0d8a1ed4f96d99b09aa616e2afd47acc3da89", + "rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c", "type": "github" }, "original": { @@ -558,11 +543,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1715087517, - "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=", + "lastModified": 1714906307, + "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29", + "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "type": "github" }, "original": { @@ -606,11 +591,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1715087517, - "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=", + "lastModified": 1714906307, + "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29", + "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "type": "github" }, "original": { @@ -641,21 +626,19 @@ "devshell": "devshell", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", - "flake-root": "flake-root", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs-unstable" ], - "pre-commit-hooks": "pre-commit-hooks", - "treefmt-nix": "treefmt-nix" + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1715115147, - "narHash": "sha256-oREqXPEtuYbOdBKbsDQzr2V01EzK4kD8MTdwO9ljTnU=", + "lastModified": 1714939240, + "narHash": "sha256-U4L+0ugafh+E3yMUzLb4N4ME9Ve4LigujiJcAFyl204=", "owner": "nix-community", "repo": "nixvim", - "rev": "f7f255afe22fcca0c07177c3707fd61fa0c85835", + "rev": "62f32bfc711f0a3c8a52af4c0790345b4b3d2346", "type": "github" }, "original": { @@ -672,11 +655,11 @@ ] }, "locked": { - "lastModified": 1715051952, - "narHash": "sha256-XSRVdI4y4+r+qL7cbY0K8Ksghc/PGZ3XQNN/ZggmVUg=", + "lastModified": 1715045783, + "narHash": "sha256-2+X1MR4/eQ/2JxGUadhir0AmcBjRF9+qTaOvlWgveE4=", "ref": "refs/heads/main", - "rev": "f7d1aaa61a544c5e36f84d80411b4be89da9a97b", - "revCount": 39, + "rev": "63092c66d8722b230272dec2781fc0f8d1b0a436", + "revCount": 38, "type": "git", "url": "https://codeberg.org/noe/personal-site" }, @@ -756,11 +739,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1715244550, - "narHash": "sha256-ffOZL3eaZz5Y1nQ9muC36wBCWwS1hSRLhUzlA9hV2oI=", + "lastModified": 1715035358, + "narHash": "sha256-RY6kqhpCPa/q3vbqt3iYRyjO3hJz9KZnshMjbpPon8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0dc50257c00ee3c65fef3a255f6564cfbfe6eb7f", + "rev": "893e3df091f6838f4f9d71c61ab079d5c5dedbd1", "type": "github" }, "original": { @@ -818,27 +801,6 @@ "type": "git", "url": "https://git.sapphic.engineer/noe/tachikoma" } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1714058656, - "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", diff --git a/pkgs/default.nix b/pkgs/default.nix index 4c620b1..8798371 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,3 +1,2 @@ { pkgs ? (import ../nixpkgs.nix) { }, ... }: rec { - freetype-triangular-oled = import ./freetype-triangular-oled; } diff --git a/pkgs/freetype-triangular-oled/default.nix b/pkgs/freetype-triangular-oled/default.nix deleted file mode 100644 index 0d7053a..0000000 --- a/pkgs/freetype-triangular-oled/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, ...}: pkgs.freetype.overrideAttrs(final: prev: { - patches = prev.patches ++ [ - ./triangular-oled.patch - ]; -}) diff --git a/pkgs/freetype-triangular-oled/triangular-oled.patch b/pkgs/freetype-triangular-oled/triangular-oled.patch deleted file mode 100644 index 37eed0a..0000000 --- a/pkgs/freetype-triangular-oled/triangular-oled.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/smooth/ftsmooth.c b/src/smooth/ftsmooth.c -index f0acc1ea4..5f163505a 100644 ---- a/src/smooth/ftsmooth.c -+++ b/src/smooth/ftsmooth.c -@@ -95,12 +95,12 @@ - - - /* set up default subpixel geometry for striped RGB panels. */ -- sub[0].x = -21; -- sub[0].y = 0; -- sub[1].x = 0; -- sub[1].y = 0; -- sub[2].x = 21; -- sub[2].y = 0; -+ sub[0].x = -18; -+ sub[0].y = -11; -+ sub[1].x = 2; -+ sub[1].y = 22; -+ sub[2].x = 16; -+ sub[2].y = -11; - - render->clazz->raster_class->raster_reset( render->raster, NULL, 0 ); -