Revert "all: remove emacs"

This reverts commit 52ecafc3c8.
This commit is contained in:
Aaron Bieber 2024-05-21 08:11:18 -06:00
parent f8ecab0bb1
commit 62d6929acb
No known key found for this signature in database
4 changed files with 80 additions and 0 deletions

View File

@ -56,6 +56,31 @@
"type": "github" "type": "github"
} }
}, },
"emacs-overlay": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"unstable"
],
"nixpkgs-stable": [
"stable"
]
},
"locked": {
"lastModified": 1707411167,
"narHash": "sha256-0JViztrDcglHQnStH2jjFV2O0NEFx7a/CmPzgTXpzaM=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "64a633659fab447f12c898a32c451f88b5c3c048",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "64a633659fab447f12c898a32c451f88b5c3c048",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -72,6 +97,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"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"
}
},
"gostart": { "gostart": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -284,6 +327,7 @@
"inputs": { "inputs": {
"beyt": "beyt", "beyt": "beyt",
"darwin": "darwin", "darwin": "darwin",
"emacs-overlay": "emacs-overlay",
"gostart": "gostart", "gostart": "gostart",
"gqrss": "gqrss", "gqrss": "gqrss",
"kogs": "kogs", "kogs": "kogs",
@ -372,6 +416,21 @@
"type": "github" "type": "github"
} }
}, },
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"traygent": { "traygent": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

View File

@ -24,6 +24,14 @@
}; };
}; };
emacs-overlay = {
url = "github:nix-community/emacs-overlay/64a633659fab447f12c898a32c451f88b5c3c048";
inputs = {
nixpkgs.follows = "unstable";
nixpkgs-stable.follows = "stable";
};
};
darwin = { darwin = {
url = "github:lnl7/nix-darwin"; url = "github:lnl7/nix-darwin";
inputs.nixpkgs.follows = "unstableSmall"; inputs.nixpkgs.follows = "unstableSmall";
@ -142,6 +150,7 @@
}; };
overlays = [ overlays = [
inputs.emacs-overlay.overlay
inputs.gostart.overlay inputs.gostart.overlay
inputs.mcchunkie.overlay inputs.mcchunkie.overlay
inputs.kogs.overlay inputs.kogs.overlay

View File

@ -11,6 +11,7 @@ let
inherit (inputs.traygent.packages.${pkgs.system}) traygent; inherit (inputs.traygent.packages.${pkgs.system}) traygent;
inherit (inputs.beyt.packages.${pkgs.system}) beyt; inherit (inputs.beyt.packages.${pkgs.system}) beyt;
firefox = import ../configs/firefox.nix { inherit pkgs; }; firefox = import ../configs/firefox.nix { inherit pkgs; };
myEmacs = pkgs.callPackage ../configs/emacs.nix { };
rage = pkgs.writeScriptBin "rage" (import ../bins/rage.nix { inherit pkgs; }); rage = pkgs.writeScriptBin "rage" (import ../bins/rage.nix { inherit pkgs; });
rpr = rpr =
pkgs.writeScriptBin "rpr" pkgs.writeScriptBin "rpr"
@ -68,6 +69,11 @@ with lib; {
services = { services = {
xserver.enable = true; xserver.enable = true;
pcscd.enable = true; pcscd.enable = true;
emacs = {
enable = true;
package = myEmacs;
install = true;
};
}; };
documentation.enable = true; documentation.enable = true;

View File

@ -4,6 +4,7 @@
}: }:
let let
tsAddr = "100.84.170.57"; tsAddr = "100.84.170.57";
#myEmacs = pkgs.callPackage ../../configs/emacs.nix { };
pubKeys = [ pubKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO7v+/xS8832iMqJHCWsxUZ8zYoMWoZhjj++e26g1fLT europa" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO7v+/xS8832iMqJHCWsxUZ8zYoMWoZhjj++e26g1fLT europa"
]; ];
@ -144,6 +145,11 @@ in
]; ];
}; };
}; };
#emacs = {
# enable = true;
# package = myEmacs;
# install = true;
#};
fwupd = { fwupd = {
enable = true; enable = true;
}; };