diff options
| -rw-r--r-- | .config/emacs/TODO.org | 1 | ||||
| -rw-r--r-- | .config/emacs/init.el | 45 | ||||
| -rw-r--r-- | .config/hypr/hyprland.conf | 2 | ||||
| -rw-r--r-- | .zprofile | 3 | ||||
| -rw-r--r-- | .zshrc | 23 | ||||
| -rwxr-xr-x | scripts/record | 14 |
6 files changed, 43 insertions, 45 deletions
diff --git a/.config/emacs/TODO.org b/.config/emacs/TODO.org index c614be9..cc6e86b 100644 --- a/.config/emacs/TODO.org +++ b/.config/emacs/TODO.org @@ -1,3 +1,4 @@ - [ ] tree sitter - [ ] cooler completion - [ ] typst +- [ ] diminish diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 378e6d1..770ab4d 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -4,7 +4,9 @@ '(("org" . "https://orgmode.org/elpa/") ("gnu" . "https://elpa.gnu.org/packages/") ("melpa" . "https://melpa.org/packages/") - ("nongnu" . "https://elpa.nongnu.org/nongnu/"))) + ("nongnu" . "https://elpa.nongnu.org/nongnu/"))) +(setq package-archive-priorities + '(("gnu" . 10))) (package-initialize) (unless package-archive-contents @@ -88,6 +90,7 @@ ;; == text editing and navigation ;; tabs + (setq-default tab-width 4) (setq backward-delete-char-untabify-method "hungry") @@ -188,11 +191,12 @@ ;; == style ;; theme -(use-package dracula-theme - :demand t - :config - (load-theme 'dracula) - (set-face-attribute 'show-paren-match nil :background "dark violet" :foreground "black")) +;; (use-package dracula-theme +;; :demand t +;; :config +;; (load-theme 'dracula) +;; (set-face-attribute 'show-paren-match nil :background "dark violet" :foreground "black")) +(load-theme `gruber-darker) ;; icons (use-package nerd-icons) @@ -208,11 +212,14 @@ :config (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter)) +;; rainbow mode +(use-package rainbow-mode + :hook (after-change-major-mode . rainbow-mode)) + ;; == minibuffer completion (use-package vertico :custom (vertico-count 15) - :diminish vertico-mode :bind (:map vertico-map ("C-n" . vertico-next) ("C-p" . vertico-previous)) @@ -281,7 +288,7 @@ ;; == lsp (use-package lsp-mode :custom - (lsp-Keymap-prefix "C-c l") + (lsp-keymap-prefix "C-c l") (lsp-headerline-breadcrumb-enable nil) (lsp-completion-enable-additional-text-edit nil) (lsp-enable-on-type-formatting nil) @@ -290,7 +297,8 @@ (lsp-enable-indentation nil) :hook ((c++-mode . lsp) (c-mode . lsp) - (typst-ts-mode . lsp)) + (typst-ts-mode . lsp) + (java-mode . lsp)) :commands lsp) (use-package lsp-ui @@ -339,6 +347,10 @@ :bind (:map corfu-map ("C-g" . corfu-quit)) + :custom + (corfu-auto t) + (corfu-auto-delay 0.2) + (corfu-auto-prefix 2) :init (add-hook 'corfu-mode-hook (lambda () @@ -349,13 +361,14 @@ (global-corfu-mode) (corfu-history-mode)) -(use-package completion-preview - :ensure nil - :hook (prog-mode . completion-preview-mode)) +(use-package cape + :init + (add-hook 'completion-at-point-functions #'cape-dabbrev) + (add-hook 'completion-at-point-functions #'cape-file) +) ;; == snippets (use-package yasnippet - :diminish yas-minor-mode :config (yas-reload-all) :hook @@ -365,11 +378,13 @@ ("M-n" . yas-next-field) ("M-p" . yas-prev-field) ([(tab)] . nil) - ("TAB" . nil)) + ("TAB" . nil) + ("M-I" . nil)) (:map yas-minor-mode-map ("C-'". yas-expand) ([(tab)] . nil) - ("TAB" . nil))) + ("TAB" . nil) + ("M-I" . nil))) (use-package yasnippet :bind diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index fdf5272..6602185 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -63,7 +63,7 @@ decoration { } master { - new_status = master + new_status = slave new_on_top = true orientation = left mfact = 0.5 @@ -1,5 +1,6 @@ export PATH="$HOME/dotfiles/scripts/:$PATH" -export EDITOR="/bin/nvim" +export EDITOR="/bin/emacs" +export GHIDRA_INSTALL_DIR="/usr/local/bin/ghidraFiles" if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then exec dbus-launch --exit-with-session Hyprland @@ -26,25 +26,6 @@ set_prompt() { } precmd_functions+=(set_prompt) -# Vi mode -bindkey -v -bindkey "^R" history-incremental-search-backward # isearch - -# Change cursor shape for different vi modes. -function zle-keymap-select () { - case $KEYMAP in - vicmd) echo -ne '\e[1 q';; # block - viins|main) echo -ne '\e[5 q';; # beam - esac -} -zle -N zle-keymap-select -zle-line-init() { - zle -K viins # initiate `vi insert` as keymap (can be removed if `bindkey -V` has been set elsewhere) - echo -ne "\e[5 q" -} -zle -N zle-line-init -echo -ne '\e[5 q' # Use beam shape cursor on startup. -preexec() { echo -ne '\e[5 q' ;} # Use beam shape cursor for each new prompt. -KEYTIMEOUT=1 # remove lag - . "$HOME/.local/bin/env" + +echo -ne '\e[2 q' diff --git a/scripts/record b/scripts/record index 077209d..c061b5e 100755 --- a/scripts/record +++ b/scripts/record @@ -1,18 +1,18 @@ #!/bin/env bash -pgrep -x "wf-recorder" && pkill -INT -x wf-recorder && notify-send -h string:wf-recorder:record -t 1000 "Finished Recording" && exit 0 +pgrep -x "wf-recorder" && pkill -INT -x wf-recorder && exit 0 -notify-send -h string:wf-recorder:record -t 1000 "Recording in:" "<span color='#90a4f4' font='26px'><i><b>3</b></i></span>" +# notify-send -h string:wf-recorder:record -t 1000 "Recording in:" "<span color='#90a4f4' font='26px'><i><b>3</b></i></span>" -sleep 1 +# sleep 1 -notify-send -h string:wf-recorder:record -t 1000 "Recording in:" "<span color='#90a4f4' font='26px'><i><b>2</b></i></span>" +# notify-send -h string:wf-recorder:record -t 1000 "Recording in:" "<span color='#90a4f4' font='26px'><i><b>2</b></i></span>" -sleep 1 +# sleep 1 -notify-send -h string:wf-recorder:record -t 950 "Recording in:" "<span color='#90a4f4' font='26px'><i><b>1</b></i></span>" +# notify-send -h string:wf-recorder:record -t 950 "Recording in:" "<span color='#90a4f4' font='26px'><i><b>1</b></i></span>" -sleep 1 +# sleep 1 dateTime=$(date +%m-%d-%Y-%H:%M:%S) wf-recorder --bframes max_b_frames -f $HOME/Videos/$dateTime.mp4 |