Fix up some search aliases

‘master’ is a problematic term and ‘main’ works just as well.

git/.config/git/config

@@ -6,4 +6,6 @@
 [diff "lisp"]
       xfuncname = "^[[:space:]]*?\\(def\\w+? ((\\w|-|'|:|=|<|>)+)"
 [sendemail]
-	sendmailcmd = /usr/bin/msmtp -t
+	sendmailcmd = /usr/bin/msmtp
+[init]
+	defaultBranchname = main

notmuch/.config/notmuch/default/hooks/post-new

@@ -7,4 +7,5 @@ exec scsh -e main -s "$0" "$@"
 (define (main args)
   (run (notmuch-collect-tasks ,(format #f "~a/documents/gtd/inbox.org" (getenv "HOME"))))
   (run (notmuch-tag-mailinglists))
-  (run (notmuch tag "+@me" "(" to:tom@ryuslash.org or to:ryuslash@gmail.com ")" and not tag:@me)))
+  (run (notmuch tag "+@me" "(" to:tom@ryuslash.org or to:ryuslash@gmail.com ")" and not tag:@me))
+  (run (notmuch tag "+deleted" from:gog.com and "subject:expires in 24" and date:..24-hours-ago)))

oni/home/config/common.scm

@@ -134,6 +134,7 @@
 (define home-openssh-service
   (service home-openssh-service-type
            (home-openssh-configuration
+            (add-keys-to-agent "yes")
             (hosts (list (openssh-host
                           (name "ryuslash.org")
                           (host-name "ryuslash.org")

oni/home/config/rincewind.scm

@@ -11,6 +11,8 @@
   #:use-module ((gnu home services gnupg)
                 #:select (home-gpg-agent-service-type
                           home-gpg-agent-configuration))
+  #:use-module ((gnu home services ssh)
+                #:select (home-ssh-agent-service-type))
   #:use-module ((gnu packages certs)
                 #:select (nss-certs))
   #:use-module ((gnu packages cdrom)
@@ -24,7 +26,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 +142,6 @@
                 #:select (count-emails))
   #:use-module ((oni packages emacs)
                 #:select (emacs-inkplate
-                          oni-emacs-company
                           emacs-outli
                           emacs-syncthing-status
                           emacs-nginx-mode))
@@ -193,7 +193,8 @@
                           emacs-oni-tramp
                           emacs-oni-embrace
                           emacs-oni-yaml
-                          emacs-oni-python))
+                          emacs-oni-python
+                          emacs-oni-git-commit))
   #:use-module ((oni packages hlwm-run-or-raise)
                 #:select (hlwm-run-or-raise))
   #:use-module ((oni packages inbox-size)
@@ -221,9 +222,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
@@ -276,12 +274,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
@@ -292,12 +290,12 @@
                  emacs-oni-browse-url
                  emacs-oni-c
                  emacs-oni-circe
-                 (with-my-emacs-company-package emacs-oni-clojure)
+                 emacs-oni-clojure
-                 (with-my-emacs-company-package emacs-oni-cmake)
+                 emacs-oni-cmake
                  emacs-oni-conf
-                 (with-my-emacs-company-package emacs-oni-cpp)
+                 emacs-oni-cpp
-                 (with-my-emacs-company-package emacs-oni-csharp)
+                 emacs-oni-csharp
-                 (with-my-emacs-company-package emacs-oni-css)
+                 emacs-oni-css
                  emacs-oni-diff-hl
                  emacs-oni-ediff
                  emacs-oni-elm
@@ -317,13 +315,14 @@
                  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
 
                  tree-sitter-bash
                  tree-sitter-scheme
@@ -531,6 +530,7 @@
 
    (service home-gpg-agent-service-type
             (home-gpg-agent-configuration
-             (ssh-support? #t)
+             (ssh-support? #f)
              (extra-content
-              "allow-emacs-pinentry\n"))))))
+              "allow-emacs-pinentry\n")))
+   (service home-ssh-agent-service-type))))

oni/home/services/utilities.scm

@@ -51,9 +51,9 @@
 (define (home-inkplate-display-mcron-service config)
   (list #~(job '(next-day)
                (lambda ()
-                 (system* "herd" "start" "inkplate-display"))
+                 (system* #$(file-append inkplate-display "/bin/inkplate-display")))
                ;; "herd start inkplate-display"
-               "Get new email and process it via the Notmuch hook scripts.")))
+               "Update my Inkplate display.")))
 
 (define home-inkplate-display-service-type
   (service-type

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+)))

surfingkeys/surfingkeys.js

@@ -7,8 +7,21 @@ function orgCapture() {
             body: window.getSelection()});
 }
 
-api.unmap(':');
 
+api.addSearchAlias('aw', 'archlinux wiki', 'https://wiki.archlinux.org/index.php?search=%s');
+api.removeSearchAlias('e');
+api.addSearchAlias(
+    'w',
+    'wikipedia',
+    'https://en.wikipedia.org/wiki/',
+    's',
+    'https://en.wikipedia.org/w/api.php?action=opensearch&format=json&formatversion=2&namespace=0&limit=40&search=',
+    function(response) {
+        return JSON.parse(response.text)[1];
+    }
+);
+
+api.unmap(':');
 api.mapkey('<Alt-x>', '#7Open commands', function() {
     api.Front.openOmnibar({type: "Commands"});
 });