feat(nix): install emacs from overlay
All checks were successful
Check Formatting of Files / Check-Formatting (push) Successful in 1m11s

This commit is contained in:
Price Hiller 2024-05-04 15:42:09 -05:00
parent 0023c65078
commit 4a34bf86f1
Signed by: Price
GPG Key ID: C3FADDE7A8534BEB
3 changed files with 106 additions and 20 deletions

View File

@ -169,6 +169,28 @@
"type": "github" "type": "github"
} }
}, },
"emacs-overlay": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1714842256,
"narHash": "sha256-q8oPSGCj1H1BLZg4a06lGrmNsgq1WkPMCIuMhAtCxu8=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "146fe1e340847eeee5243f77af634d9d1b990c8e",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -369,6 +391,24 @@
} }
}, },
"flake-utils_5": { "flake-utils_5": {
"inputs": {
"systems": "systems_7"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_6": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@ -383,7 +423,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_6": { "flake-utils_7": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@ -398,9 +438,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_7": { "flake-utils_8": {
"inputs": { "inputs": {
"systems": "systems_7" "systems": "systems_8"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
@ -564,7 +604,7 @@
}, },
"neovim-flake": { "neovim-flake": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_5",
"nixpkgs": [ "nixpkgs": [
"neovim-nightly-overlay", "neovim-nightly-overlay",
"nixpkgs" "nixpkgs"
@ -572,11 +612,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1714683427, "lastModified": 1714754042,
"narHash": "sha256-SMfFU+VsRTZLVIkGpf67oOTZ29gWmFvxF0nGO6CRx/4=", "narHash": "sha256-UcnoAT91ewoikYFeJb1S3p4rVS0tfV7/juhrDkS6kvU=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "01e4a70d668d54a7cefa3ff53ec97e39df516265", "rev": "3a8265266e0c0fe31f34b7c0192e8ae7d83ae950",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -595,11 +635,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1714694802, "lastModified": 1714780994,
"narHash": "sha256-b0+Zrd2PDgRIEeeXbivzw3kcSaXCZItOvgOgdfRsyOo=", "narHash": "sha256-Qfc+wUSIx2IGTjFiYYk3kq58Cxr88WcBWtly8qN7BGA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "9b2c33c7fa0287db93868d955e7b3d0da3837a57", "rev": "25d2ee5f16920301f53e22f606b34d4a90e10d65",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -633,7 +673,7 @@
}, },
"nixgl": { "nixgl": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_7",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
@ -682,13 +722,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1714594348, "lastModified": 1714685007,
"narHash": "sha256-fL6twwN/npU94mvumU5ho/uhM/fwePCRQ9lwamm2lds=", "narHash": "sha256-Q4ddhb5eC5pwci0QhAapFwnsc8X8H9ZMQiWpsofBsDc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1c74cc292b61614e74c1cf0d372f79d57fb4936b", "rev": "383ffe076d9b633a2e97b6e4dd97fc15fcf30159",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1714656196,
"narHash": "sha256-kjQkA98lMcsom6Gbhw8SYzmwrSo+2nruiTcTZp5jK7o=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "94035b482d181af0a0f8f77823a790b256b7c3cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -750,7 +806,7 @@
"flake-compat": [ "flake-compat": [
"nix" "nix"
], ],
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_6",
"gitignore": [ "gitignore": [
"nix" "nix"
], ],
@ -784,7 +840,8 @@
"bob": "bob", "bob": "bob",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"disko": "disko", "disko": "disko",
"flake-utils": "flake-utils_3", "emacs-overlay": "emacs-overlay",
"flake-utils": "flake-utils_4",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"impermanence": "impermanence", "impermanence": "impermanence",
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",
@ -950,6 +1007,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_8": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": { "utils": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_4"
@ -991,7 +1063,7 @@
}, },
"wezterm": { "wezterm": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_7", "flake-utils": "flake-utils_8",
"freetype2": "freetype2", "freetype2": "freetype2",
"harfbuzz": "harfbuzz", "harfbuzz": "harfbuzz",
"libpng": "libpng", "libpng": "libpng",

View File

@ -39,6 +39,10 @@
url = "git+https://git.orion-technologies.io/blog/blog"; url = "git+https://git.orion-technologies.io/blog/blog";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
emacs-overlay = {
url = "github:nix-community/emacs-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = outputs =
@ -83,6 +87,7 @@
nixpkgs.overlays = [ nixpkgs.overlays = [
inputs.neovim-nightly-overlay.overlay inputs.neovim-nightly-overlay.overlay
inputs.nixgl.overlay inputs.nixgl.overlay
inputs.emacs-overlay.overlays.default
self.overlays.modifications self.overlays.modifications
self.overlays.additions self.overlays.additions
]; ];

View File

@ -44,7 +44,6 @@ in
neovide neovide
wezterm wezterm
fontconfig fontconfig
emacs
sqlite sqlite
luajit luajit
imagemagick imagemagick
@ -121,7 +120,8 @@ in
glibc.static glibc.static
llvm llvm
llvmPackages.libcxxStdenv llvmPackages.libcxxStdenv
]; ]
++ [ rust-analyzer ];
file = { file = {
".local/share/wallpapers" = { ".local/share/wallpapers" = {
@ -230,6 +230,15 @@ in
}; };
programs = { programs = {
emacs = {
enable = true;
package = pkgs.emacsPgtk.overrideAttrs (old: {
passthru = old.passthru // {
treeSitter = true;
};
});
extraPackages = (epkgs: (with epkgs; [ treesit-grammars.with-all-grammars ]));
};
wofi.enable = true; wofi.enable = true;
gpg.enable = true; gpg.enable = true;
firefox = { firefox = {