petrichor
/
boxen
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

flake: nix-doom-emacs cleanup

This commit is contained in:
Jez Cope 2023-07-05 20:00:31 +01:00
parent 3f5527bdca
commit 3252e2b8a3
2 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
flake.nix
View File

@ -8,15 +8,16 @@
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
emacs-overlay.url = "github:nix-community/emacs-overlay"; emacs-overlay.url = "github:nix-community/emacs-overlay";
#nix-doom-emacs.url = "github:nix-community/nix-doom-emacs"; #nix-doom-emacs.url = "github:nix-community/nix-doom-emacs";
nix-doom-emacs.url = "git+https://codeberg.org/jezcope/nix-doom-emacs?ref=fix/evil-collection"; nix-doom-emacs.url =
"git+https://codeberg.org/jezcope/nix-doom-emacs?ref=fix/evil-collection";
nix-std.url = "github:chessai/nix-std"; nix-std.url = "github:chessai/nix-std";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
emacs-overlay.inputs.nixpkgs.follows = "nixpkgs"; emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = outputs = { self, nixpkgs, home-manager, nur, emacs-overlay, nix-std
{ self, nixpkgs, home-manager, nur, emacs-overlay, nix-std, ... }@inputs: , nix-doom-emacs, ... }@inputs:
let let
inherit (nixpkgs.lib) genAttrs nixosSystem; inherit (nixpkgs.lib) genAttrs nixosSystem;
@ -45,8 +46,8 @@
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users.jez = import ./home; users.jez = { imports = [ nix-doom-emacs.hmModule ./home ]; };
extraSpecialArgs = { inherit inputs std; }; extraSpecialArgs = { inherit std; };
}; };
} }
]; ];

22
home/profiles/emacs/default.nix
View File

@ -1,8 +1,6 @@
{ config, pkgs, lib, inputs, ... }: { config, pkgs, lib, ... }:
let let
inherit (inputs) nix-doom-emacs;
shellAliases = { shellAliases = {
e = "emacsclient -t"; # Terminal e = "emacsclient -t"; # Terminal
ew = "emacsclient -c"; # New window (and wait) ew = "emacsclient -c"; # New window (and wait)
@ -12,13 +10,6 @@ let
doom = "~/.emacs.d/bin/doom"; doom = "~/.emacs.d/bin/doom";
}; };
in { in {
imports = [ nix-doom-emacs.hmModule ];
# programs.emacs = {
# enable = true;
# package = pkgs.emacs-unstable;
# };
programs.doom-emacs = { programs.doom-emacs = {
enable = true; enable = true;
doomPrivateDir = ./doom.d; doomPrivateDir = ./doom.d;
@ -45,17 +36,6 @@ in {
}) })
]; ];
# home.file = {
# ".doom.d" = {
# source = ./doom.d;
# recursive = true;
# };
# ".doom.d/snippets".source = ./snippets;
# ".doom.d/nix.el".text = ''
# (add-to-list 'load-path "${pkgs.mu}/share/emacs/site-lisp/mu4e")
# '';
# };
programs.firefox.profiles.default.settings = { programs.firefox.profiles.default.settings = {
"network.protocol-handler.expose.org-protocol" = false; "network.protocol-handler.expose.org-protocol" = false;
}; };