From 62130cf13e8f421c5107930ed0be2e66a2ac31a3 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Tue, 27 Aug 2024 11:26:29 -0400 Subject: [PATCH 1/3] Teach git diff about sops files --- .gitattributes | 2 ++ modules/home-manager/common/all-cli.nix | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9f1cb3c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +*.yaml diff=sopsdiffer + diff --git a/modules/home-manager/common/all-cli.nix b/modules/home-manager/common/all-cli.nix index 34edb79..7b44177 100644 --- a/modules/home-manager/common/all-cli.nix +++ b/modules/home-manager/common/all-cli.nix @@ -97,6 +97,9 @@ in { git = { enable = true; diff-so-fancy.enable = true; + extraConfig = { + diff.sopsdiffer.textconv = "sops --config /dev/null --decrypt"; + }; ignores = [ "*~" "*.swp" From b65e0994e7a6c795b4e04a6635fed1949252d9d0 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Tue, 27 Aug 2024 11:27:20 -0400 Subject: [PATCH 2/3] Setup i2cssh --- modules/home-manager/hosts/mightymac/gene.liverman.nix | 1 + modules/home-manager/hosts/mightymac/secrets.yaml | 5 +++-- modules/hosts/darwin/mightymac/default.nix | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/home-manager/hosts/mightymac/gene.liverman.nix b/modules/home-manager/hosts/mightymac/gene.liverman.nix index 34d4064..a6ee69d 100644 --- a/modules/home-manager/hosts/mightymac/gene.liverman.nix +++ b/modules/home-manager/hosts/mightymac/gene.liverman.nix @@ -22,6 +22,7 @@ sops = { defaultSopsFile = ./secrets.yaml; secrets = { + i2cssh_config.path = "/Users/${username}/.i2csshrc"; local_git_config.path = "/Users/${username}/.gitconfig-local"; local_private_env.path = "/Users/${username}/.private-env"; }; diff --git a/modules/home-manager/hosts/mightymac/secrets.yaml b/modules/home-manager/hosts/mightymac/secrets.yaml index c49fb3b..b86eebd 100644 --- a/modules/home-manager/hosts/mightymac/secrets.yaml +++ b/modules/home-manager/hosts/mightymac/secrets.yaml @@ -1,4 +1,5 @@ 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] sops: @@ -16,8 +17,8 @@ sops: YndNc25Xemxrd2VXSStlbTJjZFBOR0UKe6wxJBlS7YZJXW3f/rlmKanqu9SeYXYB qxEU+fMDfQ/R+jRo6fGRtNnnY3nowZP+hSYYuGT9SRFwqYR1M3xeqw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-07-09T17:09:29Z" - mac: ENC[AES256_GCM,data:gzPBDHT3N99YRmVlv6MQ5MIsG+9PMjDuiM+Z2LxbEOwVzGwea1ar/iwqUEO4SYYh8KoM4hEk3QuR3JwAJPIrHdgWFVMfmT6RlaKBX8ZUZDpxwRGDSYM8HRjpT9AK8Co/Qv4E4Zww9/IFU6Vu4XKWALAVad1ep3Y7/SGdlJeUANA=,iv:xUZCwQ0M4IAiPQ1RoowCUebUUUqtf8bEssaUnGEyQuE=,tag:DzZAUJm10lnOBIA7DRhKxw==,type:str] + lastmodified: "2024-08-27T15:15:09Z" + mac: ENC[AES256_GCM,data:Dknmxt+061OaYwa9y38NYWsNi9JyLErvShysB2+Kdz9PpvlrdWeTyPW+AMSZeQ1w4oBD99wyi7eqy17Gme/qi9Hy8JfctR8zOHp4SHiZ0CrVrFVk8P52NYg8h8QglmIO+naYVA85IDFFkA+lGYEK3DszUvLd8s7azJ/xVYEIsB8=,iv:V9NAA0NJ2ZlidEVb8iKhabSFeCF6Is/OGAgtJoBHMgo=,tag:edEfmp3qwGVVu38sNsbV8w==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 diff --git a/modules/hosts/darwin/mightymac/default.nix b/modules/hosts/darwin/mightymac/default.nix index e4690be..7e69cbf 100644 --- a/modules/hosts/darwin/mightymac/default.nix +++ b/modules/hosts/darwin/mightymac/default.nix @@ -21,6 +21,7 @@ # "homebrew/bundle" # "jandedobbeleer/oh-my-posh" "puppetlabs/puppet" + "wouterdebie/repo" ]; brews = [ "adr-tools" @@ -29,6 +30,7 @@ "cilium-cli" "helm" "hubble" + "i2cssh" "kind" "kubernetes-cli" "kubeseal" From 50432211caacf831401ca642bbc5308211b6bf9d Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Tue, 27 Aug 2024 11:27:36 -0400 Subject: [PATCH 3/3] Install Mumble --- 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 7e69cbf..5b8e1fa 100644 --- a/modules/hosts/darwin/mightymac/default.nix +++ b/modules/hosts/darwin/mightymac/default.nix @@ -48,6 +48,7 @@ "elgato-stream-deck" "google-drive" "kopiaui" + "mumble" "obs" "pdk" "podman-desktop"