flake.lock

@@ -484,38 +484,6 @@
         "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-25/GE-Proton8-25.tar.gz"
       }
     },
-    "ren": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1704996573,
-        "narHash": "sha256-zVIt6Xp+Mvym6gySvHIZJt1QgzKVP/wbTGTubWk6kzI=",
-        "owner": "robenkleene",
-        "repo": "ren-find",
-        "rev": "50c40172e354caffee48932266edd7c7a76a20fd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "robenkleene",
-        "repo": "ren-find",
-        "type": "github"
-      }
-    },
-    "rep": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1705833236,
-        "narHash": "sha256-hm+v+b97z1HnY/7QHZxc0GygCq9W0mJauyjnz48ddaM=",
-        "owner": "robenkleene",
-        "repo": "rep-grep",
-        "rev": "365acc5d599934e94dc066eb85b7ddd684ba508b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "robenkleene",
-        "repo": "rep-grep",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "Comment-nvim-src": "Comment-nvim-src",
@@ -543,8 +511,6 @@
         "nvim-tree-lua-src": "nvim-tree-lua-src",
         "nvim-treesitter-src": "nvim-treesitter-src",
         "proton-ge": "proton-ge",
-        "ren": "ren",
-        "rep": "rep",
         "telescope-nvim-src": "telescope-nvim-src",
         "telescope-project-nvim-src": "telescope-project-nvim-src",
         "toggleterm-nvim-src": "toggleterm-nvim-src",

flake.nix

@@ -161,16 +161,6 @@
       flake = false;
     };
 
-    # Ren and rep - CLI find and replace
-    rep = {
-      url = "github:robenkleene/rep-grep";
-      flake = false;
-    };
-    ren = {
-      url = "github:robenkleene/ren-find";
-      flake = false;
-    };
-
     # GE version of Proton for game compatibility
     # Alternatively, could consider using https://github.com/fufexan/nix-gaming
     proton-ge = {
@@ -259,7 +249,7 @@
         (import ./overlays/proton-ge.nix inputs)
         (import ./overlays/gh-collaborators.nix)
         (import ./overlays/bypass-paywalls-clean.nix inputs)
-        (import ./overlays/ren-rep.nix inputs)
+        (import ./overlays/terraform.nix)
       ];
 
       # System types to support.

modules/common/shell/utilities.nix

@@ -31,8 +31,6 @@ in {
         lf # File viewer
         qrencode # Generate qr codes
         rsync # Copy folders
-        ren # Rename files
-        # rep # Replace text in files
         ripgrep # grep
         sd # sed
         tealdeer # Cheatsheets

modules/darwin/utilities.nix

@@ -18,6 +18,7 @@
       awscli2
       awslogs
       google-cloud-sdk
+      ansible
       vault-bin
       consul
       noti # Create notifications programmatically

overlays/ren-rep.nix

@@ -1,17 +0,0 @@
-inputs: _final: prev: {
-
-  ren = prev.rustPlatform.buildRustPackage {
-    pname = "ren-find";
-    version = "0.0.7";
-    src = inputs.ren;
-    cargoHash = "sha256-3bI3j2xvNHp4kyLEq/DZvRJBF2rn6pE4n8oXh67edDI=";
-  };
-
-  # rep = prev.rustPlatform.buildRustPackage {
-  #   pname = "rep-grep";
-  #   version = "0.0.7";
-  #   src = inputs.rep;
-  #   cargoHash = "sha256-GEr3VvQ0VTKHUbW/GFEgwLpQWP2ZhS/4KYjDvfFLgxo=";
-  # };
-
-}

overlays/terraform.nix

@@ -0,0 +1,12 @@
+# Fix for Terraform and Consul on Darwin:
+# https://github.com/NixOS/nixpkgs/pull/275534/files
+_final: prev: {
+  girara = prev.girara.overrideAttrs (old: {
+    mesonFlags = [
+      "-Ddocs=disabled"
+      (prev.lib.mesonEnable "tests"
+        ((prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform)
+          && (!prev.stdenv.isDarwin)))
+    ];
+  });
+}