diff --git a/.config/mako/config b/.config/mako/config index 45128f3..6633529 100644 --- a/.config/mako/config +++ b/.config/mako/config @@ -2,7 +2,7 @@ font=Roboto 12 background-color=#1e1e2eff text-color=#cdd6f4ff -border-color=#f9e2af +border-color=#89b4fa padding=16 outer-margin=54 diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 09d2f93..8666663 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -16,7 +16,6 @@ ;; basic key binds (global-set-key (kbd "C-`") 'other-window) (global-set-key (kbd "C-x w c") 'whitespace-cleanup) -(global-set-key (kbd "C-x w d") 'delete-all-space) (global-set-key (kbd "C-x w f") 'forward-whitespace) (global-set-key (kbd "C-c c") 'compile) (global-set-key (kbd "C-c r") 'recompile) @@ -63,6 +62,10 @@ value `italic'." (find-file custom-file) (save-buffer) (kill-current-buffer)) +(defun trim-extra-space () + (interactive) + (delete-all-space) + (insert " ")) (add-hook 'after-change-major-mode-hook #'hide-minor-modes) @@ -72,6 +75,7 @@ value `italic'." (defalias 'wc 'count-words) ;; other key binds +(global-set-key (kbd "C-x w d") 'trim-extra-space) (global-set-key (kbd "C-c e b k") 'kill-all-buffers) (global-set-key (kbd "C-c e i") 'edit-init-file) (global-set-key (kbd "C-c e r") 'reindent-buffer) @@ -79,6 +83,7 @@ value `italic'." ;; variables (setq compilation-scroll-output t + debug-on-error t dictionary-server "dict.org" dired-listing-switches "-alh --group-directories-first" fill-column 74 @@ -213,7 +218,7 @@ value `italic'." ;; eglot (require 'eglot) -(add-hook 'c-ts-mode-hook 'eglot-ensure) +;(add-hook 'c-ts-mode-hook 'eglot-ensure) (add-hook 'c++-ts-mode-hook 'eglot-ensure) (add-to-list 'eglot-server-programs `(d-mode . ("serve-d"))) @@ -303,26 +308,25 @@ value `italic'." ;; faces (require 'cus-edit) ; custom faces +(require 'dictionary) (let ((fixedpt "Roboto Mono") ( varpt "Roboto") - ( accent (catppuccin-get-color 'yellow)) + ( accent (catppuccin-get-color 'blue)) (bground (catppuccin-get-color 'base)) ( darker (catppuccin-get-color 'mantle)) (darkest (catppuccin-get-color 'crust)) ( text (catppuccin-get-color 'text))) - (add-to-list 'default-frame-alist (cons 'font fixedpt)) + (add-to-list 'default-frame-alist `(font . ,fixedpt)) + (add-to-list 'default-frame-alist '(height . 36)) (set-face-attributes - `((default :height 140) + `((default :height 112) (fixed-pitch :family ,fixedpt) (variable-pitch :family ,varpt) (font-lock-comment-face :slant italic) (font-lock-keyword-face :slant italic) (link :foreground ,accent :underline t) (mode-line-inactive :weight light) - (help-key-binding - :family ,fixedpt :background ,darker :foreground ,accent - :box (:line-width (-1 . -1) :color ,darkest :style nil)) (widget-field :extend t :background ,darker :box (:line-width (1 . 1) :color ,darkest)) @@ -332,12 +336,9 @@ value `italic'." (custom-button-mouse :background ,darkest :foreground ,text) (custom-button-pressed :inherit custom-button-mouse :box (:line-width (1 . 1) :color ,darkest)) - (match :background ,accent) - (lazy-highlight :background ,bground :foreground ,accent) - (info-xref :inherit link :background ,darker :foreground ,accent) - (anzu-mode-line :foreground ,accent) (breadcrumb-imenu-leaf-face :foreground ,accent) (dashboard-heading :foreground ,accent :height 1.2 :weight bold) + (dictionary-word-definition-face :family ,varpt) (corfu-default :background ,darker) (corfu-current :background ,darkest :box ,accent) (corfu-border :background ,accent) @@ -357,12 +358,6 @@ value `italic'." (load mu4e-file))) ;; other packages -(require 'catchup) -(setq catchup-separator "\t" - catchup-spec '((format-time-string "date %Y/%m/%d %T") - (catchup-battery "batt %s%%"))) -(global-set-key (kbd "C-c u") 'catchup) - (require 'esv) (add-to-list 'esv-arguments "-f") (setq esv-close-existing-buffers t) diff --git a/.kshrc b/.kshrc index eb06986..95580e5 100644 --- a/.kshrc +++ b/.kshrc @@ -12,9 +12,4 @@ alias npl="nix profile list" alias sway="dbus-launch --exit-with-session sway" alias pmx="pulseaudio --start && pulsemixer" -upload () { - rsync "$1" root@baxters.nz:/srv/www/sshots/ - printf 'http://%s/sshots/%s' "$(curl ifconfig.co | xargs)" "$(basename "$1")" | wl-copy -} - set -o emacs diff --git a/.zshrc b/.zshrc new file mode 100644 index 0000000..c2dcd22 --- /dev/null +++ b/.zshrc @@ -0,0 +1,12 @@ +unsetopt PROMPT_SP + +PATH="$HOME/.local/bin:$PATH" +PS1="%B%F{blue}%n%b %f%~ %# " +PS2='+ ' +HISTFILE="$HOME"/.zsh-history +HISTSIZE=1000000 +SAVEHIST=1000000 + +export EDITOR="emacsclient -c" + +alias np="nix profile" diff --git a/sync.sh b/sync.sh index 7af4aae..faff1a7 100755 --- a/sync.sh +++ b/sync.sh @@ -9,6 +9,7 @@ cp "$HOME"/.gitignore . cp "$HOME"/.kshrc . cp "$HOME"/.mbsyncrc . cp "$HOME"/.profile . +cp "$HOME"/.zshrc . mkdir -p .emacs.d/ cp "$HOME"/.emacs.d/init.el .emacs.d/init.el