From c5ac0b60dece22659a5c4386d91342b576931c26 Mon Sep 17 00:00:00 2001
From: Brian Zalewski <brian@megabyte.space>
Date: Thu, 5 Jan 2023 23:04:02 +0000
Subject: [PATCH] Update 6 files

- /home/.chezmoidata.yaml
- /home/.chezmoitemplates/debian/common-dependencies
- /home/.chezmoitemplates/ubuntu/common-dependencies
- /home/.chezmoitemplates/fedora/common-dependencies
- /home/.chezmoitemplates/centos/common-dependencies
- /software.yml
---
 home/.chezmoidata.yaml                        |  2 --
 .../centos/common-dependencies                |  1 +
 .../debian/common-dependencies                |  1 +
 .../fedora/common-dependencies                |  1 +
 .../ubuntu/common-dependencies                |  1 +
 software.yml                                  | 36 ++++---------------
 6 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml
index 764500b1..1a38dac3 100644
--- a/home/.chezmoidata.yaml
+++ b/home/.chezmoidata.yaml
@@ -331,7 +331,6 @@ softwareGroups:
     - glab
     - hub
     - lazygit
-    - mergestat
     - tig
   Git-Desktop: &Git-Desktop
     - gitdock
@@ -600,7 +599,6 @@ softwareGroups:
     - nativefier
   Virtualization: &Virtualization
     - kvm
-    - linuxkit
     - lxdc
     - multipass
     - packer
diff --git a/home/.chezmoitemplates/centos/common-dependencies b/home/.chezmoitemplates/centos/common-dependencies
index 83e9f04e..128a6e3e 100644
--- a/home/.chezmoitemplates/centos/common-dependencies
+++ b/home/.chezmoitemplates/centos/common-dependencies
@@ -2,5 +2,6 @@
   "gcc"
   "gcc-c++"
   "kernel-devel"
+  "ruby-devel"
 -}}
 {{- $packages | join " " -}}
\ No newline at end of file
diff --git a/home/.chezmoitemplates/debian/common-dependencies b/home/.chezmoitemplates/debian/common-dependencies
index aad336ba..f224be01 100644
--- a/home/.chezmoitemplates/debian/common-dependencies
+++ b/home/.chezmoitemplates/debian/common-dependencies
@@ -10,6 +10,7 @@
     "libxml2-dev"
     "libxmlsec1-dev"
     "llvm"
+    "ruby-dev"
     "tk-dev"
     "xz-utils"
     "zlib1g-dev"
diff --git a/home/.chezmoitemplates/fedora/common-dependencies b/home/.chezmoitemplates/fedora/common-dependencies
index 83e9f04e..128a6e3e 100644
--- a/home/.chezmoitemplates/fedora/common-dependencies
+++ b/home/.chezmoitemplates/fedora/common-dependencies
@@ -2,5 +2,6 @@
   "gcc"
   "gcc-c++"
   "kernel-devel"
+  "ruby-devel"
 -}}
 {{- $packages | join " " -}}
\ No newline at end of file
diff --git a/home/.chezmoitemplates/ubuntu/common-dependencies b/home/.chezmoitemplates/ubuntu/common-dependencies
index aad336ba..f224be01 100644
--- a/home/.chezmoitemplates/ubuntu/common-dependencies
+++ b/home/.chezmoitemplates/ubuntu/common-dependencies
@@ -10,6 +10,7 @@
     "libxml2-dev"
     "libxmlsec1-dev"
     "llvm"
+    "ruby-dev"
     "tk-dev"
     "xz-utils"
     "zlib1g-dev"
diff --git a/software.yml b/software.yml
index 57b9f3a3..10d3477c 100644
--- a/software.yml
+++ b/software.yml
@@ -3755,7 +3755,7 @@ softwarePackages:
     _service: null
     binary:darwin: https://github.com/instrumenta/kubeval/releases/latest/download/kubeval-darwin-amd64.tar.gz
     binary:linux: https://github.com/instrumenta/kubeval/releases/latest/download/kubeval-linux-amd64.tar.gz
-    brew: instrumenta/instrumenta/kubeval
+    brew: kubeval
     scoop: kubeval
   kvm:
     _bin:brew:
@@ -3912,17 +3912,6 @@ softwarePackages:
     brew: linkerd
     github: github.com/linkerd/linkerd2
     yay: linkerd
-  linuxkit:
-    _bin: linuxkit
-    _desc: A toolkit for building secure, portable and lean operating systems for containers
-    _docs: null
-    _github: https://github.com/linuxkit/linuxkit
-    _home: null
-    _name: linuxkit
-    _service: null
-    _type: cli
-    brew: linuxkit/linuxkit/linuxkit
-    github: github.com/linuxkit/linuxkit
   litecli:
     _bin: litecli
     _desc: CLI for SQLite Databases with auto-completion and syntax highlighting
@@ -4186,17 +4175,6 @@ softwarePackages:
     _name: McFly
     _service: null
     ansible: professormanhattan.mcfly
-  mergestat:
-    _bin: mergestat
-    _desc: Query git repositories with SQL. Generate reports, perform status checks, analyze codebases
-    _docs: null
-    _github: https://github.com/mergestat/mergestat
-    _home: null
-    _name: mergestat
-    _service: null
-    _type: cli
-    brew: mergestat/mergestat/mergestat
-    github: github.com/mergestat/mergestat
   microsoft-edge:
     _bin: null
     _desc: '[Microsoft Edge](https://www.microsoft.com/en-us/edge) is a cross-platform web browser developed by Microsoft. It was first released for Windows 10 and Xbox One in 2015, then for Android and iOS in 2017, for macOS in 2019, and as a preview for Linux in October 2020.'
@@ -5749,10 +5727,10 @@ softwarePackages:
     _name: Ruby
     _service: false
     ansible: professormanhattan.ruby
-    apt: ruby-full
+    apt: ruby-dev
     brew: ruby
     choco: ruby
-    dnf: ruby
+    dnf: ruby-devel
     pacman: ruby
     port: ruby
     scoop: ruby
@@ -5781,9 +5759,6 @@ softwarePackages:
     _service: false
     _snapClassic: true
     ansible: professormanhattan.rust
-    apt:
-      - cargo
-      - rustc
     brew: rust
     choco: rust
     dnf:
@@ -5794,7 +5769,8 @@ softwarePackages:
       - cargo
       - rust
     scoop: rust
-    snap: rustup
+    script:darwin: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+    script:linux: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
   goofys:
     _bin: goofys
     _deps:
@@ -6004,7 +5980,7 @@ softwarePackages:
     _name: sentry-cli
     _service: null
     _type: cli
-    brew: getsentry/tools/sentry-cli
+    brew:darwin: getsentry/tools/sentry-cli
     github: github.com/getsentry/sentry-cli
     npm: '@sentry/cli'
     scoop: sentry-cli