pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove package-installed-p checks since nix will installed them

Browse source 
Add python-docstring package
This commit is contained in:
Evie Litherland-Smith 2024-12-03 09:31:48 +00:00
parent f140dfdad1
commit 5db1959328
2 changed files with 7 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
system/home/emacs/default.nix
View file

@ -63,6 +63,7 @@
forge
nix-mode
lua-mode
python-docstring
auctex
markdown-mode
pandoc-mode

50
system/home/emacs/init.el
View file

@ -5,8 +5,7 @@
use-package-enable-imenu-support t)
(use-package delight
:demand t
:if (package-installed-p 'delight))
:demand t)
(setq user-full-name "Evie Litherland-Smith"
user-mail-address "evie@xenia.me.uk"
@ -25,7 +24,8 @@
(setq backup-directory-alist '(("." . "~/.local/state/emacs/backups")))
(use-package secrets)
(use-package secrets
:defer t)
(setq-default truncate-lines t
truncate-partial-width-windows nil)
@ -43,22 +43,19 @@
(scroll-bar-mode -1)
(use-package nerd-icons
:if (package-installed-p 'nerd-icons))
:demand t)
(use-package nerd-icons-dired
:if (package-installed-p 'nerd-icons-ibuffer)
:after (nerd-icons dired)
:commands nerd-icons-dired-mode
:hook (dired-mode . (lambda () (nerd-icons-dired-mode +1))))
(use-package nerd-icons-ibuffer
:if (package-installed-p 'nerd-icons-ibuffer)
:after nerd-icons
:commands nerd-icons-ibuffer-mode
:hook (ibuffer-mode . (lambda () (nerd-icons-ibuffer-mode +1))))
(use-package nerd-icons-corfu
:if (package-installed-p 'nerd-icons-corfu)
:after nerd-icons)
(setopt mode-line-compact 'long)
@ -70,7 +67,6 @@
(add-hook 'help-mode-hook (lambda () (visual-line-mode +1)))
(use-package visual-fill-column
:if (package-installed-p 'visual-fill-column)
:functions (visual-fill-column-mode)
:hook ((prog-mode . (lambda ()
(visual-line-mode +1)
@ -177,7 +173,6 @@
(gnus-icalendar-setup))
(use-package khalel
:if (package-installed-p 'khalel)
:after (org-agenda)
:commands (khalel-import-events khalel-add-capture-template khalel-run-vdirsyncer)
:custom
@ -214,7 +209,6 @@
(mm-discouraged-alternatives '("text/html")))
(use-package mu4e
:if (package-installed-p 'mu4e)
:bind
(("C-c m" . mu4e)
:map mu4e-view-mode-map
@ -568,7 +562,6 @@
(add-hook 'prog-mode-hook #'(lambda () (display-line-numbers-mode +1)))
(use-package which-key
:if (package-installed-p 'which-key)
:functions which-key-mode
:config (which-key-mode +1))
@ -604,7 +597,6 @@
tab-mark)))
(use-package diff-hl
:if (package-installed-p 'diff-hl)
:functions (diff-hl-magit-pre-refresh
diff-hl-magit-post-refresh
global-diff-hl-mode)
@ -737,7 +729,6 @@
(khalel-add-capture-template))))
(use-package org-roam
:if (package-installed-p 'org-roam)
:after org
:defines org-roam-directory
:functions org-roam-db-autosync-mode
@ -838,8 +829,6 @@
(org-icalendar-combined-description "Emacs org-mode combined export"))
(use-package org-noter
:if (package-installed-p 'org-noter)
:disabled t
:after (org doc-view citar)
:commands org-noter
:custom
@ -854,7 +843,6 @@
(org-noter-prefer-root-as-file-level nil))
(use-package citar
:if (package-installed-p 'citar)
:defines (citar-bibliography
citar-indicators)
:functions (citar-indicator-create
@ -927,7 +915,6 @@
(setq org-preview-latex-default-process 'dvisvgm)
(use-package vertico
:if (package-installed-p 'vertico)
:functions vertico-mode
:custom
(vertico-cycle t)
@ -937,7 +924,6 @@
(require 'vertico-directory))
(use-package marginalia
:if (package-installed-p 'marginalia)
:functions marginalia-mode
:custom
(marginalia-annotators '(marginalia-annotators-heavy
@ -948,7 +934,6 @@
:config (marginalia-mode +1))
(use-package orderless
:if (package-installed-p 'orderless)
:custom
(completion-styles '(orderless basic))
(completion-category-defaults nil)
@ -957,7 +942,6 @@
(eglot-capf (styles orderless)))))
(use-package corfu
:if (package-installed-p 'corfu)
:defines (corfu-map
corfu-mode-map
corfu-margin-formatters)
@ -1009,12 +993,10 @@
(corfu-popupinfo-delay 0.3))
(use-package corfu-terminal
:if (package-installed-p 'corfu-terminal)
:after corfu
:functions corfu-terminal-mode)
(use-package cape
:if (package-installed-p 'cape)
:after corfu
:functions (cape-emoji
cape-file
@ -1028,7 +1010,6 @@
(cape-dabbrev-min-length (+ corfu-auto-prefix 1)))
(use-package consult
:if (package-installed-p 'consult)
:functions (consult-org-heading
consult-history)
:bind (("<remap> <imenu>" . consult-imenu)
@ -1046,12 +1027,10 @@
("<remap> <comint-history-isearch-backward-regexp>" . consult-history)))
(use-package consult-eglot
:if (package-installed-p 'consult-eglot)
:after (consult eglot)
:bind (("C-c c s" . consult-eglot-symbols)))
(use-package tempel
:if (package-installed-p 'tempel)
:defines tempel-path
:functions (tempel-expand
tempel-abbrev-mode)
@ -1061,7 +1040,8 @@
:custom
(tempel-trigger-prefix "+"))
(use-package tempel-collection :after tempel)
(use-package tempel-collection
:after tempel)
(require 'tramp)
(setq org-publish-project-alist
@ -1084,11 +1064,9 @@
)))
(use-package rainbow-delimiters
:if (package-installed-p 'rainbow-delimiters)
:hook (prog-mode))
(use-package envrc
:if (package-installed-p 'envrc)
:hook (after-init . envrc-global-mode)
:custom
(envrc-show-summary-in-minibuffer t))
@ -1104,7 +1082,6 @@
(treesit-font-lock-level 3))
(use-package treesit-auto
:if (package-installed-p 'treesit-auto)
:after treesit
:functions (treesit-auto-add-to-auto-mode-alist
global-treesit-auto-mode)
@ -1168,7 +1145,6 @@
)
(use-package apheleia
:if (package-installed-p 'apheleia)
:delight apheleia-mode
:defines (apheleia-formatters
apheleia-mode-alist)
@ -1188,7 +1164,6 @@
(flymake-show-diagnostics-at-end-of-line 'short))
(use-package flymake-shellcheck
:if (package-installed-p 'flymake-shellcheck)
:disabled t
:functions flymake-shellcheck-load
:after flymake
@ -1196,14 +1171,12 @@
(flymake-shellcheck-load)))))
(use-package flymake-yamllint
:if (package-installed-p 'flymake-yamllint)
:functions flymake-yamllint-setup
:after flymake
:hook (yaml-ts-mode . (lambda () (if (executable-find "yamllint" t)
(flymake-yamllint-setup)))))
(use-package flymake-clippy
:if (package-installed-p 'flymake-clippy)
:disabled t
:functions flymake-clippy-setup-backend
:after flymake
@ -1211,7 +1184,6 @@
(flymake-clippy-setup-backend)))))
(use-package flymake-eslint
:if (package-installed-p 'flymake-eslint)
:functions flymake-eslint-enable
:after flymake
:hook ((js-base-mode typescript-ts-base-mode) . (lambda () (if (executable-find "eslint" t)
@ -1242,7 +1214,6 @@
))
(use-package magit
:if (package-installed-p 'magit)
:bind (("C-c g" . magit-status)
:map project-prefix-map
("m" . magit-project-status))
@ -1263,11 +1234,9 @@
("\\`\\(?:gitea:\\|gt:\\)\\([^:]+\\)\\'" "git.xenia.me.uk" "gitea.user"))))
(use-package forge
:if (package-installed-p 'forge)
:after magit)
(use-package nix-mode
:if (package-installed-p 'nix-mode)
:mode "\\.nix\\'"
:functions nix-prettify-global-mode
:config
@ -1278,7 +1247,6 @@
(nix-prettify-global-mode +1))
(use-package lua-mode
:if (package-installed-p 'lua-mode)
:mode "\\.lua\\'")
(defun my/enable-fill-column (col)
@ -1311,8 +1279,6 @@
(setq python-ts-mode-hook python-mode-hook))
(use-package python-docstring
:if (package-installed-p 'python-docstring)
:disabled t
:hook python-base-mode)
(use-package files
@ -1331,11 +1297,9 @@
(doc-view-scale-internally nil))
(use-package auctex
:if (package-installed-p 'auctex)
:defer t)
(use-package markdown-mode
:if (package-installed-p 'markdown-mode)
:hook
((markdown-mode . turn-on-auto-fill))
:custom
@ -1349,7 +1313,6 @@
(set-face-attribute 'markdown-comment-face nil :inherit 'variable-pitch))
(use-package pandoc-mode
:if (package-installed-p 'pandoc-mode)
:after (markdown-mode)
:hook (markdown-mode . conditionally-turn-on-pandoc))
@ -1364,7 +1327,6 @@
(eww-browse-url-new-window-is-tab nil))
(use-package scad-mode
:if (package-installed-p 'scad-mode)
:defer t)
;; Scratch buffer shortcut