From 5441276b4545772d62fe21aef542f57ab646125b Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sat, 17 Oct 2020 15:36:28 -0400 Subject: Bag of changes --- .gitmodules | 3 + Xresources | 71 ---------------- Xresources-aji | 48 ----------- Xresources-orange | 107 ------------------------ Xresources-pincer | 101 ----------------------- Xresources/.Xresources | 53 ++++++++++++ doom.d/config.el | 157 ----------------------------------- doom.d/init.el | 179 ---------------------------------------- doom.d/packages.el | 51 ------------ emacs/.doom.d/config.el | 157 +++++++++++++++++++++++++++++++++++ emacs/.doom.d/config.local.el | 0 emacs/.doom.d/init.el | 179 ++++++++++++++++++++++++++++++++++++++++ emacs/.doom.d/init.local.el | 0 emacs/.doom.d/packages.el | 51 ++++++++++++ emacs/.doom.d/packages.local.el | 0 emacs/.emacs.d | 1 + old/Xresources | 71 ++++++++++++++++ old/Xresources-aji | 48 +++++++++++ old/Xresources-orange | 107 ++++++++++++++++++++++++ old/Xresources-pincer | 101 +++++++++++++++++++++++ test-vm.nix | 5 +- zgen | 2 +- zsh/.zshenv | 4 + zsh/.zshrc | 17 ++++ zsh/dot-zshenv | 5 -- zsh/dot-zshrc | 17 ---- 26 files changed, 797 insertions(+), 738 deletions(-) delete mode 100644 Xresources delete mode 100644 Xresources-aji delete mode 100644 Xresources-orange delete mode 100644 Xresources-pincer create mode 100644 Xresources/.Xresources delete mode 100644 doom.d/config.el delete mode 100644 doom.d/init.el delete mode 100644 doom.d/packages.el create mode 100644 emacs/.doom.d/config.el create mode 100644 emacs/.doom.d/config.local.el create mode 100644 emacs/.doom.d/init.el create mode 100644 emacs/.doom.d/init.local.el create mode 100644 emacs/.doom.d/packages.el create mode 100644 emacs/.doom.d/packages.local.el create mode 160000 emacs/.emacs.d create mode 100644 old/Xresources create mode 100644 old/Xresources-aji create mode 100644 old/Xresources-orange create mode 100644 old/Xresources-pincer create mode 100644 zsh/.zshenv create mode 100644 zsh/.zshrc delete mode 100644 zsh/dot-zshenv delete mode 100644 zsh/dot-zshrc diff --git a/.gitmodules b/.gitmodules index 2874323..86e21b0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "zsh/zsh/pure"] path = zsh/.zsh/pure url = https://github.com/sindresorhus/pure.git +[submodule "emacs/.emacs.d"] + path = emacs/.emacs.d + url = https://github.com/hlissner/doom-emacs diff --git a/Xresources b/Xresources deleted file mode 100644 index 0653342..0000000 --- a/Xresources +++ /dev/null @@ -1,71 +0,0 @@ -*customization: -color -! urxvt*font: xft:dejavu sans mono:pixelsize=22:antialias=true -!urxvt*font: xft:DejaVu Sans Mono:pixelsize=20:antialias=true:hinting=true -urxvt*font: xft:iosevka term:size=14,xft:dejavu sans mono:size=14 -!urxvt*letterSpace: -5 -!urxvt*font: xft:fira code:pixelsize=22:antialias=true -!urxvt*font: xft:inconsolata:size=18:antialias=true -urxvt*scrollBar: false -URxvt*termName: xterm-256color -Xterm*termName: xterm-256color - -Xft.lcdfilter: lcddefault -Xft.dpi: 96 -Xft.antialias: true -Xft.rgba: rgb -Xft.hinting: true -Xft.hintstyle: hintslight - - -URxvt.keysym.M-c: perl:clipboard:copy -URxvt.keysym.M-v: perl:clipboard:paste -URxvt.saveLines: 40000 - -URxvt.perl-ext-common: default,matcher,resize-font,clipboard -URxvt.clipboard.autocopy: true -URxvt.resize-font.smaller: C-Down -URxvt.resize-font.bigger: C-Up -URxvt.iso14755: false -URxvt.iso14755_52: false -URxvt.url-launcher: /usr/bin/xdg-open -URxvt.matcher.button: 1 - -#define nord0 #2E3440 -#define nord1 #3B4252 -#define nord2 #434C5E -#define nord3 #4C566A -#define nord4 #D8DEE9 -#define nord5 #E5E9F0 -#define nord6 #ECEFF4 -#define nord7 #8FBCBB -#define nord8 #88C0D0 -#define nord9 #81A1C1 -#define nord10 #5E81AC -#define nord11 #BF616A -#define nord12 #D08770 -#define nord13 #EBCB8B -#define nord14 #A3BE8C -#define nord15 #B48EAD - -*.foreground: nord6 -*.background: nord0 -*.cursorColor: nord4 -*fading: 15 -*fadeColor: nord3 - -*.color0: nord1 -*.color1: nord11 -*.color2: nord14 -*.color3: nord13 -*.color4: nord9 -*.color5: nord15 -*.color6: nord8 -*.color7: nord5 -*.color8: nord3 -*.color9: nord11 -*.color10: nord14 -*.color11: nord13 -*.color12: nord9 -*.color13: nord15 -*.color14: nord7 -*.color15: nord6 diff --git a/Xresources-aji b/Xresources-aji deleted file mode 100644 index 61ee782..0000000 --- a/Xresources-aji +++ /dev/null @@ -1,48 +0,0 @@ -urxvt*font: xft:dejavu sans mono:size=10:antialias=true -!urxvt*font: xft:inconsolata:size=14:antialias=true -urxvt*scrollBar: false - -Xterm*termName: xterm-256color -URxvt*termName: xterm-256color - -Xft.lcdfilter: lcddefault -Xft.dpi: 96 -Xft.antialias: true -Xft.rgba: rgb -Xft.hinting: true -Xft.hintstyle: hintslight - -URxvt.perl-lib: /home/orbekk/.urxvt/ext -URxvt.keysym.M-c: perl:clipboard:copy -URxvt.keysym.M-v: perl:clipboard:paste -URxvt.scrollBar: false -URxvt.saveLines: 40000 -URxvt.perl-ext-common: default,matcher,resize-font,clipboard -URxvt.clipboard.autocopy: true -URxvt.resize-font.smaller: C-Down -URxvt.resize-font.bigger: C-Up -URxvt.iso14755: false -URxvt.iso14755_52: false -URxvt.url-launcher: /usr/bin/xdg-open -URxvt.matcher.button: 1 - -urxvt*foreground: white -urxvt*background: black - -! #2E3436 -*color0: #000000 -*color1: #a40000 -*color2: #4E9A06 -*color3: #C4A000 -*color4: #3465A4 -*color5: #75507B -*color6: #ce5c00 -*color7: #babdb9 -*color8: #555753 -*color9: #EF2929 -*color10: #8AE234 -*color11: #FCE94F -*color12: #729FCF -*color13: #AD7FA8 -*color14: #fcaf3e -*color15: #EEEEEC diff --git a/Xresources-orange b/Xresources-orange deleted file mode 100644 index 0169c37..0000000 --- a/Xresources-orange +++ /dev/null @@ -1,107 +0,0 @@ -*customization: -color -Xterm*termName: xterm-256color -URxvt*termName: xterm-256color - -Xft.lcdfilter: lcddefault -Xft.dpi: 96 -Xft.antialias: true -Xft.rgba: rgb -Xft.hinting: true -Xft.hintstyle: hintslight - -!! Droid Sans Mono -!URxvt.font: xft:Droid Sans Mono-9:hinting=True;antialias:True,xft:Bitstream Vera Sans Mono,9x15 -!urxvt*font: xft:bitstream vera sans mono:size=10:antialias=true -!URxvt.font: xft:Fira Code:pixelsize=12,hinting=True,antialias:True,style=regular -URxvt.font: xft:Fira Code:pixelsize=14,hinting=True,antialias=True -!URxvt.letterSpace: -1 -URxvt.keysym.M-c: perl:clipboard:copy -URxvt.keysym.M-v: perl:clipboard:paste -URxvt.scrollBar: false -URxvt.saveLines: 40000 - -URxvt.perl-ext-common: default,matcher,resize-font,clipboard -URxvt.clipboard.autocopy: true -URxvt.resize-font.smaller: C-Down -URxvt.resize-font.bigger: C-Up -URxvt.iso14755: false -URxvt.iso14755_52: false - -URxvt.url-launcher: /usr/bin/xdg-open -URxvt.matcher.button: 1 - -!urxvt*foreground: white -!urxvt*background: black - -! Base16 Monokai -! Scheme: Wimer Hazenberg (http://www.monokai.nl) - -! #define base00 #272822 -! #define base01 #383830 -! #define base02 #49483e -! #define base03 #75715e -! #define base04 #a59f85 -! #define base05 #f8f8f2 -! #define base06 #f5f4f1 -! #define base07 #f9f8f5 -! #define base08 #f92672 -! #define base09 #fd971f -! #define base0A #f4bf75 -! #define base0B #a6e22e -! #define base0C #a1efe4 -! #define base0D #66d9ef -! #define base0E #ae81ff -! #define base0F #cc6633 - -! Base16 Spacemacs - -#define base00 #1f2022 -#define base01 #282828 -#define base02 #444155 -#define base03 #585858 -#define base04 #b8b8b8 -#define base05 #e3e3e3 -#define base06 #e8e8e8 -#define base07 #f8f8f8 -#define base08 #f2241f -#define base09 #ffa500 -#define base0A #b1951d -#define base0B #67b11d -#define base0C #2d9574 -#define base0D #4f97d7 -#define base0E #a31db1 -#define base0F #b03060 - -*.foreground: base05 -*.background: base00 -!URxvt*depth: 32 -!URxvt*background: rgba:0000/0000/0200/c800 -*.cursorColor: base05 - -*.color0: base00 -*.color1: base08 -*.color2: base0B -*.color3: base0A -*.color4: base0D -*.color5: base0E -*.color6: base0C -*.color7: base05 - -*.color8: base03 -*.color9: base08 -*.color10: base0B -*.color11: base0A -*.color12: base0D -*.color13: base0E -*.color14: base0C -*.color15: base07 - -! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt), -! use 'shell' template to set these if necessary -*.color16: base09 -*.color17: base0F -*.color18: base01 -*.color19: base02 -*.color20: base04 -*.color21: base06 - diff --git a/Xresources-pincer b/Xresources-pincer deleted file mode 100644 index d90a24d..0000000 --- a/Xresources-pincer +++ /dev/null @@ -1,101 +0,0 @@ -*customization: -color -! urxvt*font: xft:dejavu sans mono:pixelsize=22:antialias=true -!urxvt*font: xft:DejaVu Sans Mono:pixelsize=20:antialias=true:hinting=true -urxvt*font: xft:fira code:pixelsize=22:antialias=true:hinting=true -!urxvt*letterSpace: -5 -!urxvt*font: xft:fira code:pixelsize=22:antialias=true -!urxvt*font: xft:inconsolata:size=18:antialias=true -urxvt*scrollBar: false -URxvt*termName: xterm-256color -Xterm*termName: xterm-256color - -Xcursor.size: 24 - -Xft.lcdfilter: lcddefault -Xft.dpi: 96 -Xft.antialias: true -Xft.rgba: rgb -Xft.hinting: true -Xft.hintstyle: hintslight - - -URxvt.keysym.M-c: perl:clipboard:copy -URxvt.keysym.M-v: perl:clipboard:paste -URxvt.saveLines: 40000 - -URxvt.perl-ext-common: default,matcher,resize-font,clipboard -URxvt.clipboard.autocopy: true -URxvt.resize-font.smaller: C-Down -URxvt.resize-font.bigger: C-Up -URxvt.iso14755: false -URxvt.iso14755_52: false -URxvt.url-launcher: /usr/bin/xdg-open -URxvt.matcher.button: 1 - -urxvt*foreground: white -urxvt*background: black - -*color0: #2E3436 -*color1: #a40000 -*color2: #4E9A06 -*color3: #C4A000 -*color4: #3465A4 -*color5: #75507B -*color6: #ce5c00 -*color7: #babdb9 -*color8: #555753 -*color9: #EF2929 -*color10: #8AE234 -*color11: #FCE94F -*color12: #729FCF -*color13: #AD7FA8 -*color14: #fcaf3e -*color15: #EEEEEC - -! #define base00 #272822 -! #define base01 #383830 -! #define base02 #49483e -! #define base03 #75715e -! #define base04 #a59f85 -! #define base05 #f8f8f2 -! #define base06 #f5f4f1 -! #define base07 #f9f8f5 -! #define base08 #f92672 -! #define base09 #fd971f -! #define base0A #f4bf75 -! #define base0B #a6e22e -! #define base0C #a1efe4 -! #define base0D #66d9ef -! #define base0E #ae81ff -! #define base0F #cc6633 -! -! *.foreground: base05 -! *.background: base00 -! *.cursorColor: base05 -! -! *.color0: base00 -! *.color1: base08 -! *.color2: base0B -! *.color3: base0A -! *.color4: base0D -! *.color5: base0E -! *.color6: base0C -! *.color7: base05 -! -! *.color8: base03 -! *.color9: base08 -! *.color10: base0B -! *.color11: base0A -! *.color12: base0D -! *.color13: base0E -! *.color14: base0C -! *.color15: base07 -! -! ! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt), -! ! use 'shell' template to set these if necessary -! *.color16: base09 -! *.color17: base0F -! *.color18: base01 -! *.color19: base02 -! *.color20: base04 -! *.color21: base06 diff --git a/Xresources/.Xresources b/Xresources/.Xresources new file mode 100644 index 0000000..9501ece --- /dev/null +++ b/Xresources/.Xresources @@ -0,0 +1,53 @@ +*customization: -color +urxvt*font: xft:dejavu sans mono:pixelsize=22:antialias=true:hinting=true +!urxvt*font: xft:DejaVu Sans Mono:pixelsize=20:antialias=true:hinting=true +! urxvt*font: xft:fira code:pixelsize=22:antialias=true:hinting=true +!urxvt*letterSpace: -5 +!urxvt*font: xft:fira code:pixelsize=22:antialias=true +!urxvt*font: xft:inconsolata:size=18:antialias=true +urxvt*scrollBar: false +URxvt*termName: xterm-256color +Xterm*termName: xterm-256color + +Xcursor.size: 24 + +Xft.lcdfilter: lcddefault +Xft.dpi: 96 +Xft.antialias: true +Xft.rgba: rgb +Xft.hinting: true +Xft.hintstyle: hintslight + + +URxvt.keysym.M-c: perl:clipboard:copy +URxvt.keysym.M-v: perl:clipboard:paste +URxvt.saveLines: 40000 + +URxvt.perl-ext-common: default,matcher,resize-font,clipboard +URxvt.clipboard.autocopy: true +URxvt.resize-font.smaller: C-Down +URxvt.resize-font.bigger: C-Up +URxvt.iso14755: false +URxvt.iso14755_52: false +URxvt.url-launcher: /usr/bin/xdg-open +URxvt.matcher.button: 1 + +urxvt*foreground: white +urxvt*background: black + +*color0: #2E3436 +*color1: #a40000 +*color2: #4E9A06 +*color3: #C4A000 +*color4: #3465A4 +*color5: #75507B +*color6: #ce5c00 +*color7: #babdb9 +*color8: #555753 +*color9: #EF2929 +*color10: #8AE234 +*color11: #FCE94F +*color12: #729FCF +*color13: #AD7FA8 +*color14: #fcaf3e +*color15: #EEEEEC diff --git a/doom.d/config.el b/doom.d/config.el deleted file mode 100644 index 676f9d4..0000000 --- a/doom.d/config.el +++ /dev/null @@ -1,157 +0,0 @@ -;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- - -;; Place your private configuration here! Remember, you do not need to run 'doom -;; sync' after modifying this file! - - -;; Some functionality uses this to identify you, e.g. GPG configuration, email -;; clients, file templates and snippets. -(setq user-full-name "KJ Orbekk" - user-mail-address "kj@orbekk.com") - -;; Doom exposes five (optional) variables for controlling fonts in Doom. Here -;; are the three important ones: -;; -;; + `doom-font' -;; + `doom-variable-pitch-font' -;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for -;; presentations or streaming. -;; -;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd -;; font string. You generally only need these two: -(setq doom-font (font-spec :family "monospace" :size 14)) - -;; 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-theme 'doom-nord) - -;; 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! -(setq org-directory "~/org/") -(use-package! org - :config - (setq org-todo-keywords - '((sequence - "TODO(t)" "ACTIVE(a!)" "WAIT(w@/!)" "|" "DONE(d!)" "CANCELED(c@)"))) - (setq org-refile-use-outline-path nil) - (setq org-refile-targets '((nil . (:maxlevel . 2))))) - -(setq org-log-into-drawer t) -(setq org-agenda-log-mode-items '(closed clock state)) -(setq org-agenda-files '("~/org/roam/todo.org")) - -(use-package! org-agenda - :config - (setq org-agenda-ndays 14) - (setq org-agenda-include-diary 1) - (setq org-agenda-todo-ignore-with-date 1) - (setq org-agenda-todo-ignore-scheduled 1) - (setq org-agenda-start-with-log-mode 1) - (setq org-agenda-window-setup 'current-window) - (setq org-agenda-custom-commands - '(("g" "Google agenda" - ((agenda "") - (todo "ACTIVE") - (alltodo)) - ))) - (setq org-capture-templates - `( - ("t" "Todo" entry (file+headline "~/org/roam/todo.org" "Inbox") - "* TODO %?\n %i\n %a") - ("d" "Daily review" entry (file+olp+datetree "~/org/review.org" "Daily") - (file "~/org/templates/daily-review.org") :tree-type week :jump-to-captured t) - ("w" "Weekly review" entry (file+olp+datetree "~/org/review.org" "Weekly") - (file "~/org/templates/weekly-review.org") :tree-type week :jump-to-captured t) - ("j" "Journal entry" entry (file+olp+datetree "~/org/journal.org" "Journal") - "* Journal entry\n%t\n\n%?" :tree-type week :jump-to-captured t) - ))) - -(use-package! org) -(use-package! org-roam - :after org - :init - (setq org-roam-directory "~/org/roam") - (setq org-roam-capture-templates - '( - ("d" "default" plain (function org-roam-capture--get-point) - "%?" - :file-name "%<%Y%m%d%H%M%S>-${slug}" - :head "#+TITLE: ${title}\n- tags :: [[file:%<%Y-W%W>.org][%<%Y-W%W>]]" - :unnarrowed t) - ))) - -(setq deft-directory "~/org/") -(setq deft-recursive t) - -;; 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 t) - -;; Here are some additional functions/macros that could 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 get information about any of these functions/macros, move the cursor over -;; the highlighted symbol at press 'K' (non-evil users must press 'C-c g k'). -;; This will open documentation for it, including demos of how they are used. -;; -;; You can also try 'gd' (or 'C-c g d') to jump to their definition and see how -;; they are implemented. - -(after! smartparens - (smartparens-global-mode -1)) - -(after! mu4e-maildirs-extension - (mu4e-maildirs-extension)) -(after! mu4e - (remove-hook 'mu4e-compose-mode-hook #'org-mu4e-compose-org-mode)) - -;; (setq hledger-jfile "~/.hledger.journal") - -;; (use-package! hledger-mode -;; :defer t -;; :mode ("\\.journal\\'" "\\.hledger\\'") -;; :commands hledger-enable-reporting -;; :preface -;; (defun hledger/next-entry () -;; "Move to next entry and pulse." -;; (interactive) -;; (hledger-next-or-new-entry) -;; (hledger-pulse-momentary-current-entry)) - -;; (defface hledger-warning-face -;; '((((background dark)) -;; :background "Red" :foreground "White") -;; (((background light)) -;; :background "Red" :foreground "White") -;; (t :inverse-video t)) -;; "Face for warning" -;; :group 'hledger) - -;; (defun hledger/prev-entry () -;; "Move to last entry and pulse." -;; (interactive) -;; (hledger-backward-entry) -;; (hledger-pulse-momentary-current-entry)) - -;; :config -;; (set-company-backend! 'hledger-mode '(hledger-company)) - -;; (map! :map hledger-mode-map -;; "M-p" #'hledger/prev-entry -;; "M-n" #'hledger/next-entry -;; :localleader -;; "e" #'hledger-jentry -;; "j" #'hledger-run-command) -;; ) - -(add-to-list 'auto-mode-alist '("\\.journal\\'" . ledger-mode)) - -(load-file "~/.doom.d/config.local.el") diff --git a/doom.d/init.el b/doom.d/init.el deleted file mode 100644 index 4a887c9..0000000 --- a/doom.d/init.el +++ /dev/null @@ -1,179 +0,0 @@ -;;; init.el -*- lexical-binding: t; -*- - -;; This file controls what Doom modules are enabled and what order they load -;; in. Remember to run 'doom sync' after modifying it! - -;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's -;; documentation. There you'll find information about all of Doom's -;; modules and what flags they support. - -;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or -;; 'C-c g k' for non-vim users) to view its documentation. This works on -;; flags as well (those symbols that start with a plus). -;; -;; Alternatively, press 'gd' (or 'C-c g d') on a module to browse its -;; directory (for easy access to its source code). -(load-file "~/.doom.d/init.local.el") - -(doom! :input - ;;chinese - ;;japanese - - :completion - company ; the ultimate code completion backend - ;;helm ; the *other* search engine for love and life - ;;ido ; the other *other* search engine... - ivy ; a search engine for love and life - - :ui - deft ; notational velocity for Emacs - doom ; what makes DOOM look the way it does - doom-dashboard ; a nifty splash screen for Emacs - doom-quit ; DOOM quit-message prompts when you quit Emacs - ;;fill-column ; a `fill-column' indicator - hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW - ;;hydra - ;;indent-guides ; highlighted indent columns - ;;minimap ; show a map of the code on the side - modeline ; snazzy, Atom-inspired modeline, plus API - ;;nav-flash ; blink cursor line after big motions - ;;neotree ; a project drawer, like NERDTree for vim - ophints ; highlight the region an operation acts on - (popup +defaults) ; tame sudden yet inevitable temporary windows - ;;pretty-code ; ligatures or substitute text with pretty symbols - ;;tabs ; an tab bar for Emacs - ;;treemacs ; a project drawer, like neotree but cooler - ;;unicode ; extended unicode support for various languages - vc-gutter ; vcs diff in the fringe - vi-tilde-fringe ; fringe tildes to mark beyond EOB - window-select ; visually switch windows - workspaces ; tab emulation, persistence & separate workspaces - ;;zen ; distraction-free coding or writing - - :editor - (evil +everywhere); come to the dark side, we have cookies - file-templates ; auto-snippets for empty files - fold ; (nigh) universal code folding - (format +onsave) ; automated prettiness - ;;god ; run Emacs commands without modifier keys - ;;lispy ; vim for lisp, for people who don't like vim - multiple-cursors ; editing in many places at once - ;;objed ; text object editing for the innocent - ;;parinfer ; turn lisp into python, sort of - ;;rotate-text ; cycle region at point between text candidates - snippets ; my elves. They type so I don't have to - ;;word-wrap ; soft wrapping with language-aware indent - - :emacs - dired ; making dired pretty [functional] - electric ; smarter, keyword-based electric-indent - ;;ibuffer ; interactive buffer management - undo ; persistent, smarter undo for your inevitable mistakes - vc ; version-control and Emacs, sitting in a tree - - :term - ;;eshell ; the elisp shell that works everywhere - shell ; simple shell REPL for Emacs - ;;term ; basic terminal emulator for Emacs - ;;vterm ; the best terminal emulation in Emacs - - :checkers - syntax ; tasing you for every semicolon you forget - ;;spell ; tasing you for misspelling mispelling - ;;grammar ; tasing grammar mistake every you make - - :tools - ;;ansible - ;;debugger ; FIXME stepping through code, to help you add bugs - ;;direnv - ;;docker - ;;editorconfig ; let someone else argue about tabs vs spaces - ;;ein ; tame Jupyter notebooks with emacs - (eval +overlay) ; run code, run (also, repls) - ;;gist ; interacting with github gists - lookup ; navigate your code and its documentation - ;;lsp - ;;macos ; MacOS-specific commands - magit ; a git porcelain for Emacs - ;;make ; run make tasks from Emacs - ;;pass ; password manager for nerds - ;;pdf ; pdf enhancements - ;;prodigy ; FIXME managing external services & code builders - ;;rgb ; creating color strings - ;;taskrunner ; taskrunner for all your projects - ;;terraform ; infrastructure as code - ;;tmux ; an API for interacting with tmux - ;;upload ; map local to remote projects via ssh/ftp - - :lang - ;;agda ; types of types of types of types... - cc ; C/C++/Obj-C madness - ;;clojure ; java with a lisp - ;;common-lisp ; if you've seen one lisp, you've seen them all - ;;coq ; proofs-as-programs - ;;crystal ; ruby at the speed of c - ;;csharp ; unity, .NET, and mono shenanigans - data ; config/data formats - ;;(dart +flutter) ; paint ui and not much else - ;;elixir ; erlang done right - ;;elm ; care for a cup of TEA? - emacs-lisp ; drown in parentheses - ;;erlang ; an elegant language for a more civilized age - ;;ess ; emacs speaks statistics - ;;faust ; dsp, but you get to keep your soul - ;;fsharp ; ML stands for Microsoft's Language - ;;fstar ; (dependent) types and (monadic) effects and Z3 - ;;(go +lsp) ; the hipster dialect - ;;(haskell +dante) ; a language that's lazier than I am - ;;hy ; readability of scheme w/ speed of python - ;;idris ; - ;;json ; At least it ain't XML - ;;(java +meghanada) ; the poster child for carpal tunnel syndrome - ;;javascript ; all(hope(abandon(ye(who(enter(here)))))) - ;;julia ; a better, faster MATLAB - ;;kotlin ; a better, slicker Java(Script) - ;;latex ; writing papers in Emacs has never been so fun - ;;lean - ;;factor - ledger ; an accounting system in Emacs - ;;lua ; one-based indices? one-based indices - markdown ; writing docs for people to ignore - ;;nim ; python + lisp at the speed of c - ;;nix ; I hereby declare "nix geht mehr!" - ;;ocaml ; an objective camel - (org +journal +roam) ; organize your plain life in plain text - ;;perl ; write code no one else can comprehend - ;;php ; perl's insecure younger brother - ;;plantuml ; diagrams for confusing people more - ;;purescript ; javascript, but functional - python ; beautiful is better than ugly - ;;qt ; the 'cutest' gui framework ever - ;;racket ; a DSL for DSLs - ;;rest ; Emacs as a REST client - ;;rst ; ReST in peace - ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() - ;;scala ; java, but good - ;;scheme ; a fully conniving family of lisps - sh ; she sells {ba,z,fi}sh shells on the C xor - ;;sml - ;;solidity ; do you need a blockchain? No. - ;;swift ; who asked for emoji variables? - ;;terra ; Earth and Moon in alignment for performance. - web ; the tubes - ;;yaml ; JSON, but readable - - :email - mu4e - ;;notmuch - ;;(wanderlust +gmail) - - :app - ;;calendar - ;;irc ; how neckbeards socialize - ;;(rss +org) ; emacs as an RSS reader - ;;twitter ; twitter client https://twitter.com/vnought - - :config - ;;literate - (default +bindings)) diff --git a/doom.d/packages.el b/doom.d/packages.el deleted file mode 100644 index 95c7e51..0000000 --- a/doom.d/packages.el +++ /dev/null @@ -1,51 +0,0 @@ -;; -*- no-byte-compile: t; -*- -;;; $DOOMDIR/packages.el - -;; To install a package with Doom you must declare them here, run 'doom sync' on -;; the command line, then restart Emacs for the changes to take effect. -;; Alternatively, use M-x doom/reload. - - -;; Doom's packages are pinned to a specific commit and updated from release to -;; release. The `unpin!' macro allows you to unpin single packages... -;(unpin! pinned-package) -;; ...or multiple packages -;(unpin! pinned-package another-pinned-package) -;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) -;(unpin! t) - - -;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: -;(package! some-package) - -;; To install a package directly from a particular repo, you'll need to specify -;; a `:recipe'. You'll find documentation on what `:recipe' accepts here: -;; https://github.com/raxod502/straight.el#the-recipe-format -;(package! another-package -; :recipe (:host github :repo "username/repo")) - -;; If the package you are trying to install does not contain a PACKAGENAME.el -;; file, or is located in a subdirectory of the repo, you'll need to specify -;; `:files' in the `:recipe': -;(package! this-package -; :recipe (:host github :repo "username/repo" -; :files ("some-file.el" "src/lisp/*.el"))) - -;; If you'd like to disable a package included with Doom, for whatever reason, -;; you can do so here with the `:disable' property: -;(package! builtin-package :disable t) - -;; You can override the recipe of a built in package without having to specify -;; all the properties for `:recipe'. These will inherit the rest of its recipe -;; from Doom or MELPA/ELPA/Emacsmirror: -;(package! builtin-package :recipe (:nonrecursive t)) -;(package! builtin-package-2 :recipe (:repo "myfork/package")) - -;; Specify a `:branch' to install a package from a particular branch or tag. -;; This is required for some packages whose default branch isn't 'master' (which -;; our package manager can't deal with; see raxod502/straight.el#279) -;(package! builtin-package :recipe (:branch "develop")) - -;; (package! hledger-mode) - -(load-file "~/.doom.d/packages.local.el") diff --git a/emacs/.doom.d/config.el b/emacs/.doom.d/config.el new file mode 100644 index 0000000..676f9d4 --- /dev/null +++ b/emacs/.doom.d/config.el @@ -0,0 +1,157 @@ +;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- + +;; Place your private configuration here! Remember, you do not need to run 'doom +;; sync' after modifying this file! + + +;; Some functionality uses this to identify you, e.g. GPG configuration, email +;; clients, file templates and snippets. +(setq user-full-name "KJ Orbekk" + user-mail-address "kj@orbekk.com") + +;; Doom exposes five (optional) variables for controlling fonts in Doom. Here +;; are the three important ones: +;; +;; + `doom-font' +;; + `doom-variable-pitch-font' +;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for +;; presentations or streaming. +;; +;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd +;; font string. You generally only need these two: +(setq doom-font (font-spec :family "monospace" :size 14)) + +;; 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-theme 'doom-nord) + +;; 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! +(setq org-directory "~/org/") +(use-package! org + :config + (setq org-todo-keywords + '((sequence + "TODO(t)" "ACTIVE(a!)" "WAIT(w@/!)" "|" "DONE(d!)" "CANCELED(c@)"))) + (setq org-refile-use-outline-path nil) + (setq org-refile-targets '((nil . (:maxlevel . 2))))) + +(setq org-log-into-drawer t) +(setq org-agenda-log-mode-items '(closed clock state)) +(setq org-agenda-files '("~/org/roam/todo.org")) + +(use-package! org-agenda + :config + (setq org-agenda-ndays 14) + (setq org-agenda-include-diary 1) + (setq org-agenda-todo-ignore-with-date 1) + (setq org-agenda-todo-ignore-scheduled 1) + (setq org-agenda-start-with-log-mode 1) + (setq org-agenda-window-setup 'current-window) + (setq org-agenda-custom-commands + '(("g" "Google agenda" + ((agenda "") + (todo "ACTIVE") + (alltodo)) + ))) + (setq org-capture-templates + `( + ("t" "Todo" entry (file+headline "~/org/roam/todo.org" "Inbox") + "* TODO %?\n %i\n %a") + ("d" "Daily review" entry (file+olp+datetree "~/org/review.org" "Daily") + (file "~/org/templates/daily-review.org") :tree-type week :jump-to-captured t) + ("w" "Weekly review" entry (file+olp+datetree "~/org/review.org" "Weekly") + (file "~/org/templates/weekly-review.org") :tree-type week :jump-to-captured t) + ("j" "Journal entry" entry (file+olp+datetree "~/org/journal.org" "Journal") + "* Journal entry\n%t\n\n%?" :tree-type week :jump-to-captured t) + ))) + +(use-package! org) +(use-package! org-roam + :after org + :init + (setq org-roam-directory "~/org/roam") + (setq org-roam-capture-templates + '( + ("d" "default" plain (function org-roam-capture--get-point) + "%?" + :file-name "%<%Y%m%d%H%M%S>-${slug}" + :head "#+TITLE: ${title}\n- tags :: [[file:%<%Y-W%W>.org][%<%Y-W%W>]]" + :unnarrowed t) + ))) + +(setq deft-directory "~/org/") +(setq deft-recursive t) + +;; 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 t) + +;; Here are some additional functions/macros that could 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 get information about any of these functions/macros, move the cursor over +;; the highlighted symbol at press 'K' (non-evil users must press 'C-c g k'). +;; This will open documentation for it, including demos of how they are used. +;; +;; You can also try 'gd' (or 'C-c g d') to jump to their definition and see how +;; they are implemented. + +(after! smartparens + (smartparens-global-mode -1)) + +(after! mu4e-maildirs-extension + (mu4e-maildirs-extension)) +(after! mu4e + (remove-hook 'mu4e-compose-mode-hook #'org-mu4e-compose-org-mode)) + +;; (setq hledger-jfile "~/.hledger.journal") + +;; (use-package! hledger-mode +;; :defer t +;; :mode ("\\.journal\\'" "\\.hledger\\'") +;; :commands hledger-enable-reporting +;; :preface +;; (defun hledger/next-entry () +;; "Move to next entry and pulse." +;; (interactive) +;; (hledger-next-or-new-entry) +;; (hledger-pulse-momentary-current-entry)) + +;; (defface hledger-warning-face +;; '((((background dark)) +;; :background "Red" :foreground "White") +;; (((background light)) +;; :background "Red" :foreground "White") +;; (t :inverse-video t)) +;; "Face for warning" +;; :group 'hledger) + +;; (defun hledger/prev-entry () +;; "Move to last entry and pulse." +;; (interactive) +;; (hledger-backward-entry) +;; (hledger-pulse-momentary-current-entry)) + +;; :config +;; (set-company-backend! 'hledger-mode '(hledger-company)) + +;; (map! :map hledger-mode-map +;; "M-p" #'hledger/prev-entry +;; "M-n" #'hledger/next-entry +;; :localleader +;; "e" #'hledger-jentry +;; "j" #'hledger-run-command) +;; ) + +(add-to-list 'auto-mode-alist '("\\.journal\\'" . ledger-mode)) + +(load-file "~/.doom.d/config.local.el") diff --git a/emacs/.doom.d/config.local.el b/emacs/.doom.d/config.local.el new file mode 100644 index 0000000..e69de29 diff --git a/emacs/.doom.d/init.el b/emacs/.doom.d/init.el new file mode 100644 index 0000000..4a887c9 --- /dev/null +++ b/emacs/.doom.d/init.el @@ -0,0 +1,179 @@ +;;; init.el -*- lexical-binding: t; -*- + +;; This file controls what Doom modules are enabled and what order they load +;; in. Remember to run 'doom sync' after modifying it! + +;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's +;; documentation. There you'll find information about all of Doom's +;; modules and what flags they support. + +;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or +;; 'C-c g k' for non-vim users) to view its documentation. This works on +;; flags as well (those symbols that start with a plus). +;; +;; Alternatively, press 'gd' (or 'C-c g d') on a module to browse its +;; directory (for easy access to its source code). +(load-file "~/.doom.d/init.local.el") + +(doom! :input + ;;chinese + ;;japanese + + :completion + company ; the ultimate code completion backend + ;;helm ; the *other* search engine for love and life + ;;ido ; the other *other* search engine... + ivy ; a search engine for love and life + + :ui + deft ; notational velocity for Emacs + doom ; what makes DOOM look the way it does + doom-dashboard ; a nifty splash screen for Emacs + doom-quit ; DOOM quit-message prompts when you quit Emacs + ;;fill-column ; a `fill-column' indicator + hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW + ;;hydra + ;;indent-guides ; highlighted indent columns + ;;minimap ; show a map of the code on the side + modeline ; snazzy, Atom-inspired modeline, plus API + ;;nav-flash ; blink cursor line after big motions + ;;neotree ; a project drawer, like NERDTree for vim + ophints ; highlight the region an operation acts on + (popup +defaults) ; tame sudden yet inevitable temporary windows + ;;pretty-code ; ligatures or substitute text with pretty symbols + ;;tabs ; an tab bar for Emacs + ;;treemacs ; a project drawer, like neotree but cooler + ;;unicode ; extended unicode support for various languages + vc-gutter ; vcs diff in the fringe + vi-tilde-fringe ; fringe tildes to mark beyond EOB + window-select ; visually switch windows + workspaces ; tab emulation, persistence & separate workspaces + ;;zen ; distraction-free coding or writing + + :editor + (evil +everywhere); come to the dark side, we have cookies + file-templates ; auto-snippets for empty files + fold ; (nigh) universal code folding + (format +onsave) ; automated prettiness + ;;god ; run Emacs commands without modifier keys + ;;lispy ; vim for lisp, for people who don't like vim + multiple-cursors ; editing in many places at once + ;;objed ; text object editing for the innocent + ;;parinfer ; turn lisp into python, sort of + ;;rotate-text ; cycle region at point between text candidates + snippets ; my elves. They type so I don't have to + ;;word-wrap ; soft wrapping with language-aware indent + + :emacs + dired ; making dired pretty [functional] + electric ; smarter, keyword-based electric-indent + ;;ibuffer ; interactive buffer management + undo ; persistent, smarter undo for your inevitable mistakes + vc ; version-control and Emacs, sitting in a tree + + :term + ;;eshell ; the elisp shell that works everywhere + shell ; simple shell REPL for Emacs + ;;term ; basic terminal emulator for Emacs + ;;vterm ; the best terminal emulation in Emacs + + :checkers + syntax ; tasing you for every semicolon you forget + ;;spell ; tasing you for misspelling mispelling + ;;grammar ; tasing grammar mistake every you make + + :tools + ;;ansible + ;;debugger ; FIXME stepping through code, to help you add bugs + ;;direnv + ;;docker + ;;editorconfig ; let someone else argue about tabs vs spaces + ;;ein ; tame Jupyter notebooks with emacs + (eval +overlay) ; run code, run (also, repls) + ;;gist ; interacting with github gists + lookup ; navigate your code and its documentation + ;;lsp + ;;macos ; MacOS-specific commands + magit ; a git porcelain for Emacs + ;;make ; run make tasks from Emacs + ;;pass ; password manager for nerds + ;;pdf ; pdf enhancements + ;;prodigy ; FIXME managing external services & code builders + ;;rgb ; creating color strings + ;;taskrunner ; taskrunner for all your projects + ;;terraform ; infrastructure as code + ;;tmux ; an API for interacting with tmux + ;;upload ; map local to remote projects via ssh/ftp + + :lang + ;;agda ; types of types of types of types... + cc ; C/C++/Obj-C madness + ;;clojure ; java with a lisp + ;;common-lisp ; if you've seen one lisp, you've seen them all + ;;coq ; proofs-as-programs + ;;crystal ; ruby at the speed of c + ;;csharp ; unity, .NET, and mono shenanigans + data ; config/data formats + ;;(dart +flutter) ; paint ui and not much else + ;;elixir ; erlang done right + ;;elm ; care for a cup of TEA? + emacs-lisp ; drown in parentheses + ;;erlang ; an elegant language for a more civilized age + ;;ess ; emacs speaks statistics + ;;faust ; dsp, but you get to keep your soul + ;;fsharp ; ML stands for Microsoft's Language + ;;fstar ; (dependent) types and (monadic) effects and Z3 + ;;(go +lsp) ; the hipster dialect + ;;(haskell +dante) ; a language that's lazier than I am + ;;hy ; readability of scheme w/ speed of python + ;;idris ; + ;;json ; At least it ain't XML + ;;(java +meghanada) ; the poster child for carpal tunnel syndrome + ;;javascript ; all(hope(abandon(ye(who(enter(here)))))) + ;;julia ; a better, faster MATLAB + ;;kotlin ; a better, slicker Java(Script) + ;;latex ; writing papers in Emacs has never been so fun + ;;lean + ;;factor + ledger ; an accounting system in Emacs + ;;lua ; one-based indices? one-based indices + markdown ; writing docs for people to ignore + ;;nim ; python + lisp at the speed of c + ;;nix ; I hereby declare "nix geht mehr!" + ;;ocaml ; an objective camel + (org +journal +roam) ; organize your plain life in plain text + ;;perl ; write code no one else can comprehend + ;;php ; perl's insecure younger brother + ;;plantuml ; diagrams for confusing people more + ;;purescript ; javascript, but functional + python ; beautiful is better than ugly + ;;qt ; the 'cutest' gui framework ever + ;;racket ; a DSL for DSLs + ;;rest ; Emacs as a REST client + ;;rst ; ReST in peace + ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} + rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + ;;scala ; java, but good + ;;scheme ; a fully conniving family of lisps + sh ; she sells {ba,z,fi}sh shells on the C xor + ;;sml + ;;solidity ; do you need a blockchain? No. + ;;swift ; who asked for emoji variables? + ;;terra ; Earth and Moon in alignment for performance. + web ; the tubes + ;;yaml ; JSON, but readable + + :email + mu4e + ;;notmuch + ;;(wanderlust +gmail) + + :app + ;;calendar + ;;irc ; how neckbeards socialize + ;;(rss +org) ; emacs as an RSS reader + ;;twitter ; twitter client https://twitter.com/vnought + + :config + ;;literate + (default +bindings)) diff --git a/emacs/.doom.d/init.local.el b/emacs/.doom.d/init.local.el new file mode 100644 index 0000000..e69de29 diff --git a/emacs/.doom.d/packages.el b/emacs/.doom.d/packages.el new file mode 100644 index 0000000..95c7e51 --- /dev/null +++ b/emacs/.doom.d/packages.el @@ -0,0 +1,51 @@ +;; -*- no-byte-compile: t; -*- +;;; $DOOMDIR/packages.el + +;; To install a package with Doom you must declare them here, run 'doom sync' on +;; the command line, then restart Emacs for the changes to take effect. +;; Alternatively, use M-x doom/reload. + + +;; Doom's packages are pinned to a specific commit and updated from release to +;; release. The `unpin!' macro allows you to unpin single packages... +;(unpin! pinned-package) +;; ...or multiple packages +;(unpin! pinned-package another-pinned-package) +;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) +;(unpin! t) + + +;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: +;(package! some-package) + +;; To install a package directly from a particular repo, you'll need to specify +;; a `:recipe'. You'll find documentation on what `:recipe' accepts here: +;; https://github.com/raxod502/straight.el#the-recipe-format +;(package! another-package +; :recipe (:host github :repo "username/repo")) + +;; If the package you are trying to install does not contain a PACKAGENAME.el +;; file, or is located in a subdirectory of the repo, you'll need to specify +;; `:files' in the `:recipe': +;(package! this-package +; :recipe (:host github :repo "username/repo" +; :files ("some-file.el" "src/lisp/*.el"))) + +;; If you'd like to disable a package included with Doom, for whatever reason, +;; you can do so here with the `:disable' property: +;(package! builtin-package :disable t) + +;; You can override the recipe of a built in package without having to specify +;; all the properties for `:recipe'. These will inherit the rest of its recipe +;; from Doom or MELPA/ELPA/Emacsmirror: +;(package! builtin-package :recipe (:nonrecursive t)) +;(package! builtin-package-2 :recipe (:repo "myfork/package")) + +;; Specify a `:branch' to install a package from a particular branch or tag. +;; This is required for some packages whose default branch isn't 'master' (which +;; our package manager can't deal with; see raxod502/straight.el#279) +;(package! builtin-package :recipe (:branch "develop")) + +;; (package! hledger-mode) + +(load-file "~/.doom.d/packages.local.el") diff --git a/emacs/.doom.d/packages.local.el b/emacs/.doom.d/packages.local.el new file mode 100644 index 0000000..e69de29 diff --git a/emacs/.emacs.d b/emacs/.emacs.d new file mode 160000 index 0000000..bba035a --- /dev/null +++ b/emacs/.emacs.d @@ -0,0 +1 @@ +Subproject commit bba035a1a2000f1df9ee907040e1eccbee5bc949 diff --git a/old/Xresources b/old/Xresources new file mode 100644 index 0000000..0653342 --- /dev/null +++ b/old/Xresources @@ -0,0 +1,71 @@ +*customization: -color +! urxvt*font: xft:dejavu sans mono:pixelsize=22:antialias=true +!urxvt*font: xft:DejaVu Sans Mono:pixelsize=20:antialias=true:hinting=true +urxvt*font: xft:iosevka term:size=14,xft:dejavu sans mono:size=14 +!urxvt*letterSpace: -5 +!urxvt*font: xft:fira code:pixelsize=22:antialias=true +!urxvt*font: xft:inconsolata:size=18:antialias=true +urxvt*scrollBar: false +URxvt*termName: xterm-256color +Xterm*termName: xterm-256color + +Xft.lcdfilter: lcddefault +Xft.dpi: 96 +Xft.antialias: true +Xft.rgba: rgb +Xft.hinting: true +Xft.hintstyle: hintslight + + +URxvt.keysym.M-c: perl:clipboard:copy +URxvt.keysym.M-v: perl:clipboard:paste +URxvt.saveLines: 40000 + +URxvt.perl-ext-common: default,matcher,resize-font,clipboard +URxvt.clipboard.autocopy: true +URxvt.resize-font.smaller: C-Down +URxvt.resize-font.bigger: C-Up +URxvt.iso14755: false +URxvt.iso14755_52: false +URxvt.url-launcher: /usr/bin/xdg-open +URxvt.matcher.button: 1 + +#define nord0 #2E3440 +#define nord1 #3B4252 +#define nord2 #434C5E +#define nord3 #4C566A +#define nord4 #D8DEE9 +#define nord5 #E5E9F0 +#define nord6 #ECEFF4 +#define nord7 #8FBCBB +#define nord8 #88C0D0 +#define nord9 #81A1C1 +#define nord10 #5E81AC +#define nord11 #BF616A +#define nord12 #D08770 +#define nord13 #EBCB8B +#define nord14 #A3BE8C +#define nord15 #B48EAD + +*.foreground: nord6 +*.background: nord0 +*.cursorColor: nord4 +*fading: 15 +*fadeColor: nord3 + +*.color0: nord1 +*.color1: nord11 +*.color2: nord14 +*.color3: nord13 +*.color4: nord9 +*.color5: nord15 +*.color6: nord8 +*.color7: nord5 +*.color8: nord3 +*.color9: nord11 +*.color10: nord14 +*.color11: nord13 +*.color12: nord9 +*.color13: nord15 +*.color14: nord7 +*.color15: nord6 diff --git a/old/Xresources-aji b/old/Xresources-aji new file mode 100644 index 0000000..61ee782 --- /dev/null +++ b/old/Xresources-aji @@ -0,0 +1,48 @@ +urxvt*font: xft:dejavu sans mono:size=10:antialias=true +!urxvt*font: xft:inconsolata:size=14:antialias=true +urxvt*scrollBar: false + +Xterm*termName: xterm-256color +URxvt*termName: xterm-256color + +Xft.lcdfilter: lcddefault +Xft.dpi: 96 +Xft.antialias: true +Xft.rgba: rgb +Xft.hinting: true +Xft.hintstyle: hintslight + +URxvt.perl-lib: /home/orbekk/.urxvt/ext +URxvt.keysym.M-c: perl:clipboard:copy +URxvt.keysym.M-v: perl:clipboard:paste +URxvt.scrollBar: false +URxvt.saveLines: 40000 +URxvt.perl-ext-common: default,matcher,resize-font,clipboard +URxvt.clipboard.autocopy: true +URxvt.resize-font.smaller: C-Down +URxvt.resize-font.bigger: C-Up +URxvt.iso14755: false +URxvt.iso14755_52: false +URxvt.url-launcher: /usr/bin/xdg-open +URxvt.matcher.button: 1 + +urxvt*foreground: white +urxvt*background: black + +! #2E3436 +*color0: #000000 +*color1: #a40000 +*color2: #4E9A06 +*color3: #C4A000 +*color4: #3465A4 +*color5: #75507B +*color6: #ce5c00 +*color7: #babdb9 +*color8: #555753 +*color9: #EF2929 +*color10: #8AE234 +*color11: #FCE94F +*color12: #729FCF +*color13: #AD7FA8 +*color14: #fcaf3e +*color15: #EEEEEC diff --git a/old/Xresources-orange b/old/Xresources-orange new file mode 100644 index 0000000..0169c37 --- /dev/null +++ b/old/Xresources-orange @@ -0,0 +1,107 @@ +*customization: -color +Xterm*termName: xterm-256color +URxvt*termName: xterm-256color + +Xft.lcdfilter: lcddefault +Xft.dpi: 96 +Xft.antialias: true +Xft.rgba: rgb +Xft.hinting: true +Xft.hintstyle: hintslight + +!! Droid Sans Mono +!URxvt.font: xft:Droid Sans Mono-9:hinting=True;antialias:True,xft:Bitstream Vera Sans Mono,9x15 +!urxvt*font: xft:bitstream vera sans mono:size=10:antialias=true +!URxvt.font: xft:Fira Code:pixelsize=12,hinting=True,antialias:True,style=regular +URxvt.font: xft:Fira Code:pixelsize=14,hinting=True,antialias=True +!URxvt.letterSpace: -1 +URxvt.keysym.M-c: perl:clipboard:copy +URxvt.keysym.M-v: perl:clipboard:paste +URxvt.scrollBar: false +URxvt.saveLines: 40000 + +URxvt.perl-ext-common: default,matcher,resize-font,clipboard +URxvt.clipboard.autocopy: true +URxvt.resize-font.smaller: C-Down +URxvt.resize-font.bigger: C-Up +URxvt.iso14755: false +URxvt.iso14755_52: false + +URxvt.url-launcher: /usr/bin/xdg-open +URxvt.matcher.button: 1 + +!urxvt*foreground: white +!urxvt*background: black + +! Base16 Monokai +! Scheme: Wimer Hazenberg (http://www.monokai.nl) + +! #define base00 #272822 +! #define base01 #383830 +! #define base02 #49483e +! #define base03 #75715e +! #define base04 #a59f85 +! #define base05 #f8f8f2 +! #define base06 #f5f4f1 +! #define base07 #f9f8f5 +! #define base08 #f92672 +! #define base09 #fd971f +! #define base0A #f4bf75 +! #define base0B #a6e22e +! #define base0C #a1efe4 +! #define base0D #66d9ef +! #define base0E #ae81ff +! #define base0F #cc6633 + +! Base16 Spacemacs + +#define base00 #1f2022 +#define base01 #282828 +#define base02 #444155 +#define base03 #585858 +#define base04 #b8b8b8 +#define base05 #e3e3e3 +#define base06 #e8e8e8 +#define base07 #f8f8f8 +#define base08 #f2241f +#define base09 #ffa500 +#define base0A #b1951d +#define base0B #67b11d +#define base0C #2d9574 +#define base0D #4f97d7 +#define base0E #a31db1 +#define base0F #b03060 + +*.foreground: base05 +*.background: base00 +!URxvt*depth: 32 +!URxvt*background: rgba:0000/0000/0200/c800 +*.cursorColor: base05 + +*.color0: base00 +*.color1: base08 +*.color2: base0B +*.color3: base0A +*.color4: base0D +*.color5: base0E +*.color6: base0C +*.color7: base05 + +*.color8: base03 +*.color9: base08 +*.color10: base0B +*.color11: base0A +*.color12: base0D +*.color13: base0E +*.color14: base0C +*.color15: base07 + +! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt), +! use 'shell' template to set these if necessary +*.color16: base09 +*.color17: base0F +*.color18: base01 +*.color19: base02 +*.color20: base04 +*.color21: base06 + diff --git a/old/Xresources-pincer b/old/Xresources-pincer new file mode 100644 index 0000000..d90a24d --- /dev/null +++ b/old/Xresources-pincer @@ -0,0 +1,101 @@ +*customization: -color +! urxvt*font: xft:dejavu sans mono:pixelsize=22:antialias=true +!urxvt*font: xft:DejaVu Sans Mono:pixelsize=20:antialias=true:hinting=true +urxvt*font: xft:fira code:pixelsize=22:antialias=true:hinting=true +!urxvt*letterSpace: -5 +!urxvt*font: xft:fira code:pixelsize=22:antialias=true +!urxvt*font: xft:inconsolata:size=18:antialias=true +urxvt*scrollBar: false +URxvt*termName: xterm-256color +Xterm*termName: xterm-256color + +Xcursor.size: 24 + +Xft.lcdfilter: lcddefault +Xft.dpi: 96 +Xft.antialias: true +Xft.rgba: rgb +Xft.hinting: true +Xft.hintstyle: hintslight + + +URxvt.keysym.M-c: perl:clipboard:copy +URxvt.keysym.M-v: perl:clipboard:paste +URxvt.saveLines: 40000 + +URxvt.perl-ext-common: default,matcher,resize-font,clipboard +URxvt.clipboard.autocopy: true +URxvt.resize-font.smaller: C-Down +URxvt.resize-font.bigger: C-Up +URxvt.iso14755: false +URxvt.iso14755_52: false +URxvt.url-launcher: /usr/bin/xdg-open +URxvt.matcher.button: 1 + +urxvt*foreground: white +urxvt*background: black + +*color0: #2E3436 +*color1: #a40000 +*color2: #4E9A06 +*color3: #C4A000 +*color4: #3465A4 +*color5: #75507B +*color6: #ce5c00 +*color7: #babdb9 +*color8: #555753 +*color9: #EF2929 +*color10: #8AE234 +*color11: #FCE94F +*color12: #729FCF +*color13: #AD7FA8 +*color14: #fcaf3e +*color15: #EEEEEC + +! #define base00 #272822 +! #define base01 #383830 +! #define base02 #49483e +! #define base03 #75715e +! #define base04 #a59f85 +! #define base05 #f8f8f2 +! #define base06 #f5f4f1 +! #define base07 #f9f8f5 +! #define base08 #f92672 +! #define base09 #fd971f +! #define base0A #f4bf75 +! #define base0B #a6e22e +! #define base0C #a1efe4 +! #define base0D #66d9ef +! #define base0E #ae81ff +! #define base0F #cc6633 +! +! *.foreground: base05 +! *.background: base00 +! *.cursorColor: base05 +! +! *.color0: base00 +! *.color1: base08 +! *.color2: base0B +! *.color3: base0A +! *.color4: base0D +! *.color5: base0E +! *.color6: base0C +! *.color7: base05 +! +! *.color8: base03 +! *.color9: base08 +! *.color10: base0B +! *.color11: base0A +! *.color12: base0D +! *.color13: base0E +! *.color14: base0C +! *.color15: base07 +! +! ! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt), +! ! use 'shell' template to set these if necessary +! *.color16: base09 +! *.color17: base0F +! *.color18: base01 +! *.color19: base02 +! *.color20: base04 +! *.color21: base06 diff --git a/test-vm.nix b/test-vm.nix index 359e081..343c73f 100644 --- a/test-vm.nix +++ b/test-vm.nix @@ -61,7 +61,10 @@ in ''; serviceConfig = { User = "orbekk"; + Type = "oneshot"; + RemainAfterExit = true; }; - wantedBy = ["default.target" "display-manager.service"]; + requiredBy = ["default.target" ]; + before = ["display-manager.service"]; }; } diff --git a/zgen b/zgen index 09f5425..0b669d2 160000 --- a/zgen +++ b/zgen @@ -1 +1 @@ -Subproject commit 09f542515e20ac655a4aa429cf9604fe698ccf42 +Subproject commit 0b669d2d0dcf788b4c81a7a30b4fa41dfbf7d1a7 diff --git a/zsh/.zshenv b/zsh/.zshenv new file mode 100644 index 0000000..37adc73 --- /dev/null +++ b/zsh/.zshenv @@ -0,0 +1,4 @@ +export EDITOR=nvim +export TERMINAL=urxvt +export EMACSDIR=$HOME/.emacs.d +PATH="$HOME/bin:$HOME/.emacs.d/bin:$PATH" diff --git a/zsh/.zshrc b/zsh/.zshrc new file mode 100644 index 0000000..bc1bb37 --- /dev/null +++ b/zsh/.zshrc @@ -0,0 +1,17 @@ +# Resources: +# https://github.com/mika/zsh-pony + +bindkey -e + +fpath+=$HOME/.zsh/pure + +autoload -Uz compinit; compinit +autoload -Uz promptinit; promptinit + +zstyle ':completion:*' menu select +zstyle ':completion::complete:*' gain-privileges 1 +zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS} + +setopt append_history share_history histignorealldups + +prompt pure diff --git a/zsh/dot-zshenv b/zsh/dot-zshenv deleted file mode 100644 index 6c6fb69..0000000 --- a/zsh/dot-zshenv +++ /dev/null @@ -1,5 +0,0 @@ -export EDITOR=nvim -export TERMINAL=urxvt - -typeset -U path PATH -path=("$HOME/bin" "$path[@]") diff --git a/zsh/dot-zshrc b/zsh/dot-zshrc deleted file mode 100644 index bc1bb37..0000000 --- a/zsh/dot-zshrc +++ /dev/null @@ -1,17 +0,0 @@ -# Resources: -# https://github.com/mika/zsh-pony - -bindkey -e - -fpath+=$HOME/.zsh/pure - -autoload -Uz compinit; compinit -autoload -Uz promptinit; promptinit - -zstyle ':completion:*' menu select -zstyle ':completion::complete:*' gain-privileges 1 -zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS} - -setopt append_history share_history histignorealldups - -prompt pure -- cgit v1.2.3