This commit is contained in:
Sakooooo 2023-12-29 00:04:35 +04:00
parent b9dca0857f
commit 3d1cdfd805
Signed by: sako
GPG key ID: FE52FD65B76E4751

View file

@ -95,22 +95,13 @@ Should make startup faster, taken from doom-emacs
("org" . "https://orgmode.org/elpa/") ("org" . "https://orgmode.org/elpa/")
("elpa" . "https://elpa.gnu.org/packages/"))) ("elpa" . "https://elpa.gnu.org/packages/")))
;; (package-initialize) (package-initialize)
"Return the Linux distribution or OS Emacs is running on."
;; (when (eq system-type 'gnu/linux)
(when (eq system-type 'darwin)
(unless (package-installed-p 'use-package) (unless (package-installed-p 'use-package)
(progn (progn
(package-refresh-contents) (package-refresh-contents)
(package-install 'use-package)))) (package-install 'use-package)))
(when (eq system-type 'windows-nt)
(unless (package-installed-p 'use-package)
(progn
(package-refresh-contents)
(package-install 'use-package))))
(require 'use-package) (require 'use-package)
@ -1117,14 +1108,21 @@ Dired is a built-in file manager for Emacs that does some pretty amazing things!
- =L= - Load an Emacs Lisp file into Emacs - =L= - Load an Emacs Lisp file into Emacs
*** Configuration *** Configuration
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package dired ;; (use-package dired
:commands (dired dired-jump) ;; :commands (dired dired-jump)
:bind (("C-x C-j" . dired-jump)) ;; :bind (("C-x C-j" . dired-jump))
:custom ((dired-listing-switches "-agho --group-directories-first")) ;; :custom ((dired-listing-switches "-agho --group-directories-first"))
:config ;; :config
;; (evil-collection-define-key 'normal 'dired-mode-map
;; "h" 'dired-single-up-directory
;; "l" 'dired-single-buffer))
(global-set-key (kbd "C-x C-j") 'dired-jump)
(setq dired-listing-switches "-agho --group-directories-first")
(evil-collection-define-key 'normal 'dired-mode-map (evil-collection-define-key 'normal 'dired-mode-map
"h" 'dired-single-up-directory "h" 'dired-single-up-directory
"l" 'dired-single-buffer)) "l" 'dired-single-buffer)
(use-package dired-single) (use-package dired-single)
@ -1235,16 +1233,6 @@ I should just switch to Linux at this point :(
(python . t))) (python . t)))
#+end_src #+end_src
** Auto-tangle Configuration
#+begin_src emacs-lisp
(defun sakomacs/org-babel-tangle-config ()
(when (string-equal (buffer-file-name)
(expand-file-name "~/nixos/config/emacs/emacs.org"))
(let ((org-confirm-babel-evaluate nil))
(org-babel-tangle)))
(add-hook 'org-mode-hook (lambda () (add-hook 'after-save-hook #'sakomacs/org-babel-tangle-config))))
#+end_src
* Terminals * Terminals
** EShell ** EShell
god dammit why are they making my shells in emacs lisp god dammit why are they making my shells in emacs lisp
@ -1268,13 +1256,12 @@ god dammit why are they making my shells in emacs lisp
(use-package eshell-git-prompt) (use-package eshell-git-prompt)
(use-package eshell
:hook (eshell-first-time-mode . sakomacs/configure-eshell) (add-hook 'eshell-first-time-mode 'sakomacs/configure-eshell)
:config
(with-eval-after-load 'esh-opt (with-eval-after-load 'esh-opt
(setq eshell-destroy-buffer-when-process-dies t) (setq eshell-destroy-buffer-when-process-dies t)
(setq eshell-visual-commands '("htop" "zsh" "vim"))) (setq eshell-visual-commands '("htop" "zsh" "vim"))
(eshell-git-prompt-use-theme 'powerline)) (eshell-git-prompt-use-theme 'powerline))
#+end_src #+end_src