From d49b08eda5471826dd8f2e000760657f33c6c65d Mon Sep 17 00:00:00 2001 From: Marco Thomas Date: Tue, 8 Jun 2021 12:37:47 +0200 Subject: [PATCH] EMACS!! --- files/.bashrc | 3 ++- files/.config/dunst/dunstrc | 2 +- files/.zshrc | 4 ++-- files/init.el | 25 ++++++------------------- 4 files changed, 11 insertions(+), 23 deletions(-) diff --git a/files/.bashrc b/files/.bashrc index dabf729..009f0da 100644 --- a/files/.bashrc +++ b/files/.bashrc @@ -10,12 +10,13 @@ DIR="\[\033[1;94m\]\w\[\033[m\]" export PS1="${HOST} ${DIR}${GIT} ${ICON} " # ============================== Exports -export VISUAL=vim +export VISUAL="emacsclient -c -nw -a 'emacs -nw'" export EDITOR="$VISUAL" export LANG="en_US.UTF-8" export TERM="xterm-256color" # ============================== Aliases +alias emacsnw="TERM=xterm-direct emacsclient -c -nw -a 'emacs -nw'" alias s="cd ~/scripts/" alias c='clear' diff --git a/files/.config/dunst/dunstrc b/files/.config/dunst/dunstrc index fb8526a..158913e 100644 --- a/files/.config/dunst/dunstrc +++ b/files/.config/dunst/dunstrc @@ -86,7 +86,7 @@ ### Text ### - font = Product Sans 20 + font = Product Sans 18 # The spacing between lines. If the height is smaller than the # font height, it will get raised to the font height. diff --git a/files/.zshrc b/files/.zshrc index 5735c55..3337496 100644 --- a/files/.zshrc +++ b/files/.zshrc @@ -44,12 +44,12 @@ export PROMPT="${NAME}${DIR}${GIT} ${ICON}%{$reset_color%} " zstyle ':vcs_info:git:*' formats '|%b ' # ============================== Exports -export EDITOR="nvim" +export EDITOR="emacsclient -c -nw -a 'emacs -nw'" export VISUAL="emacsclient -c -a emacs" export LANG="en_US.UTF-8" # ============================== Aliases -alias fontslist="fc-list :scalable=true:spacing=mono: family" +alias emacsnw="TERM=alacritty-direct emacsclient -c -nw -a 'emacs -nw'" alias fontscache="fc-cache -f -v" alias ofen="cc" alias mon2cam="deno run --unstable -A -r -q https://raw.githubusercontent.com/ShayBox/Mon2Cam/master/src/mod.ts" diff --git a/files/init.el b/files/init.el index e01a4d6..2047b92 100644 --- a/files/init.el +++ b/files/init.el @@ -101,30 +101,14 @@ (use-package all-the-icons :ensure t) -;; fancy startup screen -(use-package page-break-lines - :ensure t) - -(use-package dashboard - :ensure t - :config - (dashboard-setup-startup-hook)) - -(setq dashboard-banner-logo-title "Welcome back, Marc") -(setq dashboard-startup-banner 'logo) -(setq dashboard-center-content t) -(setq dashboard-items '((recents . 5) - (projects . 5))) -(setq dashboard-set-heading-icons t) -(setq dashboard-set-file-icons t) - ;; NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA NYA ;; music requires 'player' (use-package nyan-mode :ensure t :config (nyan-mode) - (nyan-start-animation)) + (nyan-start-animation) + (nyan-toggle-wavy-trail)) ;; indentation for c (setq-default c-basic-offset 8) @@ -429,6 +413,9 @@ ("=>" ?⇒) ("<->" ?↔) ("<=>" ?⇔) + ; quantors + ("\\ex" ?∃) + ("\\all" ?∀) ; sets of numbers ("\\nats" ?ℕ) ("\\ints" ?ℤ) @@ -475,7 +462,7 @@ '(custom-safe-themes '("4a8d4375d90a7051115db94ed40e9abb2c0766e80e228ecad60e06b3b397acab" "a3bdcbd7c991abd07e48ad32f71e6219d55694056c0c15b4144f370175273d16" "e074be1c799b509f52870ee596a5977b519f6d269455b84ed998666cf6fc802a" "8f5a7a9a3c510ef9cbb88e600c0b4c53cdcdb502cfe3eb50040b7e13c6f4e78e" "fce3524887a0994f8b9b047aef9cc4cc017c5a93a5fb1f84d300391fba313743" default)) '(package-selected-packages - '(quelpa dashboard org-bullets ein fill-column-indicator lsp-haskell haskell-mode lsp-java auctex rust-mode flycheck yasnippet counsel-projectile projectile company-box company lsp-ivy lsp-ui lsp-mode magit counsel evil-collection evil which-key general all-the-icons doom-themes use-package))) + '(quelpa org-bullets ein fill-column-indicator lsp-haskell haskell-mode lsp-java auctex rust-mode flycheck yasnippet counsel-projectile projectile company-box company lsp-ivy lsp-ui lsp-mode magit counsel evil-collection evil which-key general all-the-icons doom-themes use-package))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful.