From 5225562fe08d99306596efc2c07d526e90bc78bb Mon Sep 17 00:00:00 2001
From: Tom Willemse <tom@ryuslash.org>
Date: Sun, 7 Apr 2024 00:15:28 -0700
Subject: [PATCH] Remove custom company package

The changes I made to the package have been accepted upstream, so I don't need
to maintain my own anymore.

Commit: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=55c94d68df

Discussion: https://issues.guix.gnu.org/68839
---
 oni/home/config/rincewind.scm | 25 ++++++++++---------------
 oni/packages/emacs.scm        | 33 ---------------------------------
 2 files changed, 10 insertions(+), 48 deletions(-)

diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm
index a5c436f..1bc18ae 100644
--- a/oni/home/config/rincewind.scm
+++ b/oni/home/config/rincewind.scm
@@ -24,7 +24,6 @@
                 #:select (emacs-org-roam
                           emacs-guix
                           emacs-org-contacts
-                          emacs-company
                           emacs-fennel-mode))
   #:use-module ((gnu packages file-systems)
                 #:select (tmsu))
@@ -141,7 +140,6 @@
                 #:select (count-emails))
   #:use-module ((oni packages emacs)
                 #:select (emacs-inkplate
-                          oni-emacs-company
                           emacs-outli
                           emacs-syncthing-status
                           emacs-nginx-mode))
@@ -222,9 +220,6 @@
     `((with-branch . ,(string-append (package-name package) "=master"))))
    package))
 
-(define with-my-emacs-company-package
-  (package-input-rewriting `((,emacs-company . ,oni-emacs-company))))
-
 (define rincewind-picom-service
   (service home-picom-service-type
            (home-picom-configuration
@@ -277,12 +272,12 @@
                  emacs-fennel-mode
 
                  (emacs-oni-org-roam my-emacs)
-                 (with-my-emacs-company-package emacs-oni-elisp)
+                 emacs-oni-elisp
                  emacs-oni-core
                  emacs-oni-elfeed
-                 (with-my-emacs-company-package emacs-oni-eshell)
+                 emacs-oni-eshell
                  emacs-oni-compilation
-                 (with-my-emacs-company-package emacs-oni-common-lisp)
+                 emacs-oni-common-lisp
                  emacs-oni-gui
                  emacs-oni-magit
                  emacs-oni-notmuch
@@ -293,12 +288,12 @@
                  emacs-oni-browse-url
                  emacs-oni-c
                  emacs-oni-circe
-                 (with-my-emacs-company-package emacs-oni-clojure)
-                 (with-my-emacs-company-package emacs-oni-cmake)
+                 emacs-oni-clojure
+                 emacs-oni-cmake
                  emacs-oni-conf
-                 (with-my-emacs-company-package emacs-oni-cpp)
-                 (with-my-emacs-company-package emacs-oni-csharp)
-                 (with-my-emacs-company-package emacs-oni-css)
+                 emacs-oni-cpp
+                 emacs-oni-csharp
+                 emacs-oni-css
                  emacs-oni-diff-hl
                  emacs-oni-ediff
                  emacs-oni-elm
@@ -318,12 +313,12 @@
                  emacs-oni-nxml
                  emacs-oni-package
                  emacs-oni-projectile
-                 (with-my-emacs-company-package emacs-oni-scheme)
+                 emacs-oni-scheme
                  emacs-oni-sh
                  emacs-oni-shr
                  emacs-oni-tramp
                  emacs-oni-yaml
-                 (with-my-emacs-company-package emacs-oni-python)
+                 emacs-oni-python
                  emacs-nginx-mode
                  emacs-oni-git-commit
 
diff --git a/oni/packages/emacs.scm b/oni/packages/emacs.scm
index 9ff5646..3d6d721 100644
--- a/oni/packages/emacs.scm
+++ b/oni/packages/emacs.scm
@@ -642,36 +642,3 @@ faster and I highly recommend its usage if your Emacs version permits.")
       (description "My cat is named Yoshi and I was just working on a random new theme, which was
 new-theme for a while. I couldn't think of a name so I named it after him.")
       (license license:gpl3+))))
-
-(define-public oni-emacs-company
-  (package
-    (name "oni-emacs-company")
-    (version "0.10.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://elpa.gnu.org/packages/"
-                           "company-" version ".tar"))
-       (sha256
-        (base32 "0j2qrnx2w2al4f2n37b89q0pkabh5ccv00gsknvgaylhy0za5gq9"))))
-    (build-system emacs-build-system)
-    (arguments
-     (list
-      #:include #~(cons* "icons/" %default-include)
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'move-doc 'install-doc-images
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let ((images (find-files "./images/small/" ".*\\.png$")))
-                (for-each (lambda (image)
-                            (install-file image
-                                          (string-append #$output "/share/info/images/small")))
-                          images)))))))
-    (home-page "https://company-mode.github.io/")
-    (synopsis "Modular text completion framework")
-    (description
-     "Company is a modular completion mechanism.  Modules for retrieving
-completion candidates are called back-ends, modules for displaying them are
-front-ends.  Company comes with many back-ends, e.g., @code{company-elisp}.
-These are distributed in separate files and can be used individually.")
-    (license license:gpl3+)))