From 96933a43a14af734b1feb27e8a129d53dbed9562 Mon Sep 17 00:00:00 2001
From: Von Random <von@vdrandom.org>
Date: Wed, 1 Feb 2023 11:10:12 +0200
Subject: [PATCH] doom: some tweaks, get rid of literate conf; fish: ignore var
 file

---
 .gitignore          |  2 +-
 doom/config.el      | 10 ++++++++++
 doom/config.org     | 24 ------------------------
 doom/init.el        |  4 ++--
 fish/fish_variables | 30 ------------------------------
 5 files changed, 13 insertions(+), 57 deletions(-)
 create mode 100644 doom/config.el
 delete mode 100644 doom/config.org
 delete mode 100644 fish/fish_variables

diff --git a/.gitignore b/.gitignore
index b436d12..a959aa7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-doom/config.el
+fish/fish_variables
 nvim/plugin/packer_compiled.lua
diff --git a/doom/config.el b/doom/config.el
new file mode 100644
index 0000000..2610033
--- /dev/null
+++ b/doom/config.el
@@ -0,0 +1,10 @@
+(setq user-full-name "Von Random"
+      user-mail-address "von@mechanus.net")
+
+(setq doom-font (font-spec :family "Cascadia Code PL" :size 14)
+      doom-variable-pitch-font (font-spec :family "PT Sans"))
+(setq doom-theme 'doom-gruvbox)
+
+(setq display-line-numbers-type 'relative)
+(setq org-directory "~/org/")
+(menu-bar-mode -1)
diff --git a/doom/config.org b/doom/config.org
deleted file mode 100644
index c0de55a..0000000
--- a/doom/config.org
+++ /dev/null
@@ -1,24 +0,0 @@
-#+title: von's Doom Emacs config
-#+author: Von Random
-#+options: toc:2
-
-* User name and email
-#+begin_src emacs-lisp
-(setq user-full-name "Von Random"
-      user-mail-address "von@mechanus.net")
-#+end_src
-
-* Aesthetics
-Font and theme
-#+begin_src emacs-lisp
-(setq doom-font (font-spec :family "JetBrainsMono Nerd Font" :size 14)
-      doom-variable-pitch-font (font-spec :family "PT Sans"))
-(setq doom-theme 'doom-gruvbox)
-#+end_src
-
-* Other settings
-#+begin_src emacs-lisp
-(setq display-line-numbers-type 'relative)
-(setq org-directory "~/org/")
-(menu-bar-mode -1)
-#+end_src
diff --git a/doom/init.el b/doom/init.el
index 7ccc26d..6929614 100644
--- a/doom/init.el
+++ b/doom/init.el
@@ -32,7 +32,7 @@
        doom              ; what makes DOOM look the way it does
        ;;doom-dashboard    ; a nifty splash screen for Emacs
        ;;doom-quit         ; DOOM quit-message prompts when you quit Emacs
-       ;;(emoji +unicode)  ; 🙂
+       (emoji +unicode)  ; 🙂
        hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
        ;;hydra
        ;;indent-guides     ; highlighted indent columns
@@ -190,5 +190,5 @@
        ;;twitter           ; twitter client https://twitter.com/vnought
 
        :config
-       literate
+       ;;literate
        (default +bindings +smartparens))
diff --git a/fish/fish_variables b/fish/fish_variables
deleted file mode 100644
index 1b4481a..0000000
--- a/fish/fish_variables
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file contains fish universal variable definitions.
-# VERSION: 3.0
-SETUVAR __fish_initialized:3100
-SETUVAR fish_color_autosuggestion:555\x1ebrblack
-SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:005fd7
-SETUVAR fish_color_comment:990000
-SETUVAR fish_color_cwd:green
-SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:009900
-SETUVAR fish_color_error:ff0000
-SETUVAR fish_color_escape:00a6b2
-SETUVAR fish_color_history_current:\x2d\x2dbold
-SETUVAR fish_color_host:normal
-SETUVAR fish_color_host_remote:yellow
-SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:00a6b2
-SETUVAR fish_color_param:00afff
-SETUVAR fish_color_quote:999900
-SETUVAR fish_color_redirection:00afff
-SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_status:red
-SETUVAR fish_color_user:brgreen
-SETUVAR fish_color_valid_path:\x2d\x2dunderline
-SETUVAR fish_key_bindings:fish_default_key_bindings
-SETUVAR fish_pager_color_completion:\x1d
-SETUVAR fish_pager_color_description:B3A06D\x1eyellow
-SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
-SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan