Compare commits

...

10 commits

4 changed files with 22 additions and 25 deletions

View file

@ -60,17 +60,17 @@
(find-file (car org-cite-global-bibliography))) (find-file (car org-cite-global-bibliography)))
(keymap-global-set "C-c w b" #'my/open-global-bibliography) (keymap-global-set "C-c w b" #'my/open-global-bibliography)
#+end_src #+end_src
** RSS feeds file ** RSS feeds directory
#+begin_src emacs-lisp #+begin_src emacs-lisp
;; Elfeed feeds file shortcut ;; Elfeed feeds directory shortcut
(defun my/open-feeds-file () (defun my/open-feeds-directory ()
"Open org file containing elfeed sources." "Open directory containing elfeed sources."
(interactive) (interactive)
(require 'org) (require 'org)
(require 'elfeed) (require 'elfeed)
(require 'elfeed-org) (require 'elfeed-org)
(find-file (expand-file-name "feeds.org" org-directory))) (find-file (file-name-directory (car rmh-elfeed-org-files))))
(keymap-global-set "C-c w f" #'my/open-feeds-file) (keymap-global-set "C-c w f" #'my/open-feeds-directory)
#+end_src #+end_src
** Documents and Downloads ** Documents and Downloads
#+begin_src emacs-lisp #+begin_src emacs-lisp

View file

@ -88,10 +88,6 @@ Set treesit to fontify all elements, default was 3 (out of 4)
:fuzzy t) :fuzzy t)
:jedi_definition (:enabled t) :jedi_definition (:enabled t)
:jedi_hover (:enabled t))) :jedi_hover (:enabled t)))
:pyright ( :disableOrganizeImports t) ; Use isort instead
:python.analysis ( :autoImportCompletions t
:diagnosticMode "openFilesOnly" ; Better single-file support
:typeCheckingMode "off") ; Use mypy instead
:nil ( :nix :nil ( :nix
( :maxMemoryMB nil ( :maxMemoryMB nil
:flake :flake
@ -119,8 +115,8 @@ Set treesit to fontify all elements, default was 3 (out of 4)
:config :config
(add-to-list 'apheleia-formatters '(alejandra . ("alejandra"))) (add-to-list 'apheleia-formatters '(alejandra . ("alejandra")))
(add-to-list 'apheleia-mode-alist '(nix-mode . alejandra)) (add-to-list 'apheleia-mode-alist '(nix-mode . alejandra))
(add-to-list 'apheleia-mode-alist '(python-mode . ruff)) (add-to-list 'apheleia-mode-alist '(python-mode . (ruff ruff-isort)))
(add-to-list 'apheleia-mode-alist '(python-ts-mode . ruff))) (add-to-list 'apheleia-mode-alist '(python-ts-mode . (ruff ruff-isort))))
#+end_src #+end_src
* Flymake * Flymake
#+begin_src emacs-lisp :tangle yes #+begin_src emacs-lisp :tangle yes
@ -161,11 +157,6 @@ Set treesit to fontify all elements, default was 3 (out of 4)
"--warn-unreachable" "--warn-unreachable"
"--show-error-codes" "--show-error-codes"
"--no-color-output"))) "--no-color-output")))
(with-eval-after-load 'python
(add-hook 'python-base-mode-hook
(defun python-mode-setup-flymake ()
(require 'flymake-collection)
(add-hook 'flymake-diagnostic-functions 'flymake-collection-mypy nil t))))
#+end_src #+end_src
** shellcheck ** shellcheck

View file

@ -76,6 +76,12 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
("r" "Reading List" entry ("r" "Reading List" entry
(file+olp+datetree "reading.org" "Inbox") (file+olp+datetree "reading.org" "Inbox")
"* %?") "* %?")
("d" "Diary Event" entry
(file+datetree "diary.org")
"* %?\n%^T")
("#" "used by gnus-icalendar-org" entry
(file+datetree "diary.org")
"%i" :immediate-finish t)
("m" "Email Workflow") ("m" "Email Workflow")
("mf" "Follow Up" entry ("mf" "Follow Up" entry
(file+olp+datetree "tasks.org" "Inbox") (file+olp+datetree "tasks.org" "Inbox")
@ -158,10 +164,7 @@ Better syncing to mobile, for use with [[https://github.com/orgzly-revived/orgzl
(setq org-mobile-directory "~/.orgmobile/" (setq org-mobile-directory "~/.orgmobile/"
org-mobile-capture-file "inbox.org" org-mobile-capture-file "inbox.org"
org-mobile-agendas nil org-mobile-agendas nil
org-mobile-files (list (expand-file-name "diary.org" org-directory) org-mobile-files (list (expand-file-name "diary.org" org-directory))
(expand-file-name "notes.org" org-directory)
(expand-file-name "tasks.org" org-directory)
(expand-file-name "reading.org" org-directory))
org-mobile-inbox-for-pull (expand-file-name "inbox.org" org-directory) org-mobile-inbox-for-pull (expand-file-name "inbox.org" org-directory)
org-mobile-force-id-on-agenda-items nil) org-mobile-force-id-on-agenda-items nil)
(add-hook 'org-capture-finalize-hook #'org-mobile-push)) (add-hook 'org-capture-finalize-hook #'org-mobile-push))

View file

@ -177,10 +177,13 @@ nix-mode
(p (completing-read "Platform: " '("all" "allBut" "arm" "cygwin" "darwin" "freebsd" "gnu" "i686" "illumos" "linux" "mesaPlatforms" "mips" "netbsd" "none" "openbsd" "unix" "x86"))) ";" n> q "};" n> "}" (p (completing-read "Platform: " '("all" "allBut" "arm" "cygwin" "darwin" "freebsd" "gnu" "i686" "illumos" "linux" "mesaPlatforms" "mips" "netbsd" "none" "openbsd" "unix" "x86"))) ";" n> q "};" n> "}"
) )
(pythonshell "with import (builtins.getFlake \"github:nixos/nixpkgs" (p "/23.11")"\") {};" (pythonshell "with import (builtins.getFlake \"github:nixos/nixpkgs" (p "/23.11")"\") {};"
n> "with python3Packages;"
n> "mkShellNoCC {" n> "mkShellNoCC {"
n> "packages = [" (p) "];" n> "packages = ["
n> "};") n> "(" (p "python3") ".withPackages"
n> "(ps: with ps; ["(p "python-lsp-server isort mypy") "]))"
n> q
n> "];"
n> "}")
(poetryshell "with import (builtins.getFlake \"github:nixos/nixpkgs" (p "/23.11")"\") {};" (poetryshell "with import (builtins.getFlake \"github:nixos/nixpkgs" (p "/23.11")"\") {};"
n "with (builtins.getFlake \"github:nix-community/poetry2nix\").lib.mkPoetry2Nix {inherit pkgs;};" n "with (builtins.getFlake \"github:nix-community/poetry2nix\").lib.mkPoetry2Nix {inherit pkgs;};"
n> "(mkPoetryEnv rec {" n> "(mkPoetryEnv rec {"
@ -188,7 +191,7 @@ nix-mode
n> "preferWheels = true;" n> "preferWheels = true;"
n> "extras = [\"*\"];" n> "extras = [\"*\"];"
n> "editablePackageSources = {" (p "package") "=projectDir;};" n> "editablePackageSources = {" (p "package") "=projectDir;};"
n> "extraPackages = ps: with ps; [" (p "isort mypy")"];" n> "extraPackages = ps: with ps; [" (p "python-lsp-server isort mypy")"];"
n> "})" n> "})"
n> ".env") n> ".env")