immich proxy

flake.lock

@@ -87,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737504076,
+        "lastModified": 1735956190,
-        "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=",
+        "narHash": "sha256-svzx3yVXD5tbBJZCn3Lt1RriH8GHo6CyVUPTHejf7sU=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3",
+        "rev": "3feaf376d75d3d58ebf7e9a4f584d00628548ad9",
         "type": "github"
       },
       "original": {
@@ -108,11 +108,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737038063,
+        "lastModified": 1735468753,
-        "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=",
+        "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2",
+        "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21",
         "type": "github"
       },
       "original": {
@@ -145,11 +145,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737766332,
+        "lastModified": 1735952135,
-        "narHash": "sha256-EcKXfadl+51Y5DQU4R7cy3FQx6XklLwmSwIAtOl1hNU=",
+        "narHash": "sha256-1omANFYtwEeAwwzSQqJbob1ctswLa9L9QS18Kg8ICjc=",
         "owner": "bandithedoge",
         "repo": "nixpkgs-firefox-darwin",
-        "rev": "ef9a452ffc26aed9265e2a5ff04952e960f8f21b",
+        "rev": "72ce135b49236c110d86bce6e6d25bfafcc2158d",
         "type": "github"
       },
       "original": {
@@ -268,14 +268,32 @@
         "type": "github"
       }
     },
+    "flake-utils_4": {
+      "inputs": {
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "gh-collaborators": {
       "flake": false,
       "locked": {
-        "lastModified": 1736185279,
+        "lastModified": 1717117275,
-        "narHash": "sha256-SGmP/8Fvf2rcYkwscMOFG01Y0VJGb/TXrNZtLacurxA=",
+        "narHash": "sha256-x3p2bHL6U8gWanXnTTJGgA9x4Ixy9AOZiBbfcfn5VVw=",
         "owner": "katiem0",
         "repo": "gh-collaborators",
-        "rev": "bf412dde50605e48af86f291c2ac8714f2c1b228",
+        "rev": "4dfcd0b5c2e31f2d0fbfd4b83fdfae787a5e6ff8",
         "type": "github"
       },
       "original": {
@@ -307,11 +325,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737762889,
+        "lastModified": 1735947440,
-        "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=",
+        "narHash": "sha256-jnEcfmOhWntmVEcqlvs+j532+mvmgsKtQSSfukgkn+A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "daf04c5950b676f47a794300657f1d3d14c1a120",
+        "rev": "a9987622b7b93c82e147f198574e8e6ffbf5e327",
         "type": "github"
       },
       "original": {
@@ -330,11 +348,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1737770753,
+        "lastModified": 1735923240,
-        "narHash": "sha256-3CxkhWleCeSF18dO4lo0teBfHm5evdEaL959gOcD+0A=",
+        "narHash": "sha256-xRJvm/YfV9aHyesx52N/t6fauk86Ajfj/ILFldEZ8nk=",
         "owner": "martinvonz",
         "repo": "jj",
-        "rev": "e58713c1355d0536e197a3f99ce5a5c713fe69c3",
+        "rev": "1ddfc59ee95d680ccbd0cfcbcf86c9202f8e44ca",
         "type": "github"
       },
       "original": {
@@ -409,7 +427,7 @@
     "nextcloud-snappymail": {
       "flake": false,
       "locked": {
-        "lastModified": 1737776393,
+        "lastModified": 1735962117,
         "narHash": "sha256-oCw6Brs85rINBHvz3UJXheyLVqvA3RgPXG03b30Fx7E=",
         "type": "tarball",
         "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz"
@@ -442,11 +460,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1736643958,
+        "lastModified": 1734829460,
-        "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
+        "narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
+        "rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c",
         "type": "github"
       },
       "original": {
@@ -463,11 +481,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737057290,
+        "lastModified": 1734915500,
-        "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=",
+        "narHash": "sha256-A7CTIQ8SW0hfbhKlwK+vSsu4pD+Oaelw3v6goX6go+U=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453",
+        "rev": "051d1b2dda3b2e81b38d82e2b691e5c2f4d335f4",
         "type": "github"
       },
       "original": {
@@ -478,11 +496,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1737632463,
+        "lastModified": 1735834308,
-        "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=",
+        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9",
+        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
         "type": "github"
       },
       "original": {
@@ -526,11 +544,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1737632463,
+        "lastModified": 1735834308,
-        "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=",
+        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9",
+        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
         "type": "github"
       },
       "original": {
@@ -547,11 +565,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1737776325,
+        "lastModified": 1735962132,
-        "narHash": "sha256-uSt1yFqmuyehOr0u6k8MXSBrwEGToWcIrTzJexHBufM=",
+        "narHash": "sha256-7elXLoHAQ/+usWi6R08SntEiV8WyAisJAin3T0GEBPE=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "e3bdfbe8b01b6469fd2351ab0cf867d9cfa73da8",
+        "rev": "b085ce9e13651cc235ca993af7a5b09990d27807",
         "type": "github"
       },
       "original": {
@@ -563,11 +581,11 @@
     "nvim-lint-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1737487916,
+        "lastModified": 1734606055,
-        "narHash": "sha256-DKfivSjBFra/iXIuYQa7Mv5f2LglNbQTr8bQ+sCm8to=",
+        "narHash": "sha256-tD1ciHUdHIcqymImZjSSNq6M5hjsrD66AJhmLTy0cIY=",
         "owner": "mfussenegger",
         "repo": "nvim-lint",
-        "rev": "789b7ada1b4f00e08d026dffde410dcfa6a0ba87",
+        "rev": "1fea92f1d9908eaa5eb8bafe08b4293d7aadaa55",
         "type": "github"
       },
       "original": {
@@ -596,11 +614,11 @@
     "nvim-tree-lua-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1737769654,
+        "lastModified": 1734820548,
-        "narHash": "sha256-3wHzEixIhg+aFO9fOOSuTPdNkMK96eG7cdSbK7i5pXA=",
+        "narHash": "sha256-4PmP31vYPH9xw4AjV5rDSKvcvZGTnIaPfR4Bwc0lAiA=",
         "owner": "kyazdani42",
         "repo": "nvim-tree.lua",
-        "rev": "fee1da88972f5972a8296813f6c00d7598325ebd",
+        "rev": "68fc4c20f5803444277022c681785c5edd11916d",
         "type": "github"
       },
       "original": {
@@ -732,11 +750,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737685583,
+        "lastModified": 1735784864,
-        "narHash": "sha256-p+NVABRpGi+pT+xxf9HcLcFVxG6L+vEEy+NwzB9T0f8=",
+        "narHash": "sha256-tIl5p3ueaPw7T5T1UXkLc8ISMk6Y8CI/D/rd0msf73I=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "eb64cbcc8eee0fa87ebded92805280d2ec97415a",
+        "rev": "04d5f1836721461b256ec452883362c5edc5288e",
         "type": "github"
       },
       "original": {
@@ -748,11 +766,11 @@
     "snipe-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1736108869,
+        "lastModified": 1734918876,
-        "narHash": "sha256-sJ71eiE0XmMJkhNCkbY82R4eHzBOOKFrPa+nxLc1f8s=",
+        "narHash": "sha256-nut2POcxH1LgxTEKDikvRPPpbtmvlDDF52SoWZNC1Fg=",
         "owner": "leath-dub",
         "repo": "snipe.nvim",
-        "rev": "0d0a482ac713370196e4fc0025d5aaac5030104d",
+        "rev": "2550012916d4fb21d6d1c7a88a9bddde651bb1f0",
         "type": "github"
       },
       "original": {
@@ -806,6 +824,21 @@
         "type": "github"
       }
     },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "telescope-nvim-src": {
       "flake": false,
       "locked": {
@@ -842,11 +875,11 @@
     "tiny-inline-diagnostic-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1737657256,
+        "lastModified": 1735568714,
-        "narHash": "sha256-4RNZjzVrc6lSXCAEHwtdbWJvNCRjglq97ZL9DRM3IiI=",
+        "narHash": "sha256-rZ5+w6v9ONFTQIXvwTUJuwZKRaXdHZUNEUDfBsC2IMM=",
         "owner": "rachartier",
         "repo": "tiny-inline-diagnostic.nvim",
-        "rev": "5c00aec99f558b8f0a2c4445038f74e5f5435c00",
+        "rev": "867902d5974a18c156c918ab8addbf091719de27",
         "type": "github"
       },
       "original": {
@@ -875,11 +908,11 @@
     "tree-sitter-bash": {
       "flake": false,
       "locked": {
-        "lastModified": 1737678721,
+        "lastModified": 1731338420,
-        "narHash": "sha256-aTM0DjmCX2HaeDfZPCoqWULLVoa+nBppiR97jMWWItM=",
+        "narHash": "sha256-JW+30zIyq8Xc7NG9V+YoFqC+57BjZXIbAvWPD2lqvIE=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-bash",
-        "rev": "03f4927065b3c0d71a962be87130aa7e79b35448",
+        "rev": "49c31006d8307dcb12bc5770f35b6d5b9e2be68e",
         "type": "github"
       },
       "original": {
@@ -941,11 +974,11 @@
     "tree-sitter-python": {
       "flake": false,
       "locked": {
-        "lastModified": 1737668819,
+        "lastModified": 1734908773,
-        "narHash": "sha256-g06oE9w2AMCM6BwTQmB+acY1wcQXjIgj62N+z+nrpaY=",
+        "narHash": "sha256-71Od4sUsxGEvTwmXX8hBvzqD55hnXkVJublrhp1GICg=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-python",
-        "rev": "ab2ba8be034368fa009f62f371c068b8728f9db7",
+        "rev": "bffb65a8cfe4e46290331dfef0dbf0ef3679de11",
         "type": "github"
       },
       "original": {
@@ -1027,16 +1060,17 @@
     "wsl": {
       "inputs": {
         "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils_4",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1736095716,
+        "lastModified": 1733854371,
-        "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=",
+        "narHash": "sha256-K9qGHniYBbjqVcEiwXyiofj/IFf78L5F0/FCf+CKyr0=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0",
+        "rev": "dee4425dcee3149475ead0cb6a616b8a028c5888",
         "type": "github"
       },
       "original": {

hosts/flame/default.nix

@@ -100,7 +100,6 @@ inputs.nixpkgs.lib.nixosSystem rec {
         endpoint = "s3.us-west-002.backblazeb2.com";
         bucket = "noahmasur-backup";
         accessKeyId = "0026b0e73b2e2c80000000005";
-        resticBucket = "noahmasur-restic";
       };
 
       # Disable passwords, only use SSH key

hosts/swan/default.nix

@@ -134,7 +134,7 @@ inputs.nixpkgs.lib.nixosSystem rec {
         endpoint = "s3.us-west-002.backblazeb2.com";
         bucket = "noahmasur-backup";
         accessKeyId = "0026b0e73b2e2c80000000005";
-        resticBucket = "noahmasur-restic";
+        glacierBucket = "noahmasur-archive";
       };
 
       # Disable passwords, only use SSH key

modules/darwin/utilities.nix

@@ -34,7 +34,6 @@
       pkgs.ipcalc # Make IP network calculations
       # pkgs.teams
       pkgs.cloudflared # Allow connecting to Cloudflare tunnels
-      pkgs.monitorcontrol # Allows adjusting external displays
       (pkgs.writeShellApplication {
         name = "ocr";
         runtimeInputs = [ pkgs.tesseract ];

modules/nixos/hardware/monitors.nix

@@ -37,16 +37,17 @@
       # Set up screen position and rotation
       setupCommands = ''
         ${pkgs.xorg.xrandr}/bin/xrandr --output DisplayPort-1 \
-                                            --primary \
+                                            --mode 1920x1200 \
-                                            --rotate normal \
+                                            --pos 2560x0 \
-                                            --mode 2560x1440 \
-                                            --rate 165 \
-                                        --output DisplayPort-2 \
-                                            --right-of DisplayPort-1 \
                                             --rotate left \
+                                        --output DisplayPort-0 \
+                                            --primary \
+                                            --mode 2560x1440 \
+                                            --pos 0x560 \
+                                            --rotate normal \
+                                            --rate 120 \
                                         --output DVI-0 --off \
                                         --output DVI-1 --off \
-                                        || echo "xrandr failed"
       '';
     };
   };

modules/nixos/hardware/sleep.nix

@@ -8,10 +8,6 @@
 
   config = lib.mkIf (config.physical && !config.server) {
 
-    # Use power button to sleep instead of poweroff
-    services.logind.powerKey = "suspend";
-    services.logind.powerKeyLongPress = "poweroff";
-
     # Prevent wake from keyboard
     powerManagement.powerDownCommands = ''
       set +e

modules/nixos/services/actualbudget.nix

@@ -66,9 +66,6 @@
     # Configure Cloudflare DNS to point to this machine
     services.cloudflare-dyndns.domains = [ config.hostnames.budget ];
 
-    # Backups
-    services.restic.backups.default.paths = [ "/var/lib/actualbudget" ];
-
   };
 
 }

modules/nixos/services/backups.nix

@@ -22,9 +22,9 @@
         description = "S3 access key ID for backups";
         default = null;
       };
-      resticBucket = lib.mkOption {
+      glacierBucket = lib.mkOption {
         type = lib.types.nullOr lib.types.str;
-        description = "S3 bucket for restic backups";
+        description = "S3 bucket for glacier backups";
         default = null;
       };
     };
@@ -84,9 +84,9 @@
       dest = "${config.secretsDirectory}/restic";
     };
 
-    services.restic.backups = lib.mkIf (config.backup.s3.resticBucket != null) {
+    services.restic.backups = lib.mkIf (config.backup.s3.glacierBucket != null) {
       default = {
-        repository = "s3:s3.us-east-1.amazonaws.com/${config.backup.s3.resticBucket}/restic";
+        repository = "s3:s3.us-east-1.amazonaws.com/${config.backup.s3.glacierBucket}/restic";
         paths = [ ];
         environmentFile = config.secrets.s3-glacier.dest;
         passwordFile = config.secrets.restic.dest;

modules/nixos/services/default.nix

@@ -16,6 +16,7 @@
     ./cloudflare.nix
     ./filebrowser.nix
     ./identity.nix
+    ./immich-proxy.nix
     ./immich.nix
     ./irc.nix
     ./gitea-runner.nix

modules/nixos/services/immich-proxy.nix

@@ -0,0 +1,23 @@
+{ config, lib, ... }:
+
+{
+
+  options = {
+    immich-proxy.enable = lib.mkEnableOption "Immich proxy";
+  };
+
+  config = lib.mkIf config.services.immich-proxy.enable {
+    caddy.routes = [
+      {
+        match = [ { host = [ config.hostnames.photosProxy ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = "${config.hostnames.photosBackend}:443"; } ];
+          }
+        ];
+      }
+    ];
+  };
+
+}

modules/nixos/services/paperless.nix

@@ -57,9 +57,5 @@
     systemd.services.paperless-web.serviceConfig.UMask = lib.mkForce "0026";
     systemd.services.paperless-scheduler.serviceConfig.UMask = lib.mkForce "0026";
     systemd.services.paperless-task-queue.serviceConfig.UMask = lib.mkForce "0026";
-
-    # Backups
-    services.restic.backups.default.paths = [ "/data/generic/paperless/documents" ];
-
   };
 }

modules/nixos/system/timezone.nix

@@ -8,14 +8,22 @@
 
   config = lib.mkIf pkgs.stdenv.isLinux {
 
-    services.tzupdate.enable = true;
-
     # Service to determine location for time zone
-    # This is required for redshift which depends on the location provider
     services.geoclue2.enable = true;
     services.geoclue2.enableWifi = false; # Breaks when it can't connect
     location = {
       provider = "geoclue2";
     };
+
+    # Enable local time based on time zone
+    services.localtimed.enable = true;
+
+    # Required to get localtimed to talk to geoclue2
+    services.geoclue2.appConfig.localtimed.isSystem = true;
+    services.geoclue2.appConfig.localtimed.isAllowed = true;
+
+    # Fix "Failed to set timezone"
+    # https://github.com/NixOS/nixpkgs/issues/68489#issuecomment-1484030107
+    services.geoclue2.enableDemoAgent = lib.mkForce true;
   };
 }

overlays/gh-collaborators.nix

@@ -2,10 +2,11 @@ inputs: _final: prev: {
 
   gh-collaborators = prev.buildGoModule rec {
     pname = "gh-collaborators";
-    version = "v3.0.0";
+    version = "v2.0.3";
     src = inputs.gh-collaborators;
 
-    vendorHash = "sha256-9qmvG2q9t1Zj8yhKFyA99IaJ90R/gRVdQVjdliVKLRE";
+    # vendorHash = "sha256-rsRDOgJBa8T6+bC/APcmuRmg6ykbIp9pwRnJ9rrfHEs=";
+    vendorHash = "sha256-fykxRb2U9DDsXorRTLiVWmhMY89N7RS07sal8ww6gz4=";
 
     ldflags = [
       "-s"