Compare commits

...

10 commits

Author SHA1 Message Date
d158ef134f
home: Remove nomachine 2024-04-10 22:20:24 +02:00
0941f76d33
home: Disable bitwarden desktop until electron issue is fixed 2024-04-10 22:20:05 +02:00
d9bd7d8586
caddy-proxy: Decouple configuration of virtualHosts from module 2024-04-10 22:19:33 +02:00
a73ea8306a
fixup! Get atuin from bleeding edge 2024-04-10 22:19:20 +02:00
063ec26f3d
firefox: Use correct way to override some stuff 2024-04-10 22:18:34 +02:00
d8b350987e
emacs: Tweak rust-analyzer configuration 2024-04-10 21:34:27 +02:00
ba7053c769
Get atuin from bleeding edge 2024-04-10 21:34:05 +02:00
5e7d9437a2
flake.lock: Update
Flake lock file updates:

• Updated input 'atuin':
    'github:atuinsh/atuin/3f80a9fca43de7e1905db378398ad7ef2c1ff916?narHash=sha256-0McFNyQx2epRmDuQdXFLUuy6xlEczuS0R6Kd0RhK/X0%3D' (2024-04-08)
  → 'github:atuinsh/atuin/0ab9f4d9ff545d83dc664b494ecf450750c0f184?narHash=sha256-tcGPDWrfUuo3d5OpXyg9veJeYIatzFLRjcZSp%2B0SFxI%3D' (2024-04-09)
• Updated input 'disko':
    'github:nix-community/disko/0a17298c0d96190ef3be729d594ba202b9c53beb?narHash=sha256-kTcEtrQIRnexu5lAbLsmUcfR2CrmsACF1s3ZFw1NEVA%3D' (2024-04-05)
  → 'github:nix-community/disko/79eab0e82cb126bf4ac170f44af82479f0895ab5?narHash=sha256-Tv4C8OSPVmm4LbpJGLFSODyvJy6DqrisEGPCQdNVOeY%3D' (2024-04-08)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/3ef9acae671e1eab0a71ee982ef9097a9707b665?narHash=sha256-IHc8IfVjWnlET894jWyDVqwFnT95p7vBgiK5GRzJ5P4%3D' (2024-04-08)
  → 'github:nix-community/emacs-overlay/d08457d425b0a1f15f44f6d9faa17240f2bd29a6?narHash=sha256-y703Dcj6RS51iO5xFDorkyIGZD8/hQDkwaHJsB6uI80%3D' (2024-04-10)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/e38d7cb66ea4f7a0eb6681920615dfcc30fc2920?narHash=sha256-g0whLLwRvgO2FsyhY8fNk%2BTWenS3jg5UdlWL4uqgFeo%3D' (2024-04-06)
  → 'github:NixOS/nixpkgs/d272ca50d1f7424fbfcd1e6f1c9e01d92f6da167?narHash=sha256-y31s5idk3jMJMAVE4Ud9AdI7HT3CgTAeMTJ0StqKN7Y%3D' (2024-04-08)
• Updated input 'home-manager':
    'github:nix-community/home-manager/a561ad6ab38578c812cc9af3b04f2cc60ebf48c9?narHash=sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq%2BIWxFq8ey8yNPU%3D' (2024-04-07)
  → 'github:nix-community/home-manager/b00d0e4fe9cba0047f54e77418ddda5f17e6ef2c?narHash=sha256-NrVLXkpT9ZigiI8md6NIzHS%2B3lE4QTj30IgXG57O9iM%3D' (2024-04-09)
• Updated input 'microvm':
    'github:astro/microvm.nix/1e746a8987eb893adc8dd317b84e73d72803b650?narHash=sha256-7W3D1Gk6mGlwtV07n6YB/7s3tThcBYknlvDPcoJJSe4%3D' (2024-04-06)
  → 'github:astro/microvm.nix/ee0068ca87bdabbde3cc39b7af807c0302d0304c?narHash=sha256-CNdpLnGOUZfIhBanAFVF7t1xstaQGL4w6sQPrVeLlus%3D' (2024-04-09)
• Updated input 'nix-ld-rs':
    'github:nix-community/nix-ld-rs/2c1c306f4e2c24eae438248b538a6d62c99984f8?narHash=sha256-j%2Bq01YdTR42eqAI95%2B6DPyWDsBzYKxkRU4bJvXiLx24%3D' (2024-04-07)
  → 'github:nix-community/nix-ld-rs/f1c82bda746815f2162a9cc959296bfa0fc50499?narHash=sha256-99MkjQdZlEJ4292bUtHx7C07pDSbU9syEb3lc%2BFrPkw%3D' (2024-04-09)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/1e3b3a35b7083f4152f5a516798cf9b21e686465?narHash=sha256-c9nT2ZODGqobISP41kUwCQ84Srwg7a/1TmPFQuol2/8%3D' (2024-04-08)
  → 'github:NixOS/nixos-hardware/05aa46a1f3b5ac92bfe84807868ba9670d48b031?narHash=sha256-rXb3onsPMiv00FrGSpIJyYa8x53W0dlbJ5Ka3xvje/c%3D' (2024-04-09)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/ff0dbd94265ac470dda06a657d5fe49de93b4599?narHash=sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck%3D' (2024-04-06)
  → 'github:nixos/nixpkgs/4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6?narHash=sha256-vMZ5603yU0wxgyQeHJryOI%2BO61yrX2AHwY6LOFyV1gM%3D' (2024-04-08)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/e35aed5fda3cc79f88ed7f1795021e559582093a?narHash=sha256-4XLvuSIDZJGS17xEwSrNuJLL7UjDYKGJSbK1WWX2AK8%3D' (2024-04-02)
  → 'github:cachix/pre-commit-hooks.nix/70f504012f0a132ac33e56988e1028d88a48855c?narHash=sha256-igpsH%2Bpa6yFwYOdah3cFciCk8gw%2BytniG9quf5f/q84%3D' (2024-04-08)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/ece8bdb3c3b58def25f204b9a1261dee55d7c9c0?narHash=sha256-UZebDBECRSrJqw4K%2BLxZ6qFdYnScu6q1XCwqtsu1cas%3D' (2024-04-08)
  → 'github:oxalica/rust-overlay/9ef1eca23bee5fb8080863909af3802130b2ee57?narHash=sha256-uOx7GaLV%2B5hekAYtm/CBr627Pi7%2Bd1Yh70hwKmVjYYo%3D' (2024-04-10)
• Updated input 'sops':
    'github:Mic92/sops-nix/39191e8e6265b106c9a2ba0cfd3a4dafe98a31c6?narHash=sha256-DMgBS%2BjNHDg8z3g9GkwqL8xTKXCRQ/0FGsAyrniVonc%3D' (2024-04-07)
  → 'github:Mic92/sops-nix/538c114cfdf1f0458f507087b1dcf018ce1c0c4c?narHash=sha256-a4hbls4vlLRMciv62YrYT/Xs/3Cubce8WFHPUDWwzf8%3D' (2024-04-08)
2024-04-10 08:15:41 +02:00
e216d5a4e9
flake.lock: Update
Flake lock file updates:

• Added input 'atuin':
    'github:atuinsh/atuin/3f80a9fca43de7e1905db378398ad7ef2c1ff916' (2024-04-08)
• Added input 'atuin/flake-compat':
    'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04)
• Added input 'atuin/flake-utils':
    follows 'flake-utils'
• Added input 'atuin/nixpkgs':
    follows 'nixpkgs'
2024-04-09 08:45:11 +02:00
b1260972c1
flake.lock: Update
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/611c9ea53250f7bb22286b3d26872280a0e608f9?narHash=sha256-sBDe%2BQmX/QohlnKeSEzrftcXyZL5FY09OMjZ59Rpyy4%3D' (2024-04-01)
  → 'github:nix-community/disko/0a17298c0d96190ef3be729d594ba202b9c53beb?narHash=sha256-kTcEtrQIRnexu5lAbLsmUcfR2CrmsACF1s3ZFw1NEVA%3D' (2024-04-05)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/5d0a10938c32f3cb95d1f1f18127948d239c6720?narHash=sha256-QzrcwGuuAP1octIcUw/d%2BYi5BEXYt1NOwNLpeUrqKTk%3D' (2024-04-03)
  → 'github:nix-community/emacs-overlay/3ef9acae671e1eab0a71ee982ef9097a9707b665?narHash=sha256-IHc8IfVjWnlET894jWyDVqwFnT95p7vBgiK5GRzJ5P4%3D' (2024-04-08)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/219951b495fc2eac67b1456824cc1ec1fd2ee659?narHash=sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg%3D' (2024-03-28)
  → 'github:NixOS/nixpkgs/e38d7cb66ea4f7a0eb6681920615dfcc30fc2920?narHash=sha256-g0whLLwRvgO2FsyhY8fNk%2BTWenS3jg5UdlWL4uqgFeo%3D' (2024-04-06)
• Updated input 'eww':
    'github:elkowar/eww/149727ce1f7dd4f461ab1d61d560546f3d1f32a1?narHash=sha256-DkJBMFUG8GLCoZ5yEXRDb4iWQjH%2BV6hrB4QQuRrn2F8%3D' (2024-03-31)
  → 'github:elkowar/eww/ebe5f349d184e79edc33199d064d9ec5f1e4dd9b?narHash=sha256-WcAWIvIdGE0tcS7WJ6JlbRlUnKvpvut500NozUmJ6jY%3D' (2024-04-06)
• Updated input 'home-manager':
    'github:nix-community/home-manager/80546b220e95a575c66c213af1b09fe255299438?narHash=sha256-94I0sXz6fiVBvUAk2tg6t3UpM5rOImj4JTSTNFbg64s%3D' (2024-04-02)
  → 'github:nix-community/home-manager/a561ad6ab38578c812cc9af3b04f2cc60ebf48c9?narHash=sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq%2BIWxFq8ey8yNPU%3D' (2024-04-07)
• Updated input 'microvm':
    'github:astro/microvm.nix/1b7c70b198554d0f0306ec153c94906623437aed?narHash=sha256-lLlXQBebD6wd2m7vjXg2zQ8tfJF2a70RL%2BzXdbaQqn0%3D' (2024-03-29)
  → 'github:astro/microvm.nix/1e746a8987eb893adc8dd317b84e73d72803b650?narHash=sha256-7W3D1Gk6mGlwtV07n6YB/7s3tThcBYknlvDPcoJJSe4%3D' (2024-04-06)
• Updated input 'nix-ld-rs':
    'github:nix-community/nix-ld-rs/76999cac5abefc7862b19daeef0ef91d4270fb17?narHash=sha256-j0yUDFX7cyoM5r9afQ45tfu8wqUk0dRicOb79%2BK81JI%3D' (2024-03-25)
  → 'github:nix-community/nix-ld-rs/2c1c306f4e2c24eae438248b538a6d62c99984f8?narHash=sha256-j%2Bq01YdTR42eqAI95%2B6DPyWDsBzYKxkRU4bJvXiLx24%3D' (2024-04-07)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/9a763a7acc4cfbb8603bb0231fec3eda864f81c0?narHash=sha256-luvqik%2Bi3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U%3D' (2024-03-25)
  → 'github:NixOS/nixos-hardware/1e3b3a35b7083f4152f5a516798cf9b21e686465?narHash=sha256-c9nT2ZODGqobISP41kUwCQ84Srwg7a/1TmPFQuol2/8%3D' (2024-04-08)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/d8fe5e6c92d0d190646fb9f1056741a229980089?narHash=sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk%3D' (2024-03-29)
  → 'github:nixos/nixpkgs/ff0dbd94265ac470dda06a657d5fe49de93b4599?narHash=sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck%3D' (2024-04-06)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/74deb67494783168f5b6d2071d73177e6bccab65?narHash=sha256-8LU2IM4ctHz043hlzoFUwQS1QIdhiMGEH/oIfPCxoWU%3D' (2024-04-03)
  → 'github:oxalica/rust-overlay/ece8bdb3c3b58def25f204b9a1261dee55d7c9c0?narHash=sha256-UZebDBECRSrJqw4K%2BLxZ6qFdYnScu6q1XCwqtsu1cas%3D' (2024-04-08)
• Updated input 'sops':
    'github:Mic92/sops-nix/99b1e37f9fc0960d064a7862eb7adfb92e64fa10?narHash=sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg%3D' (2024-03-31)
  → 'github:Mic92/sops-nix/39191e8e6265b106c9a2ba0cfd3a4dafe98a31c6?narHash=sha256-DMgBS%2BjNHDg8z3g9GkwqL8xTKXCRQ/0FGsAyrniVonc%3D' (2024-04-07)
• Updated input 'sops/nixpkgs-stable':
    'github:NixOS/nixpkgs/2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c?narHash=sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4%3D' (2024-03-30)
  → 'github:NixOS/nixpkgs/e38d7cb66ea4f7a0eb6681920615dfcc30fc2920?narHash=sha256-g0whLLwRvgO2FsyhY8fNk%2BTWenS3jg5UdlWL4uqgFeo%3D' (2024-04-06)
2024-04-08 11:20:15 +02:00
8 changed files with 180 additions and 78 deletions

137
flake.lock generated
View file

@ -43,6 +43,30 @@
"type": "github"
}
},
"atuin": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1712668887,
"narHash": "sha256-tcGPDWrfUuo3d5OpXyg9veJeYIatzFLRjcZSp+0SFxI=",
"owner": "atuinsh",
"repo": "atuin",
"rev": "0ab9f4d9ff545d83dc664b494ecf450750c0f184",
"type": "github"
},
"original": {
"owner": "atuinsh",
"repo": "atuin",
"type": "github"
}
},
"caddy-with-plugins": {
"inputs": {
"flake-parts": [
@ -68,7 +92,7 @@
},
"colmena": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
@ -133,7 +157,7 @@
},
"crane_3": {
"inputs": {
"flake-compat": "flake-compat_4",
"flake-compat": "flake-compat_5",
"flake-utils": [
"ha-now-playing",
"flake-utils"
@ -168,11 +192,11 @@
]
},
"locked": {
"lastModified": 1711934712,
"narHash": "sha256-sBDe+QmX/QohlnKeSEzrftcXyZL5FY09OMjZ59Rpyy4=",
"lastModified": 1712612224,
"narHash": "sha256-Tv4C8OSPVmm4LbpJGLFSODyvJy6DqrisEGPCQdNVOeY=",
"owner": "nix-community",
"repo": "disko",
"rev": "611c9ea53250f7bb22286b3d26872280a0e608f9",
"rev": "79eab0e82cb126bf4ac170f44af82479f0895ab5",
"type": "github"
},
"original": {
@ -192,11 +216,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1712108714,
"narHash": "sha256-QzrcwGuuAP1octIcUw/d+Yi5BEXYt1NOwNLpeUrqKTk=",
"lastModified": 1712713563,
"narHash": "sha256-y703Dcj6RS51iO5xFDorkyIGZD8/hQDkwaHJsB6uI80=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "5d0a10938c32f3cb95d1f1f18127948d239c6720",
"rev": "d08457d425b0a1f15f44f6d9faa17240f2bd29a6",
"type": "github"
},
"original": {
@ -207,7 +231,7 @@
},
"eww": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-compat": "flake-compat_4",
"nixpkgs": [
"nixpkgs"
],
@ -216,11 +240,11 @@
]
},
"locked": {
"lastModified": 1711884036,
"narHash": "sha256-DkJBMFUG8GLCoZ5yEXRDb4iWQjH+V6hrB4QQuRrn2F8=",
"lastModified": 1712401919,
"narHash": "sha256-WcAWIvIdGE0tcS7WJ6JlbRlUnKvpvut500NozUmJ6jY=",
"owner": "elkowar",
"repo": "eww",
"rev": "149727ce1f7dd4f461ab1d61d560546f3d1f32a1",
"rev": "ebe5f349d184e79edc33199d064d9ec5f1e4dd9b",
"type": "github"
},
"original": {
@ -246,6 +270,22 @@
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1650374568,
@ -261,7 +301,7 @@
"type": "github"
}
},
"flake-compat_3": {
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1696426674,
@ -277,7 +317,7 @@
"type": "github"
}
},
"flake-compat_4": {
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1696267196,
@ -293,7 +333,7 @@
"type": "github"
}
},
"flake-compat_5": {
"flake-compat_6": {
"flake": false,
"locked": {
"lastModified": 1696426674,
@ -309,7 +349,7 @@
"type": "github"
}
},
"flake-compat_6": {
"flake-compat_7": {
"flake": false,
"locked": {
"lastModified": 1696426674,
@ -520,11 +560,11 @@
]
},
"locked": {
"lastModified": 1712093955,
"narHash": "sha256-94I0sXz6fiVBvUAk2tg6t3UpM5rOImj4JTSTNFbg64s=",
"lastModified": 1712688495,
"narHash": "sha256-NrVLXkpT9ZigiI8md6NIzHS+3lE4QTj30IgXG57O9iM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "80546b220e95a575c66c213af1b09fe255299438",
"rev": "b00d0e4fe9cba0047f54e77418ddda5f17e6ef2c",
"type": "github"
},
"original": {
@ -544,11 +584,11 @@
"spectrum": "spectrum"
},
"locked": {
"lastModified": 1711753492,
"narHash": "sha256-lLlXQBebD6wd2m7vjXg2zQ8tfJF2a70RL+zXdbaQqn0=",
"lastModified": 1712654305,
"narHash": "sha256-CNdpLnGOUZfIhBanAFVF7t1xstaQGL4w6sQPrVeLlus=",
"owner": "astro",
"repo": "microvm.nix",
"rev": "1b7c70b198554d0f0306ec153c94906623437aed",
"rev": "ee0068ca87bdabbde3cc39b7af807c0302d0304c",
"type": "github"
},
"original": {
@ -605,18 +645,18 @@
},
"nix-ld-rs": {
"inputs": {
"flake-compat": "flake-compat_5",
"flake-compat": "flake-compat_6",
"flake-utils": "flake-utils_4",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1711333167,
"narHash": "sha256-j0yUDFX7cyoM5r9afQ45tfu8wqUk0dRicOb79+K81JI=",
"lastModified": 1712668238,
"narHash": "sha256-99MkjQdZlEJ4292bUtHx7C07pDSbU9syEb3lc+FrPkw=",
"owner": "nix-community",
"repo": "nix-ld-rs",
"rev": "76999cac5abefc7862b19daeef0ef91d4270fb17",
"rev": "f1c82bda746815f2162a9cc959296bfa0fc50499",
"type": "github"
},
"original": {
@ -627,11 +667,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1711352745,
"narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=",
"lastModified": 1712695607,
"narHash": "sha256-rXb3onsPMiv00FrGSpIJyYa8x53W0dlbJ5Ka3xvje/c=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0",
"rev": "05aa46a1f3b5ac92bfe84807868ba9670d48b031",
"type": "github"
},
"original": {
@ -692,11 +732,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1711668574,
"narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
"lastModified": 1712588820,
"narHash": "sha256-y31s5idk3jMJMAVE4Ud9AdI7HT3CgTAeMTJ0StqKN7Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
"rev": "d272ca50d1f7424fbfcd1e6f1c9e01d92f6da167",
"type": "github"
},
"original": {
@ -724,11 +764,11 @@
},
"nixpkgs-stable_4": {
"locked": {
"lastModified": 1711819797,
"narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=",
"lastModified": 1712437997,
"narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c",
"rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920",
"type": "github"
},
"original": {
@ -740,11 +780,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1711703276,
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
"lastModified": 1712608508,
"narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
"rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
"type": "github"
},
"original": {
@ -784,7 +824,7 @@
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_6",
"flake-compat": "flake-compat_7",
"flake-utils": [
"flake-utils"
],
@ -795,11 +835,11 @@
"nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1712055707,
"narHash": "sha256-4XLvuSIDZJGS17xEwSrNuJLL7UjDYKGJSbK1WWX2AK8=",
"lastModified": 1712579741,
"narHash": "sha256-igpsH+pa6yFwYOdah3cFciCk8gw+ytniG9quf5f/q84=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "e35aed5fda3cc79f88ed7f1795021e559582093a",
"rev": "70f504012f0a132ac33e56988e1028d88a48855c",
"type": "github"
},
"original": {
@ -812,6 +852,7 @@
"inputs": {
"anyrun": "anyrun",
"attic": "attic",
"atuin": "atuin",
"caddy-with-plugins": "caddy-with-plugins",
"colmena": "colmena",
"disko": "disko",
@ -870,11 +911,11 @@
]
},
"locked": {
"lastModified": 1712110341,
"narHash": "sha256-8LU2IM4ctHz043hlzoFUwQS1QIdhiMGEH/oIfPCxoWU=",
"lastModified": 1712715149,
"narHash": "sha256-uOx7GaLV+5hekAYtm/CBr627Pi7+d1Yh70hwKmVjYYo=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "74deb67494783168f5b6d2071d73177e6bccab65",
"rev": "9ef1eca23bee5fb8080863909af3802130b2ee57",
"type": "github"
},
"original": {
@ -891,11 +932,11 @@
"nixpkgs-stable": "nixpkgs-stable_4"
},
"locked": {
"lastModified": 1711855048,
"narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=",
"lastModified": 1712617241,
"narHash": "sha256-a4hbls4vlLRMciv62YrYT/Xs/3Cubce8WFHPUDWwzf8=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10",
"rev": "538c114cfdf1f0458f507087b1dcf018ce1c0c4c",
"type": "github"
},
"original": {

View file

@ -101,6 +101,14 @@
inputs.nixpkgs.follows = "nixpkgs";
};
atuin = {
url = "github:atuinsh/atuin";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
};
};
caddy-with-plugins = {
url = "github:eboskma/caddy-with-plugins";
inputs = {

View file

@ -1357,17 +1357,15 @@ Configure [[https://rust-analyzer.github.io][rust-analyzer]]
:imports (:granularity (:enforce :json-false :group "crate")
:group t :merge
(:glob t)
:preferPrelude t
:prefix "plain")
:lruCapacity nil
:checkOnSave (:enable t
:command "clippy"
:allTargets t)
:inlayHints (:bindingModeHints t
:chainingHints t
:lifetimeElisionHints (:enable "always" :useParameterNames :json-false)
:lifetimeElisionHints (:enable "always" :useParameterNames t)
:maxLength nil
:parameterHints :json-false
:renderColons t
:typeHints (:enable t
:hideClosureInitialization :json-false
:hideNamedConstructor :json-false))

View file

@ -104,12 +104,10 @@ in
config = mkIf cfg.enable {
programs.firefox = {
enable = true;
package = pkgs.firefox.override {
cfg = {
enableGnomeExtensions = true;
enableSpeechSynthesisSupport = true;
};
};
package = pkgs.wrapFirefox (pkgs.firefox-unwrapped.override {
pipewireSupport = true;
ffmpegSupport = true;
}) { };
profiles = {
private = {

View file

@ -29,6 +29,7 @@ rec {
inputs.nil.overlays.default
inputs.pamedia.overlays.${system}
inputs.rust-overlay.overlays.default
inputs.atuin.overlays.default
]
++ nixpkgs.lib.optional (system == "aarch64-linux") (
_final: super: { makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; }); }

View file

@ -23,6 +23,39 @@
plugins = [ "github.com/caddy-dns/cloudflare@74f004e1c1ab9056288f0baf3cd4b0039d6c77f3" ];
vendorHash = "sha256-UYNFkGK4A7DJSmin4nCo9rUD60gx80e9YZodn7uEcUM=";
};
proxyHosts = [
{
externalHostname = "home.datarift.nl";
proxyAddress = "homeassistant.barn-beaver.ts.net:8123";
external = true;
}
{
externalHostname = "frigate.datarift.nl";
proxyAddress = "frigate.barn-beaver.ts.net:5000";
}
{
externalHostname = "git.datarift.nl";
proxyAddress = "gitea.barn-beaver.ts.net:3000";
external = true;
}
{
externalHostname = "minio.datarift.nl";
proxyAddress = "minio.barn-beaver.ts.net:9000";
external = true;
}
{
externalHostname = "minio-admin.datarift.nl";
proxyAddress = "minio.barn-beaver.ts.net:9001";
}
{
externalHostname = "saga.datarift.nl";
proxyAddress = "saga.barn-beaver.ts.net:3000";
}
{
externalHostname = "unifi.datarift.nl";
proxyAddress = "unifi.barn-beaver.ts.net:8443";
}
];
};
tailscale.enable = true;
};

View file

@ -8,14 +8,25 @@ with lib;
let
cfg = config.eboskma.caddy-proxy;
proxyHost = types.submodule {
options = {
externalHostname = mkOption {
description = "Hostname where this service should be reached";
type = types.str;
};
proxyAddress = mkOption {
description = "Internal address where this service is reachable";
type = types.str;
};
external = mkEnableOption "Make this host externally reachable.";
};
};
mkProxyHost = target: {
extraConfig = ''
reverse_proxy ${target}
tls {
dns cloudflare {env.CF_API_TOKEN}
propagation_timeout -1
}
import cloudflare-tls
'';
};
@ -31,10 +42,7 @@ let
error "Nope." 403
}
tls {
dns cloudflare {env.CF_API_TOKEN}
propagation_timeout -1
}
import cloudflare-tls
'';
};
in
@ -42,6 +50,10 @@ in
options.eboskma.caddy-proxy = {
enable = mkEnableOption "Caddy proxy";
package = mkPackageOption pkgs "caddy" { };
proxyHosts = mkOption {
description = "Proxy hosts";
type = types.listOf proxyHost;
};
};
config = mkIf cfg.enable {
@ -53,16 +65,27 @@ in
acmeCA = "https://acme-v02.api.letsencrypt.org/directory";
virtualHosts = {
"home.datarift.nl" = mkProxyHost "homeassistant.barn-beaver.ts.net:8123";
"ci.datarift.nl" = mkProxyHost "ci.barn-beaver.ts.net:8100";
"frigate.datarift.nl" = mkLocalProxyHost "frigate.barn-beaver.ts.net:5000";
"git.datarift.nl" = mkProxyHost "gitea.barn-beaver.ts.net:3000";
"minio.datarift.nl" = mkProxyHost "minio.barn-beaver.ts.net:9000";
"minio-admin.datarift.nl" = mkLocalProxyHost "minio.barn-beaver.ts.net:9001";
"saga.datarift.nl" = mkLocalProxyHost "saga.barn-beaver.ts.net:3000";
"unifi.datarift.nl" = mkLocalProxyHost "unifi.barn-beaver.ts.net:8443";
};
extraConfig = ''
(cloudflare-tls) {
tls {
dns cloudflare {env.CF_API_TOKEN}
propagation_timeout -1
}
}
'';
virtualHosts = builtins.listToAttrs (
map (
host:
let
mkProxy = if host ? external && host.external then mkProxyHost else mkLocalProxyHost;
in
{
name = host.externalHostname;
value = mkProxy host.proxyAddress;
}
) cfg.proxyHosts
);
};
systemd.services.caddy.serviceConfig.EnvironmentFile = [ config.sops.secrets.caddy-env.path ];

View file

@ -185,7 +185,8 @@ in
ardour
atool
inputs.attic.packages.${pkgs.system}.attic-client
bitwarden
# bitwarden
bitwarden-cli
blink1-tool
bottom
dconf
@ -218,7 +219,6 @@ in
minio-client
mpv
nheko
nomachine-client
nordzy-cursor-theme
(noson.overrideAttrs (_: {
qtWrapperArgs = "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.libpulseaudio ]}";