commit 48e33b0b6901ead82e76c3fed868902914f4cdaa
parent 8eb418431bf2442fde34b3e37ac2361b9349f48a
Author: Vincent Demeester <vincent@sbr.pm>
Date: Tue, 2 Jul 2024 15:26:34 +0200
flake: update to 24_05
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat:
2 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -160,7 +160,7 @@
"nixpkgs"
],
"nixpkgs-stable": [
- "nixpkgs-23_11"
+ "nixpkgs-24_05"
]
},
"locked": {
@@ -528,23 +528,23 @@
"type": "github"
}
},
- "home-manager-23_11": {
+ "home-manager-24_05": {
"inputs": {
"nixpkgs": [
- "nixpkgs-23_11"
+ "nixpkgs-24_05"
]
},
"locked": {
- "lastModified": 1717476296,
- "narHash": "sha256-ScHe38Tr+TxGURC17kby4mIIxOG3aJvZWXzPM79UnEk=",
+ "lastModified": 1719827385,
+ "narHash": "sha256-qs+nU20Sm8czHg3bhGCqiH+8e13BJyRrKONW34g3i50=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "095ef64aa3b2ab4a4f1bf07f29997e21e3a5576a",
+ "rev": "391ca6e950c2525b4f853cbe29922452c14eda82",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-23.11",
+ "ref": "release-24.05",
"repo": "home-manager",
"type": "github"
}
@@ -819,18 +819,18 @@
"type": "github"
}
},
- "nixpkgs-23_11": {
+ "nixpkgs-24_05": {
"locked": {
- "lastModified": 1719663039,
- "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=",
+ "lastModified": 1719838683,
+ "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119",
+ "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-23.11",
+ "ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
@@ -1124,12 +1124,12 @@
"emacs-overlay": "emacs-overlay",
"flake-compat": "flake-compat_5",
"home-manager": "home-manager",
- "home-manager-23_11": "home-manager-23_11",
+ "home-manager-24_05": "home-manager-24_05",
"impermanence": "impermanence",
"nixos-hardware": "nixos-hardware",
"nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_3",
- "nixpkgs-23_11": "nixpkgs-23_11",
+ "nixpkgs-24_05": "nixpkgs-24_05",
"nixpkgs-wayland": "nixpkgs-wayland",
"sops-nix": "sops-nix"
}
diff --git a/flake.nix b/flake.nix
@@ -25,7 +25,7 @@
};
};
stableModules = [
- inputs.home-manager-23_11.nixosModules.home-manager
+ inputs.home-manager-24_05.nixosModules.home-manager
];
unstableModules = [
inputs.home-manager.nixosModules.home-manager
@@ -82,12 +82,12 @@
images = {
athena = (self.nixosConfigurations.athena.extendModules {
modules = [
- "${inputs.nixpkgs-23_11}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
+ "${inputs.nixpkgs-24_05}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
];
}).config.system.build.sdImage;
demeter = (self.nixosConfigurations.demeter.extendModules {
modules = [
- "${inputs.nixpkgs-23_11}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
+ "${inputs.nixpkgs-24_05}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
];
}).config.system.build.sdImage;
};
@@ -102,30 +102,29 @@
./systems/hosts/wakasu.nix
];
};
- # Work workstation (unstable)
- aomi = inputs.nixpkgs.lib.nixosSystem {
+ # Servers (stable)
+ aomi = inputs.nixpkgs-24_05.lib.nixosSystem {
system = "x86_64-linux";
- modules = commonModules ++ unstableModules ++ [
+ modules = commonModules ++ stableModules ++ [
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p1-gen3
inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
./systems/hosts/aomi.nix
];
};
- # Servers (stable)
- shikoku = inputs.nixpkgs-23_11.lib.nixosSystem {
+ shikoku = inputs.nixpkgs-24_05.lib.nixosSystem {
system = "x86_64-linux";
modules = commonModules ++ stableModules ++ [
./systems/hosts/shikoku.nix
];
};
- sakhalin = inputs.nixpkgs-23_11.lib.nixosSystem {
+ sakhalin = inputs.nixpkgs-24_05.lib.nixosSystem {
system = "x86_64-linux";
modules = commonModules ++ stableModules ++ [
inputs.nixos-hardware.nixosModules.common-pc-ssd
./systems/hosts/sakhalin.nix
];
};
- kerkouane = inputs.nixpkgs-23_11.lib.nixosSystem {
+ kerkouane = inputs.nixpkgs-24_05.lib.nixosSystem {
system = "x86_64-linux";
modules = commonModules ++ stableModules ++ [
./systems/modules/services/govanityurl.nix
@@ -134,14 +133,14 @@
};
# Raspberry PI
# athena
- athena = inputs.nixpkgs-23_11.lib.nixosSystem {
+ athena = inputs.nixpkgs-24_05.lib.nixosSystem {
system = "aarch64-linux";
modules = commonModules ++ stableModules ++ [
./systems/hosts/athena.nix
];
};
# demeter
- demeter = inputs.nixpkgs-23_11.lib.nixosSystem {
+ demeter = inputs.nixpkgs-24_05.lib.nixosSystem {
system = "aarch64-linux";
modules = commonModules ++ stableModules ++ [
./systems/hosts/demeter.nix
@@ -186,10 +185,10 @@
# nixpkgs
nixpkgs = { type = "github"; owner = "NixOS"; repo = "nixpkgs"; ref = "nixos-unstable"; };
- nixpkgs-23_11 = { type = "github"; owner = "NixOS"; repo = "nixpkgs"; ref = "nixos-23.11"; };
+ nixpkgs-24_05 = { type = "github"; owner = "NixOS"; repo = "nixpkgs"; ref = "nixos-24.05"; };
# Home Manager
home-manager = { type = "github"; owner = "nix-community"; repo = "home-manager"; inputs.nixpkgs.follows = "nixpkgs"; };
- home-manager-23_11 = { type = "github"; owner = "nix-community"; repo = "home-manager"; ref = "release-23.11"; inputs.nixpkgs.follows = "nixpkgs-23_11"; };
+ home-manager-24_05 = { type = "github"; owner = "nix-community"; repo = "home-manager"; ref = "release-24.05"; inputs.nixpkgs.follows = "nixpkgs-24_05"; };
impermanence = { type = "github"; owner = "nix-community"; repo = "impermanence"; };
@@ -198,7 +197,7 @@
emacs-overlay = {
url = "github:nix-community/emacs-overlay";
inputs.nixpkgs.follows = "nixpkgs";
- inputs.nixpkgs-stable.follows = "nixpkgs-23_11";
+ inputs.nixpkgs-stable.follows = "nixpkgs-24_05";
};
sops-nix = {
