diff --git a/home/base.nix b/home/base.nix index ceb7ae4..716f9f7 100644 --- a/home/base.nix +++ b/home/base.nix @@ -197,7 +197,7 @@ write-info-json = true; embed-info-json = true; embed-chapters = true; - embed-metadate = true; + embed-metadata = true; write-subs = true; embed-subs = true; sub-langs = "en.*,ja"; diff --git a/home/desktop.nix b/home/desktop.nix index 612f642..0538d5f 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -149,6 +149,10 @@ logiops picard protonmail-bridge + (pkgs.python3.withPackages (python-pkgs: [ + python-pkgs.python-lsp-server + python-pkgs.python-lsp-ruff + ])) runelite thunderbird vcv-rack diff --git a/home/emacs/init.el b/home/emacs/init.el index 8b1c77c..8a533ef 100644 --- a/home/emacs/init.el +++ b/home/emacs/init.el @@ -3,6 +3,10 @@ ;;; Commentary: ;;; Code: +;; Check Emacs version and warn if it is not supported +(when (and (<= emacs-major-version 29) (< emacs-minor-version 4)) + (warn (format "This config is designed for Emacs 29+, please upgrade."))) + ;; display startup time (defun chase/display-startup-time () "Write init time and number of garbage collections to message buffer." @@ -27,17 +31,6 @@ (tool-bar-mode -1) (scroll-bar-mode -1))) -;; set repos and bootstrap use-package -;; (require 'package) - -;; (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) - -;; (package-initialize) - -;; (eval-when-compile - ;; (require 'use-package)) - -;; ;; bootstrap straight (defvar bootstrap-version) (let ((bootstrap-file @@ -57,9 +50,6 @@ (setq straight-use-package-by-default t) -;; always install missing packages -;; (require 'use-package-ensure) -;; (setq use-package-always-ensure t) (setq use-package-always-demand t use-package-compute-statistics t) @@ -72,16 +62,6 @@ :config (add-hook 'after-init-hook #'benchmark-init/deactivate)) -;; auto-update packages -;; (use-package auto-package-update -;; :custom -;; (setq auto-package-update-delete-old-versions t -;; auto-package-update-hide-results t -;; auto-package-update-interval 7) -;; :config -;; (auto-package-update-maybe) -;; (auto-package-update-at-time "09:30")) - ;; set locale (set-language-environment "UTF-8") (prefer-coding-system 'utf-8-unix) @@ -178,11 +158,6 @@ (add-hook 'prog-mode-hook #'display-line-numbers-mode) (add-hook 'text-mode #'display-line-numbers-mode) -;; center cursor -;; (use-package centered-cursor-mode -;; :config -;; (global-centered-cursor-mode)) - ;; move cursor to new help windows (setq help-window-select t) @@ -307,7 +282,7 @@ (use-package python :defer t :config - (setq python-flymake-command '("flake8" "-"))) + (setq python-flymake-command '("ruff" "--quiet" "--stdin-filename=stdin" "-"))) ;; eglot (use-package eglot @@ -371,15 +346,6 @@ (pdf-tools-install :no-query) (require 'pdf-occur)) -;; ;; helm -;; (use-package helm - ;; :config - ;; (global-set-key (kbd "M-x") #'helm-M-x) - ;; (global-set-key (kbd "C-x r b") #'helm-filtered-bookmarks) - ;; (global-set-key (kbd "C-x C-f") #'helm-find-files) - ;; (setq helm-ff-auto-update-initial-value 1) - ;; (helm-mode 1)) - ;; org stuff (use-package org :mode @@ -431,7 +397,7 @@ (setq org-refile-allow-creating-parent-nodes 'confirm org-refile-targets '(("projects.org" . (:level . 1)))) -;; source blocks + ;; source blocks (add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp")) (add-to-list 'org-structure-template-alist '("py" . "src python")) (add-to-list 'org-structure-template-alist '("sh" . "src shell")) @@ -562,24 +528,5 @@ (use-package emms) -;; exwm -;; (use-package exwm - ;; :config - ;; (add-hook 'exwm-update-class-hook - ;; (lambda () (exwm-workspace-rename-buffer exwm-class-name))) - ;; (setq exwm-input-global-keys - ;; `(([?\s-r] . exwm-reset) - ;; ([?\s-w] . exwm-workspace-switch) - ;; ([?\s-&] . (lambda (cmd) - ;; (interactive (list (read-shell-command "$ "))) - ;; (start-process-shell-command cmd nil cmd))) - ;; ,@(mapcar (lambda (i) - ;; `(,(kbd (format "s-%d" i)) - ;; (lambda () - ;; (interactive) - ;; (exwm-workspace-switch-create ,i)))) - ;; (number-sequence 0 9)))) - ;; (exwm-enable)) - (provide 'init) ;;; init.el ends here