From 2b3b2a603caf5c571f3e86b33c393b6901063ca0 Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Fri, 18 Mar 2022 18:00:59 +0100
Subject: [PATCH] Moved recipemd package

---
 flake.nix                      |  3 +++
 home/configurations.nix        |  5 -----
 home/home/pkgs.nix             |  1 +
 nixos/configurations.nix       |  2 ++
 nixos/gorgon/configuration.nix | 27 ++++++++++++++-------------
 outputs.nix                    | 12 +++---------
 overlays/default.nix           |  4 ----
 7 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/flake.nix b/flake.nix
index 0e971c8..10f838b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,6 +25,9 @@
     homePage = {
       url = github:dadada/dadada.li;
     };
+    recipemd = {
+      url = github:dadada/recipemd/nix-flake;
+    };
   };
 
   outputs = { ... } @ args: import ./outputs.nix args;
diff --git a/home/configurations.nix b/home/configurations.nix
index cc457b5..6c2850f 100644
--- a/home/configurations.nix
+++ b/home/configurations.nix
@@ -1,15 +1,11 @@
 { self
 , nixpkgs
 , home-manager
-, nix-doom-emacs
-, nvd
-, scripts
 }@inputs:
 let
   hmConfiguration =
     { homeDirectory ? "/home/dadada"
     , extraModules ? [ ]
-    , overlays ? [ ]
     , system ? "x86_64-linux"
     , username ? "dadada"
     , stateVersion
@@ -21,7 +17,6 @@ let
           config = import ./nixpkgs-config.nix {
             pkgs = nixpkgs;
           };
-          overlays = overlays;
         };
         manual.manpages.enable = false;
       };
diff --git a/home/home/pkgs.nix b/home/home/pkgs.nix
index 3603a3c..92e083f 100644
--- a/home/home/pkgs.nix
+++ b/home/home/pkgs.nix
@@ -71,6 +71,7 @@ with pkgs; [
   python3
   python38Packages.dateutil
   python38Packages.managesieve
+  recipemd
   ripgrep
   rust-analyzer
   rustup
diff --git a/nixos/configurations.nix b/nixos/configurations.nix
index a9559e9..8180186 100644
--- a/nixos/configurations.nix
+++ b/nixos/configurations.nix
@@ -6,12 +6,14 @@
 , nixos-hardware
 , nvd
 , scripts
+, recipemd
 }:
 let adapterModule = system: {
   nixpkgs.overlays = (nixpkgs.lib.attrValues self.overlays) ++ [
     (final: prev: { homePage = homePage.defaultPackage.${system}; })
     (final: prev: { s = scripts; })
     (final: prev: { n = nvd; })
+    (final: prev: { recipemd = recipemd.defaultPackage.${system}; })
   ];
 };
 in
diff --git a/nixos/gorgon/configuration.nix b/nixos/gorgon/configuration.nix
index 3a22e8c..e90efa2 100644
--- a/nixos/gorgon/configuration.nix
+++ b/nixos/gorgon/configuration.nix
@@ -82,6 +82,7 @@ in
   environment.systemPackages = with pkgs; [
     chromium
     ghostscript
+    recipemd
   ];
 
   networking.firewall = {
@@ -133,19 +134,19 @@ in
     ];
   };
 
-  networking.wg-quick.interfaces.mullvad = {
-    address = [ "10.68.15.202/32" "fc00:bbbb:bbbb:bb01::5:fc9/128" ];
-    privateKeyFile = "/var/lib/wireguard/mullvad";
-    peers = [
-      {
-        publicKey = "BLNHNoGO88LjV/wDBa7CUUwUzPq/fO2UwcGLy56hKy4=";
-        allowedIPs = [ "0.0.0.0/0" "::0/0" ];
-        endpoint = "193.27.14.98:3152";
-        persistentKeepalive = 25;
-      }
-    ];
-    postUp = "${pkgs.iproute2}/bin/ip rule add to 193.27.14.98 lookup main";
-  };
+  #networking.wg-quick.interfaces.mullvad = {
+  #  address = [ "10.68.15.202/32" "fc00:bbbb:bbbb:bb01::5:fc9/128" ];
+  #  privateKeyFile = "/var/lib/wireguard/mullvad";
+  #  peers = [
+  #    {
+  #      publicKey = "Ec/wwcosVal9Kjc97ZuTTV7Dy5c0/W5iLet7jrSEm2k=";
+  #      allowedIPs = [ "0.0.0.0/0" "::0/0" ];
+  #      endpoint = "193.27.14.66:51820";
+  #      persistentKeepalive = 25;
+  #    }
+  #  ];
+  #  postUp = "${pkgs.iproute2}/bin/ip rule add to 193.27.14.66 lookup main";
+  #};
 
   hardware.opengl = {
     enable = true;
diff --git a/outputs.nix b/outputs.nix
index b602aac..9e67dfb 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -8,6 +8,7 @@
 , nixos-hardware
 , nvd
 , scripts
+, recipemd
 , ...
 }@inputs:
 (flake-utils.lib.eachDefaultSystem (system:
@@ -44,22 +45,15 @@
         $link/activate
       '');
     };
-    apps.recipemd = {
-      type = "app";
-      program = "${selfPkgs.recipemd}/bin/recipemd";
-    };
     devShell = pkgs.callPackage ./shell.nix { };
-    packages = flake-utils.lib.flattenTree {
-      recipemd = pkgs.python3Packages.toPythonApplication python3Packages.recipemd;
-    };
   })) // {
   hmConfigurations = import ./home/configurations.nix {
-    inherit self nixpkgs home-manager nix-doom-emacs nvd scripts;
+    inherit self nixpkgs home-manager recipemd;
   };
   hmModules = import ./home/modules inputs;
   nixosConfigurations = import ./nixos/configurations.nix {
     nixosSystem = nixpkgs.lib.nixosSystem;
-    inherit self nixpkgs home-manager nixos-hardware nvd scripts homePage;
+    inherit self nixpkgs home-manager nixos-hardware nvd scripts homePage recipemd;
   };
   nixosModules = import ./nixos/modules inputs;
   overlays = import ./overlays;
diff --git a/overlays/default.nix b/overlays/default.nix
index ef7b17c..f902e63 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -2,8 +2,4 @@ let
   python3Packages = import ./python3-packages.nix;
 in
 {
-  #tubslatex = import ./tubslatex.nix;
-  recipemd = final: prev: {
-    recipemd = prev.python3Packages.toPythonApplication prev.python3Packages.recipemd;
-  };
 }