From 419a9ab0fe5d1b9298b9452129526c0dee21b532 Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Fri, 18 Nov 2022 15:01:41 +0100
Subject: chore(3p/sources): Bump channels & overlays
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* //users/tazjin/emacs: string-edit was renamed to string-edit-at-point
  https://github.com/melpa/melpa/commit/1b2c64ce1b4ce5d94dfefff25fc15537bd427ea4

* //users/grfn/…/modules:

    - readyset.nix: use rain from nixpkgs

    - obs.nix: use input-overlay from nixpkgs (newer version, untested)

Change-Id: I5887078cee22673c129d186a8448855b92d7b250
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7306
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: grfn <grfn@gws.fyi>
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
---
 .../system/home/modules/development/readyset.nix   | 16 +------
 users/grfn/system/home/modules/obs.nix             | 56 ++--------------------
 users/tazjin/emacs/config/init.el                  |  2 +-
 users/tazjin/emacs/default.nix                     |  2 +-
 4 files changed, 6 insertions(+), 70 deletions(-)

(limited to 'users')

diff --git a/users/grfn/system/home/modules/development/readyset.nix b/users/grfn/system/home/modules/development/readyset.nix
index 5c566c1060dd..05752bfe720a 100644
--- a/users/grfn/system/home/modules/development/readyset.nix
+++ b/users/grfn/system/home/modules/development/readyset.nix
@@ -10,21 +10,7 @@
     (writeShellScriptBin "dotclip" "xclip -out -selection clipboard | dot -Tpng | feh -")
     (writeShellScriptBin "dotcontroller" "curl -s localhost:6033/graph | dot -Tpng | feh -")
 
-    # TODO(grfn): rain fails to build with Go >=1.18, investigate.
-    (buildGo117Module rec {
-      pname = "rain";
-      version = "1.2.0";
-
-      src = fetchFromGitHub {
-        owner = "aws-cloudformation";
-        repo = pname;
-        rev = "v${version}";
-        sha256 = "168gkchshl5f1awqi1cgvdkm6q707702rnn0v4i5djqxmg5rk0p9";
-      };
-
-      vendorHash = "sha256:16bx7cjh5cq9zlis8lf28i016avgqf3j9fmcvkqzd8db2vxpqx3v";
-    })
-
+    rain
     awscli2
     amazon-ecr-credential-helper
   ];
diff --git a/users/grfn/system/home/modules/obs.nix b/users/grfn/system/home/modules/obs.nix
index e85a7ba9a006..7962320f8a2f 100644
--- a/users/grfn/system/home/modules/obs.nix
+++ b/users/grfn/system/home/modules/obs.nix
@@ -1,60 +1,10 @@
 { config, lib, pkgs, ... }:
 
-with pkgs;
-
 let
-  libuiohook = stdenv.mkDerivation rec {
-    pname = "libuiohook";
-    version = "1.1";
-    src = fetchFromGitHub {
-      owner = "kwhat";
-      repo = "libuiohook";
-      rev = version;
-      sha256 = "1isfxn3cfrdqq22d3mlz2lzm4asf9gprs7ww2xy9c3j3srk9kd7r";
-    };
-
-    preConfigure = ''
-      ./bootstrap.sh
-    '';
-
-    nativeBuildInputs = [ pkg-config ];
-    buildInputs = [
-      libtool
-      autoconf
-      automake
-      xlibsWrapper
-      xorg.libXtst
-      xorg.libXinerama
-      xorg.libxkbfile
-      libxkbcommon
-    ];
-  };
-
-  obs-input-overlay = stdenv.mkDerivation rec {
-    pname = "obs-input-overlay";
-    version = "4.8";
-    src = fetchFromGitHub {
-      owner = "univrsal";
-      repo = "input-overlay";
-      rev = "v${version}";
-      sha256 = "1dklg0dx9ijwyhgwcaqz859rbpaivmqxqvh9w3h4byrh5pnkz8bf";
-      fetchSubmodules = true;
-    };
-
-    nativeBuildInputs = [ cmake ];
-    buildInputs = [ obs-studio libuiohook ];
-
-    postPatch = ''
-      sed -i CMakeLists.txt \
-        -e '2iinclude(${obs-studio.src}/cmake/Modules/ObsHelpers.cmake)' \
-        -e '2ifind_package(LibObs REQUIRED)'
-    '';
-
-    cmakeFlags = [
-      "-Wno-dev"
-    ];
-  };
+  inherit (pkgs) obs-studio;
+  obs-input-overlay = pkgs.obs-studio-plugins.input-overlay;
 in
+
 {
   home.packages = [
     obs-studio
diff --git a/users/tazjin/emacs/config/init.el b/users/tazjin/emacs/config/init.el
index b0e80998d63b..7eb1a19a8e57 100644
--- a/users/tazjin/emacs/config/init.el
+++ b/users/tazjin/emacs/config/init.el
@@ -115,7 +115,7 @@
 (use-package rainbow-delimiters :hook (prog-mode . rainbow-delimiters-mode))
 (use-package rainbow-mode)
 (use-package s)
-(use-package string-edit)
+(use-package string-edit-at-point)
 
 (use-package swiper
   :after (counsel ivy)
diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix
index 6069e8c7fe0f..6dfb37bb7e97 100644
--- a/users/tazjin/emacs/default.nix
+++ b/users/tazjin/emacs/default.nix
@@ -75,7 +75,7 @@ pkgs.makeOverridable
       restclient
       rust-mode
       sly
-      string-edit
+      string-edit-at-point
       swiper
       telephone-line
       terraform-mode
-- 
cgit 1.4.1