diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..f1969cc --- /dev/null +++ b/.editorconfig @@ -0,0 +1,43 @@ +# Editor configuration, see http://editorconfig.org +root = true + +[*] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +charset = utf-8 +indent_style = space +indent_size = 2 + +# Ignore diffs/patches +[*.{diff,patch}] +end_of_line = unset +insert_final_newline = unset +trim_trailing_whitespace = unset +indent_size = unset +charset = unset +indent_style = unset +indent_size = unset + +[{.*,secrets}/**] +end_of_line = false +insert_final_newline = false +trim_trailing_whitespace = unset +charset = unset +indent_style = unset +indent_size = unset + +[*.rom] +end_of_line = unset +insert_final_newline = unset +trim_trailing_whitespace = unset +charset = unset +indent_style = unset +indent_size = unset + +[*.py] +indent_size = 4 + +[*.md] +max_line_length = off +trim_trailing_whitespace = false diff --git a/flake.lock b/flake.lock index 061db8d..38bb5ef 100644 --- a/flake.lock +++ b/flake.lock @@ -1,40 +1,20 @@ { "nodes": { - "devshell": { + "flake-parts": { "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1678957337, - "narHash": "sha256-Gw4nVbuKRdTwPngeOZQOzH/IFowmz4LryMPDiJN/ah4=", - "owner": "numtide", - "repo": "devshell", - "rev": "3e0e60ab37cd0bf7ab59888f5c32499d851edb47", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "flake-utils": { - "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "hercules-ci", + "repo": "flake-parts", "type": "github" } }, @@ -54,10 +34,21 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1725233747, + "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + } + }, "root": { "inputs": { - "devshell": "devshell", - "flake-utils": "flake-utils", + "flake-parts": "flake-parts", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index a613bd3..04d02f2 100644 --- a/flake.nix +++ b/flake.nix @@ -4,27 +4,43 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - flake-utils.url = "github:numtide/flake-utils"; - - devshell.url = "github:numtide/devshell"; - devshell.inputs.flake-utils.follows = "flake-utils"; - devshell.inputs.nixpkgs.follows = "nixpkgs"; + flake-parts.url = "github:hercules-ci/flake-parts"; }; - outputs = { self, flake-utils, devshell, nixpkgs }: - flake-utils.lib.simpleFlake { - inherit self nixpkgs; - name = "infra-project"; - overlay = devshell.overlays.default; - shell = { pkgs }: - pkgs.devshell.mkShell { - # Add additional packages you'd like to be available in your devshell - # PATH here - devshell.packages = with pkgs; [ - minio-client - ]; - bash.extra = '' - ''; + outputs = inputs@{ self, ... }: + inputs.flake-parts.lib.mkFlake { inherit inputs; } { + systems = [ + "x86_64-linux" + "aarch64-linux" + ]; + imports = [ + inputs.flake-parts.flakeModules.easyOverlay + ]; + perSystem = + args@{ + system, + pkgs, + config, + lib, + ... + }: + { + packages = { + momo-koeln = pkgs.stdenv.mkDerivation { + name = "momo.koeln"; + version = "1.0.0"; + src = ./.; + installPhase = '' + mkdir -p $out + cp -r index.html $out/ + ''; + }; + }; + overlayAttrs = config.packages; + + devShells.default = pkgs.mkShell { + buildInputs = [ ]; + }; }; }; }