From 46fa4bca55740bf458b9aa29ed879c8f288cf215 Mon Sep 17 00:00:00 2001
From: tavo <tavo@tavo.one>
Date: Wed, 27 Nov 2024 22:19:40 -0600
Subject: [PATCH] fixes
---
dev/setup.sh | 4 +--
doom/config.el | 83 ++++--------------------------------------------
doom/init.el | 14 --------
doom/packages.el | 48 +---------------------------
4 files changed, 9 insertions(+), 140 deletions(-)
diff --git a/dev/setup.sh b/dev/setup.sh
index f71085b..7b66a96 100644
--- a/dev/setup.sh
+++ b/dev/setup.sh
@@ -5,11 +5,11 @@ echo ". ~/.config/shell/env-min" >> ~/.bash_profile
echo ". ~/.config/shell/bashrc" >> ~/.bashrc
sudo pacman -S --needed --noconfirm sudo man-db exa curl jq ffmpeg imagemagick \
- nnn screen tmux groff openssh base-devel git neovim ripgrep fzf emacs \
+ nnn fd screen tmux groff openssh base-devel git neovim ripgrep fzf emacs \
python python-pip python-virtualenv python-pipx python-pynvim go go-tools \
clang nodejs npm php cargo r texlive-basic texlive-latexrecommended \
texlive-plaingeneric texlive-fontsextra shellcheck bash-language-server \
- shfmt zshdb gopls
+ shfmt zshdb gopls tree-sitter-cli cmake tidy stylelint pandoc composer
git clone git@git.tavo.one:tavo/dotfiles.git ~/.config
diff --git a/doom/config.el b/doom/config.el
index cc28037..4802e76 100644
--- a/doom/config.el
+++ b/doom/config.el
@@ -1,86 +1,17 @@
;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
-;; Place your private configuration here! Remember, you do not need to run 'doom
-;; sync' after modifying this file!
-
-
-;; Some functionality uses this to identify you, e.g. GPG configuration, email
-;; clients, file templates and snippets. It is optional.
-;; (setq user-full-name "John Doe"
-;; user-mail-address "john@doe.com")
-
-;; Doom exposes five (optional) variables for controlling fonts in Doom:
-;;
-;; - `doom-font' -- the primary font to use
-;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable)
-;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for
-;; presentations or streaming.
-;; - `doom-symbol-font' -- for symbols
-;; - `doom-serif-font' -- for the `fixed-pitch-serif' face
-;;
-;; See 'C-h v doom-font' for documentation and more examples of what they
-;; accept. For example:
-;;
-;;(setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light)
-;; doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13))
-;;
-;; If you or Emacs can't find your font, use 'M-x describe-font' to look them
-;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to
-;; refresh your font settings. If Emacs still can't find your font, it likely
-;; wasn't installed correctly. Font issues are rarely Doom issues!
-
-;; There are two ways to load a theme. Both assume the theme is installed and
-;; available. You can either set `doom-theme' or manually load a theme with the
-;; `load-theme' function. This is the default:
-(setq doom-theme 'doom-material)
-
-;; 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'.
+;; ui
(setq display-line-numbers-type t)
-
-;; 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 "~/org/")
-
-
-;; Whenever you reconfigure a package, make sure to wrap your config in an
-;; `after!' block, otherwise Doom's defaults may override your settings. E.g.
-;;
-;; (after! PACKAGE
-;; (setq x y))
-;;
-;; The exceptions to this rule:
-;;
-;; - Setting file/directory variables (like `org-directory')
-;; - Setting variables which explicitly tell you to set them before their
-;; package is loaded (see 'C-h v VARIABLE' to look up their documentation).
-;; - Setting doom variables (which start with 'doom-' or '+').
-;;
-;; Here are some additional functions/macros that will help you configure Doom.
-;;
-;; - `load!' for loading external *.el files relative to this one
-;; - `use-package!' for configuring packages
-;; - `after!' for running code after a package has loaded
-;; - `add-load-path!' for adding directories to the `load-path', relative to
-;; this file. Emacs searches the `load-path' when you load packages with
-;; `require' or `use-package'.
-;; - `map!' for binding new keys
-;;
-;; To get information about any of these functions/macros, move the cursor over
-;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k').
-;; This will open documentation for it, including demos of how they are used.
-;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces,
-;; etc).
-;;
-;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
-;; they are implemented.
-
-(setq org-agenda-files '("~/Documents/agenda"))
(setq doom-font (font-spec :family "JetBrainsMono" :size 11.0))
+(setq doom-theme 'doom-material)
(setq default-frame-alist '((undecorated . t)))
(add-to-list 'default-frame-alist '(fullscreen . maximized))
(scroll-bar-mode 0)
+;; org mode
+;; (setq org-directory "~/org/")
+(setq org-agenda-files '("~/Documents/agenda"))
+(after! org (plist-put org-format-latex-options :scale 3.2))
(dolist (mode '(org-mode-hook
org-agenda-mode-hook
dired-mode-hook
@@ -88,5 +19,3 @@
shell-mode-hook
eshell-mode-hook))
(add-hook mode (lambda () (display-line-numbers-mode 0))))
-
-(after! org (plist-put org-format-latex-options :scale 3.2))
diff --git a/doom/init.el b/doom/init.el
index d3abc1b..7914751 100644
--- a/doom/init.el
+++ b/doom/init.el
@@ -1,19 +1,5 @@
;;; init.el -*- lexical-binding: t; -*-
-;; This file controls what Doom modules are enabled and what order they load
-;; in. Remember to run 'doom sync' after modifying it!
-
-;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's
-;; documentation. There you'll find a link to Doom's Module Index where all
-;; of our modules are listed, including what flags they support.
-
-;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or
-;; 'C-c c k' for non-vim users) to view its documentation. This works on
-;; flags as well (those symbols that start with a plus).
-;;
-;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its
-;; directory (for easy access to its source code).
-
(doom! :input
;;bidi ; (tfel ot) thgir etirw uoy gnipleh
;;chinese
diff --git a/doom/packages.el b/doom/packages.el
index 364e6e9..47900c1 100644
--- a/doom/packages.el
+++ b/doom/packages.el
@@ -1,50 +1,4 @@
;; -*- no-byte-compile: t; -*-
;;; $DOOMDIR/packages.el
-;; To install a package with Doom you must declare them here and run 'doom sync'
-;; on the command line, then restart Emacs for the changes to take effect -- or
-;; use 'M-x doom/reload'.
-
-
-;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
-;; (package! some-package)
-
-;; To install a package directly from a remote git repo, you must specify a
-;; `:recipe'. You'll find documentation on what `:recipe' accepts here:
-;; https://github.com/radian-software/straight.el#the-recipe-format
-;; (package! another-package
-;; :recipe (:host github :repo "username/repo"))
-
-;; If the package you are trying to install does not contain a PACKAGENAME.el
-;; file, or is located in a subdirectory of the repo, you'll need to specify
-;; `:files' in the `:recipe':
-;; (package! this-package
-;; :recipe (:host github :repo "username/repo"
-;; :files ("some-file.el" "src/lisp/*.el")))
-
-;; If you'd like to disable a package included with Doom, you can do so here
-;; with the `:disable' property:
-;; (package! builtin-package :disable t)
-
-;; You can override the recipe of a built in package without having to specify
-;; all the properties for `:recipe'. These will inherit the rest of its recipe
-;; from Doom or MELPA/ELPA/Emacsmirror:
-;; (package! builtin-package :recipe (:nonrecursive t))
-;; (package! builtin-package-2 :recipe (:repo "myfork/package"))
-
-;; Specify a `:branch' to install a package from a particular branch or tag.
-;; This is required for some packages whose default branch isn't 'master' (which
-;; our package manager can't deal with; see radian-software/straight.el#279)
-;; (package! builtin-package :recipe (:branch "develop"))
-
-;; Use `:pin' to specify a particular commit to install.
-;; (package! builtin-package :pin "1a2b3c4d5e")
-
-
-;; Doom's packages are pinned to a specific commit and updated from release to
-;; release. The `unpin!' macro allows you to unpin single packages...
-;; (unpin! pinned-package)
-;; ...or multiple packages
-;; (unpin! pinned-package another-pinned-package)
-;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
-;; (unpin! t)
+(package! pyvenv)