Skip to content
This repository was archived by the owner on Jul 6, 2024. It is now read-only.

Commit 82442a2

Browse files
committed
feat!: Update nixpkgs ( nixos-23.11 → nixos-24.05 )
1 parent 0e06f42 commit 82442a2

File tree

8 files changed

+19
-18
lines changed

8 files changed

+19
-18
lines changed

flake.nix

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

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

99
# Home manager
1010
home-manager = {
11-
url = "github:nix-community/home-manager/release-23.11";
11+
url = "github:nix-community/home-manager/release-24.05";
1212
inputs.nixpkgs.follows = "nixpkgs";
1313
};
1414

@@ -26,7 +26,7 @@
2626

2727
# NixVim
2828
nixvim = {
29-
url = "github:nix-community/nixvim/nixos-23.11";
29+
url = "github:nix-community/nixvim/nixos-24.05";
3030
inputs.nixpkgs.follows = "nixpkgs";
3131
};
3232

homes/_modules/development/utilities/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ in
1313
home.packages = with pkgs; [
1414
cue
1515
nixd
16-
nixfmt
16+
nixfmt-rfc-style
1717
nodePackages.prettier
1818
pre-commit
1919
shellcheck

homes/_modules/kubernetes/k9s/default.nix

-4
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ in
8383
};
8484
};
8585
};
86-
87-
# TODO: Remove tihs jank when home-manager 24.05 becomes stable
88-
xdg.configFile."k9s/aliases.yaml".source = config.lib.file.mkOutOfStoreSymlink "${config.xdg.configHome}/k9s/aliases.yml";
89-
xdg.configFile."k9s/config.yaml".source = config.lib.file.mkOutOfStoreSymlink "${config.xdg.configHome}/k9s/config.yml";
9086
})
9187
];
9288
}

homes/_modules/kubernetes/kubecm/default.nix

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
}:
77
let
88
cfg = config.modules.kubernetes;
9-
package = pkgs.unstable.kubecm.overrideAttrs (_: prev: {
10-
meta = prev.meta // {
11-
mainProgram = "kubecm";
12-
};
13-
});
9+
package = pkgs.unstable.kubecm;
1410
in
1511
{
1612
config = lib.mkMerge [

homes/_modules/shell/eza/default.nix

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ _:
77
extraOptions = [
88
"--group"
99
];
10-
enableAliases = true;
10+
enableBashIntegration = true;
11+
enableFishIntegration = true;
1112
};
1213
};
1314
}

homes/_modules/shell/mise/default.nix

+8-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@ let
1010
tomlFormat = pkgs.formats.toml { };
1111
in
1212
{
13-
# TODO: Replace with official home manager module once available
1413
options.modules.shell.mise = {
1514
enable = lib.mkEnableOption "mise";
1615
package = lib.mkPackageOption pkgs "mise" { };
16+
globalConfig = lib.mkOption {
17+
inherit (tomlFormat) type;
18+
default = { };
19+
};
1720
settings = lib.mkOption {
1821
inherit (tomlFormat) type;
1922
default = { };
@@ -27,7 +30,10 @@ in
2730
];
2831

2932
xdg.configFile = {
30-
"mise/settings.toml" = {
33+
"mise/config.toml" = lib.mkIf (cfg.globalConfig != { }) {
34+
source = tomlFormat.generate "mise-config" cfg.globalConfig;
35+
};
36+
"mise/settings.toml" = lib.mkIf (cfg.settings != { }) {
3137
source = tomlFormat.generate "mise-settings" (
3238
{
3339
experimental = true;

homes/todd/config/editor/nvim/colorschemes/catppuccin-macchiato.nix

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
colorschemes = {
44
catppuccin = {
55
enable = true;
6-
flavour = "macchiato";
6+
settings = {
7+
flavour = "macchiato";
8+
};
79
};
810
};
911
};

homes/todd/config/editor/nvim/options.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
_:
22
{
33
config = {
4-
options = {
4+
opts = {
55
updatetime = 100; # Faster completion
66
swapfile = false; # Disable the swap file
77

0 commit comments

Comments
 (0)