Moved recipemd package

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;

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;
       };

home/home/pkgs.nix

@@ -71,6 +71,7 @@ with pkgs; [
   python3
   python38Packages.dateutil
   python38Packages.managesieve
+  recipemd
   ripgrep
   rust-analyzer
   rustup

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

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 = {
+  #networking.wg-quick.interfaces.mullvad = {
-    address = [ "10.68.15.202/32" "fc00:bbbb:bbbb:bb01::5:fc9/128" ];
+  #  address = [ "10.68.15.202/32" "fc00:bbbb:bbbb:bb01::5:fc9/128" ];
-    privateKeyFile = "/var/lib/wireguard/mullvad";
+  #  privateKeyFile = "/var/lib/wireguard/mullvad";
-    peers = [
+  #  peers = [
-      {
+  #    {
-        publicKey = "BLNHNoGO88LjV/wDBa7CUUwUzPq/fO2UwcGLy56hKy4=";
+  #      publicKey = "Ec/wwcosVal9Kjc97ZuTTV7Dy5c0/W5iLet7jrSEm2k=";
-        allowedIPs = [ "0.0.0.0/0" "::0/0" ];
+  #      allowedIPs = [ "0.0.0.0/0" "::0/0" ];
-        endpoint = "193.27.14.98:3152";
+  #      endpoint = "193.27.14.66:51820";
-        persistentKeepalive = 25;
+  #      persistentKeepalive = 25;
-      }
+  #    }
-    ];
+  #  ];
-    postUp = "${pkgs.iproute2}/bin/ip rule add to 193.27.14.98 lookup main";
+  #  postUp = "${pkgs.iproute2}/bin/ip rule add to 193.27.14.66 lookup main";
-  };
+  #};
 
   hardware.opengl = {
     enable = true;

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;

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;
-  };
 }