converted init code to use use-package

1 files changed, 69 insertions, 54 deletions

diff --git a/init.el b/init.el
index ca60d03..bda82da 100644
--- a/init.el
+++ b/init.el
@@ -1,65 +1,80 @@
-(defmacro require? (feature)
-  `(require ,feature nil t))
+(require 'use-package)
+(require 'cl-lib)
+(require 'seq)
+(require 'server)
+(require 'edebug)
+
+(global-unset-key (kbd "<left>"))
+(global-unset-key (kbd "<right>"))
+(global-unset-key (kbd "<up>"))
+(global-unset-key (kbd "<down>"))
+(global-unset-key (kbd "<C-left>"))
+(global-unset-key (kbd "<C-right>"))
+(global-unset-key (kbd "<C-up>"))
+(global-unset-key (kbd "<C-down>"))
+(global-set-key   (kbd "C-x k")     'kill-this-buffer)
+(global-set-key   (kbd "C-x C-b")   'ibuffer)
+
+(setq auth-source-save-behavior nil
+      auto-save-default nil
+      change-major-mode-with-file-name nil
+      custom-buffer-indent 4
+      custom-file (file-name-concat user-emacs-directory "custom.el")
+      custom-theme-directory (file-name-concat user-emacs-directory "themes/")
+      debugger 'edebug
+      display-buffer-base-action '(display-buffer-same-window display-buffer-reuse-window)
+      initial-buffer-choice (lambda ()
+                              (let ((initial-file (file-name-concat
+                                                   user-emacs-directory
+                                                   "initial-buffer")))
+                                (if (file-exists-p initial-file)
+                                    (find-file initial-file)
+                                  (get-buffer-create "*scratch*"))))
+      enable-local-variables :safe
+      inhibit-splash-screen t
+      make-backup-files nil
+      mouse-wheel-progressive-speed nil
+      tab-width 4
+      temporary-file-directory (file-name-concat (or (getenv "TMPDIR") "/tmp") ".emacs")
+      use-package-always-demand t
+      use-package-ensure-function 'ignore)
+
+(setq-default display-fill-column-indicator-column 120
+              indent-tabs-mode nil)
+
+(setq-default mode-line-format '("%*"
+                                 " "
+                                 (:eval (if buffer-file-name
+                                            (abbreviate-file-name buffer-file-name)
+                                          (buffer-name)))
+                                 " "
+                                 "(" mode-name ")"
+                                 " "
+                                 "(" (:eval (if server-process
+                                                (process-name server-process)
+                                              "_"))
+                                 ")"))
 
-(unless (when-let ((e (getenv "NO_SITE_GENTOO")))
-          (string= e "1"))
-  (require? 'site-gentoo))
-
-(require? 'magit)
-
-(require 'init-text-mode)
-(require 'init-conf-mode)
-(require 'init-prog-mode)
-(require 'init-compile)
-(require 'init-dired)
-(require 'init-display-buffer)
-(require 'init-ediff)
-(require 'init-eldoc)
-(require 'init-electric)
-(require 'init-flymake)
-(require 'init-ibuffer)
-(require 'init-ielm)
-(require 'init-keys)
-(require 'init-man)
-(require 'init-mode-line)
-(require 'init-package)
-(require 'init-project)
-(require 'init-recentf)
-(require 'init-savehist)
-(require 'init-tramp)
-
-(when (require? 'company)
-  (require 'init-company))
-
-(when (require? 'flycheck)
-  (require 'init-flycheck))
-
-(when (require? 'lsp-mode)
-  (require 'init-lsp-mode))
-
-(when (require? 'eglot)
-  (require 'init-eglot))
-
-(when (require? 'pixel-scroll)
-  (require 'init-pixel-scroll))
-
-(when (and (require? 'treesit) (treesit-available-p))
-  (require 'init-treesit))
-
-(require 'man-completion)
-
-(require 'license-boilerplate)
+(when (file-exists-p custom-file)
+  (load-file custom-file))
 
-(require 'toggle-local-vars)
+(load-file (locate-user-emacs-file "lisp/packages.el"))
 
-(require 'reload-library)
+(cl-loop with packages-directory = (file-name-concat user-emacs-directory "packages")
+         for package in (directory-files packages-directory t)
+         unless (seq-contains-p '("." "..") (file-name-base package))
+         do (load-file package))
 
-(when (file-exists-p custom-file)
-  (load custom-file))
+(mkdir temporary-file-directory t)
 
 (cua-mode 1)
 (save-place-mode 1)
 (show-paren-mode 1)
+(recentf-mode 1)
+(savehist-mode 1)
+(when (and (featurep 'pixel-scroll) (display-graphic-p))
+  (pixel-scroll-mode 1))
+
 (menu-bar-mode 0)
 (scroll-bar-mode 0)
 (tool-bar-mode 0)