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-08-08 23:27:42 -04:00
parent f06b0d9c5b
commit 6bcbadfdb1
16 changed files with 57 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
devices/nos/modules/docker/default.nix
View file

@ -15,7 +15,6 @@ in {
./wg-easy/compose.nix
./media/bazarr/compose.nix
./media/calibre/compose.nix
./media/joal/compose.nix
./media/prowlarr/compose.nix
./media/radarr/compose.nix

4
devices/nos/modules/docker/forgejo/images/act_runner.nix
View file

@ -1,8 +1,8 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "vegardit/gitea-act-runner";
imageDigest = "sha256:a69efce45a138217a87e24fe0197519a95ec60fc35bfcaffaced9fed5e86a1ec";
sha256 = "05b5r4ncbx228cc3s4b4k5n9kh9krwh20r81lbpzdbyk3m8hjfw6";
imageDigest = "sha256:0f2cedb38b779319f005dea39b1ac532757aa52bf327d93e2a2d8d82a50b04eb";
sha256 = "06gm6q8ss4dkmj8vp02wmfsw4bjy8v2n4wk2n8l7ydi6qadd4w3d";
finalImageName = "vegardit/gitea-act-runner";
finalImageTag = "dind-latest";
}

4
devices/nos/modules/docker/forgejo/images/postgres.nix
View file

@ -1,8 +1,8 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "postgres";
imageDigest = "sha256:f055b09e632d40c562d80e1078c21362d720d3c8c040f65edf6cb609229f09d3";
sha256 = "0rsqcxqx77r4z8xw15sqydp1r2mz129r36c7p43vjv6p2cxyl8sg";
imageDigest = "sha256:b4d7cd7bd1bc275e8862271531e2180b6c3e9bd92f09e2f53f6c87836183235a";
sha256 = "0391kqxi9yi2kkh8zm5q4fl4xsris68qzwvdqmpcycxr1dgpwqhj";
finalImageName = "postgres";
finalImageTag = "14";
}

4
devices/nos/modules/docker/freshrss/images/postgres.nix
View file

@ -1,8 +1,8 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "postgres";
imageDigest = "sha256:f055b09e632d40c562d80e1078c21362d720d3c8c040f65edf6cb609229f09d3";
sha256 = "0rsqcxqx77r4z8xw15sqydp1r2mz129r36c7p43vjv6p2cxyl8sg";
imageDigest = "sha256:b4d7cd7bd1bc275e8862271531e2180b6c3e9bd92f09e2f53f6c87836183235a";
sha256 = "0391kqxi9yi2kkh8zm5q4fl4xsris68qzwvdqmpcycxr1dgpwqhj";
finalImageName = "postgres";
finalImageTag = "14";
}

4
devices/nos/modules/docker/freshrss/images/rss-bridge.nix
View file

@ -1,8 +1,8 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "rssbridge/rss-bridge";
imageDigest = "sha256:5b080be160ac5e5c5a0d450f9e431a472b2ee9e95353d905628ed804efd96783";
sha256 = "06pzkyyballg5z6ycgfr7biskncayc8asgr3918dmy1mhj7zrmbd";
imageDigest = "sha256:2ed2ac1c2308f929947b363d0866aa48543600368f6df4f29a004aa0869d9f22";
sha256 = "075ymqv5z3h902yr32w1dxcpp2az79xqam0lb97c0lkq2dc5hxgb";
finalImageName = "rssbridge/rss-bridge";
finalImageTag = "latest";
}

62
devices/nos/modules/docker/media/calibre/compose.nix
View file

@ -1,62 +0,0 @@
{
config,
pkgs,
...
}: let
inherit (config.khepri) rwDataDir;
rwPath = rwDataDir + "/media/calibre";
in {
khepri.compositions."calibre" = {
networks.proxy_net = {external = true;};
services = {
"calibre" = {
image = import ./images/calibre.nix pkgs;
restart = "always";
environment = {
PUID = "1000";
PGID = "1000";
TZ = "America/New_York";
# WebUI vars
SUBFOLDER = "/calibre/";
TITLE = "CalibreDB";
NO_DECOR = "true";
};
volumes = ["${rwPath}/data-db:/config"];
extraHosts = ["lan.nelim.org:10.0.0.130"];
ports = [
"8580:8080"
#"8081:8081"
];
networks = ["proxy_net"];
#network_mode = "host";
};
"calibre-web" = {
image = import ./images/calibre-web.nix pkgs;
restart = "always";
environment = {
PUID = "1000";
PGID = "1000";
TZ = "America/New_York";
DOCKER_MODS = "linuxserver/mods:universal-calibre";
};
volumes = [
"${rwPath}/data-web:/config"
"${rwPath}/data-db/Calibre Library:/books"
];
extraHosts = ["lan.nelim.org:10.0.0.130"];
ports = ["8083:8083"];
networks = ["proxy_net"];
};
};
};
}

8
devices/nos/modules/docker/media/calibre/images/calibre-web.nix
View file

@ -1,8 +0,0 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "ghcr.io/linuxserver/calibre-web";
imageDigest = "sha256:ff7e870dec503f5bd02c5a528ba1f96617900cb4853ef05176bfbc278b5d263d";
sha256 = "00g07x609rf9wdipxw260jmc3y2wkhawgzmlqsk9h60jbhxpck57";
finalImageName = "ghcr.io/linuxserver/calibre-web";
finalImageTag = "latest";
}

8
devices/nos/modules/docker/media/calibre/images/calibre.nix
View file

@ -1,8 +0,0 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "ghcr.io/linuxserver/calibre";
imageDigest = "sha256:e179e32b1ed42814816e5379d08ee9d9f957f6e704c8695bd1ffece9668a9192";
sha256 = "13n3rw7w6a6nkq578qjhypkwh2xm7a79lmi57klzx1gsxddp5r04";
finalImageName = "ghcr.io/linuxserver/calibre";
finalImageTag = "latest";
}

4
devices/nos/modules/docker/media/prowlarr/images/prowlarr.nix
View file

@ -1,8 +1,8 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "ghcr.io/linuxserver/prowlarr";
imageDigest = "sha256:7fe57565907f4f776d43c15b2e020a0e4a62fe1e04e80e25b85a3ae4ca49e5d0";
sha256 = "0mcsjkzjjyn53zv3id7jdkk0x1w5h6hz1sp2cpizsh444cznr2gd";
imageDigest = "sha256:c80a2dcfefd85c62da2373c5bf0138bb9d1c647c4b3d8f994ce263f5e8b1db81";
sha256 = "1yyjjh53n9a1n2czy1a3l9diak960dxf0wy185khhdjyg26grl2m";
finalImageName = "ghcr.io/linuxserver/prowlarr";
finalImageTag = "latest";
}

4
devices/nos/modules/docker/media/sabnzbd/images/sabnzbd.nix
View file

@ -1,8 +1,8 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "ghcr.io/linuxserver/sabnzbd";
imageDigest = "sha256:dda700370ad4281d8ffda4fbdad8ac3f720a2829936eafc794fca652095ed4be";
sha256 = "1cgjkja9zl8s76g0x258gism7ah1p2ni72nlx0jp0skdpm7y1irx";
imageDigest = "sha256:aad79c7a696a8743b87f9a0429bf5fa0be1edc8bbf00b962008dfa9893efd28e";
sha256 = "0dangx6v4nhz80n3viwblb5qh6xa809vd20r6ryp9xd5nblf4326";
finalImageName = "ghcr.io/linuxserver/sabnzbd";
finalImageTag = "latest";
}

10
devices/nos/modules/docker/media/seerr/images/jellyseerr.nix
View file

@ -1,8 +1,8 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "ghcr.io/fallenbagel/jellyseerr";
imageDigest = "sha256:e32de15c6f35ba0cabdd728d29f35de4774bc6107ffc34203843237c33a5cf90";
sha256 = "1l3njzhsaapcs0fbmd1dkgb24ray87i11pbd5x22s2mckcnsladc";
finalImageName = "ghcr.io/fallenbagel/jellyseerr";
finalImageTag = "develop";
imageName = "docker.io/fallenbagel/jellyseerr";
imageDigest = "sha256:8f708df0ce3f202056bde5d7bff625eb59efe38f4ee47bdddc7560b6e4a5a214";
sha256 = "04ala5cpkv1rhq609yxvyf8wv6ql8ism9zyrxyiil6b1gfgcsfxz";
finalImageName = "docker.io/fallenbagel/jellyseerr";
finalImageTag = "1.9.2";
}

4
devices/nos/modules/docker/resume/images/postgres.nix
View file

@ -1,8 +1,8 @@
pkgs:
pkgs.dockerTools.pullImage {
imageName = "postgres";
imageDigest = "sha256:468d34fefd6338031787c7b8e94078975b3aaf4d66c7ead25c39cd3ba46a15c6";
sha256 = "1pg0rwqyzlhrik4x4bkx416qb034xrd0nmsckqd9w6ncsmppibvm";
imageDigest = "sha256:fa484d844b88ac34811daf3da66af1fd17e34b0e1ff5d1b6f904269c85890dc0";
sha256 = "18bljw3bydqx9vmhqnky5xp2k2fmbpzw5569hnmj261nxq5n6dws";
finalImageName = "postgres";
finalImageTag = "15-alpine";
}

56
flake.lock
View file

@ -193,11 +193,11 @@
]
},
"locked": {
"lastModified": 1722928008,
"narHash": "sha256-c0y+5P1Ng8r5qawCsrXjIVwFSGENpu9XESAcLZw1Zuw=",
"lastModified": 1723100802,
"narHash": "sha256-4aY1xzNW5LXjNEHVoMaRxIAtpVAQybNSkWhYxmCRKlM=",
"owner": "matt1432",
"repo": "discord-nightly-overlay",
"rev": "b9f8aa6902f87c510261085658a9f927a4ecec36",
"rev": "c103496daaf05d8809cf532a6a5db870e3261e31",
"type": "github"
},
"original": {
@ -420,11 +420,11 @@
"gpu-screen-recorder-src": {
"flake": false,
"locked": {
"lastModified": 1722786652,
"narHash": "sha256-oXA9xqjwLvhM6e4PikJ3nyt5+VafEIQ4O0bvAYLhyLg=",
"lastModified": 1723162587,
"narHash": "sha256-K4uM8ETQkk/h5jDOjGf0it+ly/Yovcnwu3qo7swygWU=",
"ref": "refs/heads/master",
"rev": "7bee923938bc1756110461c916a945979a7c197b",
"revCount": 710,
"rev": "b9b60ab29c133599032e49054f51a2adfd5ea39d",
"revCount": 716,
"type": "git",
"url": "https://repo.dec05eba.com/gpu-screen-recorder"
},
@ -522,11 +522,11 @@
]
},
"locked": {
"lastModified": 1722936497,
"narHash": "sha256-UBst8PkhY0kqTgdKiR8MtTBt4c1XmjJoOV11efjsC/o=",
"lastModified": 1723015306,
"narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "a6c743980e23f4cef6c2a377f9ffab506568413a",
"rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e",
"type": "github"
},
"original": {
@ -600,19 +600,19 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1722956902,
"narHash": "sha256-g3cAlVmRtnyqMZw88MKqVNM8eU88XzgNAlXdTkym5q8=",
"lastModified": 1723172503,
"narHash": "sha256-HVaAneYjMwsXXpbxDVmk+G2h1uQvAhog3QxZGuVDbX8=",
"ref": "refs/heads/main",
"rev": "b0a70f63e3865eaa77f0b78a04b230aa583bc95c",
"revCount": 5055,
"rev": "69e257d19428975d822321891e23f6c776f1be5a",
"revCount": 5072,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
"url": "https://github.com/matt1432/Hyprland"
},
"original": {
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
"url": "https://github.com/matt1432/Hyprland"
}
},
"hyprland-plugins": {
@ -630,11 +630,11 @@
]
},
"locked": {
"lastModified": 1722719004,
"narHash": "sha256-Qxu2g1Ay15g2EJE184i06tlRdoODEG+YuUvWKRQRKcQ=",
"lastModified": 1723143591,
"narHash": "sha256-dPcWAeRJoG5CyWC32X3XX+Og0v/k1/S1N0T5dQWT32k=",
"owner": "hyprwm",
"repo": "hyprland-plugins",
"rev": "4fcb4038f23e5273af9a5684f3ee10b0652b3bab",
"rev": "b73d7b901d8cb1172dd25c7b7159f0242c625a77",
"type": "github"
},
"original": {
@ -777,11 +777,11 @@
]
},
"locked": {
"lastModified": 1722929371,
"narHash": "sha256-lsj4+K7F7pjlgBwrfWbBd0QwmZBoolCy1IoD0exzaOY=",
"lastModified": 1723016361,
"narHash": "sha256-iEVCAOn7WUdJGrK2EW5hkfl4gBmYl5gVck+MSn6ba44=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "99099d758c82ba77f682867690a085e055efe906",
"rev": "fc3d12deef508a73c7beef4cd9bebe03acde4ed7",
"type": "github"
},
"original": {
@ -939,11 +939,11 @@
]
},
"locked": {
"lastModified": 1722717695,
"narHash": "sha256-fhMLDpHnG/HoivhwPeIDoXZy7wHb+DTQN7jehZmyGkw=",
"lastModified": 1723021300,
"narHash": "sha256-Ujo6MQvwolE1eWSkPXCC9WFJeLtRfnMpvxoeAGNcbFI=",
"owner": "viperML",
"repo": "nh",
"rev": "324ed46681718a2d80474a2361b9e4ed6ab22ef5",
"rev": "ea9053852f8575f650ca0080b2cac6735c7447f7",
"type": "github"
},
"original": {
@ -1310,11 +1310,11 @@
]
},
"locked": {
"lastModified": 1722986309,
"narHash": "sha256-Veppi3c8c9XJ1CmgkOc5/oipPB/J8JPHbh3SHkMov3A=",
"lastModified": 1723151834,
"narHash": "sha256-KjUcXpdLx5QzkT0x3qctGm1AM9U8g8pSFy24fE2MFeM=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "2c512b8dc9adc0ada535d23e6be30efafe09e81b",
"rev": "e28b410ad60004cca039fc6de2dd65f485779833",
"type": "github"
},
"original": {

2
flake.nix
View file

@ -129,7 +129,7 @@
};
submodules = true;
type = "git";
url = "https://github.com/hyprwm/Hyprland";
url = "https://github.com/matt1432/Hyprland";
};
hyprland-plugins = {
inputs = {

3
inputs.nix
View file

@ -118,7 +118,8 @@ let
hyprlandInputs = {
hyprland = mkDep {
type = "git";
url = "https://github.com/hyprwm/Hyprland";
# FIXME: switch back to hyprwm when build issue fixed
url = "https://github.com/matt1432/Hyprland";
submodules = true;
};

13
lib/inputs.nix
View file

@ -3,13 +3,14 @@ lib: lock: let
recursiveUpdateList = list: foldl' recursiveUpdate {} list;
in rec {
/**
From an attrset, returns a flake input that has its type defaulted
to `github` and has some of its inputs following this flake's input
of the same name.
/*
*
From an attrset, returns a flake input that has its type defaulted
to `github` and has some of its inputs following this flake's input
of the same name.
It gets information from the `flake.lock` file and can be used thanks
to flakegen
It gets information from the `flake.lock` file and can be used thanks
to flakegen
*/
mkInput = {type ? "github", ...} @ info: let
input =