diff --git a/README.md b/README.md index f256df6..82c340d 100644 --- a/README.md +++ b/README.md @@ -24,11 +24,3 @@ $ ./tf.sh apply $ cd ./targets/web01 $ ./tf.sh apply ``` - -## To update the website - -``` -$ cd ./targets/web01 -$ nix flake lock --update-input homepage --commit-lock-file -$ ./tf.sh apply -``` diff --git a/flake.lock b/flake.lock index ada95a5..2da7a9e 100644 --- a/flake.lock +++ b/flake.lock @@ -40,29 +40,6 @@ "type": "github" } }, - "homepage": { - "inputs": { - "flake-parts": [ - "flake-parts" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1689268066, - "narHash": "sha256-WyQEy6BB33liJy2BbTTCfmYVw3Ai/LxbOua2fM2Eyw4=", - "ref": "refs/heads/main", - "rev": "72d688391adaddad89bacbd2e6d373cbed5ff13f", - "revCount": 16, - "type": "git", - "url": "https://git.clan.lol/clan/clan-homepage" - }, - "original": { - "type": "git", - "url": "https://git.clan.lol/clan/clan-homepage" - } - }, "lowdown-src": { "flake": false, "locked": { @@ -123,7 +100,6 @@ "inputs": { "disko": "disko", "flake-parts": "flake-parts", - "homepage": "homepage", "nix": "nix", "nixpkgs": "nixpkgs", "sops-nix": "sops-nix", diff --git a/flake.nix b/flake.nix index 4e7aad9..e457ba1 100644 --- a/flake.nix +++ b/flake.nix @@ -17,10 +17,6 @@ disko.url = "github:nix-community/disko"; disko.inputs.nixpkgs.follows = "nixpkgs"; - homepage.url = "git+https://git.clan.lol/clan/clan-homepage"; - homepage.inputs.nixpkgs.follows = "nixpkgs"; - homepage.inputs.flake-parts.follows = "flake-parts"; - sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.inputs.nixpkgs-stable.follows = ""; @@ -74,7 +70,6 @@ ])) ]; }; - homepage = inputs'.homepage.packages.default; inherit (pkgs.callPackage ./pkgs/renovate { }) renovate; } // lib.optionalAttrs (!pkgs.stdenv.isDarwin) { gitea = pkgs.callPackage ./pkgs/gitea { }; diff --git a/modules/web01/homepage.nix b/modules/web01/homepage.nix index 2ca625c..66c0a94 100644 --- a/modules/web01/homepage.nix +++ b/modules/web01/homepage.nix @@ -6,7 +6,8 @@ virtualHosts."clan.lol" = { forceSSL = true; enableACME = true; - root = self.inputs.homepage.packages.${pkgs.system}.default; + # to be deployed via rsync + root = "/var/www"; extraConfig = '' charset utf-8; source_charset utf-8;