Compare commits

..

No commits in common. "686dbaeff7366af70031ab9615d7d29f90d6ab2c" and "32039cd82ca52d59eeabe209df694c1f348ccec8" have entirely different histories.

7 changed files with 8 additions and 73 deletions

21
flake.lock generated
View File

@ -204,26 +204,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-index-database": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1746934494,
"narHash": "sha256-3n6i+F0sDASjkhbvgFDpPDZGp7z19IrRtjfF9TwJpCA=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "e9b21b01e4307176b9718a29ac514838e7f6f4ff",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-index-database",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1733212471, "lastModified": 1733212471,
@ -292,7 +272,6 @@
"inputs": { "inputs": {
"devenv": "devenv", "devenv": "devenv",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"zen-browser": "zen-browser" "zen-browser": "zen-browser"

View File

@ -8,18 +8,11 @@
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-index-database = {
url = "github:nix-community/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
};
devenv.url = "github:cachix/devenv"; devenv.url = "github:cachix/devenv";
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
zen-browser = { zen-browser = {
url = "github:youwen5/zen-browser-flake"; url = "github:youwen5/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View File

@ -7,7 +7,6 @@
./eza.nix ./eza.nix
./mopidy.nix ./mopidy.nix
./nh.nix ./nh.nix
./nix-index.nix
./shell ./shell
./ssh.nix ./ssh.nix
./tealdeer.nix ./tealdeer.nix

View File

@ -1,10 +1,7 @@
{ {
programs.direnv = { programs.direnv = {
enable = true; enable = true;
config.global = { config.global.load_dotenv = true;
load_dotenv = true;
hide_env_diff = true;
};
nix-direnv.enable = true; nix-direnv.enable = true;
}; };
} }

View File

@ -3,7 +3,7 @@
config, config,
lib, lib,
... ...
}: with lib; let }: let
emacsDefaultPackage = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages ( emacsDefaultPackage = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (
epkgs: [ epkgs: [
epkgs.vterm epkgs.vterm
@ -14,45 +14,23 @@
cfg = config.modules.emacs; cfg = config.modules.emacs;
in { in {
options.modules.emacs = { options.modules.emacs = {
enable = mkEnableOption "enables Emacs"; enable = lib.mkEnableOption "enables Emacs";
package = mkOption { package = lib.mkOption {
type = types.package; type = lib.types.package;
default = emacsDefaultPackage; default = emacsDefaultPackage;
}; };
service = mkEnableOption "enables Emacs service"; service = lib.mkEnableOption "enables Emacs service";
mu4eMime = mkEnableOption "Enables mu4e to handle mailto scheme";
org-protocol = mkEnableOption "Enables org-protocol";
}; };
config = { config = {
programs.emacs = mkIf cfg.enable { programs.emacs = lib.mkIf cfg.enable {
enable = true; enable = true;
inherit (cfg) package; inherit (cfg) package;
}; };
services.emacs = mkIf cfg.service { services.emacs = lib.mkIf cfg.service {
enable = true; enable = true;
inherit (cfg) package; inherit (cfg) package;
startWithUserSession = "graphical"; startWithUserSession = "graphical";
}; };
xdg.desktopEntries.mu4e = mkIf cfg.mu4eMime {
name = "mu4e";
genericName = "mu4e";
comment = "Maildir Utils for Emacs";
mimeType = ["x-scheme-handler/mailto"];
noDisplay = true;
exec = "${cfg.package}/bin/emacsclient -c -n -a ${cfg.package}/bin/emacs -e \"(browse-url-mail \\\"\\$*\\\")\"";
terminal = false;
categories = ["Network" "Email" "TextEditor" "Utility"];
};
xdg.desktopEntries.org-protocol = mkIf cfg.org-protocol {
name = "org-protocol";
exec = "${cfg.package}/bin/emacsclient -c -n -a ${cfg.package}/bin/emacs %u";
terminal = false;
noDisplay = true;
categories = ["System"];
mimeType = ["x-scheme-handler/org-protocol"];
};
}; };
} }

View File

@ -1,9 +0,0 @@
{ inputs, ... }:
{
imports = [
inputs.nix-index-database.hmModules.nix-index
];
programs.nix-index.enable = true;
programs.nix-index-database.comma.enable = true;
}

View File

@ -58,8 +58,6 @@
enable = true; enable = true;
service = true; service = true;
package = emacsPkg; package = emacsPkg;
mu4eMime = true;
org-protocol = true;
}; };
hyprland = { hyprland = {
inherit emacsPkg; inherit emacsPkg;