started new basic config

3 files changed, 42 insertions, 399 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index d7cf989..58916ca 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -1,3 +1,23 @@
+;; package setup
+(require 'package)
+
+(setq package-archives '(("melpa" . "https://melpa.org/packages/")
+                         ("org" . "https://orgmode.org/elpa/")
+                         ("elpa" . "https://elpa.gnu.org/packages/")))
+
+(package-initialize)
+(unless package-archive-contents
+  (package-refresh-contents))
+
+;; Initialize use-package on non-Linux platforms
+(unless (package-installed-p 'use-package)
+  (package-install 'use-package))
+
+(require 'use-package)
+(setq use-package-always-ensure t)
+
+;; interface
+
 (setq make-backup-files nil
       create-lockfiles nil
       erc-join-buffer 'window
@@ -49,134 +69,10 @@
                     :family "Monospace"
                     :height 97)
 
-(defvar elpaca-installer-version 0.7)
-(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
-(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
-(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
-(defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git"
-                              :ref nil :depth 1
-                              :files (:defaults "elpaca-test.el" (:exclude "extensions"))
-                              :build (:not elpaca--activate-package)))
-(let* ((repo  (expand-file-name "elpaca/" elpaca-repos-directory))
-       (build (expand-file-name "elpaca/" elpaca-builds-directory))
-       (order (cdr elpaca-order))
-       (default-directory repo))
-  (add-to-list 'load-path (if (file-exists-p build) build repo))
-  (unless (file-exists-p repo)
-    (make-directory repo t)
-    (when (< emacs-major-version 28) (require 'subr-x))
-    (condition-case-unless-debug err
-        (if-let ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*"))
-                 ((zerop (apply #'call-process `("git" nil ,buffer t "clone"
-                                                 ,@(when-let ((depth (plist-get order :depth)))
-                                                     (list (format "--depth=%d" depth) "--no-single-branch"))
-                                                 ,(plist-get order :repo) ,repo))))
-                 ((zerop (call-process "git" nil buffer t "checkout"
-                                       (or (plist-get order :ref) "--"))))
-                 (emacs (concat invocation-directory invocation-name))
-                 ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch"
-                                       "--eval" "(byte-recompile-directory \".\" 0 'force)")))
-                 ((require 'elpaca))
-                 ((elpaca-generate-autoloads "elpaca" repo)))
-            (progn (message "%s" (buffer-string)) (kill-buffer buffer))
-          (error "%s" (with-current-buffer buffer (buffer-string))))
-      ((error) (warn "%s" err) (delete-directory repo 'recursive))))
-  (unless (require 'elpaca-autoloads nil t)
-    (require 'elpaca)
-    (elpaca-generate-autoloads "elpaca" repo)
-    (load "./elpaca-autoloads")))
-(add-hook 'after-init-hook #'elpaca-process-queues)
-(elpaca `(,@elpaca-order))
-
-(elpaca elpaca-use-package
-  ;; Enable use-package :ensure support for Elpaca.
-  (elpaca-use-package-mode)
-  (setq elpaca-use-package-by-default t))
-
-(elpaca-wait)
-
-(use-package diminish)
-(elpaca-wait)
-
-(diminish 'abbrev-mode)
-(auto-revert-mode 1)
-(diminish 'auto-revert-mode)
-(diminish 'eldoc-mode)
-(diminish 'isearch-mode)
-(diminish 'abbrev-mode)
-
-(recentf-mode 1)
-
-(use-package no-littering
-  :config
-  (add-to-list 'recentf-exclude
-               (recentf-expand-file-name no-littering-var-directory))
-  (add-to-list 'recentf-exclude
-               (recentf-expand-file-name no-littering-etc-directory))
-  (setq custom-file (no-littering-expand-etc-file-name "custom.el")))
-
-(use-package gcmh
-  :diminish gcmh-mode
-  :init
-  (gcmh-mode 1))
-
-(use-package which-key
-  :init (which-key-mode)
-  :diminish which-key-mode
-  :config
-  (setq which-key-idle-delay 3))
-
-(use-package vertico
-  :ensure (vertico :files (:defaults "extensions/*"))
-  :diminish vertico-mode
-  :bind (:map vertico-map
-              ("C-n" . vertico-next)
-              ("C-p" . vertico-previous))
-  :init
-  (vertico-mode 1)
-  ;; (vertico-flat-mode 1)
-  (setq vertico-count 15))
-
-(use-package vertico-directory
-  :after vertico
-  :ensure nil
-  ;; More convenient directory navigation commands
-  :bind (:map vertico-map
-              ("RET" . vertico-directory-enter)
-              ("DEL" . vertico-directory-delete-char)
-              ("M-DEL" . vertico-directory-delete-word))
-  ;; Tidy shadowed file names
-  :hook (rfn-eshadow-update-overlay . vertico-directory-tidy))
-
-(use-package savehist
-  :ensure nil
-  :diminish savehist-mode
-  :init
-  (savehist-mode 1))
-
-(use-package marginalia
-  :diminish marginalia-mode
-  :after vertico
-  :custom
-  (marginalia-annotators '(marginalia-annotators-heavy marginalia-annotators-light nil))
-  :config
-  (marginalia-mode))
-
-(use-package consult
-  :config
-  (setq completion-in-region-function
-        (lambda (&rest args)
-          (apply (if vertico-mode
-                     #'consult-completion-in-region
-                   #'completion--in-region)
-                 args)))
-  (consult-customize consult-buffer :preview-key "M-."))
-
-(use-package orderless
-  :config
-  (setq completion-styles '(orderless)
-        completion-category-defaults nil
-        completion-category-overrides '((file (styles . (partial-completion))))))
+(use-package doom-modeline
+  :ensure t
+  :init (doom-modeline-mode 1)
+  :custom ((doom-modeline-height 15)))
 
 (use-package doom-themes
   :config
@@ -185,281 +81,28 @@
   (load-theme 'doom-vibrant t)
   (doom-themes-org-config))
 
-(use-package embark
-  :bind
-  (("C-." . embark-act)
-   ("C-;" . embark-dwim))
-  :init
-  (setq prefix-help-command #'embark-prefix-help-command)
-  :config
-  (setq embark--minimal-indicator-overlay nil)
-  (setq embark-indicators (delq 'embark-mixed-indicator embark-indicators))
-  (add-to-list 'embark-indicators #'embark-minimal-indicator))
-
-(use-package embark-consult
-  :config
-  (define-key embark-file-map (kbd "S") 'sudo-find-file))
-
-(use-package nerd-icons)
-(use-package all-the-icons)
-
-(use-package flyspell
-  :ensure nil
-  ;; :diminish flyspell-mode
-  )
-
-(use-package flyspell-correct
-  :after flyspell)
-
-(use-package consult-flyspell
-  :ensure (consult-flyspell :host gitlab :repo "OlMon/consult-flyspell" :branch "master")
-  :config
-  ;; default settings
-  (setq consult-flyspell-select-function (lambda () (flyspell-correct-at-point) (consult-flyspell))
-        consult-flyspell-set-point-after-word t
-        consult-flyspell-always-check-buffer nil))
-
-(use-package rainbow-delimiters
-  :diminish rainbow-delimiters-mode
-  :hook (prog-mode . rainbow-delimiters-mode))
-
-(use-package emojify
-  :hook (after-init . global-emojify-mode)
-  :config
-  (add-hook 'prog-mode-hook #'(lambda () (emojify-mode -1))))
-
-(use-package helpful
-  :bind
-  ([remap describe-command] . helpful-command)
-  ([remap describe-function] . helpful-callable)
-  ([remap describe-variable] . helpful-variable)
-  ([remap describe-key] . helpful-key))
-
-(use-package writeroom-mode
-  :diminish)
-
-(use-package undo-tree
-  :diminish undo-tree-mode
-  :config
-  (global-undo-tree-mode)
-  (add-hook 'authinfo-mode-hook #'(lambda () (setq-local undo-tree-auto-save-history nil)))
-  (defvar --undo-history-directory (concat user-emacs-directory "undotreefiles/")
-    "Directory to save undo history files.")
-  (unless (file-exists-p --undo-history-directory)
-    (make-directory --undo-history-directory t))
-  ;; stop littering with *.~undo-tree~ files everywhere
-  (setq undo-tree-history-directory-alist `(("." . ,--undo-history-directory))))
-
-(use-package avy)
-(use-package move-text)
-
-(use-package org
-  :diminish org-mode
-  :config
-  (setq org-ellipsis " ▾")
-  (add-hook 'org-mode-hook '(lambda () (whitespace-mode -1)))
-
-  (setq org-format-latex-options (plist-put org-format-latex-options :scale 1.5))
-  (add-to-list 'org-structure-template-alist '("sh" . "src shell"))
-  (add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp"))
-  (add-to-list 'org-structure-template-alist '("py" . "src python"))
-  (add-to-list 'org-structure-template-alist '("cpp" . "src c++"))
-  (setq org-agenda-prefix-format '((agenda . " %i %-12:c%?-12t% s%:T ")
-                                   (todo . " %i %-12:c")
-                                   (tags . " %i %-12:c%:T ")
-                                   (search . " %i %-12:c%:T ")))
-  (setq org-agenda-hide-tags-regexp ".*")
-  (setq org-babel-default-header-args:emacs-lisp '((:lexical . "no") (:tangle . "./init.el")))
-
-  (org-babel-do-load-languages
-   'org-babel-load-languages
-   '((emacs-lisp . t)
-     (python . t))))
-
-(use-package org-superstar
-  :diminish org-superstar-mode
-  :after org
-  :config
-  (add-hook 'org-mode-hook (lambda () (org-superstar-mode 1)))
-  (setq org-hide-leading-stars t)
-  (require 'org-tempo))
-
-(defun org-babel-tangle-config ()
-  (when (string-equal (buffer-file-name) (expand-file-name "~/.dotfiles/.config/emacs/Emacs.org"))
-    ;; Dynamic scoping to the rescuennnn
-    (let ((org-confirm-babel-evaluate nil))
-      (org-babel-tangle))))
-
-(add-hook 'org-mode-hook (lambda () (add-hook 'after-save-hook #'org-babel-tangle-config)))
-
-(use-package ace-window
-  :config
-  (setq aw-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l)
-        aw-scope 'frame))
-(elpaca-wait)
-
-(use-package tree-sitter
-  :diminish tree-sitter-mode
-  :config
-  (global-tree-sitter-mode 1))
-(use-package tree-sitter-langs)
-
-(use-package highlight-quoted
-  :diminish highlight-quoted-mode
-  :hook (emacs-lisp-mode . highlight-quoted-mode))
-
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(package-selected-packages '(magit doom-themes ivy doom-modeline command-log-mode)))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ )
+
+;; development
+;; - magit
 (use-package transient)
 (use-package magit
   :bind (("C-x g" . magit-status))
   :custom
   (magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1))
 
+;; keybinds
+
 (global-unset-key (kbd "C-z"))
 (global-set-key (kbd "<escape>") #'keyboard-escape-quit)
-(global-set-key (kbd "C-/") #'undo-tree-undo)
-(global-set-key (kbd "M-/") #'undo-tree-redo)
-(global-set-key (kbd "C-c v") #'avy-goto-char-timer)
-(global-set-key (kbd "M-p") #'move-text-up)
-(global-set-key (kbd "M-n") #'move-text-down)
-
-(defun next-word (p)
-  "Move point to the beginning of the next word, past any spaces"
-  (interactive "d")
-  (forward-word)
-  (forward-word)
-  (backward-word))
-(global-set-key "\M-f" 'next-word)
-
-(use-package expand-region)
-(global-set-key (kbd "C-=") 'er/expand-region)
-
-(use-package lsp-mode
-    :init
-    (setq lsp-keymap-prefix "C-c l"
-          lsp-headerline-breadcrumb-enable nil
-          lsp-headerline-breadcrumb-icons-enable nil
-          lsp-keep-workspace-alive nil
-          lsp-enable-snippet nil
-          lsp-lens-enable nil)
-    :hook (;; replace XXX-mode with concrete major-mode(e. g. python-mode)
-           (c-mode . lsp)
-           (c++-mode . lsp)
-           (python-mode . lsp-deferred)
-  	 (csharp-mode . lsp)
-           ;; if you want which-key integration
-           (lsp-mode . lsp-enable-which-key-integration))
-    :commands lsp)
-
-
-  (use-package consult-lsp
-    :after lsp)
-
-  (defun my-c-mode-common-hook ()
-    ;; my customizations for all of c-mode, c++-mode, objc-mode, java-mode
-    (c-set-offset 'substatement-open 0)
-    ;; other customizations can go here
-
-    (setq c++-tab-always-indent t)
-    (setq c-basic-offset 4)                  ;; Default is 2
-    (setq c-indent-level 4)                  ;; Default is 2
-
-    (setq tab-stop-list '(4 8 12 16 20 24 28 32 36 40 44 48 52 56 60))
-    (setq tab-width 4)
-    (setq indent-tabs-mode t)  ; use spaces only if nil
-    )
-
-  (add-hook 'c-mode-common-hook 'my-c-mode-common-hook)
-
-  (use-package lsp-ui
-    :after lsp
-    :diminish lsp-lens-mode
-    :config
-    (setq lsp-ui-sideline-update-mode 'point)
-    (setq lsp-ui-sideline-show-diagnostics t)
-    (setq lsp-ui-sideline-ignore-duplicate t))
-
-  (use-package hydra)
-
-  (use-package lsp-treemacs
-    :ensure t
-    :commands lsp-treemacs-errors-list)
-
-  ;; company
-  (use-package company
-    :ensure t
-    :diminish
-    :config
-    (setq company-show-numbers            t
-       	company-minimum-prefix-length   1
-       	company-idle-delay              0.2
-       	company-backends
-       	'((company-files          
-       	   company-keywords       
-       	   company-capf           
-       	   company-yasnippet)
-       	  (company-abbrev company-dabbrev)))
-    (global-company-mode +1))
-
-  (use-package clang-format)
-  (use-package clang-format+)
-
-
-  (use-package company-box
-    :ensure t
-    :diminish
-    :after company
-    :hook (company-mode . company-box-mode))
-
-  ;; flycheck
-  (use-package flycheck
-    :diminish flycheck-mode
-    :config
-    (setq flycheck-error-message-buffer " *Flycheck error messages*")
-    (setq-default flycheck-emacs-lisp-load-path 'inherit)
-    (global-flycheck-mode 1))
-
-  (use-package flycheck-pos-tip
-    :ensure t
-    :after flycheck
-    :config
-    (flycheck-pos-tip-mode))
-
-  (use-package ccls
-    :ensure t
-    :config
-    :hook ((c-mode c++-mode objc-mode cuda-mode) .
-           (lambda () (require 'ccls) (lsp)))
-    (setq ccls-executable "/usr/local/bin/ccls")
-    (setq ccls-initialization-options
-       	'(:index (:comments 2) :completion (:detailedLabel t))))
-
-  (use-package srefactor
-    :ensure t
-    :config
-    (semantic-mode 1)
-    (define-key c-mode-map (kbd "M-RET") 'srefactor-refactor-at-point)
-    (define-key c++-mode-map (kbd "M-RET") 'srefactor-refactor-at-point))
-
-(use-package tagedit)
-
-(use-package multiple-cursors
-  :bind (:map global-map
-              ("C->" . 'mc/mark-next-like-this)
-              ("C-<" . 'mc/mark-previous-like-this)
-              ("C-c C->" . 'mc/mark-all-like-this)
-              :map mc/keymap
-              ("<return>" . nil)))
-
-(use-package dired
-  :ensure nil
-  :ensure nil
-  :commands (dired dired-jump)
-  :bind (:map dired-mode-map ("SPC" . dired-single-buffer))
-  :config
-  (setq dired-dwim-target t)
-  (evil-collection-define-key 'normal 'dired-mode-map
-			      "h" 'dired-single-up-directory
-			      "l" 'dired-single-buffer))
-
-(use-package dired-single
-  :commands (dired dired-jump))
diff --git a/.config/emacs/Emacs.org b/.config/emacs/old.org
index 5e2353b..5e2353b 100644
--- a/.config/emacs/Emacs.org
+++ b/.config/emacs/old.org
diff --git a/.config/mpd/mpd.pid b/.config/mpd/mpd.pid
index ea29ccd..74d3d60 100644
--- a/.config/mpd/mpd.pid
+++ b/.config/mpd/mpd.pid
@@ -1 +1 @@
-1362
+1374