From 75125944d4f9ab0006d60703fb012f0a91590e11 Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Mon, 9 Aug 2021 08:48:08 -0400
Subject: [PATCH] Add rectangle and bump terraform

---
 common/packages.nix     |  5 +----
 flake.lock              | 36 ++++++++++++++++++------------------
 home/default.nix        | 10 ----------
 modules/darwin/brew.nix |  1 +
 4 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/common/packages.nix b/common/packages.nix
index 9499146..91c48a3 100644
--- a/common/packages.nix
+++ b/common/packages.nix
@@ -83,9 +83,6 @@ in
         nodePackages.prettier
         nodePackages.yarn
 
-        # social media
-        rtv
-
         # imaging
         gifsicle
 
@@ -112,7 +109,7 @@ in
 
         # terraform
         terraform-ls
-        terraform_0_14
+        terraform
         tflint
         tfsec
 
diff --git a/flake.lock b/flake.lock
index 0d19a01..988aa9c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -58,11 +58,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1628287034,
-        "narHash": "sha256-pWMEpQQcKxBy0OKskFLXJHEyGYJIiMu/BUQjCWxGF38=",
+        "lastModified": 1628468976,
+        "narHash": "sha256-NHgYsXZuLWEePrC+65b8EtKQg714H9NB7cO4BM4V5JQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b0d769691cc379c9ab91d3acec5d14e75c02c02b",
+        "rev": "2c4234cb79684646657f9cfcd4075c3122845670",
         "type": "github"
       },
       "original": {
@@ -80,11 +80,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1628168846,
-        "narHash": "sha256-SKe98a5oiaCCVixVrZErNnKk+7NPbcFPwhGnxtAlC6k=",
+        "lastModified": 1628461654,
+        "narHash": "sha256-Afj3QKWKmTQ8LOkwf9DmUd9PPuPO+Gg9B+bWXFB4bIY=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "5130bc071e7720e261b7251c1716df69e33ae1dd",
+        "rev": "68f61b167e71ca8dd42157b10b3096571c06f39d",
         "type": "github"
       },
       "original": {
@@ -101,11 +101,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1628237805,
-        "narHash": "sha256-J8aN6H8xXPotJ2r3KJS8eJEOPFBUxlI3xxIoAK3y4Y0=",
+        "lastModified": 1628496999,
+        "narHash": "sha256-CaZR5sNy1uduxRdj6dwaGkaYfC5Ugd5chyjs2CCamVc=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "cc836b73d702cdd77f36dbb36c711e90b2a447fe",
+        "rev": "e6926eda3504bec0ddec1ac61e04380c49be1419",
         "type": "github"
       },
       "original": {
@@ -116,11 +116,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1628078080,
-        "narHash": "sha256-NKYtXUH32TlhOyhi41ZLtkBYh+7z24FpONDOInG4QR8=",
+        "lastModified": 1628440507,
+        "narHash": "sha256-xXnG0f3fuuCbBpiVuzsIOd59AMgTGNE0/tAhMV+oEHY=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "8296b88560d8ac07a885452e094cd454de90ea9b",
+        "rev": "7da029f26849f8696ac49652312c9171bf9eb170",
         "type": "github"
       },
       "original": {
@@ -132,11 +132,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1628121754,
-        "narHash": "sha256-WQJSvlP/4f1pJCPM9Se+0x606jrUNgDiIUvF7GYxS2Q=",
+        "lastModified": 1628287055,
+        "narHash": "sha256-YwxtAt25pZofJT/e4sxw9cFBaFok+zgIy04HFV0rDd0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5a82107589e6ba78a14b9a00c9ba268f1329a13f",
+        "rev": "0dde103318090f77ac95ef7fc26fe0cdd00fa0b3",
         "type": "github"
       },
       "original": {
@@ -148,11 +148,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1628199198,
-        "narHash": "sha256-DkMFcm5VdqbausjUjyHWGBlcXNw/EMFiQpiCY5KKtMo=",
+        "lastModified": 1628465643,
+        "narHash": "sha256-QSNw9bDq9uGUniQQtakRuw4m21Jxugm23SXLVgEV4DM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "439b1605227b8adb1357b55ce8529d541abbe9eb",
+        "rev": "6ef4f522d63f22b40004319778761040d3197390",
         "type": "github"
       },
       "original": {
diff --git a/home/default.nix b/home/default.nix
index 7dd3b25..bf45a5b 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -11,16 +11,6 @@ let
       sha256 = "sha256-FDeyGH5OPAYV7zePCfDujsj+nGd5AFnqySPStJYEY2E=";
     };
   };
-  gitlinker-nvim = pkgs.vimUtils.buildVimPlugin {
-    name = "gitlinker-nvim";
-    nativeBuildInputs = with pkgs; [ lua53Packages.luacheck stylua ];
-    src = pkgs.fetchFromGitHub {
-      owner = "ruifm";
-      repo = "gitlinker.nvim";
-      rev = "master";
-      sha256 = "sha256-MpWK5f69rTMsb9b2YHzL5+N9FFWfwZ6GsVONsk72if0=";
-    };
-  };
   inherit (pkgs) stdenv;
 in
 {
diff --git a/modules/darwin/brew.nix b/modules/darwin/brew.nix
index 48f8705..ec5c3f3 100644
--- a/modules/darwin/brew.nix
+++ b/modules/darwin/brew.nix
@@ -35,6 +35,7 @@ in
       "font-hack-nerd-font"
       "lulu"
       "osxfuse"
+      "rectangle"
       "visual-studio-code"
     ];