diff --git a/devenv.lock b/devenv.lock index 054e7c6..5e9b0ce 100644 --- a/devenv.lock +++ b/devenv.lock @@ -3,10 +3,10 @@ "devenv": { "locked": { "dir": "src/modules", - "lastModified": 1728037814, + "lastModified": 1730890834, "owner": "cachix", "repo": "devenv", - "rev": "4549e9ea6b9fe90ee5ea6705f7f82f301f464d6b", + "rev": "c5353d1a0483b8f0dc15933de91c6b1b9a892831", "type": "github" }, "original": { @@ -68,10 +68,10 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1727907660, + "lastModified": 1730741070, "owner": "NixOS", "repo": "nixpkgs", - "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -81,6 +81,21 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1730831018, + "owner": "nixos", + "repo": "nixpkgs", + "rev": "8c4dc69b9732f6bbe826b5fbb32184987520ff26", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -91,10 +106,10 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1727854478, + "lastModified": 1730814269, "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5f58871c9657b5fc0a7f65670fe2ba99c26c1d79", + "rev": "d70155fdc00df4628446352fc58adc640cd705c2", "type": "github" }, "original": { @@ -107,6 +122,7 @@ "inputs": { "devenv": "devenv", "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable", "pre-commit-hooks": "pre-commit-hooks" } } diff --git a/devenv.nix b/devenv.nix index fdefc8d..1a2475c 100644 --- a/devenv.nix +++ b/devenv.nix @@ -1,19 +1,21 @@ { pkgs, lib, config, inputs, ... }: - +let + pkgs-unstable = import inputs.nixpkgs-unstable { system = pkgs.stdenv.system; }; +in { - env.GREET = "jmclothingmfr.com dev environment"; - packages = [ pkgs.git pkgs.hugo ]; + languages.nix.enable = true; + languages.javascript.enable = true; + languages.javascript.npm.enable = true; + languages.typescript.enable = true; + languages.go.enable = true; + + packages = [ pkgs.git pkgs-unstable.hugo ]; enterShell = '' git --version ''; enterTest = '' echo "Running tests" - git --version | grep "2.42.0" + git --version | grep --color=auto "${pkgs.git.version}" ''; - languages.nix.enable = true; - languages.javascript.enable = true; - languages.javascript.npm.enable = true; - languages.typescript.enable = true; - # See full reference at https://devenv.sh/reference/options/ } diff --git a/devenv.yaml b/devenv.yaml index 116a2ad..3ba7c00 100644 --- a/devenv.yaml +++ b/devenv.yaml @@ -2,14 +2,10 @@ inputs: nixpkgs: url: github:cachix/devenv-nixpkgs/rolling - -# If you're using non-OSS software, you can set allowUnfree to true. -# allowUnfree: true - -# If you're willing to use a package that's vulnerable + nixpkgs-unstable: + url: github:nixos/nixpkgs/nixpkgs-unstable +allowUnfree: true # permittedInsecurePackages: # - "openssl-1.1.1w" - -# If you have more than one devenv you can merge them #imports: # - ./backend