diff --git a/home/base.nix b/home/base.nix index 1fb5c54..4957cd6 100644 --- a/home/base.nix +++ b/home/base.nix @@ -197,11 +197,6 @@ }; }; - programs.texlive = { - enable = true; - packageSet = pkgs.texliveSmall; - }; - programs.yazi = { enable = true; enableBashIntegration = true; @@ -238,5 +233,6 @@ lm_sensors lolcat nerd-fonts.blex-mono + texliveFull ]; } diff --git a/home/emacs/init.el b/home/emacs/init.el index 8a533ef..8b3d3fc 100644 --- a/home/emacs/init.el +++ b/home/emacs/init.el @@ -112,6 +112,22 @@ :config (evil-collection-init)) +(use-package vertico + :custom + (vertico-cycle t) + :init + (vertico-mode)) + +(use-package savehist + :init + (savehist-mode)) + +(use-package orderless + :custom + (completion-styles '(orderless basic)) + (completion-category-defaults nil) + (completion-category-overrides '((file (styles partial-completion))))) + ;; prevent laggy icons (setq inhibit-compacting-font-caches t) @@ -246,14 +262,26 @@ (treemacs-load-theme "nerd-icons")) ;; company -(use-package company - :bind (:map company-active-map - ("C-n" . company-select-next) - ("C-p" . company-select-previous)) +;; (use-package company +;; :bind (:map company-active-map +;; ("C-n" . company-select-next) +;; ("C-p" . company-select-previous)) +;; :init +;; (global-company-mode) +;; :config +;; (setq company-idle-delay 0.1)) ;; faster autocomplete + +;; corfu +(use-package corfu :init - (global-company-mode) - :config - (setq company-idle-delay 0.1)) ;; faster autocomplete + (when (> emacs-major-version 30) + ;; this mode is only available in Emacs version 30.1 and + ;; greater. + (global-completion-preview-mode 1)) + (unless (display-graphic-p) + (when (require 'corfu-terminal nil :noerror) + (corfu-terminal-mode +1))) + (global-corfu-mode 1)) ;; yasnippet config (use-package yasnippet @@ -413,10 +441,10 @@ org-export-with-section-numbers nil) ;; LaTeX - (setq org-latex-compiler "xelatex") - (setq org-latex-listings 'minted - org-latex-pdf-process - '("latexmk -shell-escape -f -pdf -%latex -interaction=nonstopmode -output-directory=%o %f")) + ;;(setq org-latex-compiler "xelatex") + ;;(setq org-latex-listings 'minted + ;;org-latex-pdf-process + ;;'("latexmk -shell-escape -f -pdf -%latex -interaction=nonstopmode -output-directory=%o %f")) (use-package evil-org :after org @@ -488,11 +516,13 @@ :after org) (use-package ox-moderncv - :after org - :straight - (org-cv :type git :host gitlab :repo "Titan-C/org-cv")) + :straight nil + :load-path "~/org-cv/" + ;;(org-cv :type git :host gitlab :repo "Titan-C/org-cv")) + :init (require 'ox-moderncv)) -(use-package ox-hugocv + + (use-package ox-hugocv :after org :straight (org-cv :type git :host gitlab :repo "Titan-C/org-cv"))) diff --git a/nixos/desktop.nix b/nixos/desktop.nix index 6a90278..fb63124 100644 --- a/nixos/desktop.nix +++ b/nixos/desktop.nix @@ -54,8 +54,11 @@ # Fonts fonts = { packages = with pkgs; [ + corefonts font-awesome + hachimarupop ibm-plex + kanji-stroke-order-font liberation_ttf nerd-fonts.blex-mono nerd-fonts.jetbrains-mono