mawalu
/
devshells
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix shell setup

This commit is contained in:
Martin 2022-05-20 15:31:42 +02:00
parent b882aea046
commit 7490393c5f
Signed by: mawalu
GPG Key ID: BF556F989760A7C8
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
flake.lock
View File

@ -4,25 +4,24 @@
"locked": { "locked": {
"lastModified": 1649676176, "lastModified": 1649676176,
"narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
"owner": "numtide", "ref": "master",
"repo": "flake-utils",
"rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
"type": "github" "revCount": 49,
"type": "git",
"url": "https://g.m5w.de/mawalu/flake-utils"
}, },
"original": { "original": {
"owner": "numtide", "type": "git",
"repo": "flake-utils", "url": "https://g.m5w.de/mawalu/flake-utils"
"rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
"type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1651495557, "lastModified": 1652261291,
"narHash": "sha256-LtdjPfRx0JdMnNcViZ/NpqCX/v3HE7SP0P/Ipf2AVtk=", "narHash": "sha256-ix8or/Evw+c9oinsqKsE3t/GXkz01Br0xv1ICS5Hrsw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2379d9d0595d269577187053b1cdfd1e0f731894", "rev": "676e4d42d68a26b758e47981bd4b2df8da1cec94",
"type": "github" "type": "github"
}, },
"original": { "original": {

14
flake.nix
View File

@ -2,13 +2,14 @@
description = "Webdev flake"; description = "Webdev flake";
inputs.nixpkgs.url = "github:NixOS/nixpkgs"; 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 }: outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem (system: flake-utils.lib.eachDefaultSystem (system:
let let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
inputs = with pkgs; [ inputs = with pkgs; [
nodejs nodePackages.npm nodePackages.yarn nodejs nodePackages.npm nodePackages.yarn
git gnupg vim less openssh git gnupg vim less openssh
]; ];
@ -16,12 +17,12 @@
extensions = { enabled, all }: enabled ++ [ all.imagick all.redis ]; extensions = { enabled, all }: enabled ++ [ all.imagick all.redis ];
extraConfig = "memory_limit = 2G"; extraConfig = "memory_limit = 2G";
}; in [ php php.packages.composer ]; }; in [ php php.packages.composer ];
devShell = config: pkgs.mkShell { devShell = config: pkgs.mkShell ({
shellHook = '' shellHook = ''
cd $DEVSHELL_OLDPWD cd $DEVSHELL_OLDPWD
exec bwbox --profile dev zsh exec bwbox --profile dev zsh
''; '';
} // config; } // config);
in { in {
devShells = { devShells = {
php74 = devShell { php74 = devShell {
@ -40,12 +41,13 @@
buildInputs = buildInputs =
let let
python = pkgs.python310.withPackages (p: with p; [ python = pkgs.python310.withPackages (p: with p; [
requests
pip pip
pwntools
requests
setuptools setuptools
]); ]);
in in
with pkgs; inputs ++ [ python curl ]; with pkgs; inputs ++ [ python curl pwndbg metasploit john gobuster nmap ];
}; };
}; };
} }