diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/bashrc | 4 | ||||
| -rw-r--r-- | home/config.scm | 3 | ||||
| -rw-r--r-- | home/dots/.config/kmonad.config | 6 | ||||
| -rw-r--r-- | home/dots/.emacs | 20 | ||||
| -rw-r--r-- | home/profile | 4 |
5 files changed, 22 insertions, 15 deletions
diff --git a/home/bashrc b/home/bashrc index f2495a8..91d2db6 100644 --- a/home/bashrc +++ b/home/bashrc @@ -35,9 +35,7 @@ cleartrail() { } alias a='pwd' - -source /run/current-system/profile/etc/profile.d/nix.sh - +eval "$(direnv hook bash)" eval "$(zoxide init posix --hook prompt)" if [ "$(tty)" = "/dev/tty1" ]; then diff --git a/home/config.scm b/home/config.scm index 3474ad9..e9ea01a 100644 --- a/home/config.scm +++ b/home/config.scm @@ -61,6 +61,7 @@ #:use-module (gnu packages video) #:use-module (gnu packages mp3) #:use-module (gnu packages haskell-xyz) + #:use-module (gnu packages shellutils) #:use-module (gnu packages haskell-apps) #:use-module (guix build-system go) #:use-module (gnu home services pm) @@ -80,6 +81,7 @@ isync + direnv zoxide ugrep imagemagick @@ -111,6 +113,7 @@ binutils sqlite gcc-toolchain + glibc clang-toolchain cmake diff --git a/home/dots/.config/kmonad.config b/home/dots/.config/kmonad.config index f0f26e5..d040c75 100644 --- a/home/dots/.config/kmonad.config +++ b/home/dots/.config/kmonad.config @@ -9,7 +9,7 @@ allow-cmd true ) -(defsrc caps lmet lalt lsft rsft lmet rmet) +(defsrc caps lalt rmet) ;; (defalias ;; ctl-lck (stepped @@ -25,9 +25,5 @@ (deflayer mine @slc - @slm @sla - @slf - @srf - (sticky-key 700 lmet) (sticky-key 700 rmet)) diff --git a/home/dots/.emacs b/home/dots/.emacs index 4be104a..1835e6f 100644 --- a/home/dots/.emacs +++ b/home/dots/.emacs @@ -6,6 +6,7 @@ corfu devdocs diminish + direnv ednc eldoc-box elfeed @@ -335,6 +336,11 @@ (auto-save-default t) (auto-save-include-big-deletions t)) +(use-package direnv + :ensure t + :config + (direnv-mode)) + (use-package minibuffer :defer t :config @@ -443,6 +449,8 @@ ("k" . kill-line) :repeat-map kill-lines-org-repeat-map ("k" . org-kill-line) + :repeat-map backspace-repeat-map + ("<backspace>" . backward-kill-word) :repeat-map delete-repeat-map ("d" . delete-char) :repeat-map kill-word-repeat-map @@ -781,12 +789,12 @@ "Introspect" #'ctrl-lock-off)) - - - - - (use-package ido + :bind + (:repeat-map + ido-next-buffer-repeat-map + ("s" . ido-next-match) + ("r" . ido-prev-match)) :init (ido-mode t)) @@ -1238,6 +1246,8 @@ rmail-remote-password-required nil rmail-secondary-file-regexp "~/personal-db/mail/home/archives/*.mbox" rmail-output-file-alist '(("\\[PATCH.*\\]" . "patch.mbox") + ("[rR]eceipt" . "receipt.mbox") + ("[oO]rder" . "receipt.mbox") (".*" . "archive.mbox")) rmail-file-name "~/personal-db/mail/home/RMAIL" user-mail-address "marc@mccd.space" diff --git a/home/profile b/home/profile index f81bc8a..b70ccc3 100644 --- a/home/profile +++ b/home/profile @@ -1,5 +1,3 @@ -PATH=${PATH}:/home/mccd/go/bin:/home/mccd/.cargo/bin:/home/mccd/.local/bin - export EDITOR="mg -n" export GDK_DPI_SCALE="1.5" export GDK_SCALE="1.5" @@ -17,3 +15,5 @@ export STITCH_GREP_CMD=ugrep export GUIX_PROFILE="/home/mccd/.guix-profile" . "$GUIX_PROFILE/etc/profile" source /run/current-system/profile/etc/profile.d/nix.sh +export PATH=${PATH}:/home/mccd/go/bin:/home/mccd/.cargo/bin:/home/mccd/.local/bin +export LD_LIBRARY_PATH=~/.guix-profile/lib |