Revert "all: remove emacs"

This reverts commit 52ecafc3c8.

flake.lock

@@ -56,6 +56,31 @@
         "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": false,
       "locked": {
@@ -72,6 +97,24 @@
         "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": {
       "inputs": {
         "nixpkgs": [
@@ -284,6 +327,7 @@
       "inputs": {
         "beyt": "beyt",
         "darwin": "darwin",
+        "emacs-overlay": "emacs-overlay",
         "gostart": "gostart",
         "gqrss": "gqrss",
         "kogs": "kogs",
@@ -372,6 +416,21 @@
         "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": {
       "inputs": {
         "nixpkgs": [

flake.nix

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

gui/default.nix

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

hosts/pwntie/default.nix

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