From 5225562fe08d99306596efc2c07d526e90bc78bb Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sun, 7 Apr 2024 00:15:28 -0700
Subject: 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 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'oni/home/config/rincewind.scm')

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
 
-- 
cgit v1.2.3-54-g00ecf