diff --git a/config.org b/config.org index 2699e2e..32eba8b 100644 --- a/config.org +++ b/config.org @@ -8,14 +8,16 @@ user-mail-address "marc.pohling@googlemail.com") #+END_SRC - I need a function to know what computer emacs is running on + I need a function to know what computer emacs is running on. The display width of 1152 pixel is an oddity of hyper-v and for my usecase specific enough to tell the machine. #+BEGIN_SRC emacs-lisp (defvar my/whoami (if (string-equal user-login-name "POH") "work_remote" - (if (string-equal system-type "gnu/linux") - "home"))) + (if (equal (display-pixel-width) 1152) + "work_hyperv" + (if (string-equal system-type "gnu/linux") + "home")))) #+END_SRC * Stuff to add / to fix - smartparens @@ -97,17 +99,17 @@ ;; pm should be fullscreen, too #+BEGIN_SRC emacs-lisp - (if (display-graphic-p) - (progn - (setq initial-frame-alist - '( - (width . 165) - (height . 70))) - (setq default-frame-alist - '( - (width . 165) - (height . 70)))) - ) +(if (display-graphic-p) + (pcase my/whoami + ("home" (progn + (setq initial-frame-alist + '((width . 165) + (height . 70))) + (setq default-frame-alist + '((width . 165) + (height . 70))))) + ("work_remote" (add-to-list 'initial-frame-alist '(fullscreen . maximized))) + ("work_hyperv" (add-to-list 'initial-frame-alist '(fullscreen . maximized))))) #+END_SRC * Visuals diff --git a/user-global/abbrev_defs b/user-global/abbrev_defs index b51eb58..aac994f 100644 --- a/user-global/abbrev_defs +++ b/user-global/abbrev_defs @@ -1,105 +1,72 @@ ;;-*-coding: utf-8;-*- (define-abbrev-table 'Buffer-menu-mode-abbrev-table '()) -(define-abbrev-table 'Custom-mode-abbrev-table '()) - (define-abbrev-table 'Info-edit-mode-abbrev-table '()) -(define-abbrev-table 'Rd-mode-abbrev-table '()) - -(define-abbrev-table 'awk-mode-abbrev-table '()) - -(define-abbrev-table 'beancount-mode-abbrev-table '()) +(define-abbrev-table 'Rd-mode-abbrev-table + '( + ("`ag" "\\arguments" nil 0) + ("`al" "\\alias" nil 0) + ("`au" "\\author" nil 0) + ("`bf" "\\bold" nil 0) + ("`co" "\\code" nil 0) + ("`de" "\\describe" nil 0) + ("`dn" "\\description" nil 0) + ("`dt" "\\details" nil 0) + ("`em" "\\emph" nil 0) + ("`en" "\\enumerate" nil 0) + ("`ex" "\\examples" nil 0) + ("`fi" "\\file" nil 0) + ("`fo" "\\format" nil 0) + ("`it" "\\item" nil 0) + ("`iz" "\\itemize" nil 0) + ("`kw" "\\keyword" nil 0) + ("`li" "\\link" nil 0) + ("`me" "\\method" nil 0) + ("`na" "\\name" nil 0) + ("`no" "\\note" nil 0) + ("`re" "\\references" nil 0) + ("`sa" "\\seealso" nil 0) + ("`se" "\\section" nil 0) + ("`so" "\\source" nil 0) + ("`ss" "\\subsection" nil 0) + ("`sy" "\\synopsis" nil 0) + ("`ta" "\\tabular" nil 0) + ("`ti" "\\title" nil 0) + ("`us" "\\usage" nil 0) + ("`va" "\\value" nil 0) + )) (define-abbrev-table 'bibtex-mode-abbrev-table '()) -(define-abbrev-table 'bookmark-bmenu-mode-abbrev-table '()) - -(define-abbrev-table 'bookmark-edit-annotation-mode-abbrev-table '()) - -(define-abbrev-table 'c++-mode-abbrev-table '()) - -(define-abbrev-table 'c-mode-abbrev-table '()) - -(define-abbrev-table 'calc-trail-mode-abbrev-table '()) - (define-abbrev-table 'calendar-mode-abbrev-table '()) (define-abbrev-table 'comint-mode-abbrev-table '()) (define-abbrev-table 'completion-list-mode-abbrev-table '()) -(define-abbrev-table 'data-debug-mode-abbrev-table '()) - -(define-abbrev-table 'diary-fancy-display-mode-abbrev-table '()) - -(define-abbrev-table 'diary-mode-abbrev-table '()) - (define-abbrev-table 'diff-mode-abbrev-table '()) -(define-abbrev-table 'dig-mode-abbrev-table '()) - (define-abbrev-table 'edit-abbrevs-mode-abbrev-table '()) (define-abbrev-table 'elisp-byte-code-mode-abbrev-table '()) (define-abbrev-table 'emacs-lisp-mode-abbrev-table '()) -(define-abbrev-table 'eshell-mode-abbrev-table '()) - -(define-abbrev-table 'ess-julia-mode-abbrev-table '()) - -(define-abbrev-table 'evil-command-window-mode-abbrev-table '()) - -(define-abbrev-table 'evil-list-view-mode-abbrev-table '()) - -(define-abbrev-table 'flycheck-error-list-mode-abbrev-table '()) - (define-abbrev-table 'fundamental-mode-abbrev-table '()) -(define-abbrev-table 'global-abbrev-table - '( - ("bg" "background" nil 3) - )) +(define-abbrev-table 'global-abbrev-table '()) (define-abbrev-table 'gnus-group-mode-abbrev-table '()) (define-abbrev-table 'help-mode-abbrev-table '()) -(define-abbrev-table 'ibuffer-mode-abbrev-table '()) - -(define-abbrev-table 'idl-mode-abbrev-table '()) - -(define-abbrev-table 'inferior-julia-mode-abbrev-table '()) - -(define-abbrev-table 'inferior-python-mode-abbrev-table '()) - -(define-abbrev-table 'ivy-occur-grep-mode-abbrev-table '()) - -(define-abbrev-table 'ivy-occur-mode-abbrev-table '()) - -(define-abbrev-table 'java-mode-abbrev-table '()) - -(define-abbrev-table 'julia-mode-abbrev-table '()) - (define-abbrev-table 'lisp-mode-abbrev-table '()) (define-abbrev-table 'message-mode-abbrev-table '()) (define-abbrev-table 'messages-buffer-mode-abbrev-table '()) -(define-abbrev-table 'notmuch-hello-mode-abbrev-table '()) - -(define-abbrev-table 'notmuch-message-mode-abbrev-table '()) - -(define-abbrev-table 'notmuch-search-mode-abbrev-table '()) - -(define-abbrev-table 'notmuch-show-mode-abbrev-table '()) - -(define-abbrev-table 'notmuch-tree-mode-abbrev-table '()) - -(define-abbrev-table 'objc-mode-abbrev-table '()) - (define-abbrev-table 'occur-edit-mode-abbrev-table '()) (define-abbrev-table 'occur-mode-abbrev-table '()) @@ -110,39 +77,25 @@ (define-abbrev-table 'package-menu-mode-abbrev-table '()) -(define-abbrev-table 'pdf-occur-buffer-mode-abbrev-table '()) - -(define-abbrev-table 'pike-mode-abbrev-table '()) - (define-abbrev-table 'process-menu-mode-abbrev-table '()) (define-abbrev-table 'prog-mode-abbrev-table '()) -(define-abbrev-table 'python-mode-abbrev-table '()) - -(define-abbrev-table 'python-mode-skeleton-abbrev-table '()) - -(define-abbrev-table 'select-tags-table-mode-abbrev-table '()) - (define-abbrev-table 'shell-mode-abbrev-table '()) -(define-abbrev-table 'smime-mode-abbrev-table '()) - -(define-abbrev-table 'snippet-mode-abbrev-table '()) - (define-abbrev-table 'special-mode-abbrev-table '()) -(define-abbrev-table 'tablist-mode-abbrev-table '()) - (define-abbrev-table 'tabulated-list-mode-abbrev-table '()) +(define-abbrev-table 'tar-mode-abbrev-table '()) + (define-abbrev-table 'text-mode-abbrev-table '()) +(define-abbrev-table 'url-cookie-mode-abbrev-table '()) + (define-abbrev-table 'vc-git-log-edit-mode-abbrev-table '()) (define-abbrev-table 'vc-git-log-view-mode-abbrev-table '()) (define-abbrev-table 'vc-git-region-history-mode-abbrev-table '()) -(define-abbrev-table 'xref--xref-buffer-mode-abbrev-table '()) -