diff --git a/flake.lock b/flake.lock index 9bf4e958cf..867fba3576 100644 --- a/flake.lock +++ b/flake.lock @@ -1,92 +1,24 @@ { "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nix-deno": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1713992202, - "narHash": "sha256-+sxjCORBeqOX4lgVGeoCiMRidLh8qpi21+NiOfiPr4k=", - "owner": "nekowinston", - "repo": "nix-deno", - "rev": "bb43316eb233e0cea0719a68b92cc797e4829169", - "type": "github" - }, - "original": { - "owner": "nekowinston", - "repo": "nix-deno", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1719082008, + "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "9693852a2070b398ee123a329e68f0dab5526681", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1713984123, - "narHash": "sha256-mpwxnahk1VqWD1nelbRr6QI+3ZOmYu+t/glpwg+AxgI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bbe2490a512b66964b48f6b431897dbed8164894", - "type": "github" - }, - "original": { - "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "flake-utils": "flake-utils", - "nix-deno": "nix-deno", - "nixpkgs": "nixpkgs_2" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index cac2f7fda6..e0ac402d28 100644 --- a/flake.nix +++ b/flake.nix @@ -1,25 +1,20 @@ { description = "Catppuccin userstyles"; - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs"; - flake-utils.url = "github:numtide/flake-utils"; - nix-deno.url = "github:nekowinston/nix-deno"; - }; + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - outputs = { - nixpkgs, - flake-utils, - ... - } @ inputs: - flake-utils.lib.eachDefaultSystem (system: let - pkgs = import nixpkgs { - inherit system; - overlays = [inputs.nix-deno.overlays.default]; - }; - in { - packages.default = pkgs.callPackage ./nix/default.nix {}; - - devShells.default = pkgs.callPackage ./nix/shell.nix {}; - }); + outputs = + { nixpkgs, ... }: + let + forAllSystems = + function: + nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed ( + system: function nixpkgs.legacyPackages.${system} + ); + in + { + devShells = forAllSystems (pkgs: { + default = pkgs.callPackage ./shell.nix { }; + }); + }; } diff --git a/nix/default.nix b/nix/default.nix deleted file mode 100644 index b95904ee87..0000000000 --- a/nix/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - lib, - denoPlatform, -}: -denoPlatform.mkDenoDerivation { - name = "userstyles"; - version = "unstable"; - - src = ../.; - - buildPhase = '' - mkdir -p $out - deno task ci:generate-import - ''; - - installPhase = '' - cp -r dist/* $out - ''; - - meta = { - description = "A collection of userstyles for various websites."; - homepage = "https://github.com/catppuccin/userstyles"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [isabelroses]; - }; -} diff --git a/nix/shell.nix b/nix/shell.nix deleted file mode 100644 index f34f3b01d7..0000000000 --- a/nix/shell.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - deno, - callPackage, - nodePackages, - ... -}: let - mainPkg = callPackage ./default.nix {}; -in - mainPkg.overrideAttrs (oa: { - buildInputs = - [ - deno - nodePackages.prettier - ] - ++ (oa.nativeBuildInputs or []); - }) diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000000..927e117a4e --- /dev/null +++ b/shell.nix @@ -0,0 +1,14 @@ +{ + deno, + typos, + mkShellNoCC, + nodePackages, + ... +}: +mkShellNoCC { + packages = [ + deno + typos + nodePackages.prettier + ]; +}