From 12428047b80f89659b3466055b5fda987249a8f0 Mon Sep 17 00:00:00 2001 From: pazpi Date: Tue, 24 Dec 2024 15:09:59 +0100 Subject: [PATCH] Update to 24.11 --- flake.lock | 20 ++++++++++---------- flake.nix | 15 +++++++++++++-- hosts/base-lxc.nix | 3 +++ hosts/default.nix | 21 ++++++++++++++++++++- hosts/plex/default.nix | 2 +- modules/home/kitty.nix | 2 +- 6 files changed, 48 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 9069fbc..4f35633 100644 --- a/flake.lock +++ b/flake.lock @@ -177,15 +177,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1723503926, - "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=", - "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2", + "lastModified": 1729298361, + "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=", + "rev": "ad9d06f7838a25beec425ff406fe68721fef73be", "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": { "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": { @@ -198,15 +198,15 @@ ] }, "locked": { - "lastModified": 1723510904, - "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=", - "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140", + "lastModified": 1732605668, + "narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=", + "rev": "f19bd752910bbe3a861c9cad269bd078689d50fe", "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": { "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": { diff --git a/flake.nix b/flake.nix index be27f86..d50371b 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; 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"; }; @@ -100,7 +100,15 @@ }; nextcloud.deployment = { - targetHost = "192.168.1.153"; + targetHost = "192.168.1.103"; + tags = [ + "lxc" + "bacco" + ]; + }; + + vaultwarden.deployment = { + targetHost = "192.168.1.154"; tags = [ "lxc" "bacco" @@ -125,6 +133,9 @@ devShells.${system}.default = pkgs.mkShell { buildInputs = with pkgs; [ + cmake + pkg-config + meson agenix.packages.${system}.agenix colmena.packages.${system}.colmena ]; diff --git a/hosts/base-lxc.nix b/hosts/base-lxc.nix index 02c7b03..1b50473 100644 --- a/hosts/base-lxc.nix +++ b/hosts/base-lxc.nix @@ -1,4 +1,7 @@ # 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--x86_64-lxc-template.tar.xz { config, diff --git a/hosts/default.nix b/hosts/default.nix index b0a73d6..c088d36 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -27,6 +27,14 @@ let customOverlays ]; 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 = { @@ -113,12 +121,23 @@ in # specialArgs = { }; }; + plex = nixpkgs.lib.nixosSystem { + pkgs = pkgs "x86_64-linux"; + modules = [ + myModule + proxmoxModule + ./plex + agenix.nixosModules.default + ]; + # specialArgs = { }; + }; + vaultwarden = nixpkgs.lib.nixosSystem { pkgs = pkgs "x86_64-linux"; modules = [ myModule proxmoxModule - ./nextcloud + ./vaultwarden agenix.nixosModules.default ]; # specialArgs = { }; diff --git a/hosts/plex/default.nix b/hosts/plex/default.nix index 5193026..f3e8cae 100644 --- a/hosts/plex/default.nix +++ b/hosts/plex/default.nix @@ -16,7 +16,7 @@ networking.nas-samba-share = { enable = true; - allowUsers = [ config.my.services.plex.user ]; + allowUsers = [ config.services.plex.user ]; }; virtualisation.proxmox.enable = true; diff --git a/modules/home/kitty.nix b/modules/home/kitty.nix index 77c86bc..d5424c8 100644 --- a/modules/home/kitty.nix +++ b/modules/home/kitty.nix @@ -31,7 +31,7 @@ shellIntegration.enableZshIntegration = true; - theme = "Catppuccin-Macchiato"; + themeFile = "Catppuccin-Macchiato"; }; }