From b60debfabde7a21ac91c065e414390840025e8e5 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foo.dogsquared@gmail.com>
Date: Thu, 14 Jan 2021 01:10:31 +0800
Subject: [PATCH] Update my config and add Starship

---
 .vtsm/nixos-zilch.json | 1 +
 emacs/config.el        | 8 ++------
 emacs/init.el          | 4 ++--
 emacs/packages.el      | 7 +++++--
 newsboat/config        | 1 +
 newsboat/urls          | 2 ++
 starship/starship.toml | 2 ++
 sxhkd/sxhkdrc          | 7 +++++++
 8 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 starship/starship.toml

diff --git a/.vtsm/nixos-zilch.json b/.vtsm/nixos-zilch.json
index ee635d7..54d2d53 100755
--- a/.vtsm/nixos-zilch.json
+++ b/.vtsm/nixos-zilch.json
@@ -5,5 +5,6 @@
     "nyxt": "$HOME/.config/nyxt",
     "newsboat": "$HOME/.config/newsboat",
     "rofi": "$HOME/.config/rofi",
+    "starship": "$HOME/.config",
     "slop": "$HOME/.config/slop"
 }
diff --git a/emacs/config.el b/emacs/config.el
index 615a1ba..02be48c 100755
--- a/emacs/config.el
+++ b/emacs/config.el
@@ -29,7 +29,8 @@
 
 ;; If you use `org' and don't want your org files in the default location below,
 ;; change `org-directory'. It must be set before org loads!
-(setq org-directory "~/writings/orgnotes")
+(setq org-directory "~/writings/orgnotes"
+      org-roam-directory "~/writings/wiki")
 
 ;; This determines the style of line numbers in effect. If set to `nil', line
 ;; numbers are disabled. For relative line numbers, set this to `relative'.
@@ -93,7 +94,6 @@
     time-stamp-start "DATE_MODIFIED:[ 	]+\\\\?[\"<]+"
 
     ; Configure org-roam.
-    org-roam-directory "~/writings/wiki"
     org-roam-capture-templates '(
       ("d" "default" plain (function org-roam--capture-get-point)
        "#+AUTHOR: \"%(user-full-name)\"
@@ -121,10 +121,6 @@
 
 (add-to-list 'org-modules 'org-checklist)
 
-; Activate minimap for all program-based modes (e.g., web-mode, python-mode) and text-based modes (e.g., org-mode, markdown-mode).
-(after! minimap
-  (setq minimap-major-modes '(prog-mode text-mode org-mode)))
-
 ; Org-roam-bibtex is somehow a horrible name.
 ; I guess that's why they insist on calling it ORB.
 (use-package! org-roam-bibtex
diff --git a/emacs/init.el b/emacs/init.el
index 0125aca..bbc473c 100755
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -52,7 +52,7 @@
        (evil +everywhere); come to the dark side, we have cookies
        file-templates    ; auto-snippets for empty files
        fold              ; (nigh) universal code folding
-       ;;(format +onsave)  ; automated prettiness
+       format ; automated prettiness
        ;;god               ; run Emacs commands without modifier keys
        ;;lispy             ; vim for lisp, for people who don't like vim
        ;;multiple-cursors  ; editing in many places at once
@@ -76,7 +76,7 @@
        vterm             ; the best terminal emulation in Emacs
 
        :checkers
-       ;;syntax              ; tasing you for every semicolon you forget
+       syntax              ; tasing you for every semicolon you forget
        ;;spell             ; tasing you for misspelling mispelling
        ;;grammar           ; tasing grammar mistake every you make
 
diff --git a/emacs/packages.el b/emacs/packages.el
index 8cf420c..beae424 100755
--- a/emacs/packages.el
+++ b/emacs/packages.el
@@ -56,8 +56,11 @@
   :recipe (:host github
            :repo "org-roam/org-roam-bibtex"))
 
-; Since org-roam-bibtex is a connector to all of the specified packages and in alpha stage, it can be problematic so we'll disable it for now.
-(unpin! org-roam company-org-roam)
+;; Inline errors? Hoorah!
+(package! flycheck-inline)
+
+;; Since org-roam-bibtex is a connector to all of the specified packages and in alpha stage, it can be problematic so we'll disable it for now.
+;(unpin! org-roam company-org-roam)
 
 ; A minimap in case you have Stockholm Syndrome for your bloated IDEs. :)
 (package! minimap
diff --git a/newsboat/config b/newsboat/config
index 93c7baa..091fea3 100755
--- a/newsboat/config
+++ b/newsboat/config
@@ -25,3 +25,4 @@ bind-key d pagedown
 bind-key r reload-all
 bind-key R reload
 
+reload-threads 50
diff --git a/newsboat/urls b/newsboat/urls
index 2f020a5..f440535 100755
--- a/newsboat/urls
+++ b/newsboat/urls
@@ -24,6 +24,8 @@ http://tonsky.me/blog/atom.xml blog.personal
 https://venam.nixers.net/blog/feed.xml blog.personal
 https://willschenk.com/feed.xml blog.personal
 https://www.malloc47.com/rss.xml blog.personal
+https://www.copetti.org/index.xml blog.personal computer.architecture
+https://www.agwa.name/blog/feed blog.personal computer.security
 
 https://www.davidrevoy.com/feed/rss blog.personal art
 
diff --git a/starship/starship.toml b/starship/starship.toml
new file mode 100644
index 0000000..7bc7ab7
--- /dev/null
+++ b/starship/starship.toml
@@ -0,0 +1,2 @@
+# Use custom format
+add_newline = false
diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
index 91b5714..1b5f185 100755
--- a/sxhkd/sxhkdrc
+++ b/sxhkd/sxhkdrc
@@ -121,3 +121,10 @@ super + {Up,Down,Left,Right}
 super + shift {Up,Down,Left,Right}
     bspc node {north,south,west,east} --swap focused --follow
 
+# The Vim keybindings.
+super + {k,j,h,l}
+    bspc node {north,south,west,east} --focus
+
+super + shift {k,j,h,l}
+    bspc node {north,south,west,east} --swap focused --follow
+