Merge pull request #456 from genebean/multiple-changes

Multiple changes

flake.lock

@@ -19,16 +19,16 @@
     "brew-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1718075954,
+        "lastModified": 1727016223,
-        "narHash": "sha256-4TeUhv5VLEufP+Z/NkKnUk4NUaf59cMsj6NvsVbE+8w=",
+        "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,
+        "lastModified": 1728874779,
-        "narHash": "sha256-jcbSPQKGWl0LVd7OBRD1Axc+4rcgB/qQNPFqEyBI8/k=",
+        "narHash": "sha256-498cQTDaU7bU3CbWPCQgSGkV25T8sZQmMwhU58WkIXE=",
         "owner": "aksiksi",
         "repo": "compose2nix",
-        "rev": "3f3f4996822a767ca06ed2418a6a10d18e1296e0",
+        "rev": "07cad037b8887ba94cd7236ffd1a8ee47002a9fe",
         "type": "github"
       },
       "original": {
@@ -99,11 +99,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724769572,
+        "lastModified": 1731060864,
-        "narHash": "sha256-K+HQbC2/hnGngIB019mX6f4XUrf7dB1eBfiUHW4Vx48=",
+        "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,
+        "lastModified": 1731071013,
-        "narHash": "sha256-k1HqpsW5buBGe3rgugQvoKw5nPu/zBWiT8blb5eHc0w=",
+        "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,
+        "lastModified": 1726989464,
-        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
+        "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,
+        "lastModified": 1731032247,
-        "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=",
+        "narHash": "sha256-OjLft7fwkmiRLXQsGAudGFZxEYXOT0nHwrQ9GbsBqJ4=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e",
+        "rev": "2fbf4a8417c28cf45bae6e6e97248cbbd9b78632",
         "type": "github"
       },
       "original": {
@@ -397,11 +375,11 @@
     },
     "nix-flatpak": {
       "locked": {
-        "lastModified": 1721549352,
+        "lastModified": 1730108712,
-        "narHash": "sha256-nlXJa8RSOX0kykrIYW33ukoHYq+FOSNztHLLgqKwOp8=",
+        "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,
+        "lastModified": 1728153462,
-        "narHash": "sha256-FNK5ZxmNC+V/wOuioc5HqkUy0ld4eW3NqcsZHLYg9HI=",
+        "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,
+        "lastModified": 1731029778,
-        "narHash": "sha256-LwaEiwEyftMnoKuMMo3dT9HxktY5zzKDctybxGnX+kY=",
+        "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,
+        "lastModified": 1730919458,
-        "narHash": "sha256-OB/kEL3GAhUZmUfkbPfsPhKs0pRqJKs0EEBiLfyKZw8=",
+        "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,
+        "lastModified": 1729156928,
-        "narHash": "sha256-nvSrmCqiGs1HuZ6RI/eYIO3GEfwxL0c36rvGldBWLXg=",
+        "narHash": "sha256-+D0R2rH2pEhzJ3zZGc5Oj5KGtnkO43sCWYNbq0ptuao=",
         "owner": "stackbuilders",
         "repo": "nixpkgs-terraform",
-        "rev": "c521613091ed7f885fcb3c6588b5a5ca1e73346d",
+        "rev": "db8dc49e397acf87d5b542755717bae368d32f3c",
         "type": "github"
       },
       "original": {
@@ -640,11 +594,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1724748588,
+        "lastModified": 1730958623,
-        "narHash": "sha256-NlpGA4+AIf1dKNq76ps90rxowlFXUsV9x7vK/mN37JM=",
+        "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a6292e34000dc93d43bccf78338770c1c5ec8a99",
+        "rev": "85f7e662eda4fa3a995556527c87b2524b691933",
         "type": "github"
       },
       "original": {
@@ -685,11 +639,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1724531977,
+        "lastModified": 1730883749,
-        "narHash": "sha256-XROVLf9ti4rrNCFLr+DmXRZtPjCQTW4cYy59owTEmxk=",
+        "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2527da1ef492c495d5391f3bcf9c1dd9f4514e32",
+        "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede",
         "type": "github"
       },
       "original": {
@@ -790,11 +744,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724725307,
+        "lastModified": 1730946479,
-        "narHash": "sha256-gnu8JrUFQoy7b927EPuwmWpvk8MSroFl07pplmVueYA=",
+        "narHash": "sha256-AxGJ3BRc44o3RBcfXxZqjVYftVtJ2sl+/WEjiLUmXRY=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "f56076b216c266cd855b0811ceb86802e834cdb9",
+        "rev": "7fba269fe89ffad47206e0afba233d337c04cf08",
         "type": "github"
       },
       "original": {
@@ -840,11 +794,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723501126,
+        "lastModified": 1731047660,
-        "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
+        "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"

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 ];
       };

modules/home-manager/common/all-cli.nix

@@ -49,7 +49,7 @@ in {
     vimv
     watch
     wget
-    yq
+    yq-go
   ];
   home.sessionVariables = {
     CLICLOLOR = 1;

modules/home-manager/hosts/mightymac/secrets.yaml

@@ -1,7 +1,7 @@
 tailscale_key: ENC[AES256_GCM,data:rWN6mW6LC/EjMTbMjXkCmMQYEehEbViScKeaLEOpR6VSZJFD0aZI9wh5yKcQeaUT0BiJIzITsUxj,iv:aCqdsW7JPq6Q2kFl6ZciwIQfzAbs9LvhWilbEI8okAc=,tag:U0p4UND/n26ZF17keSL0DA==,type:str]
 i2cssh_config: ENC[AES256_GCM,data:MwYLGFribitABOcQJFsEgd3vD4qsEdz0grg2ISE0LB3IT2usVRgUfnI/5g7pK4ON/bxz+mpkncDCZep8wBrd4+c316320u/HkxTEQYFU+zXGuFnkF380fx8klQdBel7JsJJKwa5b1M20Sqj9QYNXtwEw8zs+vG/VGdzWLKHlQosvUrdhT0LGntu+/RIgVhC3B6aEp79mbz8xOh8BrCpi4hVPFm8x5sUC++wR+aBvIg+bsOOU8T9OoW3bnEs8ucnvni9RYN7r5YCOllyhaFekNp6KiFBLd4h3A2r2UWBnRjlg5LKJc5aG6Z6XMHaz6NaGpZUw+fMHVZx7t7QL7IwvNpFp/+8oeWzBz/qecfxzVkGvBYqtPPsnv9mNUYZux6Fd0FETMbPI7dmUQrmUK2Y+L8Qw55cpL+BVJkV693DaKIJwQL3VIC6Z/NKqTXPdBBS9hWHjYWfGBmbiAiaU5X2Z3cz8YaEsCnC4OMqqlALLmzZ0crD/HXc6756U/i63GVsx4GiBTfs8Rvy+7GZOyjBhgvHZK6g4ShVZHDtNMInHlfyFzOGC03smZhgseF9ivVVXAMa6AI8OHU5678Fkb6/lD4e0Vqk77Icaj+Yte6EKmHK3Pq9ctYyJLNBFlFCreBWTcxrV+a6WLxh6QkcHmUYLfHKp/cG3nypPKRIaBkvbYOUYLuPI1IRrzdndALv5uRBhxKJEL+ukBv0EVm9y9sR1uimTQYB9tCRE7+2JfgBhcQwbUbIlW4NmZeOx9/9jAoqlID0PTS/2QsnbYI00X7c3GibGpLVVY86X6S4hW/HaHEq8jB5JiFDlQRGDLy/YV8MM1USsqZpjJHlZy8AWQRH3Ta47cXYfwCOD2eTC2pouS938qAaq48m3mPMuzCWlbiExXRrdE2Noek49/pfwCduplEebxb3FLr16lRHdcI+M8Hb9W5iXAJFYBx9FzFkIewDKz4UxL+MKX88K4t5l5ZTG6IT0OqCekZ3M/9scYbhrpgU2sWp3ADgmLRwL8iMxgwFygl1ZxdQ9C0IS8LwgLCfAn3wVKZlUogRdBkV52iHbkUVG4tEqUZxhJUALFW3P1A==,iv:udLgI4t3M3KDNfcA+WkUFLAe523/+O9tE/LGol1UBQA=,tag:6v1XUPTpgcjfmcgak9YKAQ==,type:str]
 local_git_config: ENC[AES256_GCM,data:CQjq1bFnc8jdv2bM3Ez4hEgC6CtH5xQx4nFhqSRG7oV8DtMLQOwYklQt9Fra,iv:Wxw1or1+QaROvqe7QzTRi9oJSjrPtk0N60kq7jDfdWM=,tag:eODZOCeZMM/HoeRSeeNVLA==,type:str]
-local_private_env: ENC[AES256_GCM,data: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,iv:NtNLcSiFtH49Vj9dABkoLgSqLUmuLZNvNle5rAtAX7E=,tag:vWxi3BmPf1rBFCmlouY1ZA==,type:str]
+local_private_env: ENC[AES256_GCM,data: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,iv:47L7sa1Vt4hCdBXFlD/7oLNKjJ/i0WXz2F0a6JJiie8=,tag:kIAESlg2frqNl5zemsQc3w==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -17,8 +17,8 @@ sops:
             YndNc25Xemxrd2VXSStlbTJjZFBOR0UKe6wxJBlS7YZJXW3f/rlmKanqu9SeYXYB
             qxEU+fMDfQ/R+jRo6fGRtNnnY3nowZP+hSYYuGT9SRFwqYR1M3xeqw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-08-27T15:15:09Z"
+    lastmodified: "2024-10-30T12:08:30Z"
-    mac: ENC[AES256_GCM,data:Dknmxt+061OaYwa9y38NYWsNi9JyLErvShysB2+Kdz9PpvlrdWeTyPW+AMSZeQ1w4oBD99wyi7eqy17Gme/qi9Hy8JfctR8zOHp4SHiZ0CrVrFVk8P52NYg8h8QglmIO+naYVA85IDFFkA+lGYEK3DszUvLd8s7azJ/xVYEIsB8=,iv:V9NAA0NJ2ZlidEVb8iKhabSFeCF6Is/OGAgtJoBHMgo=,tag:edEfmp3qwGVVu38sNsbV8w==,type:str]
+    mac: ENC[AES256_GCM,data:ko6uVSGiB0n3u/83EWrdvqj5O0E5gXIVbqW1+ihSmLjD0/DT7dF2+Ab36lnKLZTM+OKk72o5RZQ4vXNJsvLpjOXcqxUgo0Wv7cMymDKjrRMmC3kGAQImtBNXW/fifmZGogGzj8iAdaOoVrhTOoUdCYnqt865X3zG9cA6ZeRTYoo=,iv:yLH7l142mpogxPYx5m8riGA1kg3sBiHwE3Ojykq220Q=,tag:VbyvXFfD3+KRswocDJpteA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1

modules/hosts/darwin/mightymac/default.nix

@@ -18,8 +18,6 @@
   homebrew = {
     taps = [
       "hashicorp/tap"
-      # "homebrew/bundle"
-      # "jandedobbeleer/oh-my-posh"
       "puppetlabs/puppet"
       "wouterdebie/repo"
     ];
@@ -32,9 +30,12 @@
       "hubble"
       "i2cssh"
       "kind"
+      "kompose"
       "kubernetes-cli"
       "kubeseal"
       "lima"
+      "linkerd"
+      "minio-mc"
       "opentofu"
       "node_exporter"
       "podman"
@@ -42,7 +43,6 @@
       "terraform-docs"
     ];
     casks = [
-      "asana"
       "boinc"
       "discord"
       "elgato-stream-deck"
@@ -59,7 +59,6 @@
       "utm"
       "vagrant"
       "vial"
-      "waterfox"
       "whalebird"
       "zenmap"
     ];
@@ -70,6 +69,7 @@
       "Microsoft Remote Desktop" = 1295203466;
       "Telegram" = 747648890;
       "WhatsApp Messenger" = 310633997;
+      "Xcode" = 497799835;
     };
   };
 }

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"