From 66fcff00bf83e1277c455f6ebdc8337074712b58 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Mon, 14 Apr 2025 17:34:16 -0400 Subject: [PATCH 1/3] Update teraform flake --- flake.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index ba33803..010a8d3 100644 --- a/flake.nix +++ b/flake.nix @@ -61,8 +61,7 @@ nixpkgs-terraform = { url = "github:stackbuilders/nixpkgs-terraform"; - inputs.nixpkgs-1_6.follows = "nixpkgs"; - inputs.nixpkgs-1_9.follows = "nixpkgs-unstable"; + inputs.nixpkgs.follows = "nixpkgs"; }; simple-nixos-mailserver = { From 3ab5493215c6593d33ce4d29ae4eb6a3f8913df0 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Mon, 14 Apr 2025 17:34:39 -0400 Subject: [PATCH 2/3] Add MEATER --- modules/hosts/darwin/mightymac/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/hosts/darwin/mightymac/default.nix b/modules/hosts/darwin/mightymac/default.nix index 6e086aa..5ecb857 100644 --- a/modules/hosts/darwin/mightymac/default.nix +++ b/modules/hosts/darwin/mightymac/default.nix @@ -68,6 +68,7 @@ masApps = { "HomeCam" = 1292995895; "Keeper Password Manager" = 414781829; + "MEATER® Smart Meat Thermometer" = 1157416022; "MeetingBar" = 1532419400; "Messenger" = 1480068668; "Microsoft Remote Desktop" = 1295203466; From 247c29f5ed4a6868146fbc576d6cd2d6e7680c86 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Mon, 14 Apr 2025 17:42:23 -0400 Subject: [PATCH 3/3] Ran nix flake update --- flake.lock | 135 ++++++++++++++++++++--------------------------------- 1 file changed, 50 insertions(+), 85 deletions(-) diff --git a/flake.lock b/flake.lock index 094716b..eeb9082 100644 --- a/flake.lock +++ b/flake.lock @@ -54,23 +54,6 @@ "type": "github" } }, - "config": { - "locked": { - "dir": "templates/config", - "lastModified": 1719931926, - "narHash": "sha256-B8j9lHX0LqWlZkm8JxZRN6919RQjJEu/1J1SR8pU/ww=", - "owner": "stackbuilders", - "repo": "nixpkgs-terraform", - "rev": "034287ee462c87dadc14a94d4b53a48ed66c7b3d", - "type": "github" - }, - "original": { - "dir": "templates/config", - "owner": "stackbuilders", - "repo": "nixpkgs-terraform", - "type": "github" - } - }, "crane": { "locked": { "lastModified": 1737689766, @@ -93,11 +76,11 @@ ] }, "locked": { - "lastModified": 1741786315, - "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", + "lastModified": 1744145203, + "narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=", "owner": "nix-community", "repo": "disko", - "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", + "rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989", "type": "github" }, "original": { @@ -176,24 +159,6 @@ "type": "github" } }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1652776076, @@ -277,11 +242,11 @@ ] }, "locked": { - "lastModified": 1742655702, - "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", + "lastModified": 1744117652, + "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", "owner": "nix-community", "repo": "home-manager", - "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", + "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", "type": "github" }, "original": { @@ -298,11 +263,11 @@ ] }, "locked": { - "lastModified": 1741126078, - "narHash": "sha256-ng0a4cIq3c9E3iGKomlwqKzVYs2RLOzQho2U1Mc2sqU=", + "lastModified": 1743127615, + "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c172f50b55b087f8e7801631de977461603bb976", + "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c", "type": "github" }, "original": { @@ -314,11 +279,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1741903049, - "narHash": "sha256-8Y8brH04JjSLrCLvBEbhK9vOu7lhQhqUBW4kI3tifdI=", + "lastModified": 1744659587, + "narHash": "sha256-xJnbmRVte13akgn+Prg06IaRHJ5OX3uVltwsCP/mxoc=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "42c7fb2702219b86a8f5969c3475ce594c28f5d0", + "rev": "928d868a9141b48f152d3b2b00c433e688d4b106", "type": "github" }, "original": { @@ -338,11 +303,11 @@ ] }, "locked": { - "lastModified": 1742619394, - "narHash": "sha256-8uwIBjbKxeJ7u0VACSNs634HwtgRLxP6/+cIkUXmuyI=", + "lastModified": 1744563914, + "narHash": "sha256-0exTKCXDE/8G7gZQ9Gk3EcZBAL7lwzxhD7DtUBsnlGI=", "owner": "zhaofengli-wip", "repo": "nix-homebrew", - "rev": "04b0536479d2d2e8d71dc8c8ee97c2b61f0c9987", + "rev": "53507607d69c88efc816e806b8139607c7257285", "type": "github" }, "original": { @@ -386,11 +351,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1742863891, - "narHash": "sha256-/mGCIxO7zlWCHOZLaOMRoJgSLpIav0PBKWG3BQddElw=", + "lastModified": 1744628957, + "narHash": "sha256-g1lGl2j5b6sjAdfLXHyIQh8gvKBKnDuwYTR4EMexdP0=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "366999efebcad2165f472ef93e9c996693bda75d", + "rev": "e9da1352e4b3ad6778ae3166fbe10c6a3a879c21", "type": "github" }, "original": { @@ -401,11 +366,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742806253, - "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", + "lastModified": 1744633460, + "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", + "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", "type": "github" }, "original": { @@ -447,37 +412,37 @@ "type": "github" } }, - "nixpkgs-lib": { + "nixpkgs-1_6": { "locked": { - "lastModified": 1722555339, - "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "lastModified": 1712757991, + "narHash": "sha256-kR7C7Fqt3JP40h0mzmSZeWI5pk1iwqj4CSeGjnUbVHc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d6b3ddd253c578a7ab98f8011e59990f21dc3932", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d6b3ddd253c578a7ab98f8011e59990f21dc3932", + "type": "github" } }, "nixpkgs-terraform": { "inputs": { - "config": "config", - "flake-parts": "flake-parts", - "nixpkgs-1_0": "nixpkgs-1_0", - "nixpkgs-1_6": [ + "nixpkgs": [ "nixpkgs" ], - "nixpkgs-1_9": [ - "nixpkgs-unstable" - ], + "nixpkgs-1_0": "nixpkgs-1_0", + "nixpkgs-1_6": "nixpkgs-1_6", "systems": "systems" }, "locked": { - "lastModified": 1742861481, - "narHash": "sha256-pjPGFmy+yDZvgv7NfU7BNG6ktkSXVUu4HuT4xkGWPrY=", + "lastModified": 1744164289, + "narHash": "sha256-YLZOXvigs0X7WFxAyQFjQijOG83Hb1oJalFlbPZ5QkQ=", "owner": "stackbuilders", "repo": "nixpkgs-terraform", - "rev": "3674c0b3fc48fca619bc69ddcc8db7f5ed2d66b9", + "rev": "9fdddb5b09520d4c4a4cd79c4eca9e98ed6d4d82", "type": "github" }, "original": { @@ -488,11 +453,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1742800061, - "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=", + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", "type": "github" }, "original": { @@ -504,11 +469,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742751704, - "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { @@ -607,11 +572,11 @@ ] }, "locked": { - "lastModified": 1742437918, - "narHash": "sha256-Vflb6KJVDikFcM9E231mRN88uk4+jo7BWtaaQMifthI=", + "lastModified": 1744599145, + "narHash": "sha256-yzaDPkJwZdUtRj/dzdOeB74yryWzpngYaD7BedqFKk8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f03085549609e49c7bcbbee86a1949057d087199", + "rev": "fd6795d3d28f956de01a0458b6fa7baae5c793b4", "type": "github" }, "original": { @@ -653,11 +618,11 @@ ] }, "locked": { - "lastModified": 1742700801, - "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=", + "lastModified": 1744518500, + "narHash": "sha256-lv52pnfiRGp5+xkZEgWr56DWiRgkMFXpiGba3eJ3krE=", "owner": "mic92", "repo": "sops-nix", - "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852", + "rev": "7e147a1ae90f0d4a374938cdc3df3cdaecb9d388", "type": "github" }, "original": {