diff options
| -rw-r--r-- | desktop/.config/kanata/kanata.kbd | 76 | ||||
| -rw-r--r-- | desktop/.config/kanshi/config | 5 | ||||
| -rw-r--r-- | emacs/.config/emacs/emacs-custom.el | 41 | ||||
| -rw-r--r-- | emacs/.config/emacs/init.el | 24 | ||||
| -rw-r--r-- | emacs/.config/emacs/lisp/kj-development.el | 2 | ||||
| -rw-r--r-- | emacs/.config/emacs/lisp/kj-init.el | 6 | ||||
| -rw-r--r-- | zsh/.zshenv | 1 |
7 files changed, 134 insertions, 21 deletions
diff --git a/desktop/.config/kanata/kanata.kbd b/desktop/.config/kanata/kanata.kbd new file mode 100644 index 0000000..703e3b7 --- /dev/null +++ b/desktop/.config/kanata/kanata.kbd @@ -0,0 +1,76 @@ +;; Kanata Configuration File for Graphite Anglemod Layout + +;; Add a default configuration section to define unmapped key behavior. +(defcfg + process-unmapped-keys yes +) + +;; Define the source keys Kanata will intercept. +(defsrc + grv 1 2 3 4 5 6 7 8 9 0 - = bspc + tab q w e r t y u i o p [ ] \ + caps a s d f g h j k l ; ' ret + lsft z x c v b n m , . / rsft + lctl lmet lalt spc ralt rmet rctl +) + +;; Default QWERTY Layout +(deflayer qwerty + @grl 1 2 3 4 5 6 7 8 9 0 - = bspc + tab q w e r t y u i o p [ ] \ + caps a s d f g h j k l ; ' ret + lsft z x c v b n m , . / rsft + lctl lmet lalt spc ralt rmet rctl +) + +(deftemplate charmod (char mod) + (switch + ((key-timing 3 less-than 250)) $char break + () (tap-hold-release-timeout 200 500 $char $mod $char) break + ) +) + +(defalias + quote (fork ' S-- (lsft rsft)) ;; ' -> _ + comma (fork , S-/ (lsft rsft)) ;; , -> ? + hyphen (fork - S-' (lsft rsft)) ;; - -> " + slash (fork / S-, (lsft rsft)) ;; / -> < + + n (t! charmod n lmet) + r (t! charmod r lalt) + t (t! charmod t lctl) + s (t! charmod s lsft) + + h (t! charmod h lsft) + a (t! charmod a lctl) + e (t! charmod e lalt) + i (t! charmod i lmet) + + ;; Tap: backtick (grave), Hold: toggles 'layers' for layer switching. + grl (tap-hold 200 200 grv (layer-toggle layers)) + + ;; Layer-switch aliases + gar (layer-switch graphite) + qwr (layer-switch qwerty) + + ;; Tap for Caps Lock, Hold for Ctrl + cap (tap-hold 200 200 caps lctl) +) + +(deflayer graphite + @grl 1 2 3 4 5 6 7 8 9 0 [ ] bspc + tab b l d w z @quote f o u j ; = \ + lctl @n @r @t @s g y @h @a @e @i @comma ret + lsft q x m c v k p . @hyphen @slash rsft + lctl lmet lalt spc ralt rmet rctl +) + +;; Keys 1 and 2 switch between QWERTY and Graphite +;; The _ (underscore) indicates transparent behavior (passes through base layer). +(deflayer layers + _ @qwr @gar _ _ _ _ _ _ _ lrld _ _ _ + _ _ _ _ _ _ _ _ _ _ _ _ _ _ + _ _ _ _ _ _ _ _ _ _ _ _ _ + _ _ _ _ _ _ _ _ _ _ _ _ + _ _ _ _ _ _ _ +) diff --git a/desktop/.config/kanshi/config b/desktop/.config/kanshi/config index adb37db..ce53adf 100644 --- a/desktop/.config/kanshi/config +++ b/desktop/.config/kanshi/config @@ -9,6 +9,11 @@ profile dock-emk { output "HP Inc. HP Z27n G2 6CM9011FFS" enable position 0,0 transform 90 } +profile dock-dropin { + output eDP-1 disable + output "Dell Inc. DELL P3223QE JY37DP3" enable +} + profile dock-google { output eDP-1 disable output "Lenovo Group Limited LEN P32p-20 VNA6N4GT" enable diff --git a/emacs/.config/emacs/emacs-custom.el b/emacs/.config/emacs/emacs-custom.el index 29c4e38..f961587 100644 --- a/emacs/.config/emacs/emacs-custom.el +++ b/emacs/.config/emacs/emacs-custom.el @@ -4,21 +4,38 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(custom-safe-themes - '("fbf73690320aa26f8daffdd1210ef234ed1b0c59f3d001f342b9c0bbf49f531c" "0340489fa0ccbfa05661bc5c8c19ee0ff95ab1d727e4cc28089b282d30df8fc8" "e3999eba4f25d912d7d61cbaaed1b551957e61da047279da89499d3bd1f1d007" "8d412c0ed46b865312d6df5c1dfd1821d349dd3cba00049cf88c4ad34403597e" "88267200889975d801f6c667128301af0bc183f3450c4b86138bfb23e8a78fb1" default)) + '("fbf73690320aa26f8daffdd1210ef234ed1b0c59f3d001f342b9c0bbf49f531c" + "0340489fa0ccbfa05661bc5c8c19ee0ff95ab1d727e4cc28089b282d30df8fc8" + "e3999eba4f25d912d7d61cbaaed1b551957e61da047279da89499d3bd1f1d007" + "8d412c0ed46b865312d6df5c1dfd1821d349dd3cba00049cf88c4ad34403597e" + "88267200889975d801f6c667128301af0bc183f3450c4b86138bfb23e8a78fb1" + default)) '(package-selected-packages - '(modus-themes kj-emacs dslide org-download anki-editor yasnippet org-pomodoro eshell-syntax-highlighting esh-help pcmpl-args exercism tidal haskell-mode diff-hl dts-mode clojure-mode unobtrusive-magit-theme ledger-mode nix-mode rustic tempel puni magit gcmh smudge helpful pdf-tools pcre2el repeat-help selected ace-mc expand-region idle-highlight-mode diredfl anzu direnv ob-async mixed-pitch deadgrep wgrep coterm doom-themes with-editor zenburn-theme yasnippet-snippets yaml-mode which-key undo-tree tabbar session rust-mode puppet-mode pod-mode notmuch muttrc-mode mutt-alias lsp-mode initsplit ido-completing-read+ htmlize graphviz-dot-mode goto-chg gitignore-mode gitconfig-mode gitattributes-mode git-modes folding flycheck ess eproject editorconfig diminish csv-mode color-theme-modern browse-kill-ring boxquote bm bar-cursor apache-mode projectile embark-consult)) + '(ace-mc anki-editor anzu apache-mode bar-cursor bm boxquote + browse-kill-ring clojure-mode color-theme-modern coterm + csv-mode deadgrep diff-hl diminish diredfl direnv + doom-themes dslide dts-mode editorconfig embark-consult + eproject esh-help eshell-syntax-highlighting ess exercism + expand-region flycheck flycheck-hledger folding gcmh + git-modes gitattributes-mode gitconfig-mode gitignore-mode + goto-chg graphviz-dot-mode haskell-mode helpful htmlize + idle-highlight-mode ido-completing-read+ initsplit + kj-emacs ledger-mode lsp-mode magit mixed-pitch + modus-themes mutt-alias muttrc-mode nix-mode notmuch + ob-async org-download org-pomodoro pcmpl-args pcre2el + pdf-tools pod-mode projectile puni puppet-mode repeat-help + rust-mode rustic selected session smudge tabbar tempel + tidal undo-tree unobtrusive-magit-theme wgrep which-key + with-editor yaml-mode yasnippet yasnippet-snippets + zenburn-theme)) '(package-vc-selected-packages '((kj-emacs :url "/home/orbekk/git/kj-emacs.git"))) '(safe-local-variable-values - '((checkdoc-allow-quoting-nil-and-t . t) - (eval outline-hide-sublevels 3) - (eval outline-hide-sublevels 2) - (Package . CL-WHO) - (Package . HUNCHENTOOT) - (Base . 10) - (Package . CL-USER) - (Syntax . COMMON-LISP) - (eval sly-connect "localhost" 9090) - (sly-port . 9090) + '((org-duration-format . h:mm) (org-duration-format \` h:mm) + (checkdoc-allow-quoting-nil-and-t . t) + (eval outline-hide-sublevels 3) (eval outline-hide-sublevels 2) + (Package . CL-WHO) (Package . HUNCHENTOOT) (Base . 10) + (Package . CL-USER) (Syntax . COMMON-LISP) + (eval sly-connect "localhost" 9090) (sly-port . 9090) (checkdoc-package-keywords-flag)))) (custom-set-faces ;; custom-set-faces was added by Custom. diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el index 007f7b6..2e52519 100644 --- a/emacs/.config/emacs/init.el +++ b/emacs/.config/emacs/init.el @@ -386,6 +386,11 @@ :config (emojify-set-emoji-styles '(unicode))) +;;;;; Fonts +(use-package mixed-pitch + :hook + (org-mode . mixed-pitch-mode) + ) ;;;;; Mode line (use-package emacs :ensure nil @@ -651,6 +656,25 @@ ;; Initialize (anki-editor-reset-cloze-number)) +;;;;; Ledger +(use-package ledger-mode + :mode "\\.journal") + +(use-package flycheck-hledger + :after (flycheck ledger-mode) + :demand t) + +(defun kj/ledger-import () + (interactive) + (let* + ((rules-file "~/git/org/hledger/rules/common.rules") + (input-file + (car (last (sort (file-expand-wildcards + "~/Downloads/Chase3660*.CSV"))))) + (compile-command "hledger import ")) + (message "Importing %s" input-file) + (compile )) +) ;;;; Org mode (use-package org :config diff --git a/emacs/.config/emacs/lisp/kj-development.el b/emacs/.config/emacs/lisp/kj-development.el index 6101e28..613f735 100644 --- a/emacs/.config/emacs/lisp/kj-development.el +++ b/emacs/.config/emacs/lisp/kj-development.el @@ -83,8 +83,6 @@ (use-package nix-mode :mode "\\.nix\\'") -(use-package ledger-mode - :mode "\\.journal") (use-package unobtrusive-magit-theme) (use-package editorconfig diff --git a/emacs/.config/emacs/lisp/kj-init.el b/emacs/.config/emacs/lisp/kj-init.el index 1cf70b0..5c92bf9 100644 --- a/emacs/.config/emacs/lisp/kj-init.el +++ b/emacs/.config/emacs/lisp/kj-init.el @@ -42,12 +42,6 @@ (completing-read "Repository: " repos) (concat "ssh://dragon.orbekk.com:/storage/projects/")))) -(use-package mixed-pitch - :hook - (text-mode . mixed-pitch-mode) - (org-mode . mixed-pitch-mode) - ) - (when (string= (system-name) "fedora") (setenv "SSH_AUTH_SOCK" (string-trim (shell-command-to-string "gpgconf --list-dirs agent-ssh-socket")))) diff --git a/zsh/.zshenv b/zsh/.zshenv index 7d9861c..956958e 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -6,7 +6,6 @@ export TZ=America/New_York export ALTERNATE_EDITOR=emacs export EDITOR=emacsclient export TERMINAL=urxvt -export LEDGER_FILE=$HOME/org/hledger/2021.journal export CHEMACS_PROFILE=default if [[ $(hostname) =~ pincer* || $(hostname) =~ dex* || $(hostname) =~ fedora || $(hostname) =~ firelink ]]; then export MOZ_ENABLE_WAYLAND=1 |