From 9b248f9fb4b841aee7b63c3486543fd38c3a0302 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <b12f@noreply.example.org>
Date: Tue, 21 Sep 2021 20:27:18 +0000
Subject: [PATCH 1/2] Remove direnv (#18)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Benjamin Bädorf <hello@benjaminbaedorf.eu>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/18
Reviewed-by: teutat3s <teutates@mailbox.org>
Co-authored-by: Benjamin Bädorf <b12f@noreply.example.org>
Co-committed-by: Benjamin Bädorf <b12f@noreply.example.org>
---
 modules/terminal-life/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/terminal-life/default.nix b/modules/terminal-life/default.nix
index 0e013185..4d36655f 100644
--- a/modules/terminal-life/default.nix
+++ b/modules/terminal-life/default.nix
@@ -33,7 +33,6 @@ in
         watson
         nnn
         fd
-        direnv
       ];
 
       programs.neovim = import ./nvim { inherit config; inherit pkgs; };

From 1c47036e798da3851c9e62ce260a09e74e84a8d7 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 21 Sep 2021 20:33:10 +0000
Subject: [PATCH 2/2] Fix drone step competing for git lock (#19)

Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/19
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
---
 .drone.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c1de7237..546ae536 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -11,8 +11,6 @@ steps:
         - cron
       cron:
         - sync-master-with-upstream
-        - sync-b12f-with-master
-        - sync-teutat3s-with-master
     environment:
       GITEA_SSH_KEY:
         from_secret: gitea_ssh_key