diff --git a/home/emacs/doom/config.el b/home/emacs/doom/config.el index 175d33a4..71e87e25 100644 --- a/home/emacs/doom/config.el +++ b/home/emacs/doom/config.el @@ -14,7 +14,7 @@ user-mail-address "e.litherlandsmith@proton.me" doom-font (font-spec :family "FiraCode Nerd Font" :size 16 :weight 'regular) doom-theme 'doom-tokyo-night - doom-emoji-fallback-font-families '("Noto Color Emoji") + doom-emoji-fallback-font-families '("Noto Color Emoji" "Noto Emoji") display-line-numbers-type 'relative org-directory "~/Notes/" +latex-viewers '(pdf-tools) @@ -117,18 +117,3 @@ (setq org-roam-capture-templates '(("d" "default" plain "%?" :target (file+head "${slug}.org" "#+title: ${title}\n"))))) - -;; TRAMP host specific configs -(after! tramp - (setq tramp-default-method "sshx" - tramp-default-remote-shell "/bin/bash") - (connection-local-set-profile-variables - 'freia '((tramp-remote-path . ("/home/elitherl/.local/bin" - "/usr/local/depot/git-2.26.1/bin" - tramp-default-remote-path)))) - (connection-local-set-profiles '(:application tramp :machine "freia*") 'freia) - (connection-local-set-profile-variables - 'heimdall '((tramp-remote-path . ("/home/elitherl/.local/bin" - "/usr/local/depot/git-2.26.1/bin" - tramp-default-remote-path)))) - (connection-local-set-profiles '(:application tramp :machine "heimdall*") 'heimdall)) diff --git a/home/emacs/doom/init.el b/home/emacs/doom/init.el index e700a9f2..cb72a3ad 100644 --- a/home/emacs/doom/init.el +++ b/home/emacs/doom/init.el @@ -15,39 +15,23 @@ ;; directory (for easy access to its source code). ;;; Code: -(doom! :input - ;; chinese - ;; japanese - ;; layout ; auie,ctsrnm is the superior home row - - :completion +(doom! :completion company ; the ultimate code completion backend - ;; helm ; the *other* search engine for love and life - ;; ido ; the other *other* search engine... - ;; (ivy +fuzzy +icons) ; a search engine for love and life (vertico +icons) ; the search engine of the future :ui - ;; deft ; notational velocity for Emacs doom ; what makes DOOM look the way it does doom-dashboard ; a nifty splash screen for Emacs doom-quit ; DOOM quit-message prompts when you quit Emacs - ;; (emoji +unicode) ; 🙂 + ;; (emoji +github) ; 🙂 hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW - ;; hydra indent-guides ; highlighted indent columns ligatures ; ligatures and symbols to make your code pretty again - ;; minimap ; show a map of the code on the side modeline ; snazzy, Atom-inspired modeline, plus API - ;; nav-flash ; blink cursor line after big motions - ;; neotree ; a project drawer, like NERDTree for vim - ;; ophints ; highlight the region an operation acts on (popup +defaults) ; tame sudden yet inevitable temporary windows - ;; tabs ; a tab bar for Emacs treemacs ; a project drawer, like neotree but cooler ;; unicode ; extended unicode support for various languages vc-gutter ; vcs diff in the fringe - ;; vi-tilde-fringe ; fringe tildes to mark beyond EOB window-select ; visually switch windows workspaces ; tab emulation, persistence & separate workspaces zen ; distraction-free coding or writing @@ -57,12 +41,6 @@ file-templates ; auto-snippets for empty files fold ; (nigh) universal code folding (format +onsave) ; automated prettiness - ;; god ; run Emacs commands without modifier keys - ;; lispy ; vim for lisp, for people who don't like vim - ;; multiple-cursors ; editing in many places at once - ;; objed ; text object editing for the innocent - ;; parinfer ; turn lisp into python, sort of - ;; rotate-text ; cycle region at point between text candidates snippets ; my elves. They type so I don't have to word-wrap ; soft wrapping with language-aware indent @@ -75,8 +53,6 @@ :term eshell ; the elisp shell that works everywhere - ;; shell ; simple shell REPL for Emacs - ;; term ; basic terminal emulator for Emacs vterm ; the best terminal emulation in Emacs :checkers @@ -85,32 +61,22 @@ grammar ; tasing grammar mistake every you make :tools - ;; ansible biblio ; Writes a PhD for you (citation needed) - ;; debugger ; FIXME stepping through code, to help you add bugs direnv (docker +lsp) - ;; editorconfig ; let someone else argue about tabs vs spaces - ;; ein ; tame Jupyter notebooks with emacs (eval +overlay) ; run code, run (also, repls) - ;; gist ; interacting with github gists (lookup +dictionary +offline) ; navigate your code and its documentation (lsp +eglot) ; M-x vscode magit ; a git porcelain for Emacs make ; run make tasks from Emacs (pass +auth) ; password manager for nerds pdf ; pdf enhancements - ;; prodigy ; FIXME managing external services & code builders - ;; rgb ; creating color strings - ;; taskrunner ; taskrunner for all your projects - ;; terraform ; infrastructure as code tree-sitter ; Better syntax highlighting - ;; tmux ; an API for interacting with tmux upload ; map local to remote projects via ssh/ftp :os (:if IS-MAC macos) ; improve compatibility with macOS - ;; tty ; improve the terminal Emacs experience + tty ; improve the terminal Emacs experience :lang ;; agda ; types of types of types of types... @@ -177,17 +143,12 @@ :email (mu4e +org +gmail) - ;; (notmuch +afew +org) - ;; (wanderlust +gmail) :app calendar ;; emms - ;; everywhere ; *leave* Emacs!? You must be joking ;; irc ; how neckbeards socialize rss ; emacs as an RSS reader - ;; twitter ; twitter client https://twitter.com/vnought :config - ;; literate (default +bindings +smartparens)) diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix index bbd8c4b6..caf67775 100644 --- a/home/hyprland/config.nix +++ b/home/hyprland/config.nix @@ -81,12 +81,6 @@ in '' } } - $layers = ^(ironbar|waybar|system-menu|anyrun|gtk-layer-shell|swaync-.+)$ - layerrule = blur, $layers - # layerrule = ignorezero, $layers - layerrule = ignorealpha 0.5, $layers - layerrule = xray 1, ^(ironbar|bar|gtk-layer-shell)$ - animations { enabled = yes bezier = myBezier, 0.05, 0.9, 0.1, 1.05 @@ -157,6 +151,13 @@ in '' bind = SUPER SHIFT, K, movewindow, u bind = SUPER SHIFT, J, movewindow, d + # Layer rules + $layers = ^(ironbar|waybar|system-menu|anyrun|gtk-layer-shell|swaync-.+)$ + layerrule = blur, $layers + # layerrule = ignorezero, $layers + layerrule = ignorealpha 0.5, $layers + layerrule = xray 1, ^(ironbar|waybar|bar|gtk-layer-shell)$ + # Window rules windowrule = xray 1,(alacritty) windowrule = float,(org.kde.polkit-kde-authentication-agent-1) diff --git a/system/desktop.nix b/system/desktop.nix index 15e02b49..2fe95c03 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -52,9 +52,12 @@ fira fira-mono fira-code + fira-code-symbols (nerdfonts.override { fonts = [ "FiraCode" ]; }) - dejavu_fonts + noto-fonts + noto-fonts-cjk noto-fonts-emoji + liberation_ttf emacs-all-the-icons-fonts ]; fontconfig = { @@ -63,7 +66,7 @@ sansSerif = [ "Fira Sans" "DejaVu Sans" ]; serif = sansSerif; monospace = [ "Fira Mono" "DejaVu Sans Mono" ]; - emoji = [ "Noto Color Emoji" ]; + emoji = [ "Noto Color Emoji" "Noto Emoji" ]; }; }; };