diff --git a/.gitignore b/.gitignore index db0c6b02..ae1623d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -/music-normalize/venv/ +/music-normalize/.venv/ /music-normalize/*.log /easyffmpeg/venv/ -/venv/ +/.venv/ /ffmpeg2pass-0.log diff --git a/music-normalize/venv b/music-normalize/.venv similarity index 100% rename from music-normalize/venv rename to music-normalize/.venv diff --git a/requirements.txt b/requirements.txt new file mode 120000 index 00000000..f70d3db5 --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +music-normalize/requirements.txt \ No newline at end of file diff --git a/roles/config/files/.config/doom/config.el b/roles/config/files/.config/doom/config.el index e3eac779..144cd6a7 100644 --- a/roles/config/files/.config/doom/config.el +++ b/roles/config/files/.config/doom/config.el @@ -5,24 +5,29 @@ ;; Some functionality uses this to identify you, e.g. GPG configuration, email -;; clients, file templates and snippets. +;; clients, file templates and snippets. It is optional. (setq user-full-name "exu" user-mail-address "mrc@frm01.net") -;; Doom exposes five (optional) variables for controlling fonts in Doom. Here -;; are the three important ones: +;; Doom exposes five (optional) variables for controlling fonts in Doom: ;; -;; + `doom-font' -;; + `doom-variable-pitch-font' -;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for +;; - `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-symbol-font' -- for symbols +;; - `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: ;; -;; 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 12 :weight 'semi-light) -;; doom-variable-pitch-font (font-spec :family "sans" :size 13)) (setq doom-font (font-spec :family "monospace" :size 11.0 :weight 'regular) doom-variable-pitch-font (font-spec :family "sans" :size 12.0)) +;; +;; 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 @@ -30,16 +35,29 @@ (setq catppuccin-flavor 'macchiato) (setq doom-theme 'catppuccin) -;; 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/") - ;; 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 display-line-numbers-type t) + +;; 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/") -;; Here are some additional functions/macros that could help you configure Doom: +;; 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 @@ -52,20 +70,15 @@ ;; 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 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. -;; Enables the minimap by default. Use SPC-t-m to toggle -;;(minimap-mode 1) - (setq projectile-project-search-path '("~/GitProjects/")) -;; autoload magit -;;(require 'magit-gitflow) -;;(add-hook 'magit-mode-hook 'turn-on-magit-gitflow) - (after! hl-todo (setq hl-todo-keyword-faces '(("TODO" . "#EACD4B") @@ -76,9 +89,6 @@ ("REVIEW" . "#3DADC6") ("OHGODTHEHORROR" . "#FC7702")))) -;; Less delay for company to show up -(setq company-idle-delay 0) - ;; Set tab width to 4 spaces (setq-default indent-tabs-mode nil) (setq-default tab-width 4) @@ -87,17 +97,17 @@ ;; enable case insensitive matching for 'auto-mode-alist' ;; see https://www.gnu.org/software/emacs/manual/html_node/emacs/Choosing-Modes.html ;; disabled by doom-start.el -(setq auto-mode-case-fold t) +;; (setq auto-mode-case-fold t) ;; work around emacs hanging when opening any python requirements.txt file ;; see issue https://github.com/doomemacs/doomemacs/issues/5998 -(advice-add #'pip-requirements-fetch-packages :override #'ignore) +;; (advice-add #'pip-requirements-fetch-packages :override #'ignore) ;; Enable nimlangserver for nim files -;;(add-hook 'nim-mode-hook #'lsp) +;; (add-hook 'nim-mode-hook #'lsp) ;; Disable formatter for php -(setq-hook! 'php-mode-hook +format-with :none) +;; (setq-hook! 'php-mode-hook +format-with :none) ;; auto-virtualenv package configuration (use-package! auto-virtualenv @@ -108,8 +118,8 @@ ) ;; python debugging -(after! dap-mode - (setq dap-python-debugger 'debugpy)) +;; (after! dap-mode +;; (setq dap-python-debugger 'debugpy)) ;; justfile recipe execution (use-package! justl @@ -153,6 +163,18 @@ (add-to-list 'auto-mode-alist '("\\.pod\\'" . conf-unix-mode)) (add-to-list 'auto-mode-alist '("\\.container\\'" . conf-unix-mode)) -(setq-local completion-at-point-functions - (mapcar #'cape-company-to-capf - (list #'company-ansible))) +;; Corfu configuration +(setq corfu-auto t + corfu-auto-delay 0.1 + corfu-auto-prefix 2) +(add-hook 'corfu-mode-hook + (lambda () + ;; Settings only for Corfu + (setq-local completion-styles '(basic) + completion-category-overrides nil + completion-category-defaults nil) + ;; Cape (used by corfu) configuration + (setq-local completion-at-point-functions + (mapcar #'cape-company-to-capf + (list #'company-ansible))) + )) diff --git a/roles/config/files/.config/doom/init.el b/roles/config/files/.config/doom/init.el index 8e39f6f9..105974b2 100644 --- a/roles/config/files/.config/doom/init.el +++ b/roles/config/files/.config/doom/init.el @@ -35,7 +35,6 @@ ;;doom-quit ; DOOM quit-message prompts when you quit Emacs ;;(emoji +unicode) ; 🙂 hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW/OHGODTHEHORROR - ;;hydra indent-guides ; highlighted indent columns ;;ligatures ; ligatures and symbols to make your code pretty again ;;minimap ; show a map of the code on the side @@ -56,20 +55,21 @@ :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 + fold ; (nigh) universal code folding + (format +onsave +lsp) ; 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 + ;;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 + ;;eww ; the internet is gross ;;ibuffer ; interactive buffer management undo ; persistent, smarter undo for your inevitable mistakes vc ; version-control and Emacs, sitting in a tree @@ -81,15 +81,15 @@ vterm ; the best terminal emulation in Emacs :checkers - syntax ; tasing you for every semicolon you forget + (syntax +flymake +icons) ; tasing you for every semicolon you forget ;;(spell +flyspell) ; tasing you for misspelling mispelling - grammar ; tasing grammar mistake every you make + ;;grammar ; tasing grammar mistake every you make :tools ansible ;;biblio ; Writes a PhD for you (citation needed) ;;collab ; buffers with friends - (debugger) ; FIXME stepping through code, to help you add bugs + (debugger +lsp) ; FIXME stepping through code, to help you add bugs ;;direnv (docker +lsp) editorconfig ; let someone else argue about tabs vs spaces @@ -102,16 +102,14 @@ ;;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 + (terraform +lsp) ; infrastructure as code ;;tmux ; an API for interacting with tmux tree-sitter ; syntax and parsing, sitting in a tree... ;;upload ; map local to remote projects via ssh/ftp :os (:if (featurep :system 'macos) macos) ; improve compatibility with macOS - (tty +osc) ; improve the terminal Emacs experience + ;;tty ; improve the terminal Emacs experience :lang ;;agda ; types of types of types of types... @@ -125,7 +123,7 @@ ;;data ; config/data formats ;;(dart +flutter) ; paint ui and not much else ;;dhall - (elixir +lsp +tree-sitter) ; erlang done right + ;;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 @@ -141,7 +139,7 @@ ;;(haskell +lsp) ; a language that's lazier than I am ;;hy ; readability of scheme w/ speed of python ;;idris ; a language you can depend on - (json +tree-sitter) ; At least it ain't XML + (json +lsp +tree-sitter) ; At least it ain't XML ;;(java +lsp) ; the poster child for carpal tunnel syndrome (javascript +lsp +tree-sitter) ; all(hope(abandon(ye(who(enter(here)))))) ;;julia ; a better, faster MATLAB @@ -150,13 +148,14 @@ ;;lean ; for folks with too much to prove ;;ledger ; be audit you can be ;;lua ; one-based indices? one-based indices - (markdown +tree-sitter) ; writing docs for people to ignore + 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 ; organize your plain life in plain text (php +tree-sitter) ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more + ;;graphviz ; diagrams for confusing yourself even more ;;purescript ; javascript, but functional (python +lsp +pyright +tree-sitter) ; beautiful is better than ugly ;;qt ; the 'cutest' gui framework ever @@ -188,7 +187,6 @@ ;;everywhere ; *leave* Emacs!? You must be joking ;;irc ; how neckbeards socialize ;;(rss +org) ; emacs as an RSS reader - ;;twitter ; twitter client https://twitter.com/vnought :config ;;literate diff --git a/roles/config/files/.config/doom/packages.el b/roles/config/files/.config/doom/packages.el index 85a2a332..5c1f32e6 100644 --- a/roles/config/files/.config/doom/packages.el +++ b/roles/config/files/.config/doom/packages.el @@ -3,51 +3,50 @@ ;; To install a package with Doom you must declare them here and run 'doom sync' ;; on the command line, then restart Emacs for the changes to take effect -- or -;; use 'M-x doom/reload'. ;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: -;;(package! some-package) +;; (package! some-package) ;; To install a package directly from a remote git repo, you must 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")) +;; https://github.com/radian-software/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"))) +;; (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, you can do so here ;; with the `:disable' property: -;;(package! builtin-package :disable t) +;; (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")) +;; (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")) +;; our package manager can't deal with; see radian-software/straight.el#279) +;; (package! builtin-package :recipe (:branch "develop")) ;; Use `:pin' to specify a particular commit to install. -;;(package! builtin-package :pin "1a2b3c4d5e") +;; (package! builtin-package :pin "1a2b3c4d5e") ;; 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) +;; (unpin! pinned-package) ;; ...or multiple packages -;;(unpin! pinned-package another-pinned-package) +;; (unpin! pinned-package another-pinned-package) ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) -;;(unpin! t) +;; (unpin! t) ;; auto-virtualenv package install (package! auto-virtualenv)