diff --git a/.config/doom/config.el b/.config/doom/config.el index 9d9eebc..8d64a7e 100644 --- a/.config/doom/config.el +++ b/.config/doom/config.el @@ -1,94 +1,35 @@ -;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- +(setq user-full-name "Phil Bajsicki") -;; Place your private configuration here! Remember, you do not need to run 'doom -;; sync' after modifying this file! +(setq global-auto-revert-mode t) +(setq auth-sources '("~/.authinfo")) +(after! counsel + (setq counsel-outline-display-style 'title)) -;; Some functionality uses this to identify you, e.g. GPG configuration, email -;; clients, file templates and snippets. It is optional. -(setq user-full-name "Phil Bajsicki" - user-mail-address "phil@bajsicki.com") - -;; Doom exposes five (optional) variables for controlling fonts in Doom: -;; -;; - `doom-font' -- the primary font to use -;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable) -;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for -;; presentations or streaming. -;; - `doom-unicode-font' -- for unicode glyphs -;; - `doom-serif-font' -- for the `fixed-pitch-serif' face -;; -;; See 'C-h v doom-font' for documentation and more examples of what they -;; accept. For example: -;; -;;(setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light) -;; doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13)) -;; -;; If you or Emacs can't find your font, use 'M-x describe-font' to look them -;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to -;; refresh your font settings. If Emacs still can't find your font, it likely -;; wasn't installed correctly. Font issues are rarely Doom issues! - -;; There are two ways to load a theme. Both assume the theme is installed and -;; available. You can either set `doom-theme' or manually load a theme with the -;; `load-theme' function. This is the default: +(setq doom-font (font-spec :family "Iosevka" :size 12 :weight 'semi-light) + doom-variable-pitch-font (font-spec :family "Iosevka" :size 13)) (setq doom-theme 'doom-one) -;; This determines the style of line numbers in effect. If set to `nil', line -;; numbers are disabled. For relative line numbers, set this to `relative'. (setq display-line-numbers-type 'relative) (setq next-screen-context-lines 4) -;; If you use `org' and don't want your org files in the default location below, -;; change `org-directory'. It must be set before org loads! +(after! persp-mode + (setq persp-emacsclient-init-frame-behaviour-override "main")) +(setq doom-modeline-persp-name t) (add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode)) -(global-set-key "\C-cl" 'org-store-link) -(global-set-key "\C-ca" 'org-agenda) - -(global-set-key "\C-cne" 'elgantt-open) -(global-set-key "\C-ch" 'counsel-org-link) - -(define-prefix-command 'org-roam-map) -(global-set-key "\C-r" 'org-roam-map) -(define-key org-roam-map "o" 'org-roam-buffer-toggle) -(define-key org-roam-map "f" 'org-roam-node-find) -(define-key org-roam-map "i" 'org-roam-node-insert) -(define-key org-roam-map "n" 'org-roam-capture) - - -(define-prefix-command 'org-agenda-map) -(global-set-key "\C-a" 'org-agenda-map) -(define-key org-agenda-map "n" 'org-agenda-capture) -(define-key org-agenda-map "a" 'org-agenda) - - - - - (setq org-directory "~/enc/org/") -;; (setq org-tag-alist '2(("TBD"))) - -(setq org-agenda-start-day nil ;; start today - org-agenda-span '14 ;; and show only two weeks - org-agenda-dim-blocked-tasks 'invisible ;; Don't show me any blocked todos. Next actions only - doesn't work for tags searches - ;; org-agenda-todo-ignore-scheduled 'future - ;; org-agenda-todo-ignore-deadlines 'near - org-agenda-sorting-strategy '((agenda habit-down time-up priority-down category-keep) - (todo priority-down category-keep) - (search category-keep)) - org-deadline-warning-days 3 - org-agenda-include-diary "~/enc/org/phil-diary.org" - org-agenda-insert-diary-extract-time t - org-log-into-drawer t - org-clock-into-drawer t - org-agenda-log-mode-items '(closed clock state)) +(setq org-contacts-files + (file-expand-wildcards "~/enc/org/*.org")) -(setq org-agenda-files '("~/enc/org/org-agenda-files.org")) +(setq-default org-enforce-todo-dependencies t) + +(global-set-key "\C-cl" 'org-store-link) +(global-set-key "\C-ch" 'counsel-org-link) +(global-set-key "\C-cne" 'elgantt-open) -;; from /home/phil/.emacs.d/modules/lang/org/config.el, edited (setq org-todo-keywords '((sequence "INBOX(i)" @@ -133,39 +74,9 @@ ("FIXME" . "#cc9393") ("XXXX*" . "#cc9393"))) -(add-to-list 'load-path "~/.emacs.d/.local/straight/repos/elgantt/") - - -(setq elgantt-header-type 'outline - elgantt-draw-overarching-headers t - elgantt-insert-header-even-if-no-timestamp nil - elgantt-scroll-to-current-month-at-startup t) -;; elgantt-even-numbered-line-change 0.1 - ;; elgantt-timestamps-to-display '(deadline timestamp scheduled timestamp-range) - ;; elgantt-exclusions '(":noexport:" ":ARCHIVE:") - -(setq elgantt-user-set-color-priority-counter 0) - -(setq elgantt-custom-header-line '((:left ((:prop date-at-point - ;; you could also use, for example, 'elgantt-get-date-at-point - ;; or (lambda () (elgantt-get-date-at-point)) - :padding 25) - (:prop todo - :padding 30))) - (:center ((:prop headline))) - (:right ((:prop hashtag - :padding 40 - :text-props (face (:background "red"))))))) - - -(setq org-superstar-special-todo-items t) - -(setq org-capture-templates '(("t" "inbox" entry (file+headline "~/enc/org/inbox.org" "Inbox") "* TODO %i%?") - ("c" "work curve10" entry (file+headline "~/enc/org/inbox.org" "Curve10 Inbox") "* TODO %i%?") - ("e" "work the-engine-room" entry (file+headline "~/enc/org/inbox.org" "The Engine Room Inbox") "* TODO %i%?") - ("b" "biz inbox" entry (file+headline "~/enc/org/inbox.org" "Business Inbox") "* TODO %i%?") - ("i" "idea" entry (file+headline "~/enc/org/inbox.org" "Ideas") "* %?") - ("d" "reminder" entry (file+headline "~/enc/org/inbox.org" "Reminders") "* %i%? \n %U") +(setq org-capture-templates '(("t" "inbox" entry (file+headline "~/enc/org/phil.org" "Inbox") "* TODO %i%?") + ("i" "idea" entry (file+headline "~/enc/org/phil.org" "Ideas") "* %?") + ("d" "reminder" entry (file+headline "~/enc/org/phil.org" "Reminders") "* %i%? \n %U") ("p" "person" entry (file+headline "~/enc/org/people.org" "People") "* %(org-contacts-template-name) :PROPERTIES: @@ -179,26 +90,31 @@ :ADDRESS: :BIRTHDAY: :END:"))) + (org-wild-notifier-mode) (setq org-wild-notifier-alert-time '(10)) (setq org-wild-notifier-notification-title "Emacs org-mode agenda") -(setq org-wild-notifier-keyword-whitelist nil) +(setq org-wild-notifier-keyword-whitelist '("TODO")) - -;; (setq org-refile-targets '(("~/enc/org/" :maxlevel . 2))) (setq org-refile-targets '((nil :maxlevel . 9) (org-agenda-files :maxlevel . 9))) -(setq org-outline-path-complete-in-steps nil) ; Refile in a single go -(setq org-refile-use-outline-path t) ; Show full paths for refiling +(setq org-outline-path-complete-in-steps nil) +(setq org-refile-use-outline-path t) -(setq find-file-visit-truename t) +(define-prefix-command 'org-roam-map) +(global-set-key "\C-r" 'org-roam-map) +(define-key org-roam-map "o" 'org-roam-buffer-toggle) +(define-key org-roam-map "f" 'org-roam-node-find) +(define-key org-roam-map "i" 'org-roam-node-insert) +(define-key org-roam-map "n" 'org-roam-capture) (setq org-roam-v2-ack t) (setq org-roam-completion-everywhere t) (setq org-roam-directory (file-truename "~/enc/org/roam")) (org-roam-db-autosync-mode) +(org-roam-db-autosync-enable) (setq org-roam-capture-templates '(("r" "default" plain @@ -206,101 +122,44 @@ :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n") :unnarrowed t))) -(org-roam-db-autosync-enable) +(add-to-list 'load-path "~/.emacs.d/.local/straight/repos/elgantt/") +(setq elgantt-header-type 'outline + elgantt-draw-overarching-headers t + elgantt-insert-header-even-if-no-timestamp nil + elgantt-scroll-to-current-month-at-startup t) -(setq org-contacts-files - (file-expand-wildcards "~/enc/org/*.org")) +(setq elgantt-user-set-color-priority-counter 0) -(setq org-fontify-todo-headline t) -(setq org-footnote-section nil) -(setq org-table-duration-hour-zero-padding nil) -(setq-default org-enforce-todo-dependencies t) -(after! persp-mode - (setq persp-emacsclient-init-frame-behaviour-override "main")) -(setq doom-modeline-persp-name t) -(setq global-auto-revert-mode t) -(setq auth-sources '("~/.authinfo")) +(setq elgantt-custom-header-line + '((:left ((:prop date-at-point + :padding 25) + (:prop todo + :padding 30))) + (:center ((:prop headline))) + (:right ((:prop hashtag + :padding 40 + :text-props (face (:background "red"))))))) -(add-hook 'org-mode-hook - (lambda () (add-hook 'after-save-hook 'org-babel-tangle :append :local))) -(add-hook 'before-save-hook 'time-stamp) +(global-set-key "\C-ca" 'org-agenda) +(define-prefix-command 'org-agenda-map) +(global-set-key "\C-a" 'org-agenda-map) +(define-key org-agenda-map "n" 'org-agenda-capture) +(define-key org-agenda-map "a" 'org-agenda) +(setq org-agenda-files '("~/enc/org/org-agenda-files.org")) +(setq org-agenda-start-day nil + org-agenda-span '14 + org-agenda-dim-blocked-tasks 'invisible + org-agenda-sorting-strategy + '((agenda habit-down time-up priority-down category-keep) + (todo priority-down category-keep) + (search category-keep)) + org-deadline-warning-days 3 + org-agenda-include-diary "~/enc/org/phil-journal.org" + org-agenda-insert-diary-extract-time t + org-log-into-drawer t + org-clock-into-drawer t + org-agenda-log-mode-items '(closed clock state)) -(after! counsel - (setq counsel-outline-display-style 'title)) - -;; (after! org-id -;; ;; Do not create ID if a CUSTOM_ID exists -;; (setq org-id-link-to-org-use-id 'create-if-interactive-and-no-custom-id)) - -;; (defun zz/make-id-for-title (title) -;; "Return an ID based on TITLE." -;; (let* ((new-id (replace-regexp-in-string "[^[:alnum:]]" "-" (downcase title)))) -;; new-id)) - -;; (defun zz/org-custom-id-create () -;; "Create and store CUSTOM_ID for current heading." -;; (let* ((title (or (nth 4 (org-heading-components)) "")) -;; (new-id (zz/make-id-for-title title))) -;; (org-entry-put nil "CUSTOM_ID" new-id) -;; (org-id-add-location new-id (buffer-file-name (buffer-base-buffer))) -;; new-id)) - -;; (defun zz/org-custom-id-get-create (&optional where force) -;; "Get or create CUSTOM_ID for heading at WHERE. - -;; If FORCE is t, always recreate the property." -;; (org-with-point-at where -;; (let ((old-id (org-entry-get nil "CUSTOM_ID"))) -;; ;; If CUSTOM_ID exists and FORCE is false, return it -;; (if (and (not force) old-id (stringp old-id)) -;; old-id -;; ;; otherwise, create it -;; (zz/org-custom-id-create))))) - -;; ;; Now override counsel-org-link-action -;; (after! counsel -;; (defun counsel-org-link-action (x) -;; "Insert a link to X. - -;; X is expected to be a cons of the form (title . point), as passed -;; by `counsel-org-link'. - -;; If X does not have a CUSTOM_ID, create it based on the headline -;; title." -;; (let* ((id (zz/org-custom-id-get-create (cdr x)))) -;; (org-insert-link nil (concat "#" id) (car x))))) - - -;; Whenever You Reconfigure A package, make sure to wrap your config in an -;; `after!' block, otherwise Doom's defaults may override your settings. E.g. -;; -;; (after! PACKAGE -;; (setq x y)) -;; -;; The exceptions to this rule: -;; -;; - Setting file/directory variables (like `org-directory') -;; - Setting variables which explicitly tell you to set them before their -;; package is loaded (see 'C-h v VARIABLE' to look up their documentation). -;; - Setting doom variables (which start with 'doom-' or '+'). -;; -;; Here are some additional functions/macros that will help you configure Doom. -;; -;; - `load!' for loading external *.el files relative to this one -;; - `use-package!' for configuring packages -;; - `after!' for running code after a package has loaded -;; - `add-load-path!' for adding directories to the `load-path', relative to -;; this file. Emacs searches the `load-path' when you load packages with -;; `require' or `use-package'. -;; - `map!' for binding new keys -;; -;; To getinformation about an y of these functions/macros, move the cursor over -;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k'). -;; This will open documentation for it, including demos of how they are used. -;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces, -;; etc). -;; -;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how -;; they are implemented. +(setq doom-snippets-enable-short-helpers t) diff --git a/.config/doom/init.el b/.config/doom/init.el index 68b999e..6bbb0a4 100644 --- a/.config/doom/init.el +++ b/.config/doom/init.el @@ -95,7 +95,7 @@ (eval +overlay) ; run code, run (also, repls) ;;gist ; interacting with github gists lookup ; navigate your code and its documentation - ;;lsp ; M-x vscode + lsp ; M-x vscode magit ; a git porcelain for Emacs ;;make ; run make tasks from Emacs ;;pass ; password manager for nerds diff --git a/.config/doom/packages.el b/.config/doom/packages.el index 7bc3ff8..c802d47 100644 --- a/.config/doom/packages.el +++ b/.config/doom/packages.el @@ -63,7 +63,7 @@ (package! ivy) (package! ivy-xref) (package! counsel) - +(package! fish-mode) diff --git a/.config/fish/config.fish b/.config/fish/config.fish old mode 100755 new mode 100644 index 1bc7855..a8719fc --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,53 +1,24 @@ -# ____ _____ -# | _ \_ _| Derek Taylor (DistroTube) -# | | | || | http://www.youtube.com/c/DistroTube -# | |_| || | http://www.gitlab.com/dwt1/ -# |____/ |_| -# -# My fish config. Not much to see here; just some pretty standard stuff. - -### ADDING TO THE PATH -# First line removes the path; second line sets it. Without the first line, -# your path gets massive and fish becomes very slow. set -e fish_user_paths set -U fish_user_paths $HOME/.local/bin $HOME/Applications $HOME/.cabal/bin $HOME/.ghcup/bin $fish_user_paths - -### EXPORT ### -set fish_greeting # Supresses fish's intro message -set TERM "xterm-256color" # Sets the terminal type -set EDITOR "emacsclient -t -a ''" # $EDITOR use Emacs in terminal -set VISUAL "emacsclient -c -a emacs" # $VISUAL use Emacs in GUI mode +set fish_greeting +set TERM "xterm-256color" +set EDITOR "emacsclient -t -a ''" +set VISUAL "emacsclient -c -a emacs" set QT_QPA_PLATFORMTHEME "qt6ct" - -### SET MANPAGER -### Uncomment only one of these! - -### "bat" as manpager set -x MANPAGER "sh -c 'col -bx | bat -l man -p'" -### "vim" as manpager -# set -x MANPAGER '/bin/bash -c "vim -MRn -c \"set buftype=nofile showtabline=0 ft=man ts=8 nomod nolist norelativenumber nonu noma\" -c \"normal L\" -c \"nmap q :qa\">> conda initialize >>> -# !! Contents within this block are managed by 'conda init' !! -if test -f /home/phil/tech/Apps/miniconda3/bin/conda - eval /home/phil/tech/Apps/miniconda3/bin/conda "shell.fish" "hook" $argv | source -end -# <<< conda initialize <<< - diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 9142a66..8d13c31 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -18,7 +18,7 @@ SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrbl SETUVAR fish_color_status:red SETUVAR fish_color_user:brgreen SETUVAR fish_color_valid_path:\x2d\x2dunderline -SETUVAR fish_key_bindings:fish_vi_key_bindings +SETUVAR fish_key_bindings:fish_default_key_bindings SETUVAR fish_pager_color_completion:normal SETUVAR fish_pager_color_description:B3A06D\x1eyellow\x1e\x2di SETUVAR fish_pager_color_prefix:cyan\x1e\x2d\x2dbold\x1e\x2d\x2dunderline diff --git a/.config/fish/functions/vps.fish b/.config/fish/functions/vps.fish index d5455b4..3378e44 100644 --- a/.config/fish/functions/vps.fish +++ b/.config/fish/functions/vps.fish @@ -1,3 +1,3 @@ function vps --wraps='ssh -p 2222 phil@46.38.232.163 -i .ssh/id_ed25519_nopass' --wraps='ssh -p 22 phil@46.38.232.163 -i .ssh/id_ed25519_nopass' --description 'alias vps ssh -p 2222 phil@46.38.232.163 -i .ssh/id_ed25519_nopass' - ssh -p 2222 phil@46.38.232.163 -i .ssh/id_ed25519_nopass $argv; + ssh -p 2222 phil@46.38.232.163 -i .ssh/id_ed25519_nopass $argv; end diff --git a/.screenlayout/2screenHDMI.sh b/.screenlayout/2screenHDMI.sh deleted file mode 100755 index dbc516c..0000000 --- a/.screenlayout/2screenHDMI.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -xrandr --output DP-0 --off --output DP-1 --off --output DP-2 --off --output DP-3 --off --output HDMI-0 --mode 1920x1080 --pos 0x0 --rotate normal --output DP-4 --off --output eDP-1-1 --mode 1920x1080 --pos 1920x565 --rotate normal diff --git a/.screenlayout/3-laptop-center.sh b/.screenlayout/3-laptop-center.sh deleted file mode 100755 index 90328bb..0000000 --- a/.screenlayout/3-laptop-center.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -xrandr --output DP-0 --off -xrandr --output DP-1 --off -xrandr --output DP-2 --mode 1920x1080 --rate 60.00 --pos 3840x0 --rotate normal -xrandr --output DP-3 --off -xrandr --output HDMI-0 --mode 1920x1080 --rate 60.00 --pos 0x0 --rotate normal -xrandr --output DP-4 --mode 1920x1080 --rate 165 --pos 1920x0 --rotate normal diff --git a/.screenlayout/Laptop+144Hz.sh b/.screenlayout/Laptop+144Hz.sh deleted file mode 100755 index 51e7bda..0000000 --- a/.screenlayout/Laptop+144Hz.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -xrandr --output DP-0 --off --output DP-1 --off --output DP-2 --off --output DP-3 --off --output HDMI-0 --primary --mode 1920x1080 --pos 0x0 --rotate normal --output DP-4 --mode 1920x1080 --pos 1920x600 --rotate normal diff --git a/.screenlayout/dpright.sh b/.screenlayout/dpright.sh deleted file mode 100755 index e7b2c00..0000000 --- a/.screenlayout/dpright.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -xrandr --output DP-0 --off --output DP-1 --off --output DP-2 --mode 1920x1080 --rate 144.00 --pos 1920x0 --rotate normal -xrandr --output DP-3 --off --output HDMI-0 --off --output DP-4 --primary --mode 1920x1080 --pos 0x0 --rotate normal diff --git a/.screenlayout/extru.sh b/.screenlayout/extru.sh deleted file mode 100755 index ca1e7de..0000000 --- a/.screenlayout/extru.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -xrandr --output DP-0 --off --output DP-1 --off --output DP-2 --mode 1920x1080 --rate 144.00 --pos 1920x0 --rotate normal --output DP-3 --off --output HDMI-0 --off --output DP-4 --primary --mode 1920x1080 --pos 0x768 --rotate normal diff --git a/.screenlayout/hdmi0left.sh b/.screenlayout/hdmi0left.sh deleted file mode 100755 index 35c9e20..0000000 --- a/.screenlayout/hdmi0left.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -xrandr --output DP-0 --off --output DP-1 --off --output DP-2 --off --output DP-3 --off --output HDMI-0 --mode 1920x1080 --pos 0x0 --rotate normal --output DP-4 --mode 1920x1080 --pos 1920x0 --rotate normal diff --git a/.screenlayout/laptop+dp.sh b/.screenlayout/laptop+dp.sh deleted file mode 100755 index 189134c..0000000 --- a/.screenlayout/laptop+dp.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -xrandr --output DP-0 --off --output DP-1 --off --output DP-2 --mode 1920x1080 --rate 144.00 --pos 0x0 --rotate normal --output DP-3 --off --output HDMI-0 --off --output DP-4 --primary --mode 1920x1080 --pos 1920x650 --rotate normal diff --git a/.screenlayout/vertical.sh b/.screenlayout/vertical.sh deleted file mode 100755 index 8a5470f..0000000 --- a/.screenlayout/vertical.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -xrandr --output DP-0 --off --output DP-1 --off --output DP-2 --mode 1920x1080 --rate 144.00 --pos 0x0 --rotate normal --output DP-3 --off --output HDMI-0 --off --output DP-4 --primary --mode 1920x1080 --pos 0x1080 --rotate normal diff --git a/README.md b/README.md deleted file mode 100644 index 07a8e25..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# dot - -My dotfiles. \ No newline at end of file