From 7490393c5f0f029f560c0b07436cfa91a9b48b4e Mon Sep 17 00:00:00 2001
From: mawalu <web@mawalabs.de>
Date: Fri, 20 May 2022 15:31:42 +0200
Subject: [PATCH] Fix shell setup

---
 flake.lock | 19 +++++++++----------
 flake.nix  | 14 ++++++++------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index 94f7edf..f264a9a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -4,25 +4,24 @@
       "locked": {
         "lastModified": 1649676176,
         "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
-        "owner": "numtide",
-        "repo": "flake-utils",
+        "ref": "master",
         "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
-        "type": "github"
+        "revCount": 49,
+        "type": "git",
+        "url": "https://g.m5w.de/mawalu/flake-utils"
       },
       "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
-        "type": "github"
+        "type": "git",
+        "url": "https://g.m5w.de/mawalu/flake-utils"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1651495557,
-        "narHash": "sha256-LtdjPfRx0JdMnNcViZ/NpqCX/v3HE7SP0P/Ipf2AVtk=",
+        "lastModified": 1652261291,
+        "narHash": "sha256-ix8or/Evw+c9oinsqKsE3t/GXkz01Br0xv1ICS5Hrsw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2379d9d0595d269577187053b1cdfd1e0f731894",
+        "rev": "676e4d42d68a26b758e47981bd4b2df8da1cec94",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 6e6ad10..aa55649 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,13 +2,14 @@
   description = "Webdev flake";
 
   inputs.nixpkgs.url = "github:NixOS/nixpkgs";
-  inputs.flake-utils.url = "github:numtide/flake-utils?rev=a4b154ebbdc88c8498a5c7b01589addc9e9cb678";
+  inputs.flake-utils.url = "git+https://g.m5w.de/mawalu/flake-utils";
+  inputs.flake-utils.inputs.nixpkgs.follows = "nixpkgs";
 
   outputs = { self, nixpkgs, flake-utils }: 
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
-        inputs =  with pkgs; [
+        inputs = with pkgs; [
           nodejs nodePackages.npm nodePackages.yarn
           git gnupg vim less openssh
         ];
@@ -16,12 +17,12 @@
           extensions = { enabled, all }: enabled ++ [ all.imagick all.redis ]; 
           extraConfig = "memory_limit = 2G";
         }; in [ php php.packages.composer ];
-        devShell = config: pkgs.mkShell {
+        devShell = config: pkgs.mkShell ({
            shellHook = ''
               cd $DEVSHELL_OLDPWD
               exec bwbox --profile dev zsh
             '';
-        } // config;
+        } // config);
       in {
         devShells = {
           php74 = devShell {
@@ -40,12 +41,13 @@
             buildInputs = 
             let
                 python = pkgs.python310.withPackages (p: with p; [
-                  requests
                   pip
+                  pwntools
+                  requests
                   setuptools
             ]);
             in
-              with pkgs; inputs ++ [ python curl ];
+              with pkgs; inputs ++ [ python curl pwndbg metasploit john gobuster nmap ];
           };
         };
       }