aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Picciano <me@mediocregopher.com>2024-10-31 16:35:37 +0100
committerBrian Picciano <me@mediocregopher.com>2024-10-31 16:36:13 +0100
commit695cd4c58fb146933ed02e61db8f553f7f9bf419 (patch)
tree3e7fa672de845a578d8544500cce0a586a5d2f91
parent1372a5b5bc46ef2e204d787c83a17a81ffbde756 (diff)
Swap default.nix for shell.nix
-rw-r--r--README.md2
-rw-r--r--default.nix25
-rw-r--r--shell.nix24
3 files changed, 25 insertions, 26 deletions
diff --git a/README.md b/README.md
index 96ebbfe..010bca1 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ A nix-based development environment is provided with the correct versions of all
development dependencies. It can be activated by doing:
```bash
-nix-shell -A shell
+nix-shell
```
The `./cmd/mediocre-caddy` binary package can be used to run a Caddy instance
diff --git a/default.nix b/default.nix
deleted file mode 100644
index 7100b90..0000000
--- a/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- pkgsSrc ? builtins.fetchTarball {
- name = "nixpkgs-24.05";
- url = "https://github.com/NixOS/nixpkgs/archive/5646423bfac84ec68dfc60f2a322e627ef0d6a95.tar.gz";
- sha256 = "sha256:1lr1h35prqkd1mkmzriwlpvxcb34kmhc9dnr48gkm8hh089hifmx";
- },
-}: let
- pkgs = (import pkgsSrc) {};
-in {
- shell = pkgs.mkShell {
- name = "project-shell";
- buildInputs = [
- pkgs.go
- pkgs.golangci-lint
- pkgs.xcaddy
- pkgs.caddy
- ];
- shellHook = ''
- mkdir -p .dev-home
- echo '*' > .dev-home/.gitignore
- export XDG_CONFIG_HOME=$(pwd)/.dev-home/config
- export XDG_DATA_HOME=$(pwd)/.dev-home/data
- '';
- };
-}
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 0000000..9ef92c9
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,24 @@
+{
+ pkgsSrc ? builtins.fetchTarball {
+ name = "nixpkgs-24.05";
+ url = "https://github.com/NixOS/nixpkgs/archive/5646423bfac84ec68dfc60f2a322e627ef0d6a95.tar.gz";
+ sha256 = "sha256:1lr1h35prqkd1mkmzriwlpvxcb34kmhc9dnr48gkm8hh089hifmx";
+ },
+}: let
+ pkgs = (import pkgsSrc) {};
+in pkgs.mkShell {
+ name = "project-shell";
+ buildInputs = [
+ pkgs.go
+ pkgs.golangci-lint
+ pkgs.gopls
+ pkgs.xcaddy
+ pkgs.caddy
+ ];
+ shellHook = ''
+ mkdir -p .dev-home
+ echo '*' > .dev-home/.gitignore
+ export XDG_CONFIG_HOME=$(pwd)/.dev-home/config
+ export XDG_DATA_HOME=$(pwd)/.dev-home/data
+ '';
+}