Enable emacs

This commit is contained in:
Sridhar Ratnakumar 2024-03-16 17:28:05 -04:00
parent f2eef1afb1
commit be43374f8b
4 changed files with 111 additions and 164 deletions

247
flake.lock generated
View file

@ -90,7 +90,7 @@
"crane_2": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_4",
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixci",
"nixpkgs"
@ -129,7 +129,7 @@
},
"devshell": {
"inputs": {
"flake-utils": "flake-utils_7",
"flake-utils": "flake-utils_6",
"nixpkgs": [
"nixvim",
"nixpkgs"
@ -235,17 +235,13 @@
}
},
"emacs-overlay": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable"
},
"flake": false,
"locked": {
"lastModified": 1708794236,
"narHash": "sha256-DTmyCeySQjFOuSNRUFpA2Jxkqo7bMXvSn2tXSVk3RpQ=",
"lastModified": 1710522300,
"narHash": "sha256-9PYmC6X8qQiUExjkRmJp5d1B+cPYglvHuIg80Virvuo=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "299398be3c27d885cf17ff8310944b307a1449e9",
"rev": "28c564ccf915615c65c4c1334504f1535192dee2",
"type": "github"
},
"original": {
@ -296,7 +292,7 @@
"haskell-flake": "haskell-flake",
"heist": "heist",
"heist-extra": "heist-extra",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs",
"treefmt-nix": "treefmt-nix"
},
"locked": {
@ -637,24 +633,6 @@
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
@ -669,9 +647,9 @@
"type": "github"
}
},
"flake-utils_3": {
"flake-utils_2": {
"inputs": {
"systems": "systems_4"
"systems": "systems_3"
},
"locked": {
"lastModified": 1694529238,
@ -687,9 +665,9 @@
"type": "github"
}
},
"flake-utils_4": {
"flake-utils_3": {
"inputs": {
"systems": "systems_6"
"systems": "systems_5"
},
"locked": {
"lastModified": 1692799911,
@ -705,9 +683,27 @@
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_6"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"inputs": {
"systems": "systems_7"
"systems": "systems_8"
},
"locked": {
"lastModified": 1681202837,
@ -728,11 +724,11 @@
"systems": "systems_9"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
@ -760,24 +756,6 @@
}
},
"flake-utils_8": {
"inputs": {
"systems": "systems_11"
},
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_9": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@ -925,10 +903,10 @@
"crane": "crane",
"dioxus-desktop-template": "dioxus-desktop-template",
"flake-parts": "flake-parts_4",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_2",
"process-compose-flake": "process-compose-flake",
"rust-overlay": "rust-overlay",
"systems": "systems_3",
"systems": "systems_2",
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
@ -998,12 +976,12 @@
"evil-quick-diff": "evil-quick-diff",
"explain-pause-mode": "explain-pause-mode",
"flake-compat": "flake-compat",
"flake-utils": "flake-utils_3",
"flake-utils": "flake-utils_2",
"format-all": "format-all",
"nix-straight": [
"nix-straight"
],
"nixpkgs": "nixpkgs_5",
"nixpkgs": "nixpkgs_4",
"nose": "nose",
"ob-racket": "ob-racket",
"org": "org",
@ -1095,10 +1073,10 @@
"crane": "crane_2",
"devour-flake": "devour-flake",
"flake-parts": "flake-parts_5",
"nixpkgs": "nixpkgs_6",
"nixpkgs": "nixpkgs_5",
"process-compose-flake": "process-compose-flake_2",
"rust-overlay": "rust-overlay_3",
"systems": "systems_8",
"systems": "systems_7",
"treefmt-nix": "treefmt-nix_3"
},
"locked": {
@ -1118,7 +1096,7 @@
"nixd": {
"inputs": {
"flake-parts": "flake-parts_6",
"nixpkgs": "nixpkgs_9"
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1687572024,
@ -1166,7 +1144,7 @@
},
"nixos-shell": {
"inputs": {
"nixpkgs": "nixpkgs_10"
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1646257415,
@ -1184,8 +1162,8 @@
},
"nixos-vscode-server": {
"inputs": {
"flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_11"
"flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1684517665,
@ -1203,16 +1181,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1708655239,
"narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=",
"owner": "NixOS",
"lastModified": 1668443372,
"narHash": "sha256-lXNlVyNWwO22/JUdBtUWz68jZB3DM+Jq/irlsbwncI0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "cbc4211f0afffe6dfd2478a62615dd5175a13f9a",
"rev": "dad4de1694cd92d9a0e123bfdf134d0047b836a5",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
@ -1346,7 +1324,7 @@
"nixpkgs-match": {
"inputs": {
"flake-parts": "flake-parts_7",
"nixpkgs": "nixpkgs_13"
"nixpkgs": "nixpkgs_12"
},
"locked": {
"lastModified": 1672924430,
@ -1363,22 +1341,6 @@
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1708702655,
"narHash": "sha256-qxT5jSLhelfLhQ07+AUxSTm1VnVH+hQxDkQSZ/m/Smo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c5101e457206dd437330d283d6626944e28794b3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1683504292,
"narHash": "sha256-jlZbBIKGa6IMGkcJkQ08pbKnouTAPfeq1fD5I7l/rBw=",
@ -1395,21 +1357,6 @@
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1628465643,
"narHash": "sha256-QSNw9bDq9uGUniQQtakRuw4m21Jxugm23SXLVgEV4DM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6ef4f522d63f22b40004319778761040d3197390",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1682526928,
"narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=",
@ -1422,7 +1369,7 @@
"type": "indirect"
}
},
"nixpkgs_12": {
"nixpkgs_11": {
"locked": {
"lastModified": 1709703039,
"narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
@ -1438,7 +1385,7 @@
"type": "github"
}
},
"nixpkgs_13": {
"nixpkgs_12": {
"locked": {
"lastModified": 1672756850,
"narHash": "sha256-Smbq3+fitwA13qsTMeaaurv09/KVbZfW7m7lINwzDGA=",
@ -1454,7 +1401,7 @@
"type": "github"
}
},
"nixpkgs_14": {
"nixpkgs_13": {
"locked": {
"lastModified": 1679793451,
"narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=",
@ -1468,7 +1415,7 @@
"type": "indirect"
}
},
"nixpkgs_15": {
"nixpkgs_14": {
"locked": {
"lastModified": 1683475240,
"narHash": "sha256-sy6MYoCaIZsOenYplbzVXI4Ce9Bp/vIOpuFa97+a6wc=",
@ -1484,7 +1431,7 @@
"type": "github"
}
},
"nixpkgs_16": {
"nixpkgs_15": {
"locked": {
"lastModified": 1680945546,
"narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=",
@ -1501,22 +1448,6 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1668443372,
"narHash": "sha256-lXNlVyNWwO22/JUdBtUWz68jZB3DM+Jq/irlsbwncI0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "dad4de1694cd92d9a0e123bfdf134d0047b836a5",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1701237617,
"narHash": "sha256-Ryd8xpNDY9MJnBFDYhB37XSFIxCPVVVXAbInNPa95vs=",
@ -1532,7 +1463,7 @@
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_3": {
"locked": {
"lastModified": 1681358109,
"narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",
@ -1548,7 +1479,7 @@
"type": "github"
}
},
"nixpkgs_5": {
"nixpkgs_4": {
"locked": {
"lastModified": 1695806987,
"narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=",
@ -1563,7 +1494,7 @@
"type": "indirect"
}
},
"nixpkgs_6": {
"nixpkgs_5": {
"locked": {
"lastModified": 1688590700,
"narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=",
@ -1579,7 +1510,7 @@
"type": "github"
}
},
"nixpkgs_7": {
"nixpkgs_6": {
"locked": {
"lastModified": 1681358109,
"narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",
@ -1595,7 +1526,7 @@
"type": "github"
}
},
"nixpkgs_8": {
"nixpkgs_7": {
"locked": {
"lastModified": 1680945546,
"narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=",
@ -1611,7 +1542,7 @@
"type": "github"
}
},
"nixpkgs_9": {
"nixpkgs_8": {
"locked": {
"lastModified": 1686398752,
"narHash": "sha256-nGWNQVhSw4VSL+S0D0cbrNR9vs9Bq7rlYR+1K5f5j6w=",
@ -1627,6 +1558,21 @@
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1628465643,
"narHash": "sha256-QSNw9bDq9uGUniQQtakRuw4m21Jxugm23SXLVgEV4DM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6ef4f522d63f22b40004319778761040d3197390",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"nixvim": {
"inputs": {
"devshell": "devshell",
@ -1671,7 +1617,7 @@
},
"nuenv": {
"inputs": {
"nixpkgs": "nixpkgs_14",
"nixpkgs": "nixpkgs_13",
"rust-overlay": "rust-overlay_4"
},
"locked": {
@ -1771,7 +1717,7 @@
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_5",
"flake-utils": "flake-utils_8",
"flake-utils": "flake-utils_7",
"gitignore": "gitignore",
"nixpkgs": [
"nixvim",
@ -1862,7 +1808,7 @@
"nixos-hardware": "nixos-hardware",
"nixos-shell": "nixos-shell",
"nixos-vscode-server": "nixos-vscode-server",
"nixpkgs": "nixpkgs_12",
"nixpkgs": "nixpkgs_11",
"nixpkgs-match": "nixpkgs-match",
"nixvim": "nixvim",
"nuenv": "nuenv",
@ -1888,8 +1834,8 @@
},
"rust-overlay": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_4"
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1701310566,
@ -1934,8 +1880,8 @@
},
"rust-overlay_3": {
"inputs": {
"flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_7"
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1694052649,
@ -1953,7 +1899,7 @@
},
"rust-overlay_4": {
"inputs": {
"flake-utils": "flake-utils_9",
"flake-utils": "flake-utils_8",
"nixpkgs": [
"nuenv",
"nixpkgs"
@ -1991,8 +1937,8 @@
},
"sops-nix": {
"inputs": {
"nixpkgs": "nixpkgs_15",
"nixpkgs-stable": "nixpkgs-stable_2"
"nixpkgs": "nixpkgs_14",
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1683576450,
@ -2039,21 +1985,6 @@
"type": "github"
}
},
"systems_11": {
"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": 1681028828,
@ -2212,7 +2143,7 @@
},
"treefmt-nix_3": {
"inputs": {
"nixpkgs": "nixpkgs_8"
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1688026376,
@ -2230,7 +2161,7 @@
},
"treefmt-nix_4": {
"inputs": {
"nixpkgs": "nixpkgs_16"
"nixpkgs": "nixpkgs_15"
},
"locked": {
"lastModified": 1689243103,
@ -2264,7 +2195,7 @@
},
"utils": {
"inputs": {
"systems": "systems_5"
"systems": "systems_4"
},
"locked": {
"lastModified": 1687709756,

View file

@ -40,10 +40,11 @@
# Emacs
emacs-overlay.url = "github:nix-community/emacs-overlay";
emacs-overlay.flake = false;
nix-doom-emacs.url = "github:nix-community/nix-doom-emacs";
# https://github.com/nix-community/nix-doom-emacs/issues/409#issuecomment-1753412481
nix-straight = {
url = "github:codingkoi/nix-straight.el?ref=codingkoi/apply-librephoenixs-fix";
url = "github:codingkoi/nix-straight.el/codingkoi/apply-librephoenixs-fix";
flake = false;
};
nix-doom-emacs.inputs.nix-straight.follows = "nix-straight";

View file

@ -4,25 +4,39 @@
# open -a ~/Applications/Home\ Manager\ Apps/Emacs.app
{ pkgs, flake, ... }:
let
myEmacs = pkgs.emacs29-macport.override {
# ⚠️ Broken on Darwin
# https://github.com/NixOS/nixpkgs/issues/110218
# withXwidgets = true;
# ^ We need xwidgets for embedded browser in Emacs, which is useful for
# previewing notes.
};
in
{
imports = [ flake.inputs.nix-doom-emacs.hmModule ];
# Enable one or the other below.
# If using doom emacs ...
programs.doom-emacs = {
enable = false;
emacsPackage = pkgs.emacs29-pgtk;
enable = true;
emacsPackage = myEmacs;
doomPrivateDir = ./emacs/doom;
};
# If using vanilla emacs ...
/* programs.emacs = {
/*
programs.emacs = {
enable = true;
package = pkgs.emacs29-pgtk;
package = myEmacs;
extraPackages = epkgs: [
epkgs.org-roam
epkgs.vterm
];
}; */
};
*/
home.packages = with pkgs; [
# For org-roam

View file

@ -11,6 +11,7 @@
flake.inputs.nuenv.overlays.nuenv
flake.inputs.nixd.overlays.default
flake.inputs.nuenv.overlays.default
(import flake.inputs.emacs-overlay)
(import ../packages/overlay.nix { inherit flake; inherit (pkgs) system; })
];
};