flake.lock: Update

Flake lock file updates:

• Updated input 'base16-nvim-src':
    'github:RRethy/base16-nvim/6ac181b5733518040a33017dde654059cd771b7c' (2024-05-23)
  → 'github:RRethy/base16-nvim/2fdd4e53286dbb8978699b5e1cd09835362a70f3' (2025-02-10)
• Updated input 'darwin':
    'github:lnl7/nix-darwin/ae406c04577ff9a64087018c79b4fdc02468c87c' (2025-02-05)
  → 'github:lnl7/nix-darwin/678b22642abde2ee77ae2218ab41d802f010e5b0' (2025-02-14)
• Updated input 'disko':
    'github:nix-community/disko/ff3568858c54bd306e9e1f2886f0f781df307dff' (2025-02-05)
  → 'github:nix-community/disko/4edb87a2ac9010da6fea50fc56d67e123fca85f4' (2025-02-15)
• Updated input 'firefox-darwin':
    'github:bandithedoge/nixpkgs-firefox-darwin/debb9b889951b74cee5cbdb45074dd9d289f25d6' (2025-02-08)
  → 'github:bandithedoge/nixpkgs-firefox-darwin/99a56b8763d3f5485c89e1e05ea8133f75821fbd' (2025-02-15)
• Updated input 'home-manager':
    'github:nix-community/home-manager/433799271274c9f2ab520a49527ebfe2992dcfbd' (2025-02-06)
  → 'github:nix-community/home-manager/6d3163aea47fdb1fe19744e91306a2ea4f602292' (2025-02-14)
• Updated input 'jujutsu':
    'github:martinvonz/jj/cc5b34809cefd9d9e8c64bb26f7494be22d43973' (2025-02-07)
  → 'github:martinvonz/jj/3bc111e60efdea774b6d979c0809256218b2549b' (2025-02-15)
• Updated input 'nextcloud-snappymail':
    'https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz?narHash=sha256-oCw6Brs85rINBHvz3UJXheyLVqvA3RgPXG03b30Fx7E%3D' (2025-02-08)
  → 'https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz?narHash=sha256-oCw6Brs85rINBHvz3UJXheyLVqvA3RgPXG03b30Fx7E%3D' (2025-02-15)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/550e11f27ba790351d390d9eca3b80ad0f0254e7' (2025-02-06)
  → 'github:nixos/nixpkgs/2ff53fe64443980e139eaa286017f53f88336dd0' (2025-02-13)
• Updated input 'nur':
    'github:nix-community/nur/3680f5c26f924c7903e684b93c96b743316a31da' (2025-02-08)
  → 'github:nix-community/nur/e353ac4b999db166ad92074ca66f2394d65aeb1d' (2025-02-15)
• Updated input 'nur/nixpkgs':
    'github:nixos/nixpkgs/550e11f27ba790351d390d9eca3b80ad0f0254e7' (2025-02-06)
  → 'github:nixos/nixpkgs/2ff53fe64443980e139eaa286017f53f88336dd0' (2025-02-13)
• Updated input 'nvim-tree-lua-src':
    'github:kyazdani42/nvim-tree.lua/70825f23db61ecd900c4cfea169bffe931926a9d' (2025-02-03)
  → 'github:kyazdani42/nvim-tree.lua/80523101f0ae48b7f1990e907b685a3d79776c01' (2025-02-09)
• Updated input 'wsl':
    'github:nix-community/NixOS-WSL/63c3b4ed1712a3a0621002cd59bfdc80875ecbb0' (2025-01-05)
  → 'github:nix-community/NixOS-WSL/0b2b8b31f69f24e9a75b4b18a32c771a48612d5e' (2025-02-14)

flake.lock

@@ -19,11 +19,11 @@
     "base16-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1716483968,
+        "lastModified": 1739162639,
-        "narHash": "sha256-GRF/6AobXHamw8TZ3FjL7SI6ulcpwpcohsIuZeCSh2A=",
+        "narHash": "sha256-Hs272gEgYj29XJ4FnMRXExtnbYqRGXIGaRZXo9I2P58=",
         "owner": "RRethy",
         "repo": "base16-nvim",
-        "rev": "6ac181b5733518040a33017dde654059cd771b7c",
+        "rev": "2fdd4e53286dbb8978699b5e1cd09835362a70f3",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735956190,
+        "lastModified": 1739548217,
-        "narHash": "sha256-svzx3yVXD5tbBJZCn3Lt1RriH8GHo6CyVUPTHejf7sU=",
+        "narHash": "sha256-rlv64erpr36xdmMDPgf9rhRXBYZ0BZb5nrw2ZPSk1sQ=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "3feaf376d75d3d58ebf7e9a4f584d00628548ad9",
+        "rev": "678b22642abde2ee77ae2218ab41d802f010e5b0",
         "type": "github"
       },
       "original": {
@@ -108,11 +108,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735468753,
+        "lastModified": 1739582867,
-        "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=",
+        "narHash": "sha256-rO528HmsiPi3RO9kZdYt0NnzN3pxpXz33m6H/sIFgzI=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21",
+        "rev": "4edb87a2ac9010da6fea50fc56d67e123fca85f4",
         "type": "github"
       },
       "original": {
@@ -145,11 +145,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735952135,
+        "lastModified": 1739580952,
-        "narHash": "sha256-1omANFYtwEeAwwzSQqJbob1ctswLa9L9QS18Kg8ICjc=",
+        "narHash": "sha256-nw4dHhyxbKZVPKiBho4StznHNxlFKnY/lIJbRssXPPQ=",
         "owner": "bandithedoge",
         "repo": "nixpkgs-firefox-darwin",
-        "rev": "72ce135b49236c110d86bce6e6d25bfafcc2158d",
+        "rev": "99a56b8763d3f5485c89e1e05ea8133f75821fbd",
         "type": "github"
       },
       "original": {
@@ -268,32 +268,14 @@
         "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": 1717117275,
+        "lastModified": 1736185279,
-        "narHash": "sha256-x3p2bHL6U8gWanXnTTJGgA9x4Ixy9AOZiBbfcfn5VVw=",
+        "narHash": "sha256-SGmP/8Fvf2rcYkwscMOFG01Y0VJGb/TXrNZtLacurxA=",
         "owner": "katiem0",
         "repo": "gh-collaborators",
-        "rev": "4dfcd0b5c2e31f2d0fbfd4b83fdfae787a5e6ff8",
+        "rev": "bf412dde50605e48af86f291c2ac8714f2c1b228",
         "type": "github"
       },
       "original": {
@@ -325,11 +307,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735947440,
+        "lastModified": 1739571712,
-        "narHash": "sha256-jnEcfmOhWntmVEcqlvs+j532+mvmgsKtQSSfukgkn+A=",
+        "narHash": "sha256-0UdSDV/TBY+GuxXLbrLq3l2Fq02ciyKCIMy4qmnfJXQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a9987622b7b93c82e147f198574e8e6ffbf5e327",
+        "rev": "6d3163aea47fdb1fe19744e91306a2ea4f602292",
         "type": "github"
       },
       "original": {
@@ -348,11 +330,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1735923240,
+        "lastModified": 1739586878,
-        "narHash": "sha256-xRJvm/YfV9aHyesx52N/t6fauk86Ajfj/ILFldEZ8nk=",
+        "narHash": "sha256-WgBHMXYhWIpRhhIESolbmd1fnsjyMTOadSAB7xe+WS0=",
         "owner": "martinvonz",
         "repo": "jj",
-        "rev": "1ddfc59ee95d680ccbd0cfcbcf86c9202f8e44ca",
+        "rev": "3bc111e60efdea774b6d979c0809256218b2549b",
         "type": "github"
       },
       "original": {
@@ -427,7 +409,7 @@
     "nextcloud-snappymail": {
       "flake": false,
       "locked": {
-        "lastModified": 1735962117,
+        "lastModified": 1739590975,
         "narHash": "sha256-oCw6Brs85rINBHvz3UJXheyLVqvA3RgPXG03b30Fx7E=",
         "type": "tarball",
         "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz"
@@ -460,11 +442,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1734829460,
+        "lastModified": 1736643958,
-        "narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=",
+        "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c",
+        "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
         "type": "github"
       },
       "original": {
@@ -481,11 +463,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734915500,
+        "lastModified": 1737057290,
-        "narHash": "sha256-A7CTIQ8SW0hfbhKlwK+vSsu4pD+Oaelw3v6goX6go+U=",
+        "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "051d1b2dda3b2e81b38d82e2b691e5c2f4d335f4",
+        "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453",
         "type": "github"
       },
       "original": {
@@ -496,11 +478,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1735834308,
+        "lastModified": 1739446958,
-        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
+        "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
+        "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
         "type": "github"
       },
       "original": {
@@ -544,11 +526,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1735834308,
+        "lastModified": 1739446958,
-        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
+        "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
+        "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
         "type": "github"
       },
       "original": {
@@ -565,11 +547,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1735962132,
+        "lastModified": 1739589581,
-        "narHash": "sha256-7elXLoHAQ/+usWi6R08SntEiV8WyAisJAin3T0GEBPE=",
+        "narHash": "sha256-8/3jzauKwx4xZQf2yol/E1YDRfHTt5/tYEK3n5+Py4A=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "b085ce9e13651cc235ca993af7a5b09990d27807",
+        "rev": "e353ac4b999db166ad92074ca66f2394d65aeb1d",
         "type": "github"
       },
       "original": {
@@ -581,11 +563,11 @@
     "nvim-lint-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1734606055,
+        "lastModified": 1738838825,
-        "narHash": "sha256-tD1ciHUdHIcqymImZjSSNq6M5hjsrD66AJhmLTy0cIY=",
+        "narHash": "sha256-E/KcQr4RM4gz+ItENI9e7hMicyBKyzoIaDO5D1VDYSw=",
         "owner": "mfussenegger",
         "repo": "nvim-lint",
-        "rev": "1fea92f1d9908eaa5eb8bafe08b4293d7aadaa55",
+        "rev": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8",
         "type": "github"
       },
       "original": {
@@ -614,11 +596,11 @@
     "nvim-tree-lua-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1734820548,
+        "lastModified": 1739135162,
-        "narHash": "sha256-4PmP31vYPH9xw4AjV5rDSKvcvZGTnIaPfR4Bwc0lAiA=",
+        "narHash": "sha256-EprjYnY3cr2l+hEeVrf58yUl0mC60HQUmngHxoJo+KA=",
         "owner": "kyazdani42",
         "repo": "nvim-tree.lua",
-        "rev": "68fc4c20f5803444277022c681785c5edd11916d",
+        "rev": "80523101f0ae48b7f1990e907b685a3d79776c01",
         "type": "github"
       },
       "original": {
@@ -680,11 +662,11 @@
     "rep": {
       "flake": false,
       "locked": {
-        "lastModified": 1707216692,
+        "lastModified": 1738376193,
-        "narHash": "sha256-/dH+mNtNHaYFndVhoqmz4Sc3HeemoQt1HGD98mb9Qhw=",
+        "narHash": "sha256-gBxrbGCy6JEHnmgJmcm8sgtEvCAqra8/gPGsfCEfLqg=",
         "owner": "robenkleene",
         "repo": "rep-grep",
-        "rev": "10510d47e392cb9d30a861c69f702fd194b3fa88",
+        "rev": "2a24f95170aa14b5182b2287125664a62f8688ef",
         "type": "github"
       },
       "original": {
@@ -750,11 +732,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735784864,
+        "lastModified": 1737685583,
-        "narHash": "sha256-tIl5p3ueaPw7T5T1UXkLc8ISMk6Y8CI/D/rd0msf73I=",
+        "narHash": "sha256-p+NVABRpGi+pT+xxf9HcLcFVxG6L+vEEy+NwzB9T0f8=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "04d5f1836721461b256ec452883362c5edc5288e",
+        "rev": "eb64cbcc8eee0fa87ebded92805280d2ec97415a",
         "type": "github"
       },
       "original": {
@@ -766,11 +748,11 @@
     "snipe-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1734918876,
+        "lastModified": 1736108869,
-        "narHash": "sha256-nut2POcxH1LgxTEKDikvRPPpbtmvlDDF52SoWZNC1Fg=",
+        "narHash": "sha256-sJ71eiE0XmMJkhNCkbY82R4eHzBOOKFrPa+nxLc1f8s=",
         "owner": "leath-dub",
         "repo": "snipe.nvim",
-        "rev": "2550012916d4fb21d6d1c7a88a9bddde651bb1f0",
+        "rev": "0d0a482ac713370196e4fc0025d5aaac5030104d",
         "type": "github"
       },
       "original": {
@@ -824,21 +806,6 @@
         "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": {
@@ -875,11 +842,11 @@
     "tiny-inline-diagnostic-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1735568714,
+        "lastModified": 1738756980,
-        "narHash": "sha256-rZ5+w6v9ONFTQIXvwTUJuwZKRaXdHZUNEUDfBsC2IMM=",
+        "narHash": "sha256-M4CD2usIp6IR4EKdYvHxuf6kitE60/8RTS8F/5GRWT0=",
         "owner": "rachartier",
         "repo": "tiny-inline-diagnostic.nvim",
-        "rev": "867902d5974a18c156c918ab8addbf091719de27",
+        "rev": "576351d53c1f6bda70252c3aaa710b01472024aa",
         "type": "github"
       },
       "original": {
@@ -908,11 +875,11 @@
     "tree-sitter-bash": {
       "flake": false,
       "locked": {
-        "lastModified": 1731338420,
+        "lastModified": 1738310128,
-        "narHash": "sha256-JW+30zIyq8Xc7NG9V+YoFqC+57BjZXIbAvWPD2lqvIE=",
+        "narHash": "sha256-ODWgFpCLLPgzNYXFhfAVvDXPr5bW8/49ezsaS9MOWMk=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-bash",
-        "rev": "49c31006d8307dcb12bc5770f35b6d5b9e2be68e",
+        "rev": "0c46d792d54c536be5ff7eb18eb95c70fccdb232",
         "type": "github"
       },
       "original": {
@@ -941,11 +908,11 @@
     "tree-sitter-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1729494737,
+        "lastModified": 1738303275,
-        "narHash": "sha256-v+fFcIOv+bu+2IGI/Lh/Xbqd5BzbBjaa51ECd0hG7Ow=",
+        "narHash": "sha256-mE84uI5AKbLvX5CM7NvA59Z8Ux+QFdqVjZf4hi06NAM=",
         "owner": "MunifTanjim",
         "repo": "tree-sitter-lua",
-        "rev": "34e60e7f45fc313463c68090d88d742a55d1bd7a",
+        "rev": "68d29aa745b68ae22cbbdb5dcb68c20232521ff6",
         "type": "github"
       },
       "original": {
@@ -974,11 +941,11 @@
     "tree-sitter-python": {
       "flake": false,
       "locked": {
-        "lastModified": 1734908773,
+        "lastModified": 1738275152,
-        "narHash": "sha256-71Od4sUsxGEvTwmXX8hBvzqD55hnXkVJublrhp1GICg=",
+        "narHash": "sha256-t9etfZcrliF7f9hfiomh2U9P+3ufAm8iSK1y9rOhP7s=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-python",
-        "rev": "bffb65a8cfe4e46290331dfef0dbf0ef3679de11",
+        "rev": "710796b8b877a970297106e5bbc8e2afa47f86ec",
         "type": "github"
       },
       "original": {
@@ -1060,17 +1027,16 @@
     "wsl": {
       "inputs": {
         "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_4",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1733854371,
+        "lastModified": 1739577062,
-        "narHash": "sha256-K9qGHniYBbjqVcEiwXyiofj/IFf78L5F0/FCf+CKyr0=",
+        "narHash": "sha256-u/trdPzJO8UotNq48RbG7m6Pe8761IEMCOY0QidNjY4=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "dee4425dcee3149475ead0cb6a616b8a028c5888",
+        "rev": "0b2b8b31f69f24e9a75b4b18a32c771a48612d5e",
         "type": "github"
       },
       "original": {

hosts/flame/default.nix

@@ -100,6 +100,7 @@ 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";
-        glacierBucket = "noahmasur-archive";
+        resticBucket = "noahmasur-restic";
       };
 
       # Disable passwords, only use SSH key

modules/common/shell/work.nix

@@ -48,11 +48,19 @@
           fi
           ${ldap_script}/bin/ldap "$@" | jq '[ .[].member] | add'
         '';
+        ldapl_script = pkgs.writeShellScriptBin "ldapl" ''
+          if ! [ "$LDAP_HOST" ]; then
+              echo "No LDAP_HOST specified!"
+              exit 1
+          fi
+          ${ldap_script}/bin/ldap "*$@*" | jq -r '.[].name'
+        '';
       in
       [
         ldap_script
         ldapm_script
         ldapg_script
+        ldapl_script
         jq_parse
       ];
   };

modules/darwin/homebrew.nix

@@ -20,7 +20,10 @@
     '';
 
     # Add homebrew paths to CLI path
-    home-manager.users.${config.user}.home.sessionPath = [ "/opt/homebrew/bin/" ];
+    home-manager.users.${config.user}.home.sessionPath = [
+      "/opt/homebrew/bin/"
+      "/opt/homebrew/opt/trash/bin/"
+    ];
 
     homebrew = {
       enable = true;

modules/darwin/utilities.nix

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

modules/nixos/hardware/sleep.nix

@@ -8,6 +8,10 @@
 
   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,6 +66,9 @@
     # 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;
       };
-      glacierBucket = lib.mkOption {
+      resticBucket = lib.mkOption {
         type = lib.types.nullOr lib.types.str;
-        description = "S3 bucket for glacier backups";
+        description = "S3 bucket for restic backups";
         default = null;
       };
     };
@@ -84,9 +84,9 @@
       dest = "${config.secretsDirectory}/restic";
     };
 
-    services.restic.backups = lib.mkIf (config.backup.s3.glacierBucket != null) {
+    services.restic.backups = lib.mkIf (config.backup.s3.resticBucket != null) {
       default = {
-        repository = "s3:s3.us-east-1.amazonaws.com/${config.backup.s3.glacierBucket}/restic";
+        repository = "s3:s3.us-east-1.amazonaws.com/${config.backup.s3.resticBucket}/restic";
         paths = [ ];
         environmentFile = config.secrets.s3-glacier.dest;
         passwordFile = config.secrets.restic.dest;

modules/nixos/services/paperless.nix

@@ -57,5 +57,9 @@
     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,22 +8,14 @@
 
   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,11 +2,10 @@ inputs: _final: prev: {
 
   gh-collaborators = prev.buildGoModule rec {
     pname = "gh-collaborators";
-    version = "v2.0.3";
+    version = "v3.0.0";
     src = inputs.gh-collaborators;
 
-    # vendorHash = "sha256-rsRDOgJBa8T6+bC/APcmuRmg6ykbIp9pwRnJ9rrfHEs=";
+    vendorHash = "sha256-9qmvG2q9t1Zj8yhKFyA99IaJ90R/gRVdQVjdliVKLRE";
-    vendorHash = "sha256-fykxRb2U9DDsXorRTLiVWmhMY89N7RS07sal8ww6gz4=";
 
     ldflags = [
       "-s"