WIP: upgrade to 24.11
This commit is contained in:
parent
d665d679bb
commit
90bbc2a03c
10 changed files with 56 additions and 181 deletions
66
flake.nix
66
flake.nix
|
|
@ -4,10 +4,10 @@
|
|||
inputs = {
|
||||
flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz";
|
||||
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
|
||||
nixpkgs-u.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-24.05";
|
||||
url = "github:nix-community/home-manager/release-24.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
home-manager-u = {
|
||||
|
|
@ -49,6 +49,10 @@
|
|||
extraOptions = "experimental-features = nix-command flakes";
|
||||
permittedInsecurePackages = [
|
||||
"electron-27.3.11" # LogSeq
|
||||
"aspnetcore-runtime-6.0.36" # Sonarr
|
||||
"aspnetcore-runtime-wrapped-6.0.36" # Sonarr
|
||||
"dotnet-sdk-6.0.428" # Sonarr
|
||||
"dotnet-sdk-wrapped-6.0.428" # Sonarr
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -118,6 +122,7 @@
|
|||
};
|
||||
}
|
||||
|
||||
{ services.userborn.enable = true; }
|
||||
./modules/nixos/users/bertof.nix
|
||||
|
||||
# Some basic defaults
|
||||
|
|
@ -171,6 +176,7 @@
|
|||
};
|
||||
|
||||
devShells.default = pkgs.mkShell {
|
||||
buildInputs = [ pkgs.deploy-rs ];
|
||||
shellHook = ''
|
||||
${config.pre-commit.installationScript}
|
||||
LOCAL_KEY = "/etc/nix/key";
|
||||
|
|
@ -416,36 +422,36 @@
|
|||
home-manager.users.tiziano = import ./instances/loki/hm_tiziano.nix;
|
||||
}];
|
||||
};
|
||||
};
|
||||
|
||||
# # Deploy-rs checks
|
||||
# checks = builtins.mapAttrs (_system: deployLib: deployLib.deployChecks inputs.self.deploy) inputs.deploy-rs.lib;
|
||||
# # Deploy-rs checks
|
||||
# checks = builtins.mapAttrs (_system: deployLib: deployLib.deployChecks inputs.self.deploy) inputs.deploy-rs.lib;
|
||||
|
||||
# Map nodes to Deploy-rs deployments
|
||||
deploy.nodes = {
|
||||
baldur = {
|
||||
hostname = "baldur.bertof.net";
|
||||
profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.baldur; };
|
||||
};
|
||||
freya = {
|
||||
hostname = "freya.tsn";
|
||||
profiles.system = { user = "root"; path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos inputs.self.nixosConfigurations.freya; };
|
||||
};
|
||||
heimdall = {
|
||||
hostname = "heimdall.tsn";
|
||||
profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.heimdall; };
|
||||
};
|
||||
loki = {
|
||||
hostname = "loki.tsn";
|
||||
profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.loki; };
|
||||
};
|
||||
odin = {
|
||||
hostname = "odin.tsn";
|
||||
profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.odin; };
|
||||
};
|
||||
thor = {
|
||||
hostname = "thor.tsn";
|
||||
profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.thor; };
|
||||
};
|
||||
# Map nodes to Deploy-rs deployments
|
||||
deploy.nodes = {
|
||||
baldur = {
|
||||
hostname = "baldur.bertof.net";
|
||||
profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.baldur; };
|
||||
};
|
||||
freya = {
|
||||
hostname = "freya.tsn";
|
||||
profiles.system = { user = "root"; path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos inputs.self.nixosConfigurations.freya; };
|
||||
};
|
||||
heimdall = {
|
||||
hostname = "heimdall.tsn";
|
||||
profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.heimdall; };
|
||||
};
|
||||
loki = {
|
||||
hostname = "loki.tsn";
|
||||
profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.loki; };
|
||||
};
|
||||
odin = {
|
||||
hostname = "odin.tsn";
|
||||
profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.odin; };
|
||||
};
|
||||
thor = {
|
||||
hostname = "thor.tsn";
|
||||
profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.thor; };
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue