Skip to content

Commit 090f307

Browse files
authored
feat: upgrade to nixpkgs 24.05 (#23)
* feat: upgrade to 24.05 * fix: replace pinentryFlavor with pinentryPackage * fix: autosuggestion has been renamed * feat: enable nix-direnv of direnv
1 parent f3f2e41 commit 090f307

File tree

7 files changed

+31
-26
lines changed

7 files changed

+31
-26
lines changed

flake.lock

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33

44
inputs = {
55
# Nixpkgs
6-
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
6+
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
77

88
# Nixpkgs unstable
99
# pull request: https://github.com/NixOS/nixpkgs/pull/311047
1010
nixpkgs-unstable.url = "github:nixos/nixpkgs/817c3eccc985907e3cf8137232aa9a9715f695c8";
1111

1212
# Home manager
13-
home-manager.url = "github:nix-community/home-manager/release-23.11";
13+
home-manager.url = "github:nix-community/home-manager/release-24.05";
1414
home-manager.inputs.nixpkgs.follows = "nixpkgs";
1515

1616
# NixOS WSL
17-
nixos-wsl.url = "github:nix-community/nixos-wsl/2311.5.3";
17+
nixos-wsl.url = "github:nix-community/nixos-wsl/2405.5.4";
1818
};
1919

2020
outputs =

home-manager/common/default.nix

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@
4848
};
4949
};
5050
programs.command-not-found.enable = true;
51-
programs.direnv.enable = true;
51+
programs.direnv = {
52+
enable = true;
53+
nix-direnv.enable = true;
54+
};
5255
programs.fzf.enable = true;
5356
programs.gh = {
5457
enable = true;
@@ -115,7 +118,9 @@
115118
};
116119
programs.zsh = {
117120
enable = true;
118-
enableAutosuggestions = true;
121+
autosuggestion = {
122+
enable = true;
123+
};
119124
initExtraFirst = ''
120125
source $HOME/.p10k.zsh
121126
${builtins.readFile ./zsh/instant-prompt.zsh}

home-manager/darwin/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
systemd.user.startServices = "sd-switch";
5353

5454
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
55-
home.stateVersion = "23.11";
55+
home.stateVersion = "24.05";
5656

5757
home.file."Brewfile".text = (builtins.readFile ./Brewfile);
5858
home.file."Brewfile.lock.json".text = (builtins.readFile ./Brewfile.lock.json);

home-manager/linux/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@
5252
systemd.user.startServices = "sd-switch";
5353

5454
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
55-
home.stateVersion = "23.11";
55+
home.stateVersion = "24.05";
5656

5757
services.gpg-agent = {
5858
enable = true;
5959
enableZshIntegration = false;
6060
defaultCacheTtl = 86400; # 1 day
6161
enableSshSupport = true;
6262
maxCacheTtl = 604800; # 1 week
63-
pinentryFlavor = "curses";
63+
pinentryPackage = pkgs.pinentry-curses;
6464
};
6565
services.syncthing.enable = true;
6666
}

hosts/vm/configuration.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
};
9292

9393
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
94-
system.stateVersion = "23.11";
94+
system.stateVersion = "24.05";
9595

9696
programs.zsh.enable = true;
9797
users.defaultUserShell = pkgs.zsh;

hosts/wsl/configuration.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# this value at the release version of the first install of this system.
2323
# Before changing this value read the documentation for this option
2424
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
25-
system.stateVersion = "23.11"; # Did you read the comment?
25+
system.stateVersion = "24.05"; # Did you read the comment?
2626

2727
# NOTE: error: Neither nixpkgs.hostPlatform nor the legacy option nixpkgs.system has been set.
2828
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

0 commit comments

Comments
 (0)