Nix format
This commit is contained in:
parent
8fdef84eb2
commit
f18cd49b01
7 changed files with 70 additions and 64 deletions
15
flake.nix
15
flake.nix
|
@ -61,7 +61,10 @@
|
|||
nixosConfigurations = {
|
||||
smolboi = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit inputs; inherit pkgs-unstable; };
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
inherit pkgs-unstable;
|
||||
};
|
||||
modules = [
|
||||
stylix.nixosModules.stylix
|
||||
impermanence.nixosModules.impermanence
|
||||
|
@ -82,7 +85,10 @@
|
|||
};
|
||||
zeus = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit inputs; inherit pkgs-unstable; };
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
inherit pkgs-unstable;
|
||||
};
|
||||
modules = [
|
||||
impermanence.nixosModules.impermanence
|
||||
./systems/zeus/configuration.nix
|
||||
|
@ -95,7 +101,10 @@
|
|||
};
|
||||
orangepihole = nixpkgs.lib.nixosSystem {
|
||||
system = "aarch64-linux";
|
||||
specialArgs = { inherit inputs; inherit pkgs-unstable; };
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
inherit pkgs-unstable;
|
||||
};
|
||||
modules = [
|
||||
impermanence.nixosModules.impermanence
|
||||
./systems/orangepihole/configuration.nix
|
||||
|
|
|
@ -2,8 +2,7 @@
|
|||
let
|
||||
inherit (lib) mkIf mkEnableOption mkOption types;
|
||||
cfg = config.services.zwave-js-ui;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.services.zwave-js-ui = {
|
||||
enable = mkEnableOption "zwave-js-ui";
|
||||
store = mkOption {
|
||||
|
|
|
@ -4,19 +4,21 @@ let
|
|||
arch = "x64";
|
||||
hash = "sha256:04vg1s86krg7baifcpnqr5zg6jd6nfw0jhjsq09zzpxwg5skxlf7";
|
||||
version = "7.2.1";
|
||||
in
|
||||
{
|
||||
in {
|
||||
recyclarr = prev.recyclarr.overrideAttrs (old: {
|
||||
inherit version;
|
||||
name = "recyclarr-${version}";
|
||||
src = prev.fetchurl {
|
||||
url = "https://github.com/recyclarr/recyclarr/releases/download/v${version}/recyclarr-${os}-${arch}.tar.xz";
|
||||
url =
|
||||
"https://github.com/recyclarr/recyclarr/releases/download/v${version}/recyclarr-${os}-${arch}.tar.xz";
|
||||
inherit hash;
|
||||
};
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/recyclarr \
|
||||
--prefix PATH : ${prev.lib.makeBinPath [ prev.git ]} \
|
||||
--prefix LD_LIBRARY_PATH : ${prev.lib.makeLibraryPath [prev.icu prev.openssl prev.zlib]}
|
||||
--prefix LD_LIBRARY_PATH : ${
|
||||
prev.lib.makeLibraryPath [ prev.icu prev.openssl prev.zlib ]
|
||||
}
|
||||
'';
|
||||
});
|
||||
}
|
||||
|
|
|
@ -1,4 +1 @@
|
|||
final: prev:
|
||||
{
|
||||
zwave-js-ui = ( prev.callPackage ../pkgs/zwave-js-ui.nix {} );
|
||||
}
|
||||
final: prev: { zwave-js-ui = (prev.callPackage ../pkgs/zwave-js-ui.nix { }); }
|
||||
|
|
|
@ -37,12 +37,8 @@
|
|||
allowUnfree = true;
|
||||
permittedInsecurePackages = [ "electron-25.9.0" "nix-2.16.2" ];
|
||||
packageOverrides = pkgs: {
|
||||
steam = pkgs.steam.override {
|
||||
extraPkgs = pkgs:
|
||||
with pkgs; [
|
||||
winetricks
|
||||
];
|
||||
};
|
||||
steam =
|
||||
pkgs.steam.override { extraPkgs = pkgs: with pkgs; [ winetricks ]; };
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -132,7 +132,11 @@
|
|||
};
|
||||
jellyfin = {
|
||||
image = "lscr.io/linuxserver/jellyfin:latest";
|
||||
volumes = [ "jellyfin-config:/config" "/video-data/media:/data/media" "jellyfin-tailscale:/var/lib/tailscale"];
|
||||
volumes = [
|
||||
"jellyfin-config:/config"
|
||||
"/video-data/media:/data/media"
|
||||
"jellyfin-tailscale:/var/lib/tailscale"
|
||||
];
|
||||
environment = {
|
||||
DOCKER_MODS = "ghcr.io/tailscale-dev/docker-mod:main";
|
||||
TAILSCALE_STATE_DIR = "/var/lib/tailscale";
|
||||
|
@ -165,8 +169,7 @@
|
|||
swag_url = "zwave.icanttype.org";
|
||||
swag_port = "8091";
|
||||
};
|
||||
extraOptions =
|
||||
[ "--network=www" "--device=/dev/ttyACM0:/dev/zwave" ];
|
||||
extraOptions = [ "--network=www" "--device=/dev/ttyACM0:/dev/zwave" ];
|
||||
};
|
||||
homeassistant = {
|
||||
image = "lscr.io/linuxserver/homeassistant:latest";
|
||||
|
|
Loading…
Reference in a new issue