diff --git a/flake.lock b/flake.lock index 019392c80..05ead111b 100644 --- a/flake.lock +++ b/flake.lock @@ -16,9 +16,26 @@ "type": "github" } }, + "opdavies-theme": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "path": "./themes/opdavies", + "type": "path" + }, + "original": { + "path": "./themes/opdavies", + "type": "path" + }, + "parent": [] + }, "root": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "opdavies-theme": "opdavies-theme" } } }, diff --git a/flake.nix b/flake.nix index 9795525cc..4389de106 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,15 @@ { - inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + inputs={ + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + + opdavies-theme = { + inputs.nixpkgs.follows = "nixpkgs"; + url = "path:./themes/opdavies"; + }; + }; outputs = - { nixpkgs, ... }: + { nixpkgs, opdavies-theme, ... }: let system = "x86_64-linux"; pkgs = import nixpkgs { inherit system; }; @@ -17,13 +24,22 @@ in { devShells.${system}.default = pkgs.mkShell { + inputsFrom = [ + opdavies-theme.devShells.${system}.default + ]; + packages = with pkgs; [ just + lua-language-server + lua54Packages.luacheck + nixd php phpactor phpPackages.composer sqlite ]; }; + + formatter.${system} = pkgs.nixfmt-rfc-style; }; } diff --git a/themes/opdavies/flake.nix b/themes/opdavies/flake.nix new file mode 100644 index 000000000..ba2588772 --- /dev/null +++ b/themes/opdavies/flake.nix @@ -0,0 +1,15 @@ +{ + outputs = + { nixpkgs, ... }: + let + system = "x86_64-linux"; + pkgs = import nixpkgs { inherit system; }; + in + { + devShells.${system}.default = pkgs.mkShell { + buildInputs = with pkgs; [ + tailwindcss + ]; + }; + }; +}