Update nixpkgs and home-manager

This removes the need for the `eval "$shellHook"` in `.envrc`
This commit is contained in:
Jack O'Sullivan 2022-04-17 15:53:22 +01:00
parent 0a5d9a809b
commit c02f50e5bc
3 changed files with 7 additions and 11 deletions

4
.envrc
View File

@ -1,6 +1,2 @@
nix_direnv_watch_file devshell/{default,commands,install}.nix nix_direnv_watch_file devshell/{default,commands,install}.nix
use flake use flake
# devshell needs the shellHook to run even when cached
# https://github.com/nix-community/nix-direnv/issues/109
eval "$shellHook"

12
flake.lock generated
View File

@ -136,11 +136,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1645244400, "lastModified": 1650190514,
"narHash": "sha256-o7KCd6ySFZ9/LbS62aTeuFmBWtP7Tt3Q3RcNjYgTgZU=", "narHash": "sha256-BoBvGT71yOfrNDTZQs7+FX0zb4yjMBETgIjtTsdJw+o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0232fe1b75e6d7864fd82b5c72f6646f87838fc3", "rev": "620ed197f3624dafa5f42e61d5c043f39b8df366",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -180,11 +180,11 @@
}, },
"nixpkgs-mine": { "nixpkgs-mine": {
"locked": { "locked": {
"lastModified": 1648933481, "lastModified": 1650206447,
"narHash": "sha256-ziMZ55TOahiD9iO+YfBcAeCm2mT3wfmfZ73UTvuBHhg=", "narHash": "sha256-a4lsuGG0VDHiF19fF9Ig2BDJEXIRdrJ6+vKwPM6Xaso=",
"owner": "devplayer0", "owner": "devplayer0",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5fd6f5662c320506aba548bb03cfd8f63dac2c1a", "rev": "33465cb03e49a17203040e2e74c9a246824c572b",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -1,7 +1,7 @@
{ {
home-manager.homes."dev@castle" = { home-manager.homes."dev@castle" = {
system = "x86_64-linux"; system = "x86_64-linux";
nixpkgs = "unstable"; nixpkgs = "mine";
homeDirectory = "/home/dev"; homeDirectory = "/home/dev";
username = "dev"; username = "dev";