Compare commits

..

3 commits

Author SHA1 Message Date
cy
877efd4ce9
workflow: sign all just in case something got missed 2025-03-28 10:48:25 -04:00
cy
b5761b1a0f
workflow: nix copy --all 2025-03-28 10:35:58 -04:00
cy
8106125edb
flake.lock: Update
Flake lock file updates:

• Updated input 'conduwuit':
    'github:girlbossceo/conduwuit/7bf92c8a3710eeff229bd86bc81a89daa94b66d5' (2025-03-18)
  → 'github:girlbossceo/conduwuit/33c5afe050491988ee8224af25b9b06e892f4b50' (2025-03-21)
• Updated input 'crane':
    'github:ipetkov/crane/66cb0013f9a99d710b167ad13cbd8cc4e64f2ddb' (2025-03-18)
  → 'github:ipetkov/crane/70947c1908108c0c551ddfd73d4f750ff2ea67cd' (2025-03-19)
• Updated input 'garage':
    'github:deuxfleurs-org/garage/6906a4ff12838da2a74bdaeb7e7cd05cd1d69699' (2025-03-17)
  → 'github:deuxfleurs-org/garage/14d2f2b18da015508d4a1e31b2f014da5188d516' (2025-03-21)
• Updated input 'home-manager':
    'github:nix-community/home-manager/fb74bb76d94a6c55632376c931fc108131260ee9' (2025-03-18)
  → 'github:nix-community/home-manager/b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52' (2025-03-27)
• Updated input 'lix-module':
    'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=a6da43f8193d9e329bba1795c42590c27966082e' (2025-03-13)
  → 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=fa69ae26cc32dda178117b46487c2165c0e08316' (2025-03-25)
• Updated input 'lix-module/lix':
    '20edd45ae8.tar.gz?narHash=sha256-gJ7QmlwsJ/QdwUjwTjifNo3v7OBQm2N6xa19l3mMWM4%3D&rev=20edd45ae816c73504ddfb9c678756e003ceeafd' (2025-03-13)
  → '6059cbb031.tar.gz?narHash=sha256-z652gNdFc/95Fheq4DzVObERYRo%2Bj9RdCF6tzkR8r80%3D&rev=6059cbb031e49e05dd5d16208e2e50d3ab2611db' (2025-03-22)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/2cfb4e1ca32f59dd2811d7a6dd5d4d1225f0955c' (2025-03-17)
  → 'github:nix-community/nix-index-database/36dc43cb50d5d20f90a28d53abb33a32b0a2aae6' (2025-03-23)
• Updated input 'nix-ld':
    'github:nix-community/nix-ld/bc1ecb8ca83507c764a3909f02f1acf53c033585' (2025-03-17)
  → 'github:nix-community/nix-ld/27a5f75260a086f391c0eca38a5e306b9823a0b4' (2025-03-24)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/2b3795787eba0066a2bc8bba7362422e5713840f' (2025-03-18)
  → 'github:nixos/nixpkgs/8b1bcd4edc0de0a950eb117a37c55294997588b5' (2025-03-27)
• Updated input 'nixpkgs-stable':
    'github:nixos/nixpkgs/da044451c6a70518db5b730fe277b70f494188f1' (2025-03-18)
  → 'github:nixos/nixpkgs/d02d88f8de5b882ccdde0465d8fa2db3aa1169f7' (2025-03-25)
• Updated input 'nixvim':
    'github:nix-community/nixvim/78f6166c23f80bdfbcc8c44b20f7f4132299a33f' (2025-03-17)
  → 'github:nix-community/nixvim/1c0dd320d9c4f250ac33382e11d370b7abe97622' (2025-03-26)
• Updated input 'nixvim/nuschtosSearch':
    'github:NuschtOS/search/86e2038290859006e05ca7201425ea5b5de4aecb' (2025-02-02)
  → 'github:NuschtOS/search/508752835128a3977985a4d5225ff241f7756181' (2025-03-22)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/87f0965f9f5b13fca9f38074eee8369dc767550d' (2025-03-18)
  → 'github:oxalica/rust-overlay/f93da1d26ba9963f34f94a6872b67a7939699543' (2025-03-28)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/787afce414bcce803b605c510b60bf43c11f4b55' (2025-03-17)
  → 'github:Mic92/sops-nix/67566fe68a8bed2a7b1175fdfb0697ed22ae8852' (2025-03-23)
• Updated input 'treefmt':
    'github:numtide/treefmt-nix/b3b938ab8ba2e8a0ce9ee9b30ccfa5e903ae5753' (2025-03-18)
  → 'github:numtide/treefmt-nix/29a3d7b768c70addce17af0869f6e2bd8f5be4b7' (2025-03-27)
• Updated input 'vscode-extensions':
    'github:nix-community/nix-vscode-extensions/32de9a383db6b555ac92877dd8b5b986f4151de7' (2025-03-18)
  → 'github:nix-community/nix-vscode-extensions/2473e00df450ad863f552f2cc8da78e6a942118d' (2025-03-28)
2025-03-27 23:42:22 -04:00
8 changed files with 23 additions and 26 deletions

24
flake.lock generated
View file

@ -131,11 +131,11 @@
"rocksdb": "rocksdb" "rocksdb": "rocksdb"
}, },
"locked": { "locked": {
"lastModified": 1743186614, "lastModified": 1742567657,
"narHash": "sha256-uGI98B+binIclsCJd2wXb7l1k2wV7e+sNmX4R8L5RPc=", "narHash": "sha256-p513FwDJl1J8fCpUFbAeZTb0ONbEmn2r5kGFBc9siUw=",
"owner": "girlbossceo", "owner": "girlbossceo",
"repo": "conduwuit", "repo": "conduwuit",
"rev": "3e57b7d35d5bd6cfed5900b377f7c68970213518", "rev": "33c5afe050491988ee8224af25b9b06e892f4b50",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -455,11 +455,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743136572, "lastModified": 1743097780,
"narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=", "narHash": "sha256-5tUbaMBKYbfTe/4aXACxmiXG22TgwPBNcfZ8Kg3rt+g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1efd2503172016a6742c87b47b43ca2c8145607d", "rev": "b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -828,11 +828,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1743169207, "lastModified": 1743082947,
"narHash": "sha256-JVBHFruzE0/uCMbp8c6f/0mtMLO05Gs5kOo8RYsJss0=", "narHash": "sha256-wZ/bfXu9x025oNa4pVcwYbgVRSl2tf/izZTegPSljUQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "360e0a6013f94d32ea86050d3646e3ccba1c2667", "rev": "8b1bcd4edc0de0a950eb117a37c55294997588b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -853,11 +853,11 @@
"nuschtosSearch": "nuschtosSearch" "nuschtosSearch": "nuschtosSearch"
}, },
"locked": { "locked": {
"lastModified": 1743157969, "lastModified": 1742991302,
"narHash": "sha256-ldlSyVKNaXL7ys7Jr7mLhlpGDE4VPVcWmV7Odupn5TY=", "narHash": "sha256-5S+qnc5ijgFWlAWS9+L7uAgpDnL0RtVEDhVpHWGoavA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "95573411bc9be155a93b0f15d2bad62c6b43b3cc", "rev": "1c0dd320d9c4f250ac33382e11d370b7abe97622",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -190,4 +190,6 @@
# container stuff # container stuff
my.containerization.enable = true; my.containerization.enable = true;
my.attic.enable = true;
} }

View file

@ -24,7 +24,6 @@
compression_level = "none"; compression_level = "none";
}; };
environmentFile = config.sops.secrets."garage/env".path; environmentFile = config.sops.secrets."garage/env".path;
logLevel = "warn";
}; };
services.caddy.virtualHosts = { services.caddy.virtualHosts = {

View file

@ -6,7 +6,7 @@
}: }:
let let
uploadLocation = "/mnt/photos/immich"; uploadLocation = "/mnt/photos/immich";
# thumbsLocation = "/opt/immich/thumbs"; thumbsLocation = "/opt/immich/thumbs";
profileLocation = "/opt/immich/profile"; profileLocation = "/opt/immich/profile";
dbDataLocation = "/opt/immich/postgres"; dbDataLocation = "/opt/immich/postgres";
backupsLocation = "/opt/immich/backups"; backupsLocation = "/opt/immich/backups";
@ -20,7 +20,7 @@ in
pull = "newer"; pull = "newer";
volumes = [ volumes = [
"${uploadLocation}:/usr/src/app/upload" "${uploadLocation}:/usr/src/app/upload"
# "${thumbsLocation}:/usr/src/app/upload/thumbs" "${thumbsLocation}:/usr/src/app/upload/thumbs"
"${profileLocation}:/usr/src/app/upload/profile" "${profileLocation}:/usr/src/app/upload/profile"
"${backupsLocation}:/usr/src/app/upload/backups" "${backupsLocation}:/usr/src/app/upload/backups"
]; ];

View file

@ -14,7 +14,7 @@ let
--config ${config.sops.secrets."rclone/config".path} \ --config ${config.sops.secrets."rclone/config".path} \
--allow-other \ --allow-other \
--cache-dir /var/cache/rclone \ --cache-dir /var/cache/rclone \
--transfers 32 \ --transfers 16 \
--vfs-cache-mode full \ --vfs-cache-mode full \
--vfs-cache-min-free-space 5G \ --vfs-cache-min-free-space 5G \
--dir-cache-time 30d \ --dir-cache-time 30d \

View file

@ -94,10 +94,8 @@
# 3003 # immich-ml # 3003 # immich-ml
# ]; # ];
}; };
hosts = {
"100.122.132.30" = [ "s3.cy7.sh" ];
};
}; };
programs.nm-applet.enable = true;
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {

View file

@ -1,7 +1,9 @@
update: update:
git branch -D update || true git branch -D update || true
git switch -c update git switch -c update
nix flake update --commit-lock-file nix flake update
git add flake.lock
git commit -s -m "flake update"
git push -f git push -f
git switch main git switch main

View file

@ -8,15 +8,11 @@
"age": [ "age": [
{ {
"recipient": "age1sy0at69err83qyml2vqu8xvwjccfws447aaadfvacj2qluw3p45s2mtrw8", "recipient": "age1sy0at69err83qyml2vqu8xvwjccfws447aaadfvacj2qluw3p45s2mtrw8",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLcGd1alJmNWM3dVBmSWxs\nRHBTOVV6U3p1U3Q3bzQ3OXYrWVhNVTlxTGxvClllbFMwc3dFZW56a0d6eUhVZ2Na\nMUVJc29CNHVMcHRLaXBlRnRLZ2pNb0UKLS0tIFRERnRBZGVFRk9sYmpzVjlpdmN1\ndjUyVmRZMFlFTm4zSnZWV09WbTNoMWMKM35a6GkCZIKscqgADrbIa48T8++wkhLP\nOFr03bv6D0Hj38VLWx+kh9kmja8BaxmdSUTeAhdORwbQumJBAqjsOw==\n-----END AGE ENCRYPTED FILE-----\n" "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVdkxBV3NSL1NDRjhPanpZ\nWTQwUmJmTExNOG0xZ1l1M2ZUSlFaTWdzS2hvCkdNT0dmK3FhcC85RE1mQmN1Uncw\nU1A4Znk1Vnk3RmY1UWdBY21VdnRZdWMKLS0tIHhTYUVUeTZsYkJFWk5LdnNDWlc5\ndDFDMUN2RmN0MDNXclpEMFA5Z0F5M0kKsLgc2D73RPNdTo4q7hBPGcBVPGwY73g+\nqQZbkVVzKPHo814ivwIVFYv+i5Qvf+p985Rko/fQ98GxW0G5c9Qfkg==\n-----END AGE ENCRYPTED FILE-----\n"
}, },
{ {
"recipient": "age10h6pg5qdpc4t0rpmksfv788a57f04n83zgqaezkjjn65nkhv547s0vxfdn", "recipient": "age10h6pg5qdpc4t0rpmksfv788a57f04n83zgqaezkjjn65nkhv547s0vxfdn",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHbEh0YkFlL3dPL1FmcE9m\nbjl0dHhQZlpBREMwYzQ0NEpQQ3RZVlNsM1Q4CmYwS0VDNjFaOXhOS3JkVUtaTEJZ\nSVNyZ1lXbEhCbE5XdGxCRWhsNVR1N0EKLS0tICt2Um9wQ0pyUVpnd1dVemM4NmpU\nTHE1bi9OcmsweDZyNVpVVUlITmt3c28KdX6fO1C7Ma66AAv/RCI5z8p/7fSvKWQ7\nCL86Nl4Xzb5WWxkteO4wOoHh4y0+9dpEAbS/XP78PkC07uRttcS7pQ==\n-----END AGE ENCRYPTED FILE-----\n" "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuZ3B4czExQVZxNUJGNk1X\nbE9Md1Z6blM1S2xhb3VLT0JWbUpjSkxxS1U0Cm41bmt5Rk9LVTJFbVRFT2xxM01i\nTGUyYVU2RWdzRUhBVmNsTzJZWmh6cFUKLS0tIFlXVHQrcTVvbnptRitQVkVXRHBJ\nTjIxVXFvRmRQbUFHRXFjbFIva1IxVG8KciKyUdNjec7ocuKVX8KflMVPKpf/tEVr\nTxudivOoQ0XaqyPVi3cWDpuk2IAWUuJDxjmEctE6JgPtQvs1GsKCdg==\n-----END AGE ENCRYPTED FILE-----\n"
},
{
"recipient": "age1eg6sxflw6l44fp20sl068sampwd95fm0mnh4ssegrhtktgm50ptqcuspyn",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCRmNheTZrUWplWFZJcm53\nbC94UHdYbXdsSFB0Nk92Q29RdGMxbUxVeEhjCkZqVk13bEFvNFFLZllTN0NUeFpj\nRkhlYXl5STJrbVQzeWg3YzlQZ1ZlZncKLS0tIGhjUytJa2FXa0VVTFlMN2ZpTjF0\ncG9ZTG0zL2dNekV0NkFZWWVrcFpPU3cK/Kia/sHk5T9nlbDg2G52uQcJUoPrnu3y\n6ARJKoz0MnV4csjS6IZCFSb7Vy5DSH+at3khEw3x00eGae1Jd89vwQ==\n-----END AGE ENCRYPTED FILE-----\n"
} }
], ],
"lastmodified": "2025-03-27T20:37:28Z", "lastmodified": "2025-03-27T20:37:28Z",