diff --git a/README.md b/README.md index dea5b82..05761ac 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# Blog-pim +# Blog diff --git a/devenv.lock b/devenv.lock deleted file mode 100644 index eb20e93..0000000 --- a/devenv.lock +++ /dev/null @@ -1,156 +0,0 @@ -{ - "nodes": { - "devenv": { - "locked": { - "dir": "src/modules", - "lastModified": 1714719003, - "owner": "cachix", - "repo": "devenv", - "rev": "4d786c35280e94211b2fb7b50036cc6aeddee320", - "treeHash": "09fbabb734953977376a499dc75685d35584bef1", - "type": "github" - }, - "original": { - "dir": "src/modules", - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "treeHash": "2addb7b71a20a25ea74feeaf5c2f6a6b30898ecb", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1710146030, - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "treeHash": "bd263f021e345cb4a39d80c126ab650bebc3c10c", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "treeHash": "ca14199cabdfe1a06a7b1654c76ed49100a689f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1713361204, - "owner": "cachix", - "repo": "devenv-nixpkgs", - "rev": "285676e87ad9f0ca23d8714a6ab61e7e027020c6", - "treeHash": "50354b35a3e0277d4a83a0a88fa0b0866b5f392f", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "rolling", - "repo": "devenv-nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1714531828, - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0638fe2715d998fa81d173aad264eb671ce2ebc1", - "treeHash": "f72314bde6c77cbdf35f68581c4758f9ff28461f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "gitignore": "gitignore", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1714478972, - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "2849da033884f54822af194400f8dff435ada242", - "treeHash": "578180deb59a545b0032e9a66da4c0c043c5057d", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "root": { - "inputs": { - "devenv": "devenv", - "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "treeHash": "cce81f2a0f0743b2eb61bc2eb6c7adbe2f2c6beb", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/devenv.nix b/devenv.nix deleted file mode 100644 index 63f2d1e..0000000 --- a/devenv.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, lib, config, inputs, ... }: - -let - gems = pkgs.bundlerEnv { - name = "blog-pim"; - gemdir = ./src; - }; -in -{ - packages = [ gems gems.wrappedRuby ]; -} diff --git a/devenv.yaml b/devenv.yaml deleted file mode 100644 index 2457af5..0000000 --- a/devenv.yaml +++ /dev/null @@ -1,14 +0,0 @@ -inputs: - nixpkgs: - url: github:cachix/devenv-nixpkgs/rolling - -# If you're using non-OSS software, you can set allowUnfree to true. -# allowUnfree: true - -# If you're willing to use a package that's vulnerable -# permittedInsecurePackages: -# - "openssl-1.1.1w" - -# If you have more than one devenv you can merge them -#imports: -# - ./backend diff --git a/flake.lock b/flake.lock index 914e223..bc67a31 100644 --- a/flake.lock +++ b/flake.lock @@ -18,22 +18,6 @@ "type": "github" } }, - "nginx": { - "flake": false, - "locked": { - "lastModified": 1713277799, - "narHash": "sha256-VNDzQvUGeh54F3s6SIq6lBrp4RatURzJoJqVorexttA=", - "owner": "nginx", - "repo": "nginx", - "rev": "d8a849ae3c99ee5ca82c9a06074761e937dac6d6", - "type": "github" - }, - "original": { - "owner": "nginx", - "repo": "nginx", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1714076141, @@ -53,7 +37,6 @@ "root": { "inputs": { "flutils": "flutils", - "nginx": "nginx", "nixpkgs": "nixpkgs" } }, diff --git a/flake.nix b/flake.nix index 0ac9ab6..fa4e156 100644 --- a/flake.nix +++ b/flake.nix @@ -4,19 +4,14 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; flutils.url = "github:numtide/flake-utils"; - - nginx = { - url = "github:nginx/nginx"; - flake = false; - }; }; - outputs = { self, nixpkgs, flutils, nginx }: flutils.lib.eachDefaultSystem (system: + outputs = { self, nixpkgs, flutils}: flutils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; gems = pkgs.bundlerEnv { - name = "blog-pim"; + name = "blog"; gemdir = ./src; }; @@ -26,32 +21,11 @@ dontUnpack = true; installPhase = "install -Dm755 ${./patch-feed-date.py} $out/bin/patch-feed-date"; }; - - nginxPort = "80"; - nginxConf = pkgs.writeText "nginx.conf" '' - user nobody nobody; - daemon off; - error_log /dev/stdout info; - pid /dev/null; - events {} - http { - access_log /dev/stdout; - include ${nginx.outPath}/conf/mime.types; - - server { - listen ${nginxPort}; - index index.html; - location / { - root ${self.packages.${system}.static-website}; - } - } - } - ''; in { packages = { static-website = pkgs.stdenv.mkDerivation { - name = "blog-pim"; + name = "blog"; src = ./src; sourceRoot = "src"; @@ -71,28 +45,6 @@ patch-feed-date --file _site/feed.xml > $out/feed.xml ''; }; - - container-image = pkgs.dockerTools.buildLayeredImage { - name = "blog-pim"; - tag = "latest"; - - contents = [ - pkgs.fakeNss - pkgs.nginx - ]; - - extraCommands = '' - mkdir -p tmp/nginx_client_body - mkdir -p var/log/nginx - ''; - - config = { - Cmd = [ "nginx" "-c" nginxConf ]; - ExposedPorts = { - "${nginxPort}/tcp" = { }; - }; - }; - }; }; }); }