From ede62d00dcda087f4610492d7e41f91cf115c7e6 Mon Sep 17 00:00:00 2001
From: Terin Stock <terinjokes@gmail.com>
Date: Wed, 31 Jan 2024 21:43:13 +0100
Subject: convert OSM to module

Migrate the OSM app to a custom Doom module, and pin the osm package to
the latest release. Also update my home location.
---
 app/osm.el                  | 23 -----------------------
 init.el                     |  1 +
 modules/app/osm/config.el   | 19 +++++++++++++++++++
 modules/app/osm/packages.el |  4 ++++
 packages.el                 |  1 -
 5 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 app/osm.el
 create mode 100644 modules/app/osm/config.el
 create mode 100644 modules/app/osm/packages.el

diff --git a/app/osm.el b/app/osm.el
deleted file mode 100644
index ae21218..0000000
--- a/app/osm.el
+++ /dev/null
@@ -1,23 +0,0 @@
-;;; app/osm.el -*- lexical-binding: t; -*-
-
-(use-package! osm
-  :bind (("C-c m h" . osm-home)
-         ("C-c m s" . osm-search)
-         ("C-c m v" . osm-server)
-         ("C-c m t" . osm-goto)
-         ("C-c m x" . osm-gpx-show)
-         ("C-c m j" . osm-bookmark-jump))
-
-  :config
-  (add-to-list 'osm-server-list '(thunderforest-cycle
-                                  :name "OpenCycleMap"
-                                  :description "Map for cyclists, provided by Thunderforest"
-                                  :url "https://%s.tile.thunderforest.com/cycle/%z/%x/%y.png?apikey=7c352c8ff1244dd8b732e349e0b0fe8d"))
-  (setq osm-copyright nil)
-  (setq osm-server 'thunderforest-cycle)
-  (setq osm-home '(37.7775 -122.416389 14)) ; San Francisco, CA
-  (set-evil-initial-state! 'osm-mode 'emacs)
-
-  :init
-  (with-eval-after-load 'org
-    (require 'osm-ol)))
diff --git a/init.el b/init.el
index 84c10ef..ca4a178 100644
--- a/init.el
+++ b/init.el
@@ -184,6 +184,7 @@
        ;;irc               ; how neckbeards socialize
        ;;(rss +org)        ; emacs as an RSS reader
        ;;twitter           ; twitter client https://twitter.com/vnought
+       osm
 
        :config
        ;;literate
diff --git a/modules/app/osm/config.el b/modules/app/osm/config.el
new file mode 100644
index 0000000..68a59de
--- /dev/null
+++ b/modules/app/osm/config.el
@@ -0,0 +1,19 @@
+;;; app/osm/config.el -*- lexical-binding: t; -*-
+
+(use-package! osm
+  :bind (("C-c m h" . osm-home)
+         ("C-c m s" . osm-search)
+         ("C-c m v" . osm-server)
+         ("C-c m t" . osm-goto)
+         ("C-c m x" . osm-gpx-show)
+         ("C-c m j" . osm-bookmark-jump))
+
+  :config
+  (add-to-list 'osm-server-list '(thunderforest-cycle
+                                  :name "OpenCycleMap"
+                                  :description "Map for cyclists, provided by Thunderforest"
+                                  :url "https://%s.tile.thunderforest.com/cycle/%z/%x/%y.png?apikey=7c352c8ff1244dd8b732e349e0b0fe8d"))
+  (setq osm-copyright nil)
+  (setq osm-server 'thunderforest-cycle)
+  (setq osm-home '(52.372778 4.893611 14)) ; Amsterdam
+  (set-evil-initial-state! 'osm-mode 'emacs))
diff --git a/modules/app/osm/packages.el b/modules/app/osm/packages.el
new file mode 100644
index 0000000..02f8da5
--- /dev/null
+++ b/modules/app/osm/packages.el
@@ -0,0 +1,4 @@
+;; -*- no-byte-compile: t; -*-
+;;; app/osm/packages.el
+
+(package! osm :pin "5dffbc00e4acfcddc13677f3b76a65dc3b6aee30")
diff --git a/packages.el b/packages.el
index 8fc8efb..1da298b 100644
--- a/packages.el
+++ b/packages.el
@@ -2,6 +2,5 @@
 ;;; $DOOMDIR/packages.el
 
 (package! magit-delta)
-(package! osm)
 (package! ebuild-mode)
 (package! salt-mode)
-- 
cgit 1.4.1