matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: update flake.lock
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2024-05-11 23:20:45 -04:00
parent 69f6134563
commit 068a005108
7 changed files with 88 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
devices/nos/modules/arion/media/calibre/images/calibre-web.nix
View file

@ -1,8 +1,8 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "ghcr.io/linuxserver/calibre-web";
imageDigest = "sha256:96a7940ff83386017ab42942220312e2c1ddc88245f320d3696f2683e58ebb0e";
sha256 = "0nzy0y6s8s8jcfidni8b49464jayfn9k781ipbzspk6xcrnibksf";
imageDigest = "sha256:699a678b4240d2a2d8bd36630e2fce001e3b1c5bd7f2ae1664e24dda947c3a66";
sha256 = "1pdrj6c641akfk1p66iipffn5sg0qr85yvc6cllrd2jcbs67y4cj";
finalImageName = "ghcr.io/linuxserver/calibre-web";
finalImageTag = "latest";
}

4
devices/nos/modules/arion/media/sonarr/images/sonarr.nix
View file

@ -1,8 +1,8 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "ghcr.io/linuxserver/sonarr";
imageDigest = "sha256:230ebe3521fbfc5fd7b30e169e3219953a132bdfcca88ef595360e1364e477e8";
sha256 = "0bjpx1vbisfghqlikpyrp33af7c5wj3d546xqxgfl64bn4v0z0iw";
imageDigest = "sha256:25e0f3b3741cf8df6c322d6c9016b5be91ca6e154653b4d01c8c125bf1ce75c0";
sha256 = "1fbp6b1z4z1d7p3xq1zwsgqrs11siq7mgn8l6b92xmsf16ygwps4";
finalImageName = "ghcr.io/linuxserver/sonarr";
finalImageTag = "latest";
}

4
devices/nos/modules/arion/nextcloud/images/nextcloud.nix
View file

@ -1,8 +1,8 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "nextcloud";
imageDigest = "sha256:6bc7267423c3f343ec50efff475c882f4a638e61fbbf53444b94c622d903d94a";
sha256 = "119r8jxp7ks5m76a662vxiza2jfcwz056slkw8n0vxy81bifnfzd";
imageDigest = "sha256:40d0756a47199d7fa8d6a4a72e555f79ee760dbaf3cae199c7eb21d766785d9b";
sha256 = "1sjmsc5k916h6m09f53z401qvnc0w3lqm88s5ics4hh8h428vcx5";
finalImageName = "nextcloud";
finalImageTag = "29.0.0-fpm";
}

27
devices/nos/modules/jellyfin/packages.nix
View file

@ -1,35 +1,18 @@
{
config,
lib,
jellyfin-overlays,
pkgs,
...
}: let
inherit (lib) hasAttr optionals;
overlays = jellyfin-overlays.legacyPackages.${pkgs.system};
jellyPkgs =
if config.nvidia.enableCUDA
then pkgs.cudaPackages.pkgs
else pkgs;
then overlays.cudaPackages.pkgs
else overlays;
jellyWeb = jellyPkgs.jellyfin-web.overrideAttrs (_: o: {
# Inject skip intro button
patches =
[
(pkgs.fetchpatch {
name = "skipintro.patch";
url = "https://pastebin.com/raw/EEgvReaw";
hash = "sha256-kfvOz0ukDY09kkbmZi24ch5KWJsVcThNEVnjlk4sAC0=";
})
]
++ optionals (hasAttr "patches" o) o.patches;
# Enable backdrops by default. Not sure if it actually works
postInstall = ''
substituteInPlace $out/share/jellyfin-web/main.jellyfin.bundle.js \
--replace-fail \
'enableBackdrops:function(){return P}' \
'enableBackdrops:function(){return _}'
'';
# TODO: Inject skip intro button for 10.9.0
});
jellyfinPkg = jellyPkgs.jellyfin.overrideAttrs (_: o: {

113
flake.lock generated
View file

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1715270146,
"narHash": "sha256-byqVQyE/LN7TsLLOdrMb9RBQYZKo8OIHjJaPz09Ua3o=",
"lastModified": 1715376791,
"narHash": "sha256-QKecFhWAB7sagSE+FXztINDqYqLro2nYp94f+ZtE/f4=",
"owner": "KZDKM",
"repo": "Hyprspace",
"rev": "ffae62eb591587eef74abb020288af9b7cf8fb17",
"rev": "8049b2794ca19d49320093426677d8c2911e7327",
"type": "github"
},
"original": {
@ -122,11 +122,11 @@
]
},
"locked": {
"lastModified": 1715238371,
"narHash": "sha256-ucIpLMfNPDblzDmflt2i/eNX5nqR39sKeA9ua/+UruU=",
"lastModified": 1715411204,
"narHash": "sha256-IhzauSMhXnxMep3PwGk4tkmaJ3YGVoOEVg2IEnUz3/0=",
"owner": "matt1432",
"repo": "nixos-caddy-cloudflare",
"rev": "af53ef73025a3b68a75b2c0d1929f5007a1eab12",
"rev": "5011697983647c1777a87c30684b8c2e28f0bebc",
"type": "github"
},
"original": {
@ -408,11 +408,11 @@
"gpu-screen-recorder-src": {
"flake": false,
"locked": {
"lastModified": 1715297540,
"narHash": "sha256-Cewc4GAsHrxXnOBjXDsbpzpivyW8b6AlmFVYNl6vXUo=",
"lastModified": 1715461390,
"narHash": "sha256-MhdSOSl/1t/f/rEqzOJJe9lKn7+N6vRzZffHfnX6koA=",
"ref": "refs/heads/master",
"rev": "d690bbca35f35ddb7ab47562e22fc4f36501b455",
"revCount": 580,
"rev": "2cd031db48272635b851d6c79a6f283e497293d1",
"revCount": 585,
"type": "git",
"url": "https://repo.dec05eba.com/gpu-screen-recorder"
},
@ -465,11 +465,11 @@
"gtk-theme-src": {
"flake": false,
"locked": {
"lastModified": 1713995357,
"narHash": "sha256-pKKEZ/GheyIf6pPb+Sz4AfF8oRlf1Jk4cl0tub5Ye10=",
"lastModified": 1715376144,
"narHash": "sha256-7yG2Y5x/OOqnTimtLv0BjDBVzeRKdj31tA+9ySX05Ug=",
"owner": "dracula",
"repo": "gtk",
"rev": "5e9a46b7610da0944a8131bbf08487861cae2c46",
"rev": "2f1d8718c44fe700eba34886f7957f8ae04e222c",
"type": "github"
},
"original": {
@ -545,11 +545,11 @@
]
},
"locked": {
"lastModified": 1715358385,
"narHash": "sha256-/IQ5UheQ2Ehm79nqn8KUuxZo5mk768gZ9uV6lHIKP8s=",
"lastModified": 1715380449,
"narHash": "sha256-716+f9Rj3wjSyD1xitCv2FcYbgPz1WIVDj+ZBclH99Y=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e6a315900db775da3bb3138bab8caa70dafdaf9e",
"rev": "d7682620185f213df384c363288093b486b2883f",
"type": "github"
},
"original": {
@ -646,20 +646,20 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1715273818,
"narHash": "sha256-ZHAO+47uELv2wmtAC+VvfYh3dUS/9ORwlfrWWo6PMJw=",
"ref": "nix-build-improvements",
"rev": "e1a51862200c1f7d6797c93fcff784300ed3c6c7",
"revCount": 4644,
"lastModified": 1715471630,
"narHash": "sha256-sKP6kzFnmIVVIJTZOFmdzvDpwEcHLXt7bM9z2XutvrU=",
"ref": "nix",
"rev": "af5a98708008d6b821fc32c9992b976ed0d77a44",
"revCount": 4670,
"submodules": true,
"type": "git",
"url": "https://github.com/andresilva/Hyprland"
"url": "https://github.com/hyprwm/Hyprland"
},
"original": {
"ref": "nix-build-improvements",
"ref": "nix",
"submodules": true,
"type": "git",
"url": "https://github.com/andresilva/Hyprland"
"url": "https://github.com/hyprwm/Hyprland"
}
},
"hyprland-protocols": {
@ -676,11 +676,11 @@
]
},
"locked": {
"lastModified": 1714869498,
"narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
"lastModified": 1691753796,
"narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
"rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
"type": "github"
},
"original": {
@ -748,11 +748,11 @@
]
},
"locked": {
"lastModified": 1715090986,
"narHash": "sha256-FXpQvmS9R7alwZ47XK5UIcAbC9YKSxc0+GOVYqwa0jM=",
"lastModified": 1715287423,
"narHash": "sha256-B7AJIjOyWgVMKhu7DlOnWa0VprdhywUVHuB/j+EwSxM=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "94e32ec37e7215b16d5c1b41b1773ff6742e704b",
"rev": "e2fc1c0eb8b392110588f478cce644348ead7271",
"type": "github"
},
"original": {
@ -781,6 +781,22 @@
"type": "github"
}
},
"jellyfin-overlays": {
"locked": {
"lastModified": 1715460566,
"narHash": "sha256-LPVejVP5SG8vzayjQYfRaYAM5CUGKswSzRWDZeG2DLE=",
"owner": "minijackson",
"repo": "nixpkgs",
"rev": "ed78e1fccf9cad59ff1af01752b693bf7fb49902",
"type": "github"
},
"original": {
"owner": "minijackson",
"ref": "jellyfin-10.9.0",
"repo": "nixpkgs",
"type": "github"
}
},
"jellyfin-ultrachromic-src": {
"flake": false,
"locked": {
@ -962,11 +978,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1715269120,
"narHash": "sha256-AcN0Zv7E2mPpB4JsKCFeKz7X0VQgFSCFXplsxj6oens=",
"lastModified": 1715476621,
"narHash": "sha256-tsvjakds3dmU0L+hFk35JwihQAd40d5AoVZmq62IaHU=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "8960f1a63dab72f971044c217c6936cc527e679b",
"rev": "78c0a23969771a7fe1a0dc51b23dc8bc07a6c555",
"type": "github"
},
"original": {
@ -1025,11 +1041,11 @@
]
},
"locked": {
"lastModified": 1714878592,
"narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=",
"lastModified": 1715482642,
"narHash": "sha256-4CB9y0ktQZHIFbQYunfr1PDylPvT+TkmT9K+QQRZSp0=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10",
"rev": "03c449f9a0d87c3cca9b0c6002bd3782790215cf",
"type": "github"
},
"original": {
@ -1248,11 +1264,11 @@
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1715332660,
"narHash": "sha256-K6TsGFwukMLe0W66JrQ7yV5Vc9LRCWm3YkvT3fHiqVs=",
"lastModified": 1715454783,
"narHash": "sha256-evyR64ihJ88zGFPzZwPzUM7xENKyoqvLVFQUAYZmVrc=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "46be8bce5aaca13651966083735a891dedd9ed5f",
"rev": "193bef6e20ab814db624b01d4bdd0c7160aa9838",
"type": "github"
},
"original": {
@ -1263,11 +1279,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1714809261,
"narHash": "sha256-hfBmnYFyz9I1mdrC3tX1A+dF9cOUcds5PIMPxrT+cRk=",
"lastModified": 1715413075,
"narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d32560238207b8e26d88b265207b216ee46b8450",
"rev": "e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d",
"type": "github"
},
"original": {
@ -1465,11 +1481,11 @@
},
"nur": {
"locked": {
"lastModified": 1715360308,
"narHash": "sha256-zNNkw4+kyy1uQl5QLV++/OOpY8cbkdDX4dV48faG1h0=",
"lastModified": 1715482436,
"narHash": "sha256-PA85OrCwznxjMxFNAehV2Yd25081E1Vf9nVzAMV1lPE=",
"owner": "nix-community",
"repo": "NUR",
"rev": "f34e3751da550eb46f49ce20d47c31585e137238",
"rev": "8c627de6d436a7771acf3f43e068dad14d0f9809",
"type": "github"
},
"original": {
@ -1719,6 +1735,7 @@
"hypridle": "hypridle",
"hyprland": "hyprland",
"jellyfin-flake": "jellyfin-flake",
"jellyfin-overlays": "jellyfin-overlays",
"jellyfin-ultrachromic-src": "jellyfin-ultrachromic-src",
"libratbag-src": "libratbag-src",
"modernx-src": "modernx-src",
@ -2146,11 +2163,11 @@
]
},
"locked": {
"lastModified": 1714060055,
"narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=",
"lastModified": 1714662532,
"narHash": "sha256-Pj2xGSYhapYbXL7sk7TTlOtCZcTfPQoL3fPbZeg7L4Y=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a",
"rev": "1f228ba2f1f254195c0b571302b37482861abee3",
"type": "github"
},
"original": {

14
flake.nix
View file

@ -241,6 +241,13 @@
inputs.nixpkgs.follows = "nixpkgs";
};
jellyfin-overlays = {
type = "github";
owner = "minijackson";
repo = "nixpkgs";
ref = "jellyfin-10.9.0";
};
subsync = {
type = "github";
owner = "matt1432";
@ -257,9 +264,8 @@
## Hyprland
hyprland = {
type = "git";
# FIXME: wait for https://github.com/hyprwm/Hyprland/pull/5952
url = "https://github.com/andresilva/Hyprland";
ref = "nix-build-improvements";
url = "https://github.com/hyprwm/Hyprland";
ref = "nix";
submodules = true;
inputs.nixpkgs.follows = "nixpkgs";
@ -349,6 +355,8 @@
owner = "nix-community";
repo = "nixd";
};
# FIXME: get it from nixpkgs when it gets merged
basedpyright.url = "github:kiike/nixpkgs/pkgs/basedpyright";
vimplugin-easytables-src = {

2
modules/hyprland/default.nix
View file

@ -61,7 +61,7 @@ in {
# HOME-MANAGER CONFIG
home-manager.users.${mainUser} = {
imports = [
./hyprexpo.nix
# ./hyprexpo.nix
# ./Hyprspace.nix
./inputs.nix
./style.nix