From 09a4099586657170cbdcff071b2d0fac5ed133b7 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Thu, 28 May 2026 02:12:40 -0700 Subject: oni-yasnippet: Move all snippets to ‘oni-yasnippet’ There is no real point in having them all separate. Having them all in a single place makes them much easier to manage. --- oni-css/Eldev | 13 --- oni-css/oni-css.el | 173 ----------------------------------- oni-css/snippets/css-mode/box-shadow | 5 - 3 files changed, 191 deletions(-) delete mode 100644 oni-css/Eldev delete mode 100644 oni-css/oni-css.el delete mode 100644 oni-css/snippets/css-mode/box-shadow (limited to 'oni-css') diff --git a/oni-css/Eldev b/oni-css/Eldev deleted file mode 100644 index 1ba3134..0000000 --- a/oni-css/Eldev +++ /dev/null @@ -1,13 +0,0 @@ -; -*- mode: emacs-lisp; lexical-binding: t -*- - -;; Uncomment some calls below as needed for your project. -(eldev-use-package-archive 'gnu-elpa) -;(eldev-use-package-archive 'nongnu-elpa) -(eldev-use-package-archive 'melpa) -(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin"))) - -(eldev-use-plugin 'autoloads) - -(setf eldev-files-to-package - `(:or ,eldev-files-to-package - '("*.el" "./snippets/**/*"))) diff --git a/oni-css/oni-css.el b/oni-css/oni-css.el deleted file mode 100644 index cf58284..0000000 --- a/oni-css/oni-css.el +++ /dev/null @@ -1,173 +0,0 @@ -;;; oni-css.el --- CSS configuration -*- lexical-binding: t; -*- - -;; Copyright (C) 2019 Tom Willemse - -;; Author: Tom Willemse -;; Keywords: local -;; Version: 2025.0617.123504 -;; Package-Requires: (oni-company oni-hydra rainbow-mode oni-yasnippet prettier-js) - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see . - -;;; Commentary: - -;; Configuration for `css-mode' and `scss-mode'. - -;;; Code: - -(require 'align) -(require 'css-mode) -(require 'hydra) -(require 'yasnippet) - -(eval-when-compile - (require 'compile) - (require 'grep)) - -(defconst oni-css-root - (file-name-directory - (or load-file-name - (buffer-file-name))) - "The directory where ‘oni-css’ was loaded from.") - -(defconst oni-css-snippets-dir - (expand-file-name "snippets" oni-css-root) - "The directory where ‘oni-css’ stores its snippets.") - -(defun oni-css-property-important-p () - "Return whether or not the current property is important." - (save-excursion - (beginning-of-line) - (re-search-forward "!important" (line-end-position) :noerror))) - -(defun oni-css-add-important () - "Add an important flag to the property on the current line." - (interactive) - (unless (oni-css-property-important-p) - (save-excursion - (end-of-line) - (when (re-search-backward ";" (line-beginning-position) :noerror) - (insert " !important"))))) - -(defun oni-css-snippets-initialize () - "Initialize the snippets for ‘oni-css’." - (when (boundp 'yas-snippet-dirs) - (add-to-list 'yas-snippet-dirs oni-css-snippets-dir t)) - (yas-load-directory oni-css-snippets-dir)) - -(defun oni-css-remove-important () - "Remove the important flag from the property on the current line." - (interactive) - (when (oni-css-property-important-p) - (save-excursion - (end-of-line) - (when (re-search-backward " !important" (line-beginning-position) :noerror) - (replace-match ""))))) - -(defun oni-css-mode-init--toggle-important () - "Toggle the important flag on the property on the current line." - (interactive) - (if (oni-css-property-important-p) - (oni-css-remove-important) - (oni-css-add-important))) - -(defun oni-css--auto-fill-mode () - "Enable ‘auto-fill-mode’ only for comments." - (setq-local comment-auto-fill-only-comments t) - (auto-fill-mode)) - -(defhydra css-mode-hydra (:color blue) - ("!" oni-css-mode-init--toggle-important)) - -(setq css-indent-offset 2) - -(add-hook 'css-mode-hook 'company-mode) -(add-hook 'css-mode-hook 'display-fill-column-indicator-mode) -(add-hook 'css-mode-hook 'electric-indent-local-mode) -(add-hook 'css-mode-hook 'electric-pair-local-mode) -(add-hook 'css-mode-hook 'oni-css--auto-fill-mode) -(add-hook 'css-mode-hook 'prettier-js-mode) -(add-hook 'css-mode-hook 'rainbow-mode) - -(with-eval-after-load 'compile - (let ((scss-error-regexp - (rx (and bol - (zero-or-more space) "on line " - (group (one-or-more digit)) " of " - (group (one-or-more (or word punct (syntax symbol)))) - eol)))) - - (add-to-list 'compilation-error-regexp-alist - (list scss-error-regexp 2 1 nil 2 2)))) - -(define-key css-mode-map (kbd "C-c m") #'css-mode-hydra/body) - -;; Align CSS files like so: - -;; body { color: #ffffff; } -;; .some-class { background-color: #ffffff; } -;; #some-id { width: 200px; } - -;; .some-more-class { -;; color: #ffffff; -;; background-color: #ffffff; -;; width: 200px; -;; } - -;; Keep these in order. They are each added to the _front_ of the -;; list and are applied in order. Changing their order will change -;; the results. -(add-to-list 'align-rules-list - `(css-closing-brace - (regexp . ,(rx (group (0+ whitespace)) "}" eol)) - (group . (1)) - (modes . '(scss-mode css-mode)))) - -(add-to-list 'align-rules-list - `(css-colons - (regexp . ,(rx bol - (0+ whitespace) - (1+ (any (?a . ?z) ?- ?$)) - ":" - (group (0+ whitespace)) - (0+ nonl) - ";" - eol)) - (group . (1)) - (modes . '(scss-mode css-mode)) - (repeat . t))) - -(add-to-list 'align-rules-list - `(css-opening-brace - (regexp . ,(rx bol - (0+ whitespace) - (0+ (any ?# ?. ?, ?\s ?& ?: ?- - (?a . ?z) (?A . ?Z) (?0 . ?9))) - (any (?a . ?z) (?A . ?Z) (?0 . ?9)) - (group (0+ whitespace)) - "{" - (0+ nonl))) - (group . (1)) - (modes . '(scss-mode css-mode)))) - -;;;###autoload -(with-eval-after-load 'grep - (add-to-list 'grep-files-aliases '("css" . "*.css *.less *.sass *.scss"))) - -(with-eval-after-load 'css-mode - (with-eval-after-load 'yasnippet - (oni-css-snippets-initialize))) - -(provide 'oni-css) -;;; oni-css.el ends here diff --git a/oni-css/snippets/css-mode/box-shadow b/oni-css/snippets/css-mode/box-shadow deleted file mode 100644 index 82fe9d5..0000000 --- a/oni-css/snippets/css-mode/box-shadow +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet; require-final-newline: nil -*- -# name: box-shadow -# key: boxshadow -# -- -box-shadow: ${1:offset-x} ${2:offset-y}${3: [blur-radius]}${4: [spread-radius]}${5: [color]}; \ No newline at end of file -- cgit v1.3-2-g0d8e