Update flake.lock

• Updated input 'cataclysm-dda':
    'github:CleverRaven/Cataclysm-DDA/8e428ca5f21fb868b7eb6aa8380d1fcdbb960bd8' (2022-12-08)
  → 'github:CleverRaven/Cataclysm-DDA/03f25dcc19e8e27f765f768ef56cbd55dc6bbd29' (2023-01-31)
• Updated input 'colmena':
    'github:zhaofengli/colmena/64c46fa0169233d4faed70c52583cd3183c7f5aa' (2022-12-01)
  → 'github:zhaofengli/colmena/7602e548a78932bd28a7e2f621b3d62b4124e993' (2023-01-29)
• Removed input 'colmena/nix-eval-jobs'
• Removed input 'colmena/nix-eval-jobs/flake-utils'
• Removed input 'colmena/nix-eval-jobs/nixpkgs'
• Updated input 'fenix':
    'github:nix-community/fenix/e7941faba7f6cd0a6058330ad8c40d8dc52d741c' (2022-12-08)
  → 'github:nix-community/fenix/97deb5c86b238c2a000ef4eb92fb40465f086706' (2023-01-31)
• Updated input 'fenix/rust-analyzer-src':
    'github:rust-lang/rust-analyzer/6e8a54d0f68702cf7981c8299357838eb0f4d5b2' (2022-12-07)
  → 'github:rust-lang/rust-analyzer/b75803ad31772d105d86f8ebee0cbc8844a4fa29' (2023-01-30)
• Updated input 'glados':
    'git+https://git.sr.ht/~megamanmalte/GLaDOS?ref=main&rev=c92d51bcfa27ea9e0cbabbfba6069c0e4e1243dc' (2022-03-30)
  → 'git+http://git.home/megamanmalte/GLaDOS?ref=main&rev=2954e07ad5f94cf4812891c0fc0fbd9c159c1540' (2021-12-10)
• Updated input 'glados/nixCargoIntegration':
    'github:yusdacra/nix-cargo-integration/15c34bac7a54d4519ba821a844f4a0867ffd0504' (2022-03-30)
  → 'github:yusdacra/nix-cargo-integration/a25206065a3a19d3dbcb2192d9bd273eea5cd919' (2021-11-19)
• Updated input 'glados/nixCargoIntegration/devshell':
    'github:numtide/devshell/4b5ac7cf7d9a1cc60b965bb51b59922f2210cbc7' (2021-06-30)
  → 'github:numtide/devshell/e8c2d4967b5c498b12551d1bb49352dcf9efa3e4' (2021-11-16)
• Updated input 'glados/nixCargoIntegration/nixpkgs':
    'github:NixOS/nixpkgs/6fc5211eddddc02c50ca7f98d6cc377726417fa9' (2021-08-13)
  → 'github:NixOS/nixpkgs/931ab058daa7e4cd539533963f95e2bb0dbd41e6' (2021-11-15)
• Updated input 'glados/nixCargoIntegration/rustOverlay':
    'github:oxalica/rust-overlay/ad311f5bb5c5ef475985f1e0f264e831470a8510' (2021-08-15)
  → 'github:oxalica/rust-overlay/ccc467eff80b2fbb8000cf425e999ef14fbe200c' (2021-11-19)
• Updated input 'home-manager':
    'github:nix-community/home-manager/2af0d07678fc15612345e0dd55337550dcf6465f' (2022-12-05)
  → 'github:nix-community/home-manager/08a778d80308353f4f65c9dcd3790b5da02d6306' (2023-01-28)
• Updated input 'hydra':
    'github:NixOS/hydra/d1fac69c213002721971cd983e2576b784677d40' (2022-12-05)
  → 'github:NixOS/hydra/f48f00ee6d5727ae3e488cbf9ce157460853fea8' (2022-12-23)
• Updated input 'hyprland':
    'github:hyprwm/Hyprland/668cc93962c738d791993e581443273eaca05086' (2022-12-19)
  → 'github:hyprwm/Hyprland/85c07c2fe0427ab5603addcef0e6b7cc211e1af7' (2023-01-31)
• Updated input 'hyprland/hyprland-protocols':
    'github:hyprwm/hyprland-protocols/d0d6db8cb5bef6d93ca3ad8fb2124964173396da' (2022-12-10)
  → 'github:hyprwm/hyprland-protocols/b8f55e02a328c47ed373133c52483bbfa20a1b75' (2022-12-23)
• Added input 'hyprland/hyprland-protocols/nixpkgs':
    follows 'hyprland/nixpkgs'
• Updated input 'hyprland/nixpkgs':
    'github:NixOS/nixpkgs/04f574a1c0fde90b51bf68198e2297ca4e7cccf4' (2022-12-18)
  → 'github:NixOS/nixpkgs/0f213d0fee84280d8c3a97f7469b988d6fe5fcdf' (2023-01-12)
• Updated input 'hyprland/wlroots':
    'gitlab:wlroots/wlroots/c8eb24d30e18c165728b8788a10716611c3b633d' (2022-12-01)
  → 'gitlab:wlroots/wlroots/5f264a7d6c8af27d41ff440c05262b022c055593' (2023-01-04)
• Updated input 'hyprland/xdph':
    'github:hyprwm/xdg-desktop-portal-hyprland/9fb4fae94b9bd80395c193dcaf6fdf740550cff1' (2022-12-13)
  → 'github:hyprwm/xdg-desktop-portal-hyprland/d479c846531fd0e1d2357c9588b8310a2b859ef2' (2023-01-07)
• Updated input 'hyprland/xdph/hyprland-protocols':
    'github:hyprwm/hyprland-protocols/d0d6db8cb5bef6d93ca3ad8fb2124964173396da' (2022-12-10)
  → follows 'hyprland/hyprland-protocols'
• Updated input 'jovian-nixos':
    'github:Jovian-Experiments/Jovian-NixOS/6d70c2fda85377e1fd7f2ede9ac82ff02dfeb0d5' (2022-12-04)
  → 'github:Jovian-Experiments/Jovian-NixOS/212c8e630b7267a5a712b3b20e4403cf232fd9e0' (2023-01-17)
• Updated input 'nickel':
    'github:tweag/nickel/6110c7f61e46f39e57503889b8f699de8ef3d41e' (2022-12-07)
  → 'github:tweag/nickel/b930544978e657dc2f214a9357bcbb06979095d7' (2023-01-31)
• Updated input 'nickel/crane':
    'github:ipetkov/crane/24591d5f8cc979f7b243b88a2d39da09976970ad' (2022-11-28)
  → 'github:ipetkov/crane/b13963c8c18026aa694acd98d14f66d24666f70b' (2023-01-11)
• Updated input 'nickel/crane/flake-compat':
    'github:edolstra/flake-compat/b4a34015c698c7793d592d66adbab377907a2be8' (2022-04-19)
  → 'github:edolstra/flake-compat/009399224d5e398d03b22badca40a37ac85412a1' (2022-11-17)
• Updated input 'nickel/crane/rust-overlay':
    'github:oxalica/rust-overlay/cf668f737ac986c0a89e83b6b2e3c5ddbd8cf33b' (2022-11-03)
  → 'github:oxalica/rust-overlay/69fb7bf0a8c40e6c4c197fa1816773774c8ac59f' (2023-01-03)
• Removed input 'nickel/import-cargo'
• Updated input 'nickel/pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/2597510df32efafda4d05f5122efe612a7a5da66' (2022-12-03)
  → 'github:cachix/pre-commit-hooks.nix/53e766957b73298fa68b47478c48cbcc005cc18a' (2023-01-19)
• Updated input 'nickel/pre-commit-hooks/flake-compat':
    'github:edolstra/flake-compat/009399224d5e398d03b22badca40a37ac85412a1' (2022-11-17)
  → 'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17)
• Updated input 'nickel/pre-commit-hooks/nixpkgs-stable':
    'github:NixOS/nixpkgs/cf63ade6f74bbc9d2a017290f1b2e33e8fbfa70a' (2022-11-20)
  → 'github:NixOS/nixpkgs/2f9fd351ec37f5d479556cd48be4ca340da59b8f' (2023-01-15)
• Updated input 'nickel/rust-overlay':
    'github:oxalica/rust-overlay/a0d5773275ecd4f141d792d3a0376277c0fc0b65' (2022-12-03)
  → 'github:oxalica/rust-overlay/1fd6d280c132f4facad8cd023543fb10121e6487' (2023-01-21)
• Updated input 'nix-colors':
    'github:Misterio77/nix-colors/fcd345bd1c9e7c203c3320ee6ca39814c97ac1fe' (2022-12-05)
  → 'github:Misterio77/nix-colors/7e459f1d88ac54fc2f4b308adb5064863006e4b1' (2022-12-28)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/9d87bc030a0bf3f00e953dbf095a7d8e852dab6b' (2022-12-04)
  → 'github:NixOS/nixos-hardware/b7ac0a56029e4f9e6743b9993037a5aaafd57103' (2023-01-24)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/6e51c97f1c849efdfd4f3b78a4870e6aa2da4198' (2022-12-05)
  → 'github:NixOS/nixpkgs/2caf4ef5005ecc68141ecb4aac271079f7371c44' (2023-01-30)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/5097457af8e9dcf45a68fa892716919ad28e545a' (2022-12-08)
  → 'github:nix-community/nixpkgs-wayland/95408e974fd4a118ecff9820694d0c35750a18eb' (2023-01-31)
• Updated input 'nixpkgs-wayland/flake-compat':
    'github:edolstra/flake-compat/009399224d5e398d03b22badca40a37ac85412a1' (2022-11-17)
  → 'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/c0f784c05c85422cd7d532fd1a630ba5e8f2348f' (2022-12-04)
  → 'github:nix-community/lib-aggregate/c15111d65432ee32ce64d31b268219e2d4d1bae6' (2023-01-29)
• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/77e67cb65014fb75c1c8ccfec60e9bd8b7d02c94' (2022-12-04)
  → 'github:nix-community/nixpkgs.lib/a6486be6c11c609cd60c01a427279e8a80a025fa' (2023-01-29)
• Updated input 'nixpkgs-wayland/nix-eval-jobs':
    'github:nix-community/nix-eval-jobs/6117ef2024f679d5c52876031880b752f2be4517' (2022-12-08)
  → 'github:nix-community/nix-eval-jobs/dd47d16dc2d88a210197079b362ffefed09a4265' (2023-01-30)
• Added input 'nixpkgs-wayland/nix-eval-jobs/flake-parts':
    'github:hercules-ci/flake-parts/7c7a8bce3dffe71203dcd4276504d1cb49dfe05f' (2023-01-26)
• Added input 'nixpkgs-wayland/nix-eval-jobs/flake-parts/nixpkgs-lib':
    follows 'nixpkgs-wayland/nix-eval-jobs/nixpkgs'
• Removed input 'nixpkgs-wayland/nix-eval-jobs/flake-utils'
• Updated input 'nixpkgs-wayland/nix-eval-jobs/nixpkgs':
    follows 'nixpkgs-wayland/nixpkgs'
  → 'github:NixOS/nixpkgs/99f5676ba0a0c2d7605b63b2dd1b146c384f42dd' (2023-01-30)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/a518c77148585023ff56022f09c4b2c418a51ef5' (2023-01-05)
  → 'github:nixos/nixpkgs/2caf4ef5005ecc68141ecb4aac271079f7371c44' (2023-01-30)
• Updated input 'qmk-udev-rules':
    'github:qmk/qmk_firmware/bb3d694875e4b02d0befee60853d3f5997acabb8' (2022-12-07)
  → 'github:qmk/qmk_firmware/e296d671463f38a78c75ee0727016939634ef985' (2023-01-30)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/da98a111623101c64474a14983d83dad8f09f93d' (2022-12-04)
  → 'github:Mic92/sops-nix/b6ab3c61e2ca5e07d1f4eb1b67304e2670ea230c' (2023-01-24)
• Updated input 'sops-nix/nixpkgs-stable':
    'github:NixOS/nixpkgs/86370507cb20c905800527539fc049a2bf09c667' (2022-12-04)
  → 'github:NixOS/nixpkgs/918b760070bb8f48cb511300fcd7e02e13058a2e' (2023-01-22)
This commit is contained in:
Malte Tammena 2023-01-31 16:02:20 +01:00
parent 22253c9654
commit 4eaa8117c5
6 changed files with 187 additions and 280 deletions

View file

@ -35,11 +35,11 @@
"cataclysm-dda": {
"flake": false,
"locked": {
"lastModified": 1670479840,
"narHash": "sha256-0en/OLMvCBp1zV6cf2g50Yv4ne2ivxf+d3qDMDgDgZQ=",
"lastModified": 1675145333,
"narHash": "sha256-NEiKuj4sBLPIzmMObMXbiJOFu9klGuRO0aQp2WNapZc=",
"owner": "CleverRaven",
"repo": "Cataclysm-DDA",
"rev": "8e428ca5f21fb868b7eb6aa8380d1fcdbb960bd8",
"rev": "03f25dcc19e8e27f765f768ef56cbd55dc6bbd29",
"type": "github"
},
"original": {
@ -52,18 +52,17 @@
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": [
"nixpkgs"
],
"stable": "stable"
},
"locked": {
"lastModified": 1669917327,
"narHash": "sha256-YYjaNOUJZaM5t35GbWtfX825TlI9LAksbfdhaCYWmfY=",
"lastModified": 1675019967,
"narHash": "sha256-AD9udouBmfWxmsM1j6eNCu+HEB9E41+fA3XRIb765LU=",
"owner": "zhaofengli",
"repo": "colmena",
"rev": "64c46fa0169233d4faed70c52583cd3183c7f5aa",
"rev": "7602e548a78932bd28a7e2f621b3d62b4124e993",
"type": "github"
},
"original": {
@ -83,11 +82,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1669605882,
"narHash": "sha256-TiQtL5sUI5rp28S63v+VX25qNjcrc8Xeu+shf3g7Tj4=",
"lastModified": 1673405853,
"narHash": "sha256-6Nq9DuOo+gE2I8z5UZaKuumykz2xxZ9JGYmUthOuwSA=",
"owner": "ipetkov",
"repo": "crane",
"rev": "24591d5f8cc979f7b243b88a2d39da09976970ad",
"rev": "b13963c8c18026aa694acd98d14f66d24666f70b",
"type": "github"
},
"original": {
@ -143,11 +142,11 @@
},
"devshell_3": {
"locked": {
"lastModified": 1625086391,
"narHash": "sha256-IpNPv1v8s4L3CoxhwcgZIitGpcrnNgnj09X7TA0QV3k=",
"lastModified": 1637098489,
"narHash": "sha256-IWBYLSNSENI/fTrXdYDhuCavxcgN9+RERrPM81f6DXY=",
"owner": "numtide",
"repo": "devshell",
"rev": "4b5ac7cf7d9a1cc60b965bb51b59922f2210cbc7",
"rev": "e8c2d4967b5c498b12551d1bb49352dcf9efa3e4",
"type": "github"
},
"original": {
@ -217,11 +216,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1670480689,
"narHash": "sha256-DADoR6R7DpnQaZjuUr6Z5EeNxr9ClP6u3Oqf7PpS9yA=",
"lastModified": 1675146246,
"narHash": "sha256-upQtcca/sThA5Jkmn5pDaYFoCmPLMyv7bGFCZFcVhqM=",
"owner": "nix-community",
"repo": "fenix",
"rev": "e7941faba7f6cd0a6058330ad8c40d8dc52d741c",
"rev": "97deb5c86b238c2a000ef4eb92fb40465f086706",
"type": "github"
},
"original": {
@ -249,11 +248,11 @@
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1650374568,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
"lastModified": 1668681692,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
"type": "github"
},
"original": {
@ -265,11 +264,11 @@
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1668681692,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
@ -281,11 +280,11 @@
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1668681692,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
@ -294,6 +293,28 @@
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"nixpkgs-wayland",
"nix-eval-jobs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1674771137,
"narHash": "sha256-Zpk1GbEsYrqKmuIZkx+f+8pU0qcCYJoSUwNz1Zk+R00=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "7c7a8bce3dffe71203dcd4276504d1cb49dfe05f",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": {
"locked": {
"lastModified": 1659877975,
@ -355,21 +376,6 @@
}
},
"flake-utils_5": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_6": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@ -411,18 +417,18 @@
"nixCargoIntegration": "nixCargoIntegration_3"
},
"locked": {
"lastModified": 1648670721,
"narHash": "sha256-VA5ipmgevzMDzjsgRS8oJryrEyKsby0aypriOUZKjQ8=",
"lastModified": 1639140254,
"narHash": "sha256-gtjlmHwxMXZPj73A/h28/J2ANsToJnN7pIo4jruegs4=",
"ref": "main",
"rev": "c92d51bcfa27ea9e0cbabbfba6069c0e4e1243dc",
"rev": "2954e07ad5f94cf4812891c0fc0fbd9c159c1540",
"revCount": 15,
"type": "git",
"url": "https://git.sr.ht/~megamanmalte/GLaDOS"
"url": "http://git.home/megamanmalte/GLaDOS"
},
"original": {
"ref": "main",
"type": "git",
"url": "https://git.sr.ht/~megamanmalte/GLaDOS"
"url": "http://git.home/megamanmalte/GLaDOS"
}
},
"home-manager": {
@ -433,11 +439,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1670280307,
"narHash": "sha256-3x+0whP1nCz5adQMIsBA3L9fI/ABOpRUJdbw0AmxBnU=",
"lastModified": 1674928308,
"narHash": "sha256-elVU4NUZEl11BdT4gC+lrpLYM8Ccxqxs19Ix84HTI9o=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2af0d07678fc15612345e0dd55337550dcf6465f",
"rev": "08a778d80308353f4f65c9dcd3790b5da02d6306",
"type": "github"
},
"original": {
@ -457,11 +463,11 @@
]
},
"locked": {
"lastModified": 1670258926,
"narHash": "sha256-HVsp+BPjEDS1lR7sjplWNrNljHvYcaUiaAn8gGNAMxU=",
"lastModified": 1671755331,
"narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=",
"owner": "NixOS",
"repo": "hydra",
"rev": "d1fac69c213002721971cd983e2576b784677d40",
"rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8",
"type": "github"
},
"original": {
@ -478,11 +484,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1671461359,
"narHash": "sha256-uHoaa0hEII2qvnS7EsVhOCw1rzmSlKkXMehWL+bAdPg=",
"lastModified": 1675168163,
"narHash": "sha256-dNHfiGF+cIyKI+F5T/6s8aWFiXonfcbEx5zg8lntkK8=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "668cc93962c738d791993e581443273eaca05086",
"rev": "85c07c2fe0427ab5603addcef0e6b7cc211e1af7",
"type": "github"
},
"original": {
@ -492,13 +498,18 @@
}
},
"hyprland-protocols": {
"flake": false,
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
]
},
"locked": {
"lastModified": 1670703428,
"narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=",
"lastModified": 1671839510,
"narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da",
"rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75",
"type": "github"
},
"original": {
@ -507,45 +518,14 @@
"type": "github"
}
},
"hyprland-protocols_2": {
"flake": false,
"locked": {
"lastModified": 1670703428,
"narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"import-cargo": {
"locked": {
"lastModified": 1594305518,
"narHash": "sha256-frtArgN42rSaEcEOYWg8sVPMUK+Zgch3c+wejcpX3DY=",
"owner": "edolstra",
"repo": "import-cargo",
"rev": "25d40be4a73d40a2572e0cc233b83253554f06c5",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "import-cargo",
"type": "github"
}
},
"jovian-nixos": {
"flake": false,
"locked": {
"lastModified": 1670112157,
"narHash": "sha256-zu3F3EBUca8LqQcc2PVrzT1lGpqSjxDlYiG1wIrj0kQ=",
"lastModified": 1673947327,
"narHash": "sha256-F47OS8ABmA77THZglhryGRYpQVP4oOOlUMFiwWanKQE=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "6d70c2fda85377e1fd7f2ede9ac82ff02dfeb0d5",
"rev": "212c8e630b7267a5a712b3b20e4403cf232fd9e0",
"type": "github"
},
"original": {
@ -560,11 +540,11 @@
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1670155750,
"narHash": "sha256-42o7/LiCRPUd2eCnN576a973NfWcBrqURMTlKkOJafc=",
"lastModified": 1674994116,
"narHash": "sha256-KHcCk/EnKqC1Dl5hFnJVNJ4AwOQSgYKG/xG7FZxGzsI=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "c0f784c05c85422cd7d532fd1a630ba5e8f2348f",
"rev": "c15111d65432ee32ce64d31b268219e2d4d1bae6",
"type": "github"
},
"original": {
@ -612,7 +592,6 @@
"inputs": {
"crane": "crane",
"flake-utils": "flake-utils_3",
"import-cargo": "import-cargo",
"nixpkgs": [
"nixpkgs"
],
@ -620,11 +599,11 @@
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1670425837,
"narHash": "sha256-zRb0IpZPMsfmLkn3CZ+/tSIox0hpbJ6r0vvY1mWZJ84=",
"lastModified": 1675155643,
"narHash": "sha256-DSsBtlbbyQs18Cc4hOd1gAYa4/FSyyJ0UGUfKhLk42k=",
"owner": "tweag",
"repo": "nickel",
"rev": "6110c7f61e46f39e57503889b8f699de8ef3d41e",
"rev": "b930544978e657dc2f214a9357bcbb06979095d7",
"type": "github"
},
"original": {
@ -638,11 +617,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1670210028,
"narHash": "sha256-2VpxobYICB+l6n963nR37r0ongTtvHfHQvsPGgMWDmw=",
"lastModified": 1672236234,
"narHash": "sha256-dpBIuxcDEvJbLD8fTipE0A0JbQD1lZB94zYFPoh01PI=",
"owner": "Misterio77",
"repo": "nix-colors",
"rev": "fcd345bd1c9e7c203c3320ee6ca39814c97ac1fe",
"rev": "7e459f1d88ac54fc2f4b308adb5064863006e4b1",
"type": "github"
},
"original": {
@ -653,44 +632,15 @@
},
"nix-eval-jobs": {
"inputs": {
"flake-utils": [
"colmena",
"flake-utils"
],
"nixpkgs": [
"colmena",
"nixpkgs"
]
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1660713017,
"narHash": "sha256-w6KLNkT/2fI7UvPg3NoKj7gve4CgUHpyWOFq0BUwW7o=",
"owner": "zhaofengli",
"repo": "nix-eval-jobs",
"rev": "b4c078a4870c5b1a5b74420ca1dca41f4d75b7cc",
"type": "github"
},
"original": {
"owner": "zhaofengli",
"ref": "colmena",
"repo": "nix-eval-jobs",
"type": "github"
}
},
"nix-eval-jobs_2": {
"inputs": {
"flake-utils": "flake-utils_5",
"nixpkgs": [
"nixpkgs-wayland",
"nixpkgs"
]
},
"locked": {
"lastModified": 1670462645,
"narHash": "sha256-dneOybXzqQUF0Q7ywW24NXrbbbE0RWQeySrD9M8Xex0=",
"lastModified": 1675041725,
"narHash": "sha256-b1C+pLPA7ZWp3mDtMoFIEKmBhCSSCpe6tTpLP0Vc8Es=",
"owner": "nix-community",
"repo": "nix-eval-jobs",
"rev": "6117ef2024f679d5c52876031880b752f2be4517",
"rev": "dd47d16dc2d88a210197079b362ffefed09a4265",
"type": "github"
},
"original": {
@ -748,16 +698,15 @@
"rustOverlay": "rustOverlay_3"
},
"locked": {
"lastModified": 1648668486,
"narHash": "sha256-XuG24LJvz1gLJBrg6uVfnfxNoq9uTPZfoAhCaEUVVIM=",
"lastModified": 1637302206,
"narHash": "sha256-X82LW/R35vCxNSk9jcddZFbjO6ZMjsq+KhIGC/GMkJg=",
"owner": "yusdacra",
"repo": "nix-cargo-integration",
"rev": "15c34bac7a54d4519ba821a844f4a0867ffd0504",
"rev": "a25206065a3a19d3dbcb2192d9bd273eea5cd919",
"type": "github"
},
"original": {
"owner": "yusdacra",
"ref": "release-1.0",
"repo": "nix-cargo-integration",
"type": "github"
}
@ -808,11 +757,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1670174919,
"narHash": "sha256-XdQr3BUnrvVLRFunLWrZORhwYHDG0+9jUUe0Jv1pths=",
"lastModified": 1674550793,
"narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "9d87bc030a0bf3f00e953dbf095a7d8e852dab6b",
"rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103",
"type": "github"
},
"original": {
@ -854,11 +803,11 @@
},
"nixpkgs-lib_2": {
"locked": {
"lastModified": 1670114968,
"narHash": "sha256-2a9m6wpsGKRpQdBh3B+aMVzfKzrOpu9+HbLXO1DNy7Y=",
"lastModified": 1674953599,
"narHash": "sha256-DlAzFbth2P6Hp1M7smDd1apa2dJdxw3FeaWpl03LWeU=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "77e67cb65014fb75c1c8ccfec60e9bd8b7d02c94",
"rev": "a6486be6c11c609cd60c01a427279e8a80a025fa",
"type": "github"
},
"original": {
@ -885,27 +834,27 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1668984258,
"narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=",
"lastModified": 1673800717,
"narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cf63ade6f74bbc9d2a017290f1b2e33e8fbfa70a",
"rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.05",
"ref": "nixos-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1670146390,
"narHash": "sha256-XrEoDpuloRHHbUkbPnhF2bQ0uwHllXq3NHxtuVe/QK4=",
"lastModified": 1674352297,
"narHash": "sha256-OkAnJPrauEcUCrst4/3DKoQfUn2gXKuU6CFvhtMrLgg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "86370507cb20c905800527539fc049a2bf09c667",
"rev": "918b760070bb8f48cb511300fcd7e02e13058a2e",
"type": "github"
},
"original": {
@ -919,15 +868,15 @@
"inputs": {
"flake-compat": "flake-compat_4",
"lib-aggregate": "lib-aggregate",
"nix-eval-jobs": "nix-eval-jobs_2",
"nixpkgs": "nixpkgs_7"
"nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1670465161,
"narHash": "sha256-iJmBbuq2Wwq3U5bieqdB3ZNw728leZ7bQHl8pEgqY3s=",
"lastModified": 1675160077,
"narHash": "sha256-DyQDjd3Kx95uby8Dd7Z6O9rim2J2weSHD90aFE9A1eg=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "5097457af8e9dcf45a68fa892716919ad28e545a",
"rev": "95408e974fd4a118ecff9820694d0c35750a18eb",
"type": "github"
},
"original": {
@ -970,11 +919,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1628869426,
"narHash": "sha256-7OetQdzAnml3+0b3pmr+reBKs9jn54IvVxbsncWzBn0=",
"lastModified": 1636976544,
"narHash": "sha256-9ZmdyoRz4Qu8bP5BKR1T10YbzcB9nvCeQjOEw2cRKR0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6fc5211eddddc02c50ca7f98d6cc377726417fa9",
"rev": "931ab058daa7e4cd539533963f95e2bb0dbd41e6",
"type": "github"
},
"original": {
@ -986,11 +935,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1671359686,
"narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=",
"lastModified": 1673540789,
"narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4",
"rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf",
"type": "github"
},
"original": {
@ -1018,11 +967,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1670242877,
"narHash": "sha256-jBLh7dRHnbfvPPA9znOC6oQfKrCPJ0El8Zoe0BqnCjQ=",
"lastModified": 1675115703,
"narHash": "sha256-4zetAPSyY0D77x+Ww9QBe8RHn1akvIvHJ/kgg8kGDbk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6e51c97f1c849efdfd4f3b78a4870e6aa2da4198",
"rev": "2caf4ef5005ecc68141ecb4aac271079f7371c44",
"type": "github"
},
"original": {
@ -1033,11 +982,27 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1672953546,
"narHash": "sha256-oz757DnJ1ITvwyTovuwG3l9cX6j9j6/DH9eH+cXFJmc=",
"lastModified": 1675040521,
"narHash": "sha256-+YhT+lQT95qHcj5SNXdRFqIV/SvAezT90T8GzqQ94lE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "99f5676ba0a0c2d7605b63b2dd1b146c384f42dd",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1675115703,
"narHash": "sha256-4zetAPSyY0D77x+Ww9QBe8RHn1akvIvHJ/kgg8kGDbk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a518c77148585023ff56022f09c4b2c418a51ef5",
"rev": "2caf4ef5005ecc68141ecb4aac271079f7371c44",
"type": "github"
},
"original": {
@ -1062,11 +1027,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1670078914,
"narHash": "sha256-oS3/KHb+S1Hf/PSqHAs8xVmvORRL3G2N+9hvX5uP1rI=",
"lastModified": 1674122161,
"narHash": "sha256-9QM4rvgUSEwO8DWtJN9sR/afEqrH1s3b6ACsZT5wiAM=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "2597510df32efafda4d05f5122efe612a7a5da66",
"rev": "53e766957b73298fa68b47478c48cbcc005cc18a",
"type": "github"
},
"original": {
@ -1078,11 +1043,11 @@
"qmk-udev-rules": {
"flake": false,
"locked": {
"lastModified": 1670446925,
"narHash": "sha256-O+dVFWhsJFBb5Fbq2KPWXwdFLhIMku1ZYU6my+nBkVo=",
"lastModified": 1675068466,
"narHash": "sha256-RevCj+tFlleH08VGRwJjKhZdXwU6VlMsSCR9090pgRI=",
"owner": "qmk",
"repo": "qmk_firmware",
"rev": "bb3d694875e4b02d0befee60853d3f5997acabb8",
"rev": "e296d671463f38a78c75ee0727016939634ef985",
"type": "github"
},
"original": {
@ -1155,11 +1120,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1670426523,
"narHash": "sha256-Zh+pAuj4PmBmISXCz+54yVSwSXZwbn+ZELgM85xVUE0=",
"lastModified": 1675097868,
"narHash": "sha256-BKFLjEzdoFWso7Artln7djf8RbtBynj9wZKIj22LV5g=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "6e8a54d0f68702cf7981c8299357838eb0f4d5b2",
"rev": "b75803ad31772d105d86f8ebee0cbc8844a4fa29",
"type": "github"
},
"original": {
@ -1183,11 +1148,11 @@
]
},
"locked": {
"lastModified": 1667487142,
"narHash": "sha256-bVuzLs1ZVggJAbJmEDVO9G6p8BH3HRaolK70KXvnWnU=",
"lastModified": 1672712534,
"narHash": "sha256-8S0DdMPcbITnlOu0uA81mTo3hgX84wK8S9wS34HEFY4=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "cf668f737ac986c0a89e83b6b2e3c5ddbd8cf33b",
"rev": "69fb7bf0a8c40e6c4c197fa1816773774c8ac59f",
"type": "github"
},
"original": {
@ -1208,11 +1173,11 @@
]
},
"locked": {
"lastModified": 1670034122,
"narHash": "sha256-EqmuOKucPWtMvCZtHraHr3Q3bgVszq1x2PoZtQkUuEk=",
"lastModified": 1674267882,
"narHash": "sha256-53sIczqxA5BbrhgO6l54DSisDqHvQ3UUwbSqBryA/k0=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "a0d5773275ecd4f141d792d3a0376277c0fc0b65",
"rev": "1fd6d280c132f4facad8cd023543fb10121e6487",
"type": "github"
},
"original": {
@ -1256,11 +1221,11 @@
"rustOverlay_3": {
"flake": false,
"locked": {
"lastModified": 1628993514,
"narHash": "sha256-TiQUY8H+A/2IUYyFnprt5PE/Aj5ivUXrdhz7VGM8Rd4=",
"lastModified": 1637288133,
"narHash": "sha256-x5XWEK333KEhy2WL3TafE1vSa8/A1sGdbirTIV2bmSc=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "ad311f5bb5c5ef475985f1e0f264e831470a8510",
"rev": "ccc467eff80b2fbb8000cf425e999ef14fbe200c",
"type": "github"
},
"original": {
@ -1293,11 +1258,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1670149631,
"narHash": "sha256-rwmtlxx45PvOeZNP51wql/cWjY3rqzIR3Oj2Y+V7jM0=",
"lastModified": 1674546403,
"narHash": "sha256-vkyNv0xzXuEnu9v52TUtRugNmQWIti8c2RhYnbLG71w=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "da98a111623101c64474a14983d83dad8f09f93d",
"rev": "b6ab3c61e2ca5e07d1f4eb1b67304e2670ea230c",
"type": "github"
},
"original": {
@ -1339,7 +1304,7 @@
},
"utils_2": {
"inputs": {
"flake-utils": "flake-utils_6"
"flake-utils": "flake-utils_5"
},
"locked": {
"lastModified": 1657226504,
@ -1359,11 +1324,11 @@
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1669925104,
"narHash": "sha256-xMHfW+/G9MieN/5tXHUA5/ztE8dkE093cNFTEUgcwxI=",
"lastModified": 1672824257,
"narHash": "sha256-SbYoZj57VlopTzI+OSW9jlgYxN1gI1KLg/s/HV+87eE=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "c8eb24d30e18c165728b8788a10716611c3b633d",
"rev": "5f264a7d6c8af27d41ff440c05262b022c055593",
"type": "gitlab"
},
"original": {
@ -1375,18 +1340,21 @@
},
"xdph": {
"inputs": {
"hyprland-protocols": "hyprland-protocols_2",
"hyprland-protocols": [
"hyprland",
"hyprland-protocols"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
]
},
"locked": {
"lastModified": 1670892912,
"narHash": "sha256-HC1qHrGXivdzNlWuuWcxX/P7OkNrlLbhzaqLx0mslPA=",
"lastModified": 1673116118,
"narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "9fb4fae94b9bd80395c193dcaf6fdf740550cff1",
"rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2",
"type": "github"
},
"original": {

View file

@ -35,7 +35,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
glados = {
url = "git+https://git.sr.ht/~megamanmalte/GLaDOS?ref=main";
url = "git+http://git.home/megamanmalte/GLaDOS?ref=main";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {

View file

@ -255,10 +255,24 @@ in {
# === Photoprism ===
services.photoprism = {
enable = true;
url = "http://foto.home";
port = 2342;
rootDir = "/data/dirty/photoprism";
environmentFile = config.sops.secrets."photoprism-env".path;
storagePath = "/data/dirty/photoprism/storage";
originalsPath = "/data/dirty/photoprism/originals";
importPath = "/data/dirty/photoprism/import";
passwordFile = sopsPath "photoprism-admin-password";
settings = {
PHOTOPRISM_SESSION_MAXAGE = "31536000";
PHOTOPRISM_SESSION_TIMEOUT = "31536000";
PHOTOPRISM_UPLOAD_NSFW = "true";
PHOTOPRISM_DETECT_NSFW = "true";
PHOTOPRISM_UID = "558";
PHOTOPRISM_GID = "558";
PHOTOPRISM_SITE_URL = "https://foto.home";
PHOTOPRISM_SITE_TITLE = "PhotoPrism";
PHOTOPRISM_SITE_CAPTION = "All the pictures!";
PHOTOPRISM_SITE_DESCRIPTION = "";
PHOTOPRISM_SITE_AUTHOR = "";
};
};
services.nginx.virtualHosts."foto.home" = mkVirtHost {
locations."/" = {
@ -413,7 +427,7 @@ in {
sops.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
sops.secrets = {
"paperless-admin-password" = {};
"photoprism-env" = {};
"photoprism-admin-password" = {};
"grafana-admin-password" = {
owner = config.users.users.grafana.name;
mode = "0400";

View file

@ -133,7 +133,7 @@
# Create a `docker` alias for podman, to use it as a drop-in replacement
dockerCompat = true;
dockerSocket.enable = true;
defaultNetwork.dnsname.enable = true;
defaultNetwork.settings.dns_enabled = true;
};
};

View file

@ -20,7 +20,6 @@ in {
./hdparm.nix
./malte.nix
./marie.nix
./photoprism.nix
./radicale.nix
./restic.nix
./scanner.nix

View file

@ -1,74 +0,0 @@
{
pkgs,
lib,
config,
...
}:
# TODO: Improve with mariadb database
let
uid = 558;
gid = 558;
cfg = config.services.photoprism;
in {
options.services.photoprism = with lib; {
enable = mkEnableOption "Photoprism service";
url = mkOption {
type = types.str;
description = "Url with http:// prefix";
};
port = mkOption {
type = types.int;
default = 2342;
description = "Port to expose on";
};
rootDir = mkOption {
type = types.str;
description = "Path to use for photoprism storage";
};
environmentFile = mkOption {
type = types.str;
description = "Additional environment file. I.e. for specifying PHOTOPRISM_ADMIN_PASSWORD";
};
openFirewall = mkEnableOption "port opening";
};
config = lib.mkIf cfg.enable {
# Create the necessary user and group
users = {
groups.photoprism.gid = gid;
users.photoprism = {
inherit uid;
group = config.users.groups.photoprism.name;
isSystemUser = true;
};
};
# Open the port in the firewall
networking.firewall.allowedTCPPorts = lib.optional cfg.openFirewall cfg.port;
virtualisation.oci-containers.containers = {
# Configure the main container
"photoprism" = {
image = "photoprism/photoprism:latest";
ports = ["${builtins.toString cfg.port}:2342"];
environment = {
PHOTOPRISM_UPLOAD_NSFW = "true";
PHOTOPRISM_DETECT_NSFW = "true";
PHOTOPRISM_UID = builtins.toString uid;
PHOTOPRISM_GID = builtins.toString gid;
PHOTOPRISM_SITE_URL = cfg.url;
PHOTOPRISM_SITE_TITLE = "PhotoPrism";
PHOTOPRISM_SITE_CAPTION = "All the pictures!";
PHOTOPRISM_SITE_DESCRIPTION = "";
PHOTOPRISM_SITE_AUTHOR = "";
};
environmentFiles = [cfg.environmentFile];
volumes = [
"${cfg.rootDir}/storage:/photoprism/storage"
"${cfg.rootDir}/import:/photoprism/import"
"${cfg.rootDir}/originals:/photoprism/originals"
];
};
};
};
}