aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Kummerlaender2024-11-12 10:27:28 +0100
committerAdrian Kummerlaender2024-11-12 10:27:28 +0100
commit237f67f4610615133375acd218f852b2a4cfca5d (patch)
tree139b62eef6ff36f92742e9f3a952efed5df01421
parent7beea5eb72d84dd041d870ca2c884eb597cca10a (diff)
downloadnixos_home-237f67f4610615133375acd218f852b2a4cfca5d.tar
nixos_home-237f67f4610615133375acd218f852b2a4cfca5d.tar.gz
nixos_home-237f67f4610615133375acd218f852b2a4cfca5d.tar.bz2
nixos_home-237f67f4610615133375acd218f852b2a4cfca5d.tar.lz
nixos_home-237f67f4610615133375acd218f852b2a4cfca5d.tar.xz
nixos_home-237f67f4610615133375acd218f852b2a4cfca5d.tar.zst
nixos_home-237f67f4610615133375acd218f852b2a4cfca5d.zip
emacs: Update, fix mu4e completing read issueHEADmaster
-rw-r--r--flake.lock30
-rw-r--r--gui/conf/email.el2
-rw-r--r--gui/conf/init.el19
-rw-r--r--gui/emacs.nix2
4 files changed, 17 insertions, 36 deletions
diff --git a/flake.lock b/flake.lock
index 37fe44a..5f622cf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -6,11 +6,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1730913294,
- "narHash": "sha256-OZjABHdKGwqjWMgMovRN0RTlJHwsPnGlma1KDKT4WiQ=",
+ "lastModified": 1731315605,
+ "narHash": "sha256-a38eEP2aWC/XtiIAuR3yX3mXnxBb2C/QCRhWqwlLajQ=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "881e7b588330736320f2a6496225e729156cbcde",
+ "rev": "8bb826ff3ad7dd473f69c518272ae56d5f917a52",
"type": "github"
},
"original": {
@@ -78,11 +78,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1730785428,
- "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
+ "lastModified": 1731139594,
+ "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
+ "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github"
},
"original": {
@@ -94,11 +94,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1730741070,
- "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
+ "lastModified": 1730963269,
+ "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
+ "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc",
"type": "github"
},
"original": {
@@ -169,11 +169,11 @@
},
"stable": {
"locked": {
- "lastModified": 1730741070,
- "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
+ "lastModified": 1730963269,
+ "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
+ "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc",
"type": "github"
},
"original": {
@@ -185,11 +185,11 @@
},
"unstable": {
"locked": {
- "lastModified": 1730831018,
- "narHash": "sha256-2S0HwIFRxYp+afuoFORcZA9TjryAf512GmE0MTfEOPU=",
+ "lastModified": 1730958623,
+ "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "8c4dc69b9732f6bbe826b5fbb32184987520ff26",
+ "rev": "85f7e662eda4fa3a995556527c87b2524b691933",
"type": "github"
},
"original": {
diff --git a/gui/conf/email.el b/gui/conf/email.el
index 747476e..2af5977 100644
--- a/gui/conf/email.el
+++ b/gui/conf/email.el
@@ -20,7 +20,7 @@
(:from . 22)
(:subject)))
(mu4e-hide-index-messages t)
- (mu4e-completing-read-function 'helm-comp-read)
+ (mu4e-completing-read-function 'completing-read)
(shr-color-visible-luminance-min 80)
(doom-modeline-mu4e t)
(doom-modeline-gnus nil)
diff --git a/gui/conf/init.el b/gui/conf/init.el
index 5c77f51..628cfae 100644
--- a/gui/conf/init.el
+++ b/gui/conf/init.el
@@ -351,25 +351,6 @@
:config
(evil-leader/set-key "s" 'helm-swoop-without-pre-input))
-(use-package org-ref
- :ensure t
- :custom
- (reftex-default-bibliography '("~/university/bib/lit.bib"))
- (org-ref-bibliography-notes "~/org/literature.org")
- (org-ref-default-bibliography '("~/university/bib/lit.bib"))
- (org-ref-get-pdf-filename-function 'org-ref-get-pdf-filename-helm-bibtex))
-
-(use-package helm-bibtex
- :ensure t
- :config
- (setq bibtex-completion-bibliography '("~/university/bib/lit.bib"))
- (setq bibtex-completion-pdf-field "file"))
-
-(use-package zotxt
- :ensure t
- :config
- (add-hook 'org-mode-hook 'org-zotxt-mode))
-
(evil-define-key 'normal 'global
"J" 'evil-forward-paragraph
"K" 'evil-backward-paragraph)
diff --git a/gui/emacs.nix b/gui/emacs.nix
index d29a6b3..e8322fd 100644
--- a/gui/emacs.nix
+++ b/gui/emacs.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, pkgs-unstable, ... }:
+{ config, pkgs, ... }:
{
programs.emacs = let