Switches emacs on macos to cli

This commit is contained in:
willemml 2023-11-15 22:45:09 -08:00
parent ff11528808
commit 8305d2a247
Signed by: willemml
GPG key ID: C3DE5DF6198DACBD
6 changed files with 13 additions and 84 deletions

82
flake.lock generated
View file

@ -21,28 +21,6 @@
"type": "github"
}
},
"emacs-overlay": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1699724244,
"narHash": "sha256-I3+cOlXU4jIoqnyYWezbNc26/56EI4YwwDQf80hdbeI=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "c5f0c468f8e92246473c1eabe997ad1c41fb6a1a",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"type": "github"
}
},
"fenix": {
"inputs": {
"nixpkgs": "nixpkgs",
@ -113,25 +91,7 @@
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
"systems": "systems_2"
},
"locked": {
"lastModified": 1685518550,
@ -193,7 +153,7 @@
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs_2",
"systems": "systems_2",
"systems": "systems",
"wlroots": "wlroots",
"xdph": "xdph"
},
@ -333,22 +293,6 @@
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1699291058,
"narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "41de143fda10e33be0f47eab2bfe08a50f234267",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1685801374,
"narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
@ -399,12 +343,12 @@
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils",
"gitignore": "gitignore",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable_2"
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1699271226,
@ -423,7 +367,6 @@
"root": {
"inputs": {
"darwin": "darwin",
"emacs-overlay": "emacs-overlay",
"fenix": "fenix",
"flake-parts": "flake-parts",
"home-manager": "home-manager",
@ -469,21 +412,6 @@
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -498,7 +426,7 @@
"type": "github"
}
},
"systems_3": {
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

View file

@ -7,9 +7,6 @@
darwin.url = "github:willemml/nix-darwin?ref=feat/networking.hosts";
darwin.inputs.nixpkgs.follows = "nixpkgs";
emacs-overlay.url = "github:nix-community/emacs-overlay";
emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
fenix.url = "github:nix-community/fenix";
flake-parts.url = "github:hercules-ci/flake-parts";

View file

@ -6,7 +6,6 @@
}: {
flake.overlays = {
default = import ../packages;
emacs-overlay = inputs.emacs-overlay.overlays.default;
fenix = inputs.fenix.overlays.default;
};
}

View file

@ -12,6 +12,11 @@ in {
agents.emacs = {
enable = true;
config = {
EnvironmentVariables = {
TERM = "xterm-kitty";
TERMINFO = "${config.programs.kitty.package}/Applications/kitty.app/Contents/Resources/kitty/terminfo";
TERMINFO_DIRS = "${config.home.homeDirectory}/.nix-profile/share/terminfo:/run/current-system/sw/share/terminfo:/nix/var/nix/profiles/default/share/terminfo:/usr/share/terminfo";
};
ProgramArguments = [
"${config.programs.emacs.finalPackage}/bin/emacs"
"--fg-daemon"

View file

@ -8,7 +8,9 @@
enable = true;
extraConfig = ''
include themes/draculaplus.conf
editor "${config.programs.emacs.finalPackage.out}/bin/emacsclient" -c
editor "${config.programs.emacs.finalPackage.out}/bin/emacsclient" -nw -c
macos_option_as_alt yes
'';
shellIntegration.enableZshIntegration = true;

View file

@ -83,8 +83,6 @@
dotd = "cd ${config.home.sessionVariables.DOTDIR} ";
e = "emacsclient -c -nw";
em = "emacs -nw";
emw = "emacs";
ew = "emacsclient -c -n";
l = "ls -1";
lh = "ls --hyperlink";
np = "nix-shell -p";