mirror of
https://github.com/librephoenix/nixos-config
synced 2025-07-05 22:44:34 +05:30
Updated system
This commit is contained in:
Emmet
parent
5ae14e31b2
commit
f27c29cec3
8 changed files with 42 additions and 171 deletions
|
|
@ -2,10 +2,6 @@
|
|||
|
||||
{
|
||||
|
||||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
qutebrowser = pkgs.qutebrowser.override { enableVulkan = false; };
|
||||
};
|
||||
|
||||
home.packages = [ pkgs.qutebrowser
|
||||
(pkgs.callPackage ./qute-containers.nix { dmenuCmd = "fuzzel -d"; })
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1234,7 +1234,7 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)."
|
|||
"q" 'helpful-kill-buffers)
|
||||
|
||||
;;;------ helpful configuration ------;;;
|
||||
(add-load-path! "~/.nix-profile/share/emacs/site-lisp/elpa/mu4e-1.10.7")
|
||||
(add-load-path! "~/.nix-profile/share/emacs/site-lisp/elpa/mu4e-1.10.8")
|
||||
(require 'mu4e)
|
||||
(require 'mu4e-contrib)
|
||||
(require 'mu4e-actions)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ config, lib, pkgs, userSettings, systemSettings,
|
||||
eaf, eaf-browser, org-nursery, org-yaap,
|
||||
org-side-tree, org-timeblock, phscroll, ... }:
|
||||
{ config, lib, pkgs, pkgs-stable, userSettings, systemSettings,
|
||||
org-nursery, org-yaap, org-side-tree, org-timeblock, phscroll, ... }:
|
||||
let
|
||||
themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../../themes"+("/"+userSettings.theme)+"/polarity.txt"));
|
||||
dashboardLogo = ./. + "/nix-" + themePolarity + ".png";
|
||||
|
|
@ -41,19 +40,17 @@ in
|
|||
extension = ".el";
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
home.packages = (with pkgs; [
|
||||
nil
|
||||
nixfmt
|
||||
git
|
||||
file
|
||||
nodejs
|
||||
wmctrl
|
||||
jshon
|
||||
aria
|
||||
hledger
|
||||
hunspell hunspellDicts.en_US-large
|
||||
pandoc
|
||||
nodePackages.mermaid-cli
|
||||
(pkgs.mu.override { emacs = emacs29-pgtk; })
|
||||
emacsPackages.mu4e
|
||||
isync
|
||||
|
|
@ -61,29 +58,15 @@ in
|
|||
(python3.withPackages (p: with p; [
|
||||
pandas
|
||||
requests
|
||||
pyqt6 sip qtpy qt6.qtwebengine epc lxml pyqt6-webengine
|
||||
epc lxml
|
||||
pysocks
|
||||
pymupdf
|
||||
markdown
|
||||
]))
|
||||
];
|
||||
|
||||
nixpkgs.overlays = [
|
||||
(self: super:
|
||||
{
|
||||
mu = super.mu.overrideAttrs (oldAttrs: rec {
|
||||
pname = "mu";
|
||||
version = "1.10.7";
|
||||
src = super.fetchFromGitHub {
|
||||
owner = "djcb";
|
||||
repo = "mu";
|
||||
rev = "v1.10.7";
|
||||
hash = "sha256-x1TsyTOK5U6/Y3QInm+XQ7T32X49iwa+4UnaHdiyqCI=";
|
||||
};
|
||||
});
|
||||
}
|
||||
)
|
||||
];
|
||||
]) ++ (with pkgs-stable; [
|
||||
nodejs
|
||||
nodePackages.mermaid-cli
|
||||
]);
|
||||
|
||||
services.mbsync = {
|
||||
enable = true;
|
||||
|
|
@ -91,11 +74,6 @@ in
|
|||
frequency = "*:0/5";
|
||||
};
|
||||
|
||||
home.file.".emacs.d/eaf" = {
|
||||
source = "${eaf}";
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
home.file.".emacs.d/org-yaap" = {
|
||||
source = "${org-yaap}";
|
||||
recursive = true;
|
||||
|
|
@ -111,17 +89,6 @@ in
|
|||
recursive = true;
|
||||
};
|
||||
|
||||
home.file.".emacs.d/eaf/app/browser" = {
|
||||
source = "${eaf-browser}";
|
||||
recursive = true;
|
||||
onChange = "
|
||||
pushd ~/.emacs.d/eaf/app/browser;
|
||||
rm package*.json;
|
||||
npm install darkreader @mozilla/readability && rm package*.json;
|
||||
popd;
|
||||
";
|
||||
};
|
||||
|
||||
home.file.".emacs.d/org-nursery" = {
|
||||
source = "${org-nursery}";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
- [[#focus-mode-configuration][Focus Mode Configuration]]
|
||||
- [[#helpful-mode-configuration][Helpful Mode Configuration]]
|
||||
- [[#mu4e-configuration][mu4e Configuration]]
|
||||
- [[#eaf][EAF]]
|
||||
- [[#direnv][Direnv]]
|
||||
- [[#projectile][Projectile]]
|
||||
- [[#sudo-edit][sudo-edit]]
|
||||
|
|
@ -1458,7 +1457,7 @@ I don't have this active right now since it's kinda weird with pgtk...
|
|||
** mu4e Configuration
|
||||
#+BEGIN_SRC emacs-lisp :tangle config.el
|
||||
;;;------ helpful configuration ------;;;
|
||||
(add-load-path! "~/.nix-profile/share/emacs/site-lisp/elpa/mu4e-1.10.7")
|
||||
(add-load-path! "~/.nix-profile/share/emacs/site-lisp/elpa/mu4e-1.10.8")
|
||||
(require 'mu4e)
|
||||
(require 'mu4e-contrib)
|
||||
(require 'mu4e-actions)
|
||||
|
|
@ -1579,40 +1578,6 @@ I don't have this active right now since it's kinda weird with pgtk...
|
|||
;; (mu4e-message-contact-field-matches msg
|
||||
;; :to ,catch-address)))))
|
||||
|
||||
#+END_SRC
|
||||
** EAF
|
||||
EAF doesn't work on Wayland :(
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
;;;-- Load emacs application framework;;;--
|
||||
(use-package! eaf
|
||||
:load-path "~/.emacs.d/eaf/"
|
||||
:init
|
||||
:custom
|
||||
(eaf-browser-continue-where-left-off t)
|
||||
(eaf-browser-enable-adblocker t)
|
||||
(browse-url-browser-function 'eaf-open-browser) ;; Make EAF Browser my default browser
|
||||
:config
|
||||
(defalias 'browse-web #'eaf-open-browser)
|
||||
|
||||
(require 'eaf-browser)
|
||||
|
||||
(require 'eaf-evil)
|
||||
(define-key key-translation-map (kbd "SPC")
|
||||
(lambda (prompt)
|
||||
(if (derived-mode-p 'eaf-mode)
|
||||
(pcase eaf--buffer-app-name
|
||||
("browser" (if (string= (eaf-call-sync "eval_function" eaf--buffer-id "is_focus") "True")
|
||||
(kbd "SPC")
|
||||
(kbd eaf-evil-leader-key)))
|
||||
(_ (kbd "SPC")))
|
||||
(kbd "SPC")))))
|
||||
|
||||
(setq browse-url-browser-function 'browse-url-default-browser)
|
||||
|
||||
(map! :leader
|
||||
:desc "Open web browser"
|
||||
"o w" #'eaf-open-browser-with-history)
|
||||
|
||||
#+END_SRC
|
||||
** Direnv
|
||||
#+BEGIN_SRC emacs-lisp :tangle config.el
|
||||
|
|
@ -1977,9 +1942,8 @@ Any git package can be configured for a particular commit or branch:
|
|||
* Nix Integration
|
||||
In order to have Nix load my Doom Emacs configuration [[./doom.nix][doom.nix]], which I source in the =imports= block of my [[../../../profiles/work/home.nix][home.nix]].
|
||||
#+BEGIN_SRC nix :tangle doom.nix
|
||||
{ config, lib, pkgs, userSettings, systemSettings,
|
||||
eaf, eaf-browser, org-nursery, org-yaap,
|
||||
org-side-tree, org-timeblock, phscroll, ... }:
|
||||
{ config, lib, pkgs, pkgs-stable, userSettings, systemSettings,
|
||||
org-nursery, org-yaap, org-side-tree, org-timeblock, phscroll, ... }:
|
||||
let
|
||||
themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../../themes"+("/"+userSettings.theme)+"/polarity.txt"));
|
||||
dashboardLogo = ./. + "/nix-" + themePolarity + ".png";
|
||||
|
|
@ -2020,19 +1984,17 @@ in
|
|||
extension = ".el";
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
home.packages = (with pkgs; [
|
||||
nil
|
||||
nixfmt
|
||||
git
|
||||
file
|
||||
nodejs
|
||||
wmctrl
|
||||
jshon
|
||||
aria
|
||||
hledger
|
||||
hunspell hunspellDicts.en_US-large
|
||||
pandoc
|
||||
nodePackages.mermaid-cli
|
||||
(pkgs.mu.override { emacs = emacs29-pgtk; })
|
||||
emacsPackages.mu4e
|
||||
isync
|
||||
|
|
@ -2040,29 +2002,15 @@ in
|
|||
(python3.withPackages (p: with p; [
|
||||
pandas
|
||||
requests
|
||||
pyqt6 sip qtpy qt6.qtwebengine epc lxml pyqt6-webengine
|
||||
epc lxml
|
||||
pysocks
|
||||
pymupdf
|
||||
markdown
|
||||
]))
|
||||
];
|
||||
|
||||
nixpkgs.overlays = [
|
||||
(self: super:
|
||||
{
|
||||
mu = super.mu.overrideAttrs (oldAttrs: rec {
|
||||
pname = "mu";
|
||||
version = "1.10.7";
|
||||
src = super.fetchFromGitHub {
|
||||
owner = "djcb";
|
||||
repo = "mu";
|
||||
rev = "v1.10.7";
|
||||
hash = "sha256-x1TsyTOK5U6/Y3QInm+XQ7T32X49iwa+4UnaHdiyqCI=";
|
||||
};
|
||||
});
|
||||
}
|
||||
)
|
||||
];
|
||||
]) ++ (with pkgs-stable; [
|
||||
nodejs
|
||||
nodePackages.mermaid-cli
|
||||
]);
|
||||
|
||||
services.mbsync = {
|
||||
enable = true;
|
||||
|
|
@ -2070,11 +2018,6 @@ in
|
|||
frequency = "*:0/5";
|
||||
};
|
||||
|
||||
home.file.".emacs.d/eaf" = {
|
||||
source = "${eaf}";
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
home.file.".emacs.d/org-yaap" = {
|
||||
source = "${org-yaap}";
|
||||
recursive = true;
|
||||
|
|
@ -2090,17 +2033,6 @@ in
|
|||
recursive = true;
|
||||
};
|
||||
|
||||
home.file.".emacs.d/eaf/app/browser" = {
|
||||
source = "${eaf-browser}";
|
||||
recursive = true;
|
||||
onChange = "
|
||||
pushd ~/.emacs.d/eaf/app/browser;
|
||||
rm package*.json;
|
||||
npm install darkreader @mozilla/readability && rm package*.json;
|
||||
popd;
|
||||
";
|
||||
};
|
||||
|
||||
home.file.".emacs.d/org-nursery" = {
|
||||
source = "${org-nursery}";
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue