add website flake to root

jakeisnt · Jan 2, 2022 · bc8db08 · bc8db08
1 parent 107ba36
commit bc8db08
Show file tree

Hide file tree

Showing 6 changed files with 177 additions and 30 deletions.
diff --git a/default.nix b/default.nix
@@ -8,6 +8,7 @@ with inputs; {
     [
       home-manager.nixosModules.home-manager
       simple-nixos-mailserver.nixosModules.mailserver
+      isntweb-home.nixosModules.isntweb-home
     ]
     # All my personal modules
     ++ (mapModulesRec' (toString ./modules) import);

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -16,6 +16,7 @@
     nixpkgs.url = "nixpkgs/master";
     nixpkgs-unstable.url = "nixpkgs/master";
 
+
     home-manager.url = "github:rycee/home-manager/master";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     nur.url = "github:nix-community/NUR/master";
@@ -44,11 +45,13 @@
       flake = false;
     };
 
+    isntweb-home.url = "github:isntweb/home";
+
     # neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
     # broken too frequently for me to be able to live on the bleeding edge...
   };
 
-  outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, spicetify-nix, doom-emacs, ... }:
+  outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, spicetify-nix, doom-emacs, isntweb-home, ... }:
     let
       inherit (lib) attrValues;
       inherit (lib.my) mapModules mapModulesRec mapHosts;
@@ -82,7 +85,6 @@
       );
     in
       {
-        lib = lib.my;
         overlay = final: prev: {
           unstable = uPkgs;
           my = self.packages."${system}";

diff --git a/hosts/vultr/default.nix b/hosts/vultr/default.nix
@@ -51,4 +51,16 @@ with lib.my; {
     interfaces.ens3.useDHCP = true;
   };
 
+
+  isntweb-home.enable = true;
+
+  services.nginx.virtualHosts = {
+    "isnt.online" = {
+      forceSSL = true;
+      enableACME = true;
+      locations."/" = { proxyPass = "http://127.0.0.1:6200"; };
+    };
+  };
+
+
 }
diff --git a/modules/services/mailserver.nix b/modules/services/mailserver.nix
@@ -8,7 +8,6 @@ let
 in {
   options.modules.services.mailserver = { enable = mkBoolOpt false; };
 
-
   config = mkIf cfg.enable {
     modules.services.acme.enable = true;
     networking.firewall.allowedTCPPorts = [

diff --git a/overlays/x-clipboard.nix b/overlays/x-clipboard.nix
@@ -1,9 +1,9 @@
-self: super: {
-  wl-clipboard-x11 = super.stdenv.mkDerivation rec {
+final: prev: {
+  wl-clipboard-x11 = prev.stdenv.mkDerivation rec {
     pname = "wl-clipboard-x11";
     version = "5";
 
-    src = super.fetchFromGitHub {
+    src = prev.fetchFromGitHub {
       owner = "brunelli";
       repo = "wl-clipboard-x11";
       rev = "v${version}";
@@ -12,10 +12,10 @@ self: super: {
 
     dontBuild = true;
     dontConfigure = true;
-    propagatedBuildInputs = [ super.wl-clipboard ];
+    propagatedBuildInputs = [ prev.wl-clipboard ];
     makeFlags = [ "PREFIX=$(out)" ];
   };
 
-  xsel = self.wl-clipboard-x11;
-  xclip = self.wl-clipboard-x11;
+  xsel = final.wl-clipboard-x11;
+  xclip = final.wl-clipboard-x11;
 }