diff options
| -rw-r--r-- | common/common.nix | 1 | ||||
| -rw-r--r-- | inputs.nix | 8 | ||||
| -rw-r--r-- | npins/sources.json | 32 | ||||
| -rw-r--r-- | pkgs/overlay.nix | 6 |
4 files changed, 24 insertions, 23 deletions
diff --git a/common/common.nix b/common/common.nix index 02fec64..b26009f 100644 --- a/common/common.nix +++ b/common/common.nix @@ -6,6 +6,7 @@ nixpkgs.flake = inputs.nixpkgs; unstable.flake = inputs.nixpkgs-unstable; }; + nix.package = pkgs.lix; nix.nixPath = lib.mkForce [ "nixpkgs=${inputs.nixpkgs}" "unstable=${inputs.nixpkgs-unstable}"]; @@ -30,7 +30,7 @@ let (import sources.rust-overlay) deploy-rs.overlay (import ./pkgs/overlay.nix { inherit inputs; }) - lix-overlay + # lix-overlay ]; } // { outPath = sources.nixpkgs.outPath; }; @@ -52,8 +52,8 @@ let simple-nixos-mailserver = import sources.simple-nixos-mailserver; - lix-overlay = import "${sources.lix-nixos-module}/overlay.nix" { - lix = sources.lix; - }; + # lix-overlay = import "${sources.lix-nixos-module}/overlay.nix" { + # lix = sources.lix; + # }; }; in inputs diff --git a/npins/sources.json b/npins/sources.json index 260317b..c704a15 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -100,9 +100,9 @@ "url": "git+ssh://git@git.lix.systems/lix-project/lix" }, "branch": "main", - "revision": "6b7076f81c25941559f7d132a5ebc2fcfcedcc4d", + "revision": "8a9094303bc7873c979e54ea20b9f50464ee3965", "url": null, - "hash": "1kv0yxaw1mfi9c99g940m0w8aqfnpwnwrxpd43920xqnd928jxli" + "hash": "1bywrll49l2d4gdqlqpf78izdzv0isc41752sgpl1z9lz285v1qs" }, "lix-nixos-module": { "type": "Git", @@ -111,9 +111,9 @@ "url": "git+ssh://git@git.lix.systems/lix-project/nixos-module" }, "branch": "main", - "revision": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d", + "revision": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34", "url": null, - "hash": "0jxpqaz12lqibg03iv36sa0shfvamn2yhg937llv3kl4csijd34f" + "hash": "1h4f2p6x8vq7bfc20hxk6zz9i4imsjjkmf0m28bzmx6vinxqimj4" }, "nixpkgs": { "type": "Git", @@ -123,9 +123,9 @@ "repo": "nixpkgs" }, "branch": "nixos-24.05", - "revision": "080166c15633801df010977d9d7474b4a6c549d7", - "url": "https://github.com/NixOS/nixpkgs/archive/080166c15633801df010977d9d7474b4a6c549d7.tar.gz", - "hash": "17sls93qjqr0dsh31xph33m1f1x67gs22s3cr8qv20bm8zkab9y4" + "revision": "9256f7c71a195ebe7a218043d9f93390d49e6884", + "url": "https://github.com/NixOS/nixpkgs/archive/9256f7c71a195ebe7a218043d9f93390d49e6884.tar.gz", + "hash": "0dxwisjg7cg8m7lm1643s0fs9gplji1l25hiwplkqwa5c4hs6v5b" }, "nixpkgs-unstable": { "type": "Git", @@ -135,9 +135,9 @@ "repo": "nixpkgs" }, "branch": "nixpkgs-unstable", - "revision": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", - "url": "https://github.com/NixOS/nixpkgs/archive/2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53.tar.gz", - "hash": "1v6gpivg8mj4qapdp0y5grapnlvlw8xyh5bjahq9i50iidjr3587" + "revision": "85f7e662eda4fa3a995556527c87b2524b691933", + "url": "https://github.com/NixOS/nixpkgs/archive/85f7e662eda4fa3a995556527c87b2524b691933.tar.gz", + "hash": "1p8qam6pixcin63wai3y55bcyfi1i8525s1hh17177cqchh1j117" }, "ntfy-matrix-bot": { "type": "Git", @@ -169,9 +169,9 @@ "repo": "rust-overlay" }, "branch": "master", - "revision": "41814763a2c597755b0755dbe3e721367a5e420f", - "url": "https://github.com/oxalica/rust-overlay/archive/41814763a2c597755b0755dbe3e721367a5e420f.tar.gz", - "hash": "0pphdgma7dm0mhknnmg41ga4779cg47f9v8h2znhy15f79v5l1f5" + "revision": "7c4cd99ed7604b79e8cb721099ac99c66f656b3a", + "url": "https://github.com/oxalica/rust-overlay/archive/7c4cd99ed7604b79e8cb721099ac99c66f656b3a.tar.gz", + "hash": "00h0j10d1zxg03gjzzfj22s14fs0apmd2cvxmk7dcsaj9d8ni1bx" }, "showrt": { "type": "Git", @@ -204,9 +204,9 @@ "repo": "sops-nix" }, "branch": "master", - "revision": "e9b5eef9b51cdf966c76143e13a9476725b2f760", - "url": "https://github.com/Mic92/sops-nix/archive/e9b5eef9b51cdf966c76143e13a9476725b2f760.tar.gz", - "hash": "1irwfigc3fcxdm5pc3p9cddv57drjp208sa0hd7bq78b0csdxnyl" + "revision": "f1675e3b0e1e663a4af49be67ecbc9e749f85eb7", + "url": "https://github.com/Mic92/sops-nix/archive/f1675e3b0e1e663a4af49be67ecbc9e749f85eb7.tar.gz", + "hash": "1sy61kizq4a1nj06d85p2q0h30a37ha7ja62s6k2k6abf7m247wd" }, "traveltext": { "type": "Git", diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index c7e929e..679fef8 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -181,10 +181,10 @@ in }; in '' ln -sf ${TwemojiMozilla-colr} \ - node_modules/matrix-react-sdk/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2 + res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2 ln -sf ${TwemojiMozilla-sbix} \ - node_modules/matrix-react-sdk/res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2 - substituteInPlace node_modules/matrix-react-sdk/src/stores/room-list/ListLayout.ts \ + res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2 + substituteInPlace src/stores/room-list/ListLayout.ts \ --replace "TILE_HEIGHT_PX = 44" "TILE_HEIGHT_PX = 32" ''; }; |