Update to 24.11
This commit is contained in:
parent
1d7dd28eed
commit
12428047b8
6 changed files with 48 additions and 15 deletions
20
flake.lock
generated
20
flake.lock
generated
|
|
@ -177,15 +177,15 @@
|
||||||
"lix": {
|
"lix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723503926,
|
"lastModified": 1729298361,
|
||||||
"narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
|
"narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
|
||||||
"rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
|
"rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
|
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"lix-module": {
|
"lix-module": {
|
||||||
|
|
@ -198,15 +198,15 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723510904,
|
"lastModified": 1732605668,
|
||||||
"narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
|
"narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=",
|
||||||
"rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
|
"rev": "f19bd752910bbe3a861c9cad269bd078689d50fe",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/f19bd752910bbe3a861c9cad269bd078689d50fe.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
|
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
|
|
|
||||||
15
flake.nix
15
flake.nix
|
|
@ -17,7 +17,7 @@
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||||
|
|
||||||
lix-module = {
|
lix-module = {
|
||||||
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
|
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -100,7 +100,15 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
nextcloud.deployment = {
|
nextcloud.deployment = {
|
||||||
targetHost = "192.168.1.153";
|
targetHost = "192.168.1.103";
|
||||||
|
tags = [
|
||||||
|
"lxc"
|
||||||
|
"bacco"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
vaultwarden.deployment = {
|
||||||
|
targetHost = "192.168.1.154";
|
||||||
tags = [
|
tags = [
|
||||||
"lxc"
|
"lxc"
|
||||||
"bacco"
|
"bacco"
|
||||||
|
|
@ -125,6 +133,9 @@
|
||||||
|
|
||||||
devShells.${system}.default = pkgs.mkShell {
|
devShells.${system}.default = pkgs.mkShell {
|
||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [
|
||||||
|
cmake
|
||||||
|
pkg-config
|
||||||
|
meson
|
||||||
agenix.packages.${system}.agenix
|
agenix.packages.${system}.agenix
|
||||||
colmena.packages.${system}.colmena
|
colmena.packages.${system}.colmena
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,7 @@
|
||||||
# Starting image for LXC containers on Proxmox
|
# Starting image for LXC containers on Proxmox
|
||||||
|
# How to generate the tarball and upload it to Proxmox:
|
||||||
|
# 1. nix build ".#nixosConfigurations.baseLXC.config.system.build.tarball"
|
||||||
|
# 2. rsync -vzh --progress ./result/tarball/nixos-system-x86_64-linux.tar.xz root@proxmox:/var/lib/vz/template/cache/nixos-system-<NIXOS-VERSION>-x86_64-lxc-template.tar.xz
|
||||||
|
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,14 @@ let
|
||||||
customOverlays
|
customOverlays
|
||||||
];
|
];
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
|
|
||||||
|
# Necessary for Sonarr on arr host
|
||||||
|
config.permittedInsecurePackages = [
|
||||||
|
"aspnetcore-runtime-6.0.36"
|
||||||
|
"aspnetcore-runtime-wrapped-6.0.36"
|
||||||
|
"dotnet-sdk-6.0.428"
|
||||||
|
"dotnet-sdk-wrapped-6.0.428"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
myModule = {
|
myModule = {
|
||||||
|
|
@ -113,12 +121,23 @@ in
|
||||||
# specialArgs = { };
|
# specialArgs = { };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
plex = nixpkgs.lib.nixosSystem {
|
||||||
|
pkgs = pkgs "x86_64-linux";
|
||||||
|
modules = [
|
||||||
|
myModule
|
||||||
|
proxmoxModule
|
||||||
|
./plex
|
||||||
|
agenix.nixosModules.default
|
||||||
|
];
|
||||||
|
# specialArgs = { };
|
||||||
|
};
|
||||||
|
|
||||||
vaultwarden = nixpkgs.lib.nixosSystem {
|
vaultwarden = nixpkgs.lib.nixosSystem {
|
||||||
pkgs = pkgs "x86_64-linux";
|
pkgs = pkgs "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
myModule
|
myModule
|
||||||
proxmoxModule
|
proxmoxModule
|
||||||
./nextcloud
|
./vaultwarden
|
||||||
agenix.nixosModules.default
|
agenix.nixosModules.default
|
||||||
];
|
];
|
||||||
# specialArgs = { };
|
# specialArgs = { };
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
networking.nas-samba-share = {
|
networking.nas-samba-share = {
|
||||||
enable = true;
|
enable = true;
|
||||||
allowUsers = [ config.my.services.plex.user ];
|
allowUsers = [ config.services.plex.user ];
|
||||||
};
|
};
|
||||||
|
|
||||||
virtualisation.proxmox.enable = true;
|
virtualisation.proxmox.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@
|
||||||
|
|
||||||
shellIntegration.enableZshIntegration = true;
|
shellIntegration.enableZshIntegration = true;
|
||||||
|
|
||||||
theme = "Catppuccin-Macchiato";
|
themeFile = "Catppuccin-Macchiato";
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue