diff options
| -rw-r--r-- | config.org | 124 | ||||
| -rw-r--r-- | init.el | 5 | ||||
| -rw-r--r-- | xmonad.hs | 7 |
3 files changed, 75 insertions, 61 deletions
@@ -72,56 +72,61 @@ (require 'elpaca) (elpaca-generate-autoloads "elpaca" repo) (let ((load-source-file-function nil)) (load "./elpaca-autoloads")))) - (add-hook 'after-init-hook #'elpaca-process-queues) + (setq elpaca-wait-for-builds nil) + (elpaca-process-queues) (elpaca `(,@elpaca-order)) #+end_src ** Load Evil Mode #+begin_src emacs-lisp - ;; Install a package via the elpaca macro - ;; See the "recipes" section of the manual for more details. - - ;; (elpaca example-package) - - ;; Install use-package support - (elpaca elpaca-use-package - ;; Enable use-package :ensure support for Elpaca. - (elpaca-use-package-mode) - (setq use-package-always-ensure t)) - - ;;When installing a package used in the init file itself, - ;;e.g. a package which adds a use-package key word, - ;;use the :wait recipe keyword to block until that package is installed/configured. - ;;For example: - ;;(use-package general :ensure (:wait t) :demand t) - - ;; Expands to: (elpaca evil (use-package evil :demand t)) - (use-package evil - :ensure t - :init - (setq evil-want-integration t) - (setq evil-want-keybinding nil) - (setq evil-vsplit-window-right t) - (setq evil-split-window-below t) - (evil-mode)) - (use-package evil-collection - :ensure t - :after evil - :config - (setq evil-collection-mode-list '(dashboard dired ibuffer)) - (evil-collection-init)) - (use-package evil-tutor :ensure t) - - ;;Turns off elpaca-use-package-mode current declaration - ;;Note this will cause evaluate the declaration immediately. It is not deferred. - ;;Useful for configuring built-in emacs features. - (use-package emacs :ensure nil :config (setq ring-bell-function #'ignore)) + ;; Install a package via the elpaca macro + ;; See the "recipes" section of the manual for more details. + + ;; (elpaca example-package) + + ;; Install use-package support + (elpaca elpaca-use-package + ;; Enable use-package :ensure support for Elpaca. + (elpaca-use-package-mode) + (setq use-package-always-ensure t)) + (elpaca-wait) + + ;;When installing a package used in the init file itself, + ;;e.g. a package which adds a use-package key word, + ;;use the :wait recipe keyword to block until that package is installed/configured. + ;;For example: + ;;(use-package general :ensure (:wait t) :demand t) + + ;; Expands to: (elpaca evil (use-package evil :demand t)) + (use-package evil + :ensure (:wait t) + :demand t + :config + (setq evil-want-integration t) + (setq evil-want-keybinding nil) + (setq evil-vsplit-window-right t) + (setq evil-split-window-below t) + (evil-mode)) + (use-package evil-collection + :ensure (:wait t) + :demand t + :after evil + :config + (setq evil-collection-mode-list '(dashboard dired ibuffer)) + (evil-collection-init)) + (use-package evil-tutor :ensure t) + + ;;Turns off elpaca-use-package-mode current declaration + ;;Note this will cause evaluate the declaration immediately. It is not deferred. + ;;Useful for configuring built-in emacs features. + (use-package emacs :ensure nil :config (setq ring-bell-function #'ignore)) #+end_src ** General Keybindings #+begin_src emacs-lisp (use-package general - :ensure t + :ensure (:wait t) + :demand t :config (general-evil-setup) @@ -292,11 +297,17 @@ Defining the fonts that Emacs will use. :height 100 :weight 'medium)) - (add-hook 'after-make-frame-functions - (lambda (frame) - (with-selected-frame frame - (cb/set-fonts)))) - + ;; Apply fonts on every new emacsclient frame, including the very first one. + ;; after-make-frame-functions fires reliably for all frames when running as a daemon. + (if (daemonp) + (add-hook 'after-make-frame-functions + (lambda (frame) + (with-selected-frame frame + (cb/set-fonts)))) + ;; Fallback: not running as a daemon, apply immediately. + (cb/set-fonts)) + + (setq inhibit-compacting-font-caches t) (add-to-list 'default-frame-alist '(font . "FiraMono Nerd Font-11")) (setq-default line-spacing 0.12) #+end_src @@ -321,10 +332,13 @@ Make GNU Emacs look better. ** Display Line Numbers and Disable Truncated Lines #+begin_src emacs-lisp + (setq display-line-numbers-type 'relative) (global-display-line-numbers-mode 1) (global-visual-line-mode 0) - (setq display-line-numbers 'relative) - (setq-default truncate-lines t) + (setq-default truncate-lines t) + + (setq-default indent-tabs-mode nil + tab-width 4) #+end_src * ORG MODE @@ -422,11 +436,11 @@ Type "<s" followed by TAB to expand to a begin_src tag. * PDF TOOLS #+begin_src emacs-lisp - (use-package pdf-tools - :ensure t - :defer t - :magic ("%PDF" . pdf-view-mode) - :config (pdf-tools-install :no-query)) + (use-package pdf-tools + :ensure t + :defer t + :magic ("%PDF" . pdf-view-mode) + :hook (pdf-view-mode . (lambda () (pdf-tools-install :no-query)))) #+end_src * AUCTEX @@ -505,9 +519,9 @@ Type "<s" followed by TAB to expand to a begin_src tag. (("C-c C-r" . ivy-resume) ("C-x B" . ivy-switch-buffer-other-window)) :custom - (setq ivy-use-virtual-buffers t) - (setq ivy-count-format "(%d/%d) ") - (setq enable-recursive-minibuffers t) + (ivy-use-virtual-buffers t) + (ivy-count-format "(%d/%d) ") + (enable-recursive-minibuffers t) :config (ivy-mode)) @@ -1,4 +1,3 @@ (org-babel-load-file - (expand-file-name - "config.org" - user-emacs-directory)) + (expand-file-name "config.org" user-emacs-directory)) +(elpaca-wait) @@ -25,7 +25,7 @@ myModMask :: KeyMask myModMask = mod1Mask myTerminal :: String -myTerminal = "urxvt" +myTerminal = "urxvtc" myBorderWidth :: Dimension myBorderWidth = 1 @@ -75,6 +75,8 @@ myStartupHook = do spawnOnce "picom" spawnOnce "nitrogen --restore" spawnOnce "nm-applet" + spawnOnce "pipewire" + spawnOnce "pipewire-pulse" spawnOnce "pa-applet" spawnOnce "xrdb -merge ~/.Xresources" spawnOnce "xset r rate 300 50" @@ -126,8 +128,7 @@ myKeys = , ("M-<Space>", windows W.focusMaster) , ("M-f", withFocused (windows . W.sink) >> sendMessage NextLayout) - , ("M-S-<minus>", windows (W.shift "NSP")) - , ("M-<minus>", windows (W.greedyView "NSP")) + , ("<Print>", spawn "flameshot full -p ~/Pictures") , ("<XF86AudioRaiseVolume>", spawn "pamixer --increase 5") , ("<XF86AudioLowerVolume>", spawn "pamixer --decrease 5") |