maciej/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add python mode and change modeline

Browse source
This commit is contained in:
Maciej 2023-05-24 09:30:03 +03:00
parent c95181ebe5
commit ef5ba4f7ed
Signed by: maciej
GPG key ID: 41D62D42D3B0D765
7 changed files with 135 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

50
pkg/fonts.el
View file

@ -31,27 +31,34 @@
;; Set completion and modeline font to be 1 pixel point smaller than
;; the general font
;; (set-face-attribute 'markdown-code-face nil :font (format "%s %d" name (- size 1)))
(set-face-attribute 'tooltip nil :font (format "%s %d" name (- size 1)))
(set-face-attribute 'company-tooltip nil :font (format "%s %d" name (- size 1)))
(set-face-attribute 'company-tooltip-annotation nil :font (format "%s %d" name (- size 1)))
(set-face-attribute 'company-tooltip-mouse nil :font (format "%s %d" name (- size 1)))
(set-face-attribute 'mode-line nil :font (format "%s %d" name (- size 1)))
(set-face-attribute 'mode-line-inactive nil :font (format "%s %d" name (- size 1)))
;; (set-face-attribute
;; 'markdown-code-face nil :font (format "%s %d" name (- size 1)))
(set-face-attribute
'tooltip nil :font (format "%s %d" name (- size 1)))
(set-face-attribute
'company-tooltip nil :font (format "%s %d" name (- size 1)))
(set-face-attribute
'company-tooltip-annotation nil :font (format "%s %d" name (- size 1)))
(set-face-attribute
'company-tooltip-mouse nil :font (format "%s %d" name (- size 1)))
(set-face-attribute
'mode-line nil :font (format "%s %d" name (- size 1)))
(set-face-attribute
'mode-line-inactive nil :font (format "%s %d" name (- size 1)))
;; Call LSP-UI hook
(+custom-set-lsp-ui-font-hook))
(defvar +custom-font "Iosevka")
;; (defvar +custom-font "Iosevka")
;; (defvar +custom-font "Input Mono Condensed")
;; (defvar +custom-font "SF Mono")
;; (defvar +custom-font "Monaco")
;; (defvar +custom-font "JetBrains Mono")
(defvar +custom-font "JetBrains Mono")
;; (defvar +custom-font "JuliaMono")
;; (defvar +custom-font "Rec Mono Semicasual")
;; (defvar +custom-font "Victor Mono")
;; (defvar +custom-font "IBM Plex Mono")
(defvar +custom-font-size 15)
(defvar +custom-font-size 14)
(defun set-font-to-screen ()
"Automatically set font size to suit the monitor."
@ -59,20 +66,29 @@
;; smaller.
(interactive)
(cond ((eq (x-display-list) nil))
;; built-in screen
((>= 1050 (x-display-pixel-height)) (set-font +custom-font +custom-font-size))
((>= 1050 (x-display-pixel-height))
(set-font +custom-font +custom-font-size))
;; 4K screen on a Mac
((>= 1080 (x-display-pixel-height)) (set-font +custom-font +custom-font-size))
((>= 1080 (x-display-pixel-height))
(set-font +custom-font +custom-font-size))
;; Other screens
((>= 1120 (x-display-pixel-height)) (set-font +custom-font +custom-font-size))
((>= 1440 (x-display-pixel-height)) (set-font +custom-font (+ +custom-font-size 3)))
((>= 1920 (x-display-pixel-height)) (set-font +custom-font +custom-font-size))
((>= 1120 (x-display-pixel-height))
(set-font +custom-font +custom-font-size))
((>= 1440 (x-display-pixel-height))
(set-font +custom-font (+ +custom-font-size 3)))
((>= 1920 (x-display-pixel-height))
(set-font +custom-font +custom-font-size))
;; 4K screen on Windows
((>= 2160 (x-display-pixel-height)) (set-font +custom-font (+ +custom-font-size 6)))
((>= 2160 (x-display-pixel-height))
(set-font +custom-font (+ +custom-font-size 6)))
;; Default
(t (set-font +custom-font (+ +custom-font-size 2)))))
;; Do it automatically on startup

2
pkg/prog-mode.el
View file

@ -23,7 +23,7 @@
:hook (((prog-mode text-mode conf-mode) . whitespace-mode)
(before-save . whitespace-cleanup))
:config
(setq whitespace-style #'(face trailing empty newline)
(setq whitespace-style #'(face trailing empty)
;;; Insert newline on save
require-final-newline 't))

18
pkg/themes.el
View file

@ -2,16 +2,11 @@
;;; Commentary:
;;; Code:
;; Use smart-mode-line
(use-package smart-mode-line
:straight t
:config
(setq-default sml/no-confirm-load-theme t
display-time-format "%H:%M") ;; time format to display on mode line
(sml/setup))
(use-package spaceline :straight t :defer t)
(use-package base16-theme :straight t :defer t)
(use-package apropospriate-theme :straight t :defer t)
(use-package leuven-theme :straight t :defer t)
(use-package modus-themes :straight t :defer t)
;; Disable cursor blinking
@ -21,9 +16,11 @@
(setq base16-theme-256-color-source "colors")
;; Light themes
(load-theme 'apropospriate-light t t)
(load-theme 'leuven t t)
(load-theme 'base16-atelier-forest-light t t)
(load-theme 'base16-harmonic16-light t t)
(load-theme 'apropospriate-light t t)
(load-theme 'base16-horizon-light t t)
(load-theme 'base16-humanoid-light t t)
;; Dark themes
@ -34,6 +31,7 @@
(load-theme 'base16-snazzy t t)
(load-theme 'base16-gruvbox-dark-hard t t)
(load-theme 'modus-vivendi t t)
(load-theme 'base16-zenbones t t)
;; My own theme modifications:
(require 'base16-zenburn-modified-theme
@ -42,8 +40,8 @@
(require 'base16-harmonic-light-modified-theme
"$HOME/.emacs.d/themes/base16-harmonic-light-modified.el")
(sml/apply-theme 'respectful)
(enable-theme 'base16-zenburn-modified)
(spaceline-emacs-theme)
(enable-theme 'base16-harmonic-light-modified)
(provide '+custom-pkg-themes)
;;; themes.el ends here