From e004db0e9aa5c39a804de864961e872de53a8d34 Mon Sep 17 00:00:00 2001
From: Muhammad Nauman Raza <thedevraza@proton.me>
Date: Tue, 8 Nov 2022 22:05:28 +0000
Subject: [PATCH] feat: general.el for convenient keybinds

---
 .org-id-locations |   2 ++
 bookmarks         |  10 ++++++++++
 init.el           |   2 ++
 lisp/editor.el    |  34 ++++++++++++++++++++++++----------
 lisp/interface.el |   8 ++++++++
 lisp/org-mode.el  |  24 ++++++++++++++++++++++++
 org-roam.db       | Bin 0 -> 53248 bytes
 7 files changed, 70 insertions(+), 10 deletions(-)
 create mode 100644 .org-id-locations
 create mode 100644 bookmarks
 create mode 100644 org-roam.db

diff --git a/.org-id-locations b/.org-id-locations
new file mode 100644
index 0000000..4577dfd
--- /dev/null
+++ b/.org-id-locations
@@ -0,0 +1,2 @@
+
+(("~/Org/Roam/voidlinux.org" "109dbb09-0ec2-4222-bdb9-6e8da47afe02") ("~/Org/Roam/20221108190909-campaign.org" "b157f89e-f6a8-4d98-8b45-fb203a25b18a") ("~/Org/Roam/campaign.org" "23669621-3833-4829-8bd4-6347ff3c5d1d"))
diff --git a/bookmarks b/bookmarks
new file mode 100644
index 0000000..26d6d7d
--- /dev/null
+++ b/bookmarks
@@ -0,0 +1,10 @@
+;;;; Emacs Bookmark Format Version 1;;;; -*- coding: utf-8-emacs; mode: lisp-data -*-
+;;; This format is meant to be slightly human-readable;
+;;; nevertheless, you probably don't want to edit it.
+;;; -*- End Of Bookmark File Format Version Stamp -*-
+(("org-capture-last-stored"
+ (filename . "~/Org/Roam/voidlinux.org")
+ (front-context-string)
+ (rear-context-string . "mad Nauman Raza\n")
+ (position . 149))
+)
diff --git a/init.el b/init.el
index 35a47da..9cda741 100644
--- a/init.el
+++ b/init.el
@@ -6,6 +6,8 @@
 ;; Disable the modeline. Done in this file for the same reason above
 (setq-default mode-line-format nil)
 
+(defconst leader-key "SPC")
+
 ;; Straight.el bootstrap
 (defvar bootstrap-version)
 (let ((bootstrap-file
diff --git a/lisp/editor.el b/lisp/editor.el
index 6271702..4f624b7 100644
--- a/lisp/editor.el
+++ b/lisp/editor.el
@@ -3,21 +3,17 @@
 ;; Quit input dialogues after pressing escape once
 (global-set-key (kbd "<escape>") 'keyboard-escape-quit)
 
+;;; Line Wrapping
+(global-visual-line-mode 1) ; Prevent wrapping of words
+
 ;;; evil - A Vi Layer inside of Emacs
 (use-package evil
-  :init
-  (setq evil-want-keybinding nil ; Make room for evil-collection
-	evil-want-integration t ; Same as above
-	evil-undo-system 'undo-fu) ; Set the undo/redo system
+  :custom
+  (evil-want-integration t) ; Same as above
+  (evil-undo-system 'undo-fu) ; Set the undo/redo system
   :config
   (evil-mode 1))
 
-;; evil-collection - a collection of keybindings for evil-mode
-(use-package evil-collection
-  :after evil ; In order to recognize evil-want-... being set
-  :init
-  (evil-collection-init)) ; Enable the evil-collection keybinds
-
 ;; undo-fu, used by evil for undo/redo functionality
 (use-package undo-fu)
 
@@ -40,5 +36,23 @@
 (setq which-key-idle-delay 0.1) ; Make the popup appear faster
 (setq which-key-separator " - " ) ; Change the seperator which-key uses
 
+;; general - More convenient key definitions for Emacs
+(use-package general
+  :config
+  (general-evil-setup t)
+  :init
+  (general-create-definer diancite/leaders
+			  :prefix "SPC"))
+
+(diancite/leaders
+ :keymaps 'normal
+ "f" '(:which-key "File")
+ "n" '(:which-key "Org")
+ "m" '(:which-key "Magit")
+ "w" '(:which-key "Evil")
+ "p" '(:which-key "Projects"))
+
+(set-face-foreground 'vertical-border (face-background 'default))
+
 ;; Provide this file to init.el
 (provide 'editor)
diff --git a/lisp/interface.el b/lisp/interface.el
index 463e748..cd391f6 100644
--- a/lisp/interface.el
+++ b/lisp/interface.el
@@ -40,5 +40,13 @@
 ;; all-the-icons - Icons for various UI elements
 (use-package all-the-icons)
 
+;; vertico - An amazing search engine!
+(use-package vertico
+  :init
+  (vertico-mode 1))
+
+(use-package diredfl ; Colourise dired!
+  :hook dired-mode)
+
 ;; Provide this file to init.el
 (provide 'interface)
diff --git a/lisp/org-mode.el b/lisp/org-mode.el
index dc21d9a..cdd8a0b 100644
--- a/lisp/org-mode.el
+++ b/lisp/org-mode.el
@@ -41,5 +41,29 @@
 ;; Enable org-superstar-mode in org-mode files
 (add-hook 'org-mode-hook 'org-superstar-mode)
 
+;;; org-roam - A plain-text personal knowledge management system
+(use-package org-roam
+  :custom
+  (org-directory file-truename "Org/") ; Set the folder used by org-mode
+  (org-roam-directory (file-truename "Org/Roam/")) ; Set the folder used by org-roam
+  (org-roam-databse-connector 'sqlite3)
+  :init
+  (org-roam-db-autosync-mode 1)) ; Automatically sync nodes
+
+(setq org-roam-capture-templates
+      '(("d" "default" plain
+         "\n%?"
+        :if-new (file+head "${slug}.org" "#+title: ${title}\n#+date: %U\n#+author: %n\n")
+        :unnarrowed t)))
+
+;; Keybinds for org-mode
+(general-create-definer diancite/org
+			:prefix leader-key)
+
+(diancite/org
+ :keymaps 'normal
+ "n r" '(org-roam-node-find :wk "Find Nodes")
+ "n a" '(org-table-align :wk "Align Table"))
+
 ;; Provide this file to init.el
 (provide 'org-mode)
diff --git a/org-roam.db b/org-roam.db
new file mode 100644
index 0000000000000000000000000000000000000000..4b6dce03dd54143a98d6a7d0aa5233dfd0d5e033
GIT binary patch
literal 53248
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

literal 0
HcmV?d00001