commit 7388889363d46ff5402b73eeaf0be975e6ac3694
parent c64466b13a0ab82be025f9e850b82fb94bbf7c49
Author: Vincent Demeester <vincent@sbr.pm>
Date: Tue, 30 May 2023 17:40:11 +0200
flake: add 23.05 and remove 22.05…
… and try it on shikoku
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat:
| M | flake.lock | | | 54 | +++++++++++++++++++++++++++--------------------------- |
| M | flake.nix | | | 19 | +++++++++---------- |
2 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -336,45 +336,45 @@
"type": "github"
}
},
- "home-manager-22_05": {
+ "home-manager-22_11": {
"inputs": {
"nixpkgs": [
- "nixos-22_05"
- ]
+ "nixos-22_11"
+ ],
+ "utils": "utils"
},
"locked": {
- "lastModified": 1667907331,
- "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=",
+ "lastModified": 1681092193,
+ "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "6639e3a837fc5deb6f99554072789724997bc8e5",
+ "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-22.05",
+ "ref": "release-22.11",
"repo": "home-manager",
"type": "github"
}
},
- "home-manager-22_11": {
+ "home-manager-23_05": {
"inputs": {
"nixpkgs": [
- "nixos-22_11"
- ],
- "utils": "utils"
+ "nixos-23_05"
+ ]
},
"locked": {
- "lastModified": 1681092193,
- "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
+ "lastModified": 1685189510,
+ "narHash": "sha256-Hq5WF7zIixojPgvhgcd6MBvywwycVZ9wpK/8ogOyoaA=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
+ "rev": "2d963854ae2499193c0c72fd67435fee34d3e4fd",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-22.11",
+ "ref": "release-23.05",
"repo": "home-manager",
"type": "github"
}
@@ -447,34 +447,34 @@
"type": "github"
}
},
- "nixos-22_05": {
+ "nixos-22_11": {
"locked": {
- "lastModified": 1682600000,
- "narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=",
+ "lastModified": 1684661732,
+ "narHash": "sha256-2/Xo/UmUUoMXc0T5tzoUsYjMLLMjEfzRWDAQB0WwtW0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0",
+ "rev": "b0671cbf1e5c443f7fbfd4941ee0f8a151435114",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-22.05",
+ "ref": "nixos-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
- "nixos-22_11": {
+ "nixos-23_05": {
"locked": {
- "lastModified": 1684661732,
- "narHash": "sha256-2/Xo/UmUUoMXc0T5tzoUsYjMLLMjEfzRWDAQB0WwtW0=",
+ "lastModified": 1685356226,
+ "narHash": "sha256-f2clSOdqi0SvY1WSgbnl2YgCZmoCXOxeUjYeXp8p2zI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "b0671cbf1e5c443f7fbfd4941ee0f8a151435114",
+ "rev": "0f7f5ca1cdec8dea85bb4fa60378258171d019ad",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-22.11",
+ "ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
@@ -742,12 +742,12 @@
"flake-utils": "flake-utils_3",
"flake-utils-plus": "flake-utils-plus",
"home-manager": "home-manager",
- "home-manager-22_05": "home-manager-22_05",
"home-manager-22_11": "home-manager-22_11",
+ "home-manager-23_05": "home-manager-23_05",
"impermanence": "impermanence",
"nix-hardware": "nix-hardware",
- "nixos-22_05": "nixos-22_05",
"nixos-22_11": "nixos-22_11",
+ "nixos-23_05": "nixos-23_05",
"nixos-hardware": "nixos-hardware",
"nixos-unstable": "nixos-unstable",
"nixos-wsl": "nixos-wsl",
diff --git a/flake.nix b/flake.nix
@@ -16,8 +16,8 @@
# Flake Dependencies
home-manager = { type = "github"; owner = "nix-community"; repo = "home-manager"; inputs.nixpkgs.follows = "nixpkgs"; };
- home-manager-22_05 = { type = "github"; owner = "nix-community"; repo = "home-manager"; ref = "release-22.05"; inputs.nixpkgs.follows = "nixos-22_05"; };
home-manager-22_11 = { type = "github"; owner = "nix-community"; repo = "home-manager"; ref = "release-22.11"; inputs.nixpkgs.follows = "nixos-22_11"; };
+ home-manager-23_05 = { type = "github"; owner = "nix-community"; repo = "home-manager"; ref = "release-23.05"; inputs.nixpkgs.follows = "nixos-23_05"; };
impermanence = { type = "github"; owner = "nix-community"; repo = "impermanence"; };
nixpkgs-wayland = { type = "github"; owner = "nix-community"; repo = "nixpkgs-wayland"; inputs.nixpkgs.follows = "nixpkgs"; };
@@ -53,8 +53,8 @@
# Channels
# FIXME: is it needed or should I just alias nixos-unstable instead
nixpkgs = { type = "github"; owner = "NixOS"; repo = "nixpkgs"; ref = "nixos-unstable"; };
- nixos-22_05 = { type = "github"; owner = "NixOS"; repo = "nixpkgs"; ref = "nixos-22.05"; };
nixos-22_11 = { type = "github"; owner = "NixOS"; repo = "nixpkgs"; ref = "nixos-22.11"; };
+ nixos-23_05 = { type = "github"; owner = "NixOS"; repo = "nixpkgs"; ref = "nixos-23.05"; };
nixos-unstable = { type = "github"; owner = "NixOS"; repo = "nixpkgs"; ref = "nixos-unstable"; };
nixpkgs-unstable = { type = "github"; owner = "NixOS"; repo = "nixpkgs"; ref = "nixpkgs-unstable"; };
};
@@ -65,8 +65,8 @@
, flake-utils-plus
, flake-utils
, home-manager
- , home-manager-22_05
, home-manager-22_11
+ , home-manager-23_05
, emacs-overlay
, chapeau-rouge
, nur
@@ -84,14 +84,14 @@
./systems/modules/virtualisation/buildkit.nix
];
- stableModules_22_05 = [
- home-manager-22_05.nixosModules.home-manager
- ./systems/modules/profiles/docker.nix
- ];
stableModules_22_11 = [
home-manager-22_11.nixosModules.home-manager
./systems/modules/profiles/docker.nix
];
+ stableModules_23_05 = [
+ home-manager-23_05.nixosModules.home-manager
+ ./systems/modules/profiles/docker.nix
+ ];
unstableModules = [
home-manager.nixosModules.home-manager
./systems/modules/profiles/docker.nix
@@ -211,7 +211,6 @@
};
# Work "workstation"
aomi = {
- # channelName = "nixos-22_05";
modules = unstableModules ++ [
nixos-hardware.nixosModules.lenovo-thinkpad-p1-gen3
nixos-hardware.nixosModules.common-pc-laptop-ssd
@@ -220,8 +219,8 @@
};
# Servers
shikoku = {
- channelName = "nixos-22_11";
- modules = stableModules_22_11 ++ [
+ channelName = "nixos-23_05";
+ modules = stableModules_23_05 ++ [
./systems/hosts/shikoku.nix
];
};
