From e446ad4e08f26dc3eaf3004fa5ca5b565a881811 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Fri, 8 Nov 2024 08:22:19 -0500 Subject: [PATCH] Update flake --- flake.lock | 162 ++++++++------------------- flake.nix | 2 +- modules/system/common/all-darwin.nix | 1 - 3 files changed, 48 insertions(+), 117 deletions(-) diff --git a/flake.lock b/flake.lock index 147b92e..903f108 100644 --- a/flake.lock +++ b/flake.lock @@ -19,16 +19,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1718075954, - "narHash": "sha256-4TeUhv5VLEufP+Z/NkKnUk4NUaf59cMsj6NvsVbE+8w=", + "lastModified": 1727016223, + "narHash": "sha256-iZqd91Cp4O02BU6/eBZ0UZgJN8AlwH+0geQUpqF176E=", "owner": "Homebrew", "repo": "brew", - "rev": "3f08c75e7b950d4340dab462f3e7f77e8093fa2b", + "rev": "916044581862c32fc2365e8e9ff0b1507a98925e", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "4.3.5", + "ref": "4.3.24", "repo": "brew", "type": "github" } @@ -41,11 +41,11 @@ "onchg": "onchg" }, "locked": { - "lastModified": 1724373510, - "narHash": "sha256-jcbSPQKGWl0LVd7OBRD1Axc+4rcgB/qQNPFqEyBI8/k=", + "lastModified": 1728874779, + "narHash": "sha256-498cQTDaU7bU3CbWPCQgSGkV25T8sZQmMwhU58WkIXE=", "owner": "aksiksi", "repo": "compose2nix", - "rev": "3f3f4996822a767ca06ed2418a6a10d18e1296e0", + "rev": "07cad037b8887ba94cd7236ffd1a8ee47002a9fe", "type": "github" }, "original": { @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1724769572, - "narHash": "sha256-K+HQbC2/hnGngIB019mX6f4XUrf7dB1eBfiUHW4Vx48=", + "lastModified": 1731060864, + "narHash": "sha256-aYE7oAYZ+gPU1mPNhM0JwLAQNgjf0/JK1BF1ln2KBgk=", "owner": "nix-community", "repo": "disko", - "rev": "b89a61129f3976d6440e2356ac5d3e30930f7012", + "rev": "5e40e02978e3bd63c2a6a9fa6fa8ba0e310e747f", "type": "github" }, "original": { @@ -183,28 +183,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "nixos-cosmic", - "nix-update", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -301,11 +279,11 @@ "genebean-omp-themes": { "flake": false, "locked": { - "lastModified": 1694629194, - "narHash": "sha256-k1HqpsW5buBGe3rgugQvoKw5nPu/zBWiT8blb5eHc0w=", + "lastModified": 1731071013, + "narHash": "sha256-alEp6FoFIroS0rkY06kd/uIH5YF1h6foKn4/dhWF5co=", "owner": "genebean", "repo": "my-oh-my-posh-themes", - "rev": "eb6ba507c2f37accc926c65bac1b88293a71eb9c", + "rev": "76fe6c603c06c9b7b7d27ea655ffbb5dbb719317", "type": "github" }, "original": { @@ -343,11 +321,11 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { @@ -364,11 +342,11 @@ ] }, "locked": { - "lastModified": 1724561770, - "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", + "lastModified": 1731032247, + "narHash": "sha256-OjLft7fwkmiRLXQsGAudGFZxEYXOT0nHwrQ9GbsBqJ4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", + "rev": "2fbf4a8417c28cf45bae6e6e97248cbbd9b78632", "type": "github" }, "original": { @@ -397,11 +375,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1721549352, - "narHash": "sha256-nlXJa8RSOX0kykrIYW33ukoHYq+FOSNztHLLgqKwOp8=", + "lastModified": 1730108712, + "narHash": "sha256-vIvmXmjAQIY39hACGFe/cdBK2r3ZprpHLwX2HIy7Mj8=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "dbce39ea8664820ba9037caaf1e2fad365ed6b4b", + "rev": "1cba177bb0a948c919af7596e40bef307543d40a", "type": "github" }, "original": { @@ -418,11 +396,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1719720211, - "narHash": "sha256-FNK5ZxmNC+V/wOuioc5HqkUy0ld4eW3NqcsZHLYg9HI=", + "lastModified": 1728153462, + "narHash": "sha256-jOF15LIzDf7SIkbjzhKq9nlnkS1aFTUCiIo92ipXMY4=", "owner": "zhaofengli-wip", "repo": "nix-homebrew", - "rev": "0afc51fd86693c73e4b60be8ed8c782c4c09b4cc", + "rev": "86af3bb8f7d365eb496ef5553646ec2fe06a3662", "type": "github" }, "original": { @@ -454,33 +432,9 @@ "type": "github" } }, - "nix-update": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1724271552, - "narHash": "sha256-xn0dC4M3mfItxP+s3/v3Hz/CSKp74VH/gMfufKxl9/4=", - "owner": "Mic92", - "repo": "nix-update", - "rev": "737121eccb67542e8c004c64da833fede2e80c64", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "nix-update", - "type": "github" - } - }, "nixos-cosmic": { "inputs": { "flake-compat": "flake-compat_2", - "nix-update": "nix-update", "nixpkgs": [ "nixpkgs" ], @@ -490,11 +444,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1724808932, - "narHash": "sha256-LwaEiwEyftMnoKuMMo3dT9HxktY5zzKDctybxGnX+kY=", + "lastModified": 1731029778, + "narHash": "sha256-hhGQBLgRc/QfEN4YhmNdI3YTkEtXkWW8UvQANHCPBl4=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "305434fce8b341baa596d6a0d7ec7a3a8ac60893", + "rev": "5421fc0cb8e440ac02b23400d8c919a3a77f56f2", "type": "github" }, "original": { @@ -505,11 +459,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1724575805, - "narHash": "sha256-OB/kEL3GAhUZmUfkbPfsPhKs0pRqJKs0EEBiLfyKZw8=", + "lastModified": 1730919458, + "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9fc19be21f0807d6be092d70bf0b1de0c00ac895", + "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", "type": "github" }, "original": { @@ -614,7 +568,7 @@ "nixpkgs-terraform": { "inputs": { "config": "config", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "nixpkgs-1_0": "nixpkgs-1_0", "nixpkgs-1_6": [ "nixpkgs" @@ -625,11 +579,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1724201314, - "narHash": "sha256-nvSrmCqiGs1HuZ6RI/eYIO3GEfwxL0c36rvGldBWLXg=", + "lastModified": 1729156928, + "narHash": "sha256-+D0R2rH2pEhzJ3zZGc5Oj5KGtnkO43sCWYNbq0ptuao=", "owner": "stackbuilders", "repo": "nixpkgs-terraform", - "rev": "c521613091ed7f885fcb3c6588b5a5ca1e73346d", + "rev": "db8dc49e397acf87d5b542755717bae368d32f3c", "type": "github" }, "original": { @@ -640,11 +594,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1724748588, - "narHash": "sha256-NlpGA4+AIf1dKNq76ps90rxowlFXUsV9x7vK/mN37JM=", + "lastModified": 1730958623, + "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a6292e34000dc93d43bccf78338770c1c5ec8a99", + "rev": "85f7e662eda4fa3a995556527c87b2524b691933", "type": "github" }, "original": { @@ -685,11 +639,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1724531977, - "narHash": "sha256-XROVLf9ti4rrNCFLr+DmXRZtPjCQTW4cYy59owTEmxk=", + "lastModified": 1730883749, + "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2527da1ef492c495d5391f3bcf9c1dd9f4514e32", + "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede", "type": "github" }, "original": { @@ -790,11 +744,11 @@ ] }, "locked": { - "lastModified": 1724725307, - "narHash": "sha256-gnu8JrUFQoy7b927EPuwmWpvk8MSroFl07pplmVueYA=", + "lastModified": 1730946479, + "narHash": "sha256-AxGJ3BRc44o3RBcfXxZqjVYftVtJ2sl+/WEjiLUmXRY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f56076b216c266cd855b0811ceb86802e834cdb9", + "rev": "7fba269fe89ffad47206e0afba233d337c04cf08", "type": "github" }, "original": { @@ -840,11 +794,11 @@ ] }, "locked": { - "lastModified": 1723501126, - "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=", + "lastModified": 1731047660, + "narHash": "sha256-iyp51lPWEQz4c5VH9bVbAuBcFP4crETU2QJYh5V0NYA=", "owner": "mic92", "repo": "sops-nix", - "rev": "be0eec2d27563590194a9206f551a6f73d52fa34", + "rev": "60e1bce1999f126e3b16ef45f89f72f0c3f8d16f", "type": "github" }, "original": { @@ -934,28 +888,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nix-update", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719887753, - "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems_4" diff --git a/flake.nix b/flake.nix index bccab47..08a3929 100644 --- a/flake.nix +++ b/flake.nix @@ -87,7 +87,7 @@ inherit system; config = { allowUnfree = true; - permittedInsecurePackages = [ "python-2.7.18.7" ]; + permittedInsecurePackages = [ "olm-3.2.16" "python-2.7.18.7" ]; }; overlays = [ nixpkgs-terraform.overlays.default ]; }; diff --git a/modules/system/common/all-darwin.nix b/modules/system/common/all-darwin.nix index 77680dd..44c1ee6 100644 --- a/modules/system/common/all-darwin.nix +++ b/modules/system/common/all-darwin.nix @@ -1,7 +1,6 @@ { pkgs, hostname, username, ... }: { environment = { shells = with pkgs; [ bash zsh ]; - loginShell = pkgs.zsh; pathsToLink = [ "/Applications" "/share/zsh"