8 changed files with 1192 additions and 61 deletions
--- a/.guix-authorizations
+++ b/.guix-authorizations
@ -0,0 +1,5 @@
+;; -*- mode: scheme; -*-
+(authorizations
+ (version 0)                            ;current file format version
+ (("061C C5C4 D936 C9A8 AECC  1A17 7D5C 407B 4350 25C1"
+   (name "tom"))))
--- a/README.org
+++ b/README.org
@ -0,0 +1,47 @@
+#+TITLE: My Guix Packages
+
+To use this channel (although I don’t see why you would want to) add the following channel to your =channels.scm=:
+
+#+begin_src scheme
+  (channel
+     (name 'oni)
+     (url "https://code.ryuslash.org/ryuslash/guix-packages.git")
+     (introduction
+      (make-channel-introduction
+       "646573578b7adfbff415645fed201269076cebf6"
+       (openpgp-fingerprint
+        "061C C5C4 D936 C9A8 AECC  1A17 7D5C 407B 4350 25C1"))))
+#+end_src
+
+Or, if you're using Guix Home to configure your user profile, you can do it like this:
+
+#+begin_src scheme
+  (use-modules ((gnu home services guix)
+                #:select (home-channels-service-type))
+               ((gnu home)
+                #:select (home-environment))
+               ((gnu services)
+                #:select (simple-service))
+               ((guix channels)
+                #:select (channel
+                          make-channel-introduction
+                          openpgp-fingerprint)))
+
+  (home-environment
+   (services
+    (list
+     (simple-service
+      'my-channel-service
+      home-channels-service-type
+      (list
+       (channel
+        (name 'oni)
+        (url "https://code.ryuslash.org/ryuslash/guix-packages.git")
+        (introduction
+         (make-channel-introduction
+          "646573578b7adfbff415645fed201269076cebf6"
+          (openpgp-fingerprint
+           "061C C5C4 D936 C9A8 AECC  1A17 7D5C 407B 4350 25C1"))))))))
+   ;; ...
+   )
+#+end_src
--- a/oni/packages/emacs-config.scm
+++ b/oni/packages/emacs-config.scm
@ -0,0 +1,541 @@
+(define-module (oni packages emacs-config)
+  #:use-module (guix packages)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system emacs)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages emacs-xyz)
+  #:use-module (gnu packages llvm)
+  #:use-module (gnu packages cmake)
+  #:use-module (gnu packages bash)
+  #:use-module (oni packages emacs)
+  #:use-module (oni packages go))
+
+(define-public emacs-oni-config
+  (let ((commit "8eb16a8db6424eeca3fc82bdd806529edd94bd5e")
+        (revision "0"))
+    (package
+      (name "emacs-oni-config")
+      (version (git-version "0.0.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://code.ryuslash.org/ryuslash/emacs-config.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0m88z982j113jdyy1zsii4m0hg5p1l6g3gj47s3msspr2dz2b9hi"))))
+      (build-system emacs-build-system)
+      (home-page "https://code.ryuslash.org/ryuslash/emacs-config")
+      (synopsis "My Emacs configuration")
+      (description "This package provides my configuration for emacs")
+      (license license:gpl3+))))
+
+(define-public emacs-oni-vterm
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-vterm")
+   (arguments
+    '(#:include '("oni-vterm.el")))
+   (propagated-inputs
+    `(("emacs-vterm" ,emacs-vterm)))
+   (synopsis "My Emacs vterm configuration")
+   (description "This package provides my configuration for emacs-vterm")))
+
+(define-public emacs-oni-elfeed
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-elfeed")
+   (arguments
+    '(#:include '("oni-elfeed.el")))
+   (propagated-inputs
+    `(("emacs-elfeed" ,emacs-elfeed)))
+   (synopsis "My Emacs elfeed configuration")
+   (description "This package provides my configuration for emacs-elfeed")))
+
+(define-public emacs-oni-alert
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-alert")
+   (arguments
+    '(#:include '("oni-alert.el")))
+   (propagated-inputs
+    `(("emacs-alert" ,emacs-alert)))
+   (synopsis "My Emacs alert configuration")
+   (description "This package provides my configuration for emacs-alert")))
+
+(define-public emacs-oni-bookmark
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-bookmark")
+   (arguments
+    '(#:include '("oni-bookmark.el")))
+   (synopsis "My Emacs bookmark configuration")
+   (description "This package provides my configuration for the bookmark library
+in Emacs")))
+
+(define-public emacs-oni-lui
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-lui")
+   (arguments
+    '(#:include '("oni-lui.el")))
+   (propagated-inputs
+    `(("emacs-circe" ,emacs-circe)))
+   (synopsis "My Emacs Line-UI configuration")
+   (description "This package provides my configuration for the lui library in
+Emacs")))
+
+(define-public emacs-oni-circe
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-circe")
+   (arguments
+    '(#:include '("oni-circe.el")))
+   (propagated-inputs
+    `(("emacs-circe" ,emacs-circe)
+      ("emacs-circe-serenityc" ,emacs-circe-serenity)
+      ("emacs-oni-lui" ,emacs-oni-lui)
+      ("emacs-olivetti" ,emacs-olivetti)))
+   (synopsis "My Emacs Circe configuration")
+   (description "This package provides my configuration for emacs-circe")))
+
+(define-public emacs-oni-embrace
+  (package
+    (inherit emacs-oni-config)
+    (name "emacs-oni-embrace")
+    (arguments
+     '(#:include '("oni-embrace.el")))
+    (propagated-inputs
+     `(("emacs-embrace" ,emacs-embrace)))
+    (synopsis "My Emacs Embrace configuration")
+    (description "This package provides my configuration for emacs-embrace")))
+
+(define-public emacs-oni-hydra
+  (package
+    (inherit emacs-oni-config)
+    (name "emacs-oni-hydra")
+    (arguments
+     '(#:include '("oni-hydra.el")))
+    (propagated-inputs
+     `(("emacs-hydra" ,emacs-hydra)
+       ("emacs-posframe" ,emacs-posframe)))
+    (synopsis "My Emacs Hydra configuration")
+    (description "This package provides my configuration for emacs-hydra")))
+
+(define-public emacs-oni-data-dir
+  (package
+    (inherit emacs-oni-config)
+    (name "emacs-oni-data-dir")
+    (arguments
+     '(#:include '("oni-data-dir.el")))
+    (synopsis "Data dir configuration")
+    (description "Utilities for placing all state files in 'data/' inside my
+`user-emacs-directory'.")))
+
+(define-public emacs-oni-core
+  (package
+    (inherit emacs-oni-config)
+    (name "emacs-oni-core")
+    (arguments
+     '(#:include '("oni-core.el")))
+    (propagated-inputs
+     `(("emacs-oni-data-dir" ,emacs-oni-data-dir)
+       ("emacs-oni-embrace" ,emacs-oni-embrace)
+       ("emacs-oni-hydra" ,emacs-oni-hydra)
+       ("emacs-expand-region" ,emacs-expand-region)
+       ("emacs-multiple-cursors" ,emacs-multiple-cursors)
+       ("emacs-gcmh" ,emacs-gcmh)
+       ("emacs-diminish" ,emacs-diminish)
+       ("emacs-ws-butler" ,emacs-ws-butler)
+       ("emacs-which-key" ,emacs-which-key)
+       ("emacs-insert-char-preview" ,emacs-insert-char-preview)
+       ("emacs-mixed-pitch" ,emacs-mixed-pitch)
+       ("emacs-ace-window" ,emacs-ace-window)
+       ("emacs-vertico" ,emacs-vertico)
+       ("emacs-marginalia" ,emacs-marginalia)
+       ("emacs-orderless" ,emacs-orderless)
+       ("emacs-consult" ,emacs-consult)
+       ("emacs-embark" ,emacs-embark)
+       ("emacs-docstr" ,emacs-docstr)
+       ("emacs-mini-frame" ,emacs-mini-frame)))
+    (synopsis "My core Emacs configuration")
+    (description "This package provides my core configuration for Emacs")))
+
+(define-public emacs-oni-smartparens
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-smartparens")
+   (arguments
+    '(#:include '("oni-smartparens.el")))
+   (propagated-inputs
+    `(("emacs-smartparens" ,emacs-smartparens)))
+   (synopsis "My Emacs smartparens configuration")
+   (description "This package provides my configuration for Emacs smartparens")))
+
+(define-public emacs-oni-flycheck
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-flycheck")
+   (arguments
+    '(#:include '("oni-flycheck.el")))
+   (propagated-inputs
+    `(("emacs-flycheck" ,emacs-flycheck)
+      ("emacs-flycheck-posframe" ,emacs-flycheck-posframe)
+      ("emacs-flycheck-cask" ,emacs-flycheck-cask)))
+   (synopsis "My Emacs flycheck configuration")
+   (description "This package provides my configuration for Emacs flycheck")))
+
+(define-public emacs-oni-lsp
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-lsp")
+   (arguments
+    '(#:include '("oni-lsp.el")))
+   (propagated-inputs
+    `(("emacs-lsp-mode" ,emacs-lsp-mode)
+      ("emacs-lsp-ui" ,emacs-lsp-ui)
+      ("emacs-lsp-ivy" ,emacs-lsp-ivy)))
+   (synopsis "My Emacs LSP configuration")
+   (description "This package provides my configuration for Emacs LSP")))
+
+(define-public emacs-oni-c
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-c")
+   (arguments
+    '(#:include '("oni-c.el")))
+   (propagated-inputs
+    `(("emacs-oni-flycheck" ,emacs-oni-flycheck)
+      ("emacs-oni-lsp" ,emacs-oni-lsp)
+      ("emacs-reformatter" ,emacs-reformatter)
+      ("emacs-ccls" ,emacs-ccls)
+      ("emacs-rainbow-delimiters" ,emacs-rainbow-delimiters)
+      ;; For `clang-format'.
+      ("clang" ,clang)))
+   (synopsis "My Emacs C coding configuration")
+   (description "This package provides my configuration for coding in C")))
+
+(define-public emacs-oni-sh
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-sh")
+   (arguments
+    '(#:include '("oni-sh.el")))
+   (propagated-inputs
+    `(("emacs-reformatter" ,emacs-reformatter)
+      ("emacs-oni-flycheck" ,emacs-oni-flycheck)
+      ("emacs-oni-smartparens" ,emacs-oni-smartparens)
+      ("shfmt" ,shfmt)))
+   (synopsis "My Emacs Shell coding configuration")
+   (description "This package provides my configuration for coding in Shell")))
+
+(define-public emacs-oni-yasnippet
+  (package
+    (inherit emacs-oni-config)
+    (name "emacs-oni-yasnippet")
+    (arguments
+     '(#:include '("oni-yasnippet.el")))
+    (propagated-inputs
+     `(("emacs-yasnippet" ,emacs-yasnippet)
+       ("emacs-yasnippet-snippets" ,emacs-yasnippet-snippets)
+       ("emacs-diminish" ,emacs-diminish)))
+    (synopsis "My Emacs yasnippet configuration")
+    (description "This package provides my configuration for yasnippet")))
+
+(define-public emacs-oni-bats
+  (package
+    (inherit emacs-oni-config)
+    (name "emacs-oni-bats")
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'chdir-oni-bats
+           (lambda _
+             (chdir "oni-bats"))))
+       #:include '("\\.el$" "^snippets\\/bats-mode\\/")))
+    (propagated-inputs
+     `(("emacs-bats" ,emacs-bats)
+       ("emacs-oni-sh" ,emacs-oni-sh)
+       ("emacs-oni-yasnippet" ,emacs-oni-yasnippet)
+       ("bats" ,bats)))
+    (synopsis "My Emacs Bats coding configuration")
+    (description "This package provides my configuration for coding in Bats")))
+
+(define-public emacs-oni-org
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-org")
+   (arguments
+    `(#:phases
+      (modify-phases %standard-phases
+                     (add-after 'unpack 'chdir-oni-org
+                                (lambda _
+                                  (chdir "oni-org"))))
+      #:include '("\\.el$"
+                  "^snippets\\/org-mode\\/"
+                  "^capture-templates\\/"
+                  "^icons\\/")))
+   (propagated-inputs
+    `(("emacs-oni-yasnippet" ,emacs-oni-yasnippet)
+      ("emacs-oni-alert" ,emacs-oni-alert)
+      ("emacs-oni-hydra" ,emacs-oni-hydra)
+      ("emacs-org" ,emacs-org)
+      ("emacs-org-contrib" ,emacs-org-contrib)
+      ("emacs-org-bullets" ,emacs-org-bullets)
+      ("emacs-org-edna" ,emacs-org-edna)
+      ("emacs-diminish" ,emacs-diminish)
+      ("emacs-all-the-icons" ,emacs-all-the-icons)
+      ("emacs-olivetti" ,emacs-olivetti)
+      ("emacs-form-feed" ,emacs-form-feed)
+      ("emacs-org-pretty-table" ,emacs-org-pretty-table)))
+   (synopsis "My Emacs Org configuration")
+   (description "This package provides my configuration for org")))
+
+(define-public emacs-oni-org-roam
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-org-roam")
+   (arguments
+    '(#:include '("oni-org-roam.el")))
+   (propagated-inputs
+    `(("emacs-oni-org" ,emacs-oni-org)
+      ("emacs-org-roam" ,emacs-org-roam)))
+   (synopsis "My Emacs Org Roam configuration")
+   (description "This package provides my configuration for Org Roam")))
+
+(define-public emacs-oni-browse-url
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-browse-url")
+   (arguments
+    '(#:include '("oni-browse-url.el")))
+   (synopsis "My Emacs Browse Url configuration")
+   (description "This package provides my configuration for Browse Url")))
+
+(define-public emacs-oni-prescient
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-prescient")
+   (arguments
+    '(#:include '("oni-prescient.el")))
+   (propagated-inputs
+    `(("emacs-prescient" ,emacs-prescient)
+      ("emacs-oni-data-dir" ,emacs-oni-data-dir)))
+   (synopsis "My Emacs prescient configuration")
+   (description "This package provides my configuration for prescient")))
+
+(define-public emacs-oni-company
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-company")
+   (arguments
+    '(#:include '("oni-company.el")))
+   (propagated-inputs
+    `(("emacs-company" ,emacs-company)
+      ("emacs-oni-prescient" ,emacs-oni-prescient)
+      ("emacs-company-posframe" ,emacs-company-posframe)
+      ("emacs-diminish" ,emacs-diminish)))
+   (synopsis "My Emacs Company configuration")
+   (description "This package provides my configuration for company")))
+
+(define-public emacs-oni-paredit
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-paredit")
+   (arguments
+    '(#:include '("oni-paredit.el")))
+   (propagated-inputs
+    `(("emacs-paredit" ,emacs-paredit)
+      ("emacs-diminish" ,emacs-diminish)))
+   (synopsis "My Emacs paredit configuration")
+   (description "This package provides my configuration for paredit")))
+
+(define-public emacs-oni-clojure
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-clojure")
+   (arguments
+    '(#:include '("oni-clojure.el")))
+   (propagated-inputs
+    `(("emacs-clojure-mode" ,emacs-clojure-mode)
+      ("emacs-oni-company" ,emacs-oni-company)
+      ("emacs-cider" ,emacs-cider)
+      ("emacs-oni-paredit" ,emacs-oni-paredit)
+      ("emacs-rainbow-delimiters" ,emacs-rainbow-delimiters)
+      ("emacs-oni-data-dir" ,emacs-oni-data-dir)))
+   (synopsis "My Emacs Clojure configuration")
+   (description "This package provides my configuration for Clojure")))
+
+(define-public emacs-oni-cmake
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-cmake")
+   (arguments
+    '(#:include '("oni-cmake.el")))
+   (propagated-inputs
+    `(("emacs-cmake-mode" ,emacs-cmake-mode)
+      ("emacs-oni-company" ,emacs-oni-company)
+      ("emacs-oni-flycheck" ,emacs-oni-flycheck)
+      ("emacs-oni-lsp" ,emacs-oni-lsp)
+      ("emacs-cmake-font-lock" ,emacs-cmake-font-lock)
+      ("emacs-eldoc-cmake" ,emacs-eldoc-cmake)))
+   (synopsis "My Emacs CMake confifguration")
+   (description "This package provides my configuration for CMake")))
+
+(define-public emacs-oni-common-lisp
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-common-lisp")
+   (arguments
+    '(#:include '("oni-common-lisp.el")))
+   (propagated-inputs
+    `(("emacs-oni-company" ,emacs-oni-company)
+      ("emacs-oni-flycheck" ,emacs-oni-flycheck)
+      ("emacs-oni-paredit" ,emacs-oni-paredit)
+      ("emacs-rainbow-delimiters" ,emacs-rainbow-delimiters)
+      ("emacs-slime" ,emacs-slime)
+      ("emacs-slime-company" ,emacs-slime-company)))
+   (synopsis "My Emacs Common Lisp configuration")
+   (description "This package provides my configuration for Common Lisp")))
+
+(define-public emacs-oni-compilation
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-compilation")
+   (arguments
+    '(#:include '("oni-compilation.el")))
+   (propagated-inputs
+    `(("emacs-oni-alert" ,emacs-oni-alert)
+      ("emacs-xterm-color" ,emacs-xterm-color)))
+   (synopsis "My Emacs Compilation configuration")
+   (description "This package provides my configuration for Compilation mode")))
+
+(define-public emacs-oni-conf
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-conf")
+   (arguments
+    `(#:phases
+      (modify-phases %standard-phases
+                     (add-after 'unpack 'chdir-oni-conf
+                                (lambda _ (chdir "oni-conf"))))
+      #:include '("\\.el$"
+                  "^snippets\\/conf-mode\\/")))
+   (propagated-inputs
+    `(("emacs-oni-yasnippet" ,emacs-oni-yasnippet)))
+   (synopsis "My Emacs Conf mode configuration")
+   (description "This pakcage provides my configuation for Conf mode")))
+
+(define-public emacs-oni-counsel
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-counsel")
+   (arguments
+    '(#:include '("oni-counsel.el")))
+   (propagated-inputs
+    `(("emacs-counsel" ,emacs-counsel)
+      ("emacs-diminish" ,emacs-diminish)))
+   (synopsis "My Emacs Counsel configuration")
+   (description "This package provides my configuration for Counsel mode")))
+
+(define-public emacs-oni-cpp
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-cpp")
+   (arguments
+    '(#:include '("oni-cpp.el")))
+   (propagated-inputs
+    `(("emacs-oni-company" ,emacs-oni-company)
+      ("emacs-oni-flycheck" ,emacs-oni-flycheck)))
+   (synopsis "My Emacs C++ configuration")
+   (description "This package provides my configuration for programming in C++.")))
+
+(define-public emacs-oni-csharp
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-csharp")
+   (arguments
+    '(#:phases
+      (modify-phases %standard-phases
+                     (add-after 'unpack 'chdir-oni-csharp
+                                (lambda _ (chdir "oni-csharp"))))
+      #:include '("\\.el$" "^snippets\\/")))
+   (propagated-inputs
+    `(("emacs-csharp-mode" ,emacs-csharp-mode)
+      ("emacs-oni-company" ,emacs-oni-company)
+      ("emacs-oni-flycheck" ,emacs-oni-flycheck)
+      ("emacs-oni-yasnippet" ,emacs-oni-yasnippet)
+      ("emacs-oni-hydra" ,emacs-oni-hydra)
+      ("emacs-oni-lsp" ,emacs-oni-lsp)
+      ("emacs-oni-smartparens" ,emacs-oni-smartparens)))
+   (synopsis "My Emacs C# configuration")
+   (description "This package provides my configuration for programming in C#.")))
+
+(define-public emacs-oni-css
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-css")
+   (arguments
+    '(#:phases
+      (modify-phases %standard-phases
+                     (add-after 'unpack 'chdir-oni-css
+                                (lambda _ (chdir "oni-css"))))
+      #:include '("\\.el$" "^snippets\\/")))
+   (propagated-inputs
+    `(("emacs-oni-company" ,emacs-oni-company)
+      ("emacs-oni-hydra" ,emacs-oni-hydra)
+      ("emacs-rainbow-mode" ,emacs-rainbow-mode)
+      ("emacs-oni-yasnippet" ,emacs-oni-yasnippet)))
+   (synopsis "My Emacs CSS configuration")
+   (description "This package provides my configuration for writing CSS.")))
+
+(define-public emacs-oni-diff-hl
+  (package
+   (inherit emacs-oni-config)
+   (name "emacs-oni-diff-hl")
+   (arguments
+    '(#:include '("oni-diff-hl.el")))
+   (propagated-inputs
+    `(("emacs-diff-hl" ,emacs-diff-hl)))
+   (synopsis "My Emacs Diff Highlight configuration")
+   (description "This package provides my configuration for Diff Highlight.")))
+
+(define-public emacs-oni-elisp
+  (package
+    (inherit emacs-oni-config)
+    (name "emacs-oni-elisp")
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'chdir-oni-elisp
+           (lambda _ (chdir "oni-elisp"))))
+       #:include '("\\.el$" "^snippets\\/")))
+    (propagated-inputs
+     `(("emacs-oni-company" ,emacs-oni-company)
+       ("emacs-oni-flycheck" ,emacs-oni-flycheck)
+       ("emacs-oni-paredit" ,emacs-oni-paredit)
+       ("emacs-oni-yasnippet" ,emacs-oni-yasnippet)
+       ("emacs-oni-hydra" ,emacs-oni-hydra)
+       ("emacs-rainbow-delimiters" ,emacs-rainbow-delimiters)
+       ("emacs-nameless" ,emacs-nameless)
+       ("emacs-erefactor" ,emacs-erefactor)
+       ("emacs-flycheck-relint" ,emacs-flycheck-relint)
+       ("emacs-handle" ,emacs-handle)
+       ("emacs-elisp-format" ,emacs-elisp-format)))
+    (synopsis "My Emacs Lisp configuration")
+    (description "This package provides my configuration for Emacs Lisp.")))
+
+(define-public emacs-oni-eshell
+  (package
+    (inherit emacs-oni-config)
+    (name "emacs-oni-eshell")
+    (arguments
+     '(#:include '("oni-eshell.el")))
+    (propagated-inputs
+     `(("emacs-esh-autosuggest" ,emacs-esh-autosuggest)
+       ("emacs-xterm-color" ,emacs-xterm-color)
+       ("emacs-eshell-syntax-highlighting" ,emacs-eshell-syntax-highlighting)
+       ("emacs-eshell-fringe-status" ,emacs-eshell-fringe-status)))
+    (synopsis "My Emacs Lisp configuration")
+    (description "This package provides my configuration for Emacs Lisp.")))
--- a/oni/packages/emacs.scm
+++ b/oni/packages/emacs.scm
@ -0,0 +1,369 @@
+(define-module (oni packages emacs)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system emacs)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages emacs-xyz))
+
+(define-public emacs-inkplate
+  (let ((commit "0897721a7b3d84aa3f200ae85fddd5fdd370fc42")
+        (revision "0"))
+    (package
+     (name "emacs-inkplate")
+     (version (git-version "0.0.1" revision commit))
+     (source
+      (origin
+       (uri (git-reference
+             (url "https://git.sr.ht/~ryuslash/inkplatel")
+             (commit commit)))
+       (method git-fetch)
+       (sha256
+        (base32 "0mqnpf4vrzn3013pcwcr9150k4jy4klrdg0pd3amhg2y25054w4s"))
+       (file-name (git-file-name name version))))
+     (build-system emacs-build-system)
+     (synopsis "Interface for my Inkplate")
+     (description
+      "This package provides a way to communicate with Inkplate in peripheral mode.")
+     (license license:gpl3+)
+     (home-page "https://sr.ht/~ryuslash/inkplate/"))))
+
+(define-public emacs-circe-serenity
+  (let ((commit "6dbc0944755b198c923689c33e7287e444f6a310")
+        (revision "0"))
+    (package
+     (name "emacs-circe-serenity")
+     (version (git-version "0.0.1" revision commit))
+     (source
+      (origin
+       (uri (git-reference
+             (url "https://github.com/ryuslash/circe-serenity.git")
+             (commit commit)))
+       (method git-fetch)
+       (sha256
+        (base32 "05fpbvqx6ii8kypv880j3mdc8kql7k16dcs42vpaaabjwn3kv4kn"))
+       (file-name (git-file-name name version))))
+     (build-system emacs-build-system)
+     (propagated-inputs
+      `(("emacs-circe" ,emacs-circe)))
+     (synopsis "Someone's idea of a more serene Circe configuration")
+     (description "A configuration for Circe")
+     (license license:gpl3)
+     (home-page "https://github.com/ryuslash/circe-serenity"))))
+
+(define-public emacs-embrace
+  (package
+   (name "emacs-embrace")
+   (version "0.1.4")
+   (source
+    (origin
+      (uri (git-reference
+            (url "https://github.com/cute-jumper/embrace.el")
+            (commit version)))
+      (method git-fetch)
+      (file-name (git-file-name name version))
+      (sha256
+       (base32 "1m0qyipkp5ydgcav8d0m58fbj1gilipbj7g8mg40iajr8wfqcjdc"))))
+   (build-system emacs-build-system)
+   (propagated-inputs
+    `(("emacs-expand-region" ,emacs-expand-region)))
+   (home-page "https://github.com/cute-jumper/embrace.el")
+   (synopsis "Add/Change/Delete pairs based on `expand-region', similar to `evil-surround'")
+   (description "This package is heavily inspired by evil-surround (which is a port of the vim
+plugin surround.vim). But instead of using evil and its text objects, this
+package relies on another excellent package expand-region.
+
+For Emacs users who don’t like evil and thus don’t use evil-surround, embrace
+provides similar commands that can be found in evil-surround. Evil is absolutely
+not required. For evil-surround users, embrace can make your evil-surround
+commands even better! (Have you noticed that evil-surround doesn’t work on many
+custom pairs?)")
+   (license license:gpl3+)))
+
+(define-public emacs-insert-char-preview
+  (let ((commit "0e4a62b5407fb1bed8920a4c13cf9a91065e15ad")
+        (revision "0"))
+   (package
+     (name "emacs-insert-char-preview")
+     (version (git-version "0.0.0" revision commit))
+     (source
+      (origin
+        (uri (git-reference
+              (url "https://gitlab.com/matsievskiysv/insert-char-preview")
+              (commit commit)))
+        (method git-fetch)
+        (file-name (git-file-name name version))
+        (sha256
+         (base32 "0cqc23y9n63a7kl2p1zrfcsxnclfxcszfmbh2hmbrs6q05ys0kzg"))))
+     (build-system emacs-build-system)
+     (home-page "https://gitlab.com/matsievskiysv/insert-char-preview")
+     (synopsis "Insert Unicode char")
+     (description "Insert Unicode char via insert-char-preview similar to insert-char command, but
+with character preview in completion prompt.")
+     (license license:gpl3+))))
+
+(define-public emacs-bats
+  (let ((commit "d519f7c89f5ae17dfc33400596df4564b478315f")
+        (revision "0"))
+    (package
+     (name "emacs-bats")
+     (version (git-version "0.0.0" revision commit))
+     (source
+      (origin
+       (uri (git-reference
+             (url "https://github.com/dougm/bats-mode")
+             (commit commit)))
+       (method git-fetch)
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1ikb4rb20ng1yq95g3ydwpk37axmiw38rjzn1av9m4cs81qby4jv"))))
+     (build-system emacs-build-system)
+     (home-page "https://github.com/dougm/bats-mode")
+     (synopsis "Emacs mode for editing and running Bats tests")
+     (description "bats-mode is an Emacs mode for editing and running Bats tests.
+
+bats-mode derives from the bash flavor of sh-mode, adding font-lock for bats
+keywords.")
+     (license license:gpl2+))))
+
+(define-public emacs-docstr
+  (let ((commit "4a991860c1259657c07c726bc482c97a1f597394")
+        (revision "0"))
+    (package
+      (name "emacs-docstr")
+      (version (git-version "5.7.0" revision commit))
+      (source
+       (origin
+         (uri (git-reference
+               (url "https://github.com/emacs-vs/docstr")
+               (commit commit)))
+         (method git-fetch)
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1z2l1mvrijwap83fpdlyfclk5aygfvmjaq7dayacj5nz5rggk0j6"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-s" ,emacs-s)))
+      (home-page "https://emacs-vs.github.io/docstr/")
+      (synopsis "A document string minor mode")
+      (description "This package provides a simple solution for the insertion of documentation
+strings into code.")
+      (license license:gpl3+))))
+
+(define-public emacs-flycheck-posframe
+  (let ((commit "8f60c9bf124ab9597d681504a73fdf116a0bde12")
+        (revision "0"))
+    (package
+     (name "emacs-flycheck-posframe")
+     (version (git-version "0.0.0" revision commit))
+     (source
+      (origin
+       (uri (git-reference
+             (url "https://github.com/alexmurray/flycheck-posframe")
+             (commit commit)))
+       (method git-fetch)
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0qh9hzvs95jvfrspglzkwhfq6a5pinab94bbh5vzkg8jc2fq6drf"))))
+     (build-system emacs-build-system)
+     (propagated-inputs
+      `(("emacs-flycheck" ,emacs-flycheck)
+        ("emacs-posframe" ,emacs-posframe)))
+     (home-page "https://github.com/alexmurray/flycheck-posframe")
+     (synopsis "Show flycheck errors via posframe.el")
+     (description "Show flycheck errors via posframe.el")
+     (license license:gpl3+))))
+
+(define-public emacs-flycheck-cask
+  (package
+   (name "emacs-flycheck-cask")
+   (version "0.4")
+   (source
+    (origin
+     (uri (git-reference
+           (url "https://github.com/flycheck/flycheck-cask")
+           (commit version)))
+     (method git-fetch)
+     (file-name (git-file-name name version))
+     (sha256
+      (base32 "1wm5saf29gw0gp0qq5glf9qq3iras99npc2rip7bsnn0czr2mscy"))))
+   (build-system emacs-build-system)
+   (propagated-inputs
+    `(("emacs-flycheck" ,emacs-flycheck)
+      ("emacs-dash" ,emacs-dash)))
+   (home-page "https://github.com/flycheck/flycheck-cask")
+   (synopsis "Cask support for Flycheck")
+   (description "Make Flycheck use Cask packages in Cask projects.")
+   (license license:gpl3+)))
+
+(define-public emacs-nroam
+  (package
+   (name "emacs-nroam")
+   (version "20210325.2015")
+   (source
+    (origin
+     (method url-fetch)
+     (uri (string-append
+           "https://melpa.org/packages/nroam-"
+           version
+           ".tar"))
+     (sha256
+      (base32
+       "1aybc2k8kyf2dlpbq39p3k1nsvzrhw58xarbwwq0qgz91r49m4xq"))))
+   (build-system emacs-build-system)
+   (propagated-inputs
+    `(("emacs-org-roam" ,emacs-org-roam)
+      ("emacs-org" ,emacs-org)))
+   (home-page
+    "https://github.com/NicolasPetton/nroam")
+   (synopsis
+    "Org-roam backlinks within org-mode buffers")
+   (description
+    "nroam is a supplementary package for org-roam that replaces the backlink side
+buffer of Org-roam.  Instead, it displays org-roam backlinks at the end of
+org-roam buffers.
+
+To setup nroam for all org-roam buffers, evaluate the following:
+(add-hook 'org-mode-hook #'nroam-setup-maybe)
+")
+   (license license:gpl3+)))
+
+(define-public emacs-eldoc-cmake
+  (package
+   (name "emacs-eldoc-cmake")
+   (version "20190419.2244")
+   (source
+    (origin
+     (method url-fetch)
+     (uri (string-append
+           "https://melpa.org/packages/eldoc-cmake-"
+           version
+           ".el"))
+     (sha256
+      (base32
+       "08qa4lp22pracwskjq1kqv6kjwfbgyjsjsxb8kv820ndz5ccwaik"))))
+   (build-system emacs-build-system)
+   (home-page
+    "https://github.com/ikirill/eldoc-cmake")
+   (synopsis "Eldoc support for CMake")
+   (description
+    "
+CMake eldoc support, using a pre-generated set of docstrings from
+CMake's documentation source.
+
+See function `eldoc-cmake-enable'.
+")
+   (license license:gpl3)))
+
+(define-public emacs-elisp-format
+  (let ((commit "03cc293eb2f78ec58fc1d84279af06816a04b979")
+        (revision "0"))
+    (package
+      (name "emacs-elisp-format")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (uri (git-reference
+               (url "https://github.com/Yuki-Inoue/elisp-format")
+               (commit commit)))
+         (method git-fetch)
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "17l2xsixx3p93dmx9jsg0a3xqdg19nwp1di2pymlg41pw0kdf3x3"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/Yuki-Inoue/elisp-format")
+      (synopsis "Format elisp code")
+      (description "This package is format by itself, so you can view format effect.")
+      (license license:gpl3+))))
+
+(define-public emacs-erefactor
+  (let ((commit "bfe27a1b8c7cac0fe054e76113e941efa3775fe8")
+        (revision "0"))
+    (package
+      (name "emacs-erefactor")
+      (version (git-version "0.7.2" revision commit))
+      (source
+       (origin
+         (uri (git-reference
+               (url "https://github.com/mhayashi1120/Emacs-erefactor")
+               (commit commit)))
+         (method git-fetch)
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1071gqli1qd498syhysyj2wzyw1nya5070m82xd9qalqdh11b8is"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/mhayashi1120/Emacs-erefactor")
+      (synopsis "Emacs-Lisp refactoring utilities")
+      (description "Simple refactoring, linting utilities for Emacs-Lisp.")
+      (license license:gpl3+))))
+
+(define-public emacs-flycheck-relint
+  (let ((commit "84b66d364ba583c1d5173a326997d11c6946b463")
+        (revision "0"))
+    (package
+      (name "emacs-flycheck-relint")
+      (version (git-version "0.6" revision commit))
+      (source
+       (origin
+         (uri (git-reference
+               (url "https://github.com/purcell/flycheck-relint")
+               (commit commit)))
+         (method git-fetch)
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "04ypamfnfhw7ba6zd1k62xaxq91qbzfxx4n5nld74w2cyv3s645f"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-flycheck" ,emacs-flycheck)
+         ("emacs-relint" ,emacs-relint)))
+      (home-page "https://github.com/purcell/flycheck-relint")
+      (synopsis "Flycheck integration for `relint`, which checks regexps in emacs lisp")
+      (description "This library provides a Flycheck checker for rx and string regular expressions
+in Emacs Lisp files, using relint.")
+      (license license:gpl3+))))
+
+(define-public emacs-outli
+  (let ((commit "f16f3ab90c5e4194b62f461e82f01709ae80f6e9")
+        (revision "0"))
+    (package
+     (name "emacs-outli")
+     (version (git-version "0.0.0" revision commit))
+     (source
+      (origin
+       (uri (git-reference
+             (url "https://github.com/jdtsmith/outli")
+             (commit commit)))
+       (method git-fetch)
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "03xirf5q6n1iy3h1gqhzwbiw7vadfmna1h3gkfkdrjqfd3jjq6qm"))))
+     (build-system emacs-build-system)
+     (home-page "https://github.com/jdtsmith/outli")
+     (synopsis "Simple comment-based outlines for Emacs")
+     (description "outli is a simple Emacs outliner for code, documents, and more which styles your
+headings, and emulates org-mode navigation and structure editing. It is based on
+the built-in outline-minor-mode and is simple by design, providing just a few
+key features.")
+     (license license:gpl3+))))
+
+(define-public emacs-eshell-fringe-status
+  (let ((commit "047e9b9c75a39ac9f903bab937918165261d44f8")
+        (revision "0"))
+    (package
+     (name "emacs-eshell-fringe-status")
+     (version (git-version "0.0.0" revision commit))
+     (source
+      (origin
+       (uri (git-reference
+             (url "https://code.ryuslash.org/ryuslash/eshell-fringe-status.git")
+             (commit commit)))
+       (method git-fetch)
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0frx1lc0rf6p01m5gjyaazl64f839856qn88v263rdls5rpncmz9"))))
+     (build-system emacs-build-system)
+     (home-page "https://code.ryuslash.org/ryuslash/eshell-fringe-status")
+     (synopsis "Show last status in fringe")
+     (description "Show last status in fringe")
+     (license license:gpl3+))))
--- a/oni/packages/go.scm
+++ b/oni/packages/go.scm
@ -0,0 +1,183 @@
+(define-module (oni packages go)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system go)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages golang)
+  #:use-module (gnu packages golang-build)
+  #:use-module (gnu packages cmake))
+
+(define-public go-github-com-creack-pty
+  (package
+    (name "go-github-com-creack-pty")
+    (version "1.1.13")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/creack/pty")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32
+            "09glkl7f86njv78l849rpi80pw1ji5n1zbh48rd9ysl9rfzy34zq"))))
+    (build-system go-build-system)
+    (arguments
+      '(#:import-path "github.com/creack/pty"))
+    (home-page "https://github.com/creack/pty")
+    (synopsis "pty")
+    (description
+      "Package pty provides functions for working with Unix terminals.")
+    (license license:expat)))
+
+(define-public go-golang-org-x-term
+  (package
+    (name "go-golang-org-x-term")
+    (version "0.0.0-20210615171337-6886f2dfbf5b")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://go.googlesource.com/term")
+               (commit (go-version->git-ref version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32
+            "0661w7dp2ak1k4ii90v6chw2x8a6g4sc5j0ba58qlplaj4k5l0xs"))))
+    (build-system go-build-system)
+    (arguments '(#:import-path "golang.org/x/term"))
+    (propagated-inputs
+      `(("go-golang-org-x-sys" ,go-golang-org-x-sys)))
+    (home-page "https://golang.org/x/term")
+    (synopsis "Go terminal/console support")
+    (description
+      "Package term provides support functions for dealing with terminals, as
+commonly found on UNIX systems.")
+    (license license:bsd-3)))
+
+(define-public go-mvdan-cc-editorconfig
+  (package
+    (name "go-mvdan-cc-editorconfig")
+    (version "0.2.0")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/mvdan/editorconfig")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32
+            "1rav1rp8pi921gsffqr2wjdhbr12w81g31yv6iw4yb1zyh726qqg"))))
+    (build-system go-build-system)
+    (arguments
+      '(#:import-path "mvdan.cc/editorconfig"))
+    (native-inputs
+     `(("cmake" ,cmake)))
+    (home-page "https://mvdan.cc/editorconfig")
+    (synopsis "editorconfig")
+    (description
+      "Package editorconfig allows parsing and using EditorConfig files, as defined
+in @url{https://editorconfig.org/,https://editorconfig.org/}.")
+    (license license:bsd-3)))
+
+(define-public go-github-com-google-renameio-v1
+  (package
+   (name "go-github-com-google-renameio")
+   (version "1.0.1")
+   (source
+    (origin
+     (method git-fetch)
+     (uri (git-reference
+           (url "https://github.com/google/renameio")
+           (commit (string-append "v" version))))
+     (file-name (git-file-name name version))
+     (sha256
+      (base32
+       "1qn84nra9nxqyqg4i496b6ijbhnxvx66hdndwl7qh7r6q8lz2ba5"))))
+   (build-system go-build-system)
+   (arguments
+    '(#:import-path "github.com/google/renameio"))
+   (home-page "https://github.com/google/renameio")
+   (synopsis "Atomicity vs durability")
+   (description
+    "Package renameio provides a way to atomically create or replace a file or
+symbolic link.")
+   (license license:asl2.0)))
+
+(define-public go-github-com-pkg-diff
+  (package
+    (name "go-github-com-pkg-diff")
+    (version "0.0.0-20210226163009-20ebb0f2a09e")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/pkg/diff")
+               (commit (go-version->git-ref version))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32
+            "1g3dzgwhz4fx3ddpsv7fsa4r1v5clsp2lbw2qrkdk9y1vc5gi8yi"))))
+    (build-system go-build-system)
+    (arguments
+      '(#:import-path "github.com/pkg/diff"))
+    (home-page "https://github.com/pkg/diff")
+    (synopsis "diff")
+    (description
+      "Package diff contains high level routines that generate a textual diff.")
+    (license license:bsd-3)))
+
+(define-public shfmt
+  (package
+    (name "shfmt")
+    (version "3.3.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mvdan/sh")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1d3bn9l7k1df9prsz9zwakxi2q5750vdhrz8r91d1r3hn28nfgd4"))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "mvdan.cc/sh/v3"
+                 #:phases
+                 (modify-phases %standard-phases
+                   (replace 'build
+                     (lambda _
+                       (with-directory-excursion "src/mvdan.cc/sh/v3/cmd/shfmt"
+                         (invoke "go" "build" "-ldflags" "-linkmode=external"))))
+                   (replace 'install
+                     (lambda* (#:key outputs #:allow-other-keys)
+                       (let ((out (assoc-ref outputs "out")))
+                         (with-directory-excursion "src/mvdan.cc/sh/v3/cmd/shfmt"
+                           (install-file "shfmt" (string-append out "/bin"))))))
+                   ;; (replace 'check
+                   ;;   (lambda _
+                   ;;     (with-directory-excursion "src/mvdan.cc/sh/v3"
+                   ;;       (invoke "go" "test" "./..."))))
+                   )
+                 #:tests? #f
+                 #:install-source? #f))
+    (propagated-inputs
+     `(("go-mvdan-cc-editorconfig" ,go-mvdan-cc-editorconfig)
+       ("go-golang-org-x-term" ,go-golang-org-x-term)
+       ("go-golang-org-x-sys" ,go-golang-org-x-sys)
+       ("go-golang-org-x-sync" ,go-golang-org-x-sync)
+       ("go-github-com-rogpeppe-go-internal" ,go-github-com-rogpeppe-go-internal)
+       ("go-github-com-pkg-diff" ,go-github-com-pkg-diff)
+       ("go-github-com-kr-text" ,go-github-com-kr-text)
+       ("go-github-com-kr-pretty" ,go-github-com-kr-pretty)
+       ("go-github-com-google-renameio" ,go-github-com-google-renameio-v1)
+       ("go-github-com-creack-pty" ,go-github-com-creack-pty)))
+    (home-page "https://mvdan.cc/sh/v3")
+    (synopsis "sh")
+    (description
+     "This package provides a shell parser, formatter, and interpreter.  Supports @url{https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html,POSIX Shell}, @url{https://www.gnu.org/software/bash/,Bash}, and
+@url{http://www.mirbsd.org/mksh.htm,mksh}.  Requires Go 1.15 or later.")
+    (license license:bsd-3)))
--- a/oni/packages/stumpwm.scm
+++ b/oni/packages/stumpwm.scm
@ -0,0 +1,35 @@
+(define-module (oni packages stumpwm)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (gnu packages wm)
+  #:use-module (gnu packages lisp-xyz))
+
+(define-public stumpwm+swank
+  (package
+    (inherit stumpwm)
+    (name "stumpwm-with-swank")
+    (outputs '("out"))
+    (inputs
+     `(("stumpwm" ,stumpwm "lib")
+       ("swank" ,sbcl-slime-swank)))
+    (arguments
+     (substitute-keyword-arguments (package-arguments stumpwm)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (replace 'build-program
+             (lambda* (#:key inputs outputs #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out"))
+                      (program (string-append out "/bin/stumpwm")))
+                 (setenv "HOME" "/tmp")
+                 (build-program program outputs
+                                #:entry-program '((stumpwm:stumpwm) 0)
+                                #:dependencies '("stumpwm" "swank")
+                                #:dependency-prefixes
+                                (map (lambda (input) (assoc-ref inputs input))
+                                     '("stumpwm" "swank")))
+                 #t)))
+           (delete 'copy-source)
+           (delete 'build)
+           (delete 'check)
+           (delete 'remove-temporary-cache)
+           (delete 'cleanup)))))))
--- a/scsh-nonstring-search-path.patch
+++ b/scsh-nonstring-search-path.patch
@ -0,0 +1,12 @@
+diff --git a/scheme/lib-dirs.scm b/scheme/lib-dirs.scm
+index a1fc009..c630fb4 100644
+--- a/scheme/lib-dirs.scm
+++ b/scheme/lib-dirs.scm
+@@ -75,6 +75,7 @@
+               (let ((val (read)))
+                 (cond ((eof-object? val) '())
+                       ((string? val) (cons val (recur)))
+                      ((symbol? val) (cons (symbol->string val) (recur)))
+                       ((not val) (append default-lib-dirs (recur)))
+                       (else 
+                        (error 
--- a/tom.key
+++ b/tom.key
@ -1,61 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=gtK0
-----END PGP PUBLIC KEY BLOCK-----