From 4ceb6029cd44d6e9e5d7102b6dcb95a24acf10bf Mon Sep 17 00:00:00 2001
From: Sakooooo <78461130+Sakooooo@users.noreply.github.com>
Date: Mon, 25 Dec 2023 01:35:40 +0400
Subject: [PATCH] add emacs-overlay

---
 flake.lock           | 74 +++++++++++++++++++++++++++++++++++++++++++-
 flake.nix            | 15 +++++----
 overlays/default.nix |  3 ++
 3 files changed, 85 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index 02a1de35..f09f9552 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,6 +22,28 @@
         "type": "github"
       }
     },
+    "emacs-overlay": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable"
+      },
+      "locked": {
+        "lastModified": 1703434612,
+        "narHash": "sha256-L8TAl5MDTb091uxmT/qBUIG9Szxt2oed1pTiYk6diNk=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "28c6b6217ef2b5346ad4fb08365cdb6e116e521a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -56,6 +78,24 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -94,6 +134,22 @@
       }
     },
     "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1703034876,
+        "narHash": "sha256-4bMPFv/bs5g1nEsXQwXlrAGJgjv1Ilr0ejdaTkBwQLs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "312ab59e8ade69e6083017bd9b98a2919f1fb86a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable_2": {
       "locked": {
         "lastModified": 1702777222,
         "narHash": "sha256-/SYmqgxTYzqZnQEfbOCHCN4GzqB9uAIsR9IWLzo0/8I=",
@@ -128,6 +184,7 @@
     "root": {
       "inputs": {
         "NixOS-WSL": "NixOS-WSL",
+        "emacs-overlay": "emacs-overlay",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
@@ -139,7 +196,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-stable": "nixpkgs-stable"
+        "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
         "lastModified": 1702937567,
@@ -169,6 +226,21 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 08be84dc..50e4e956 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,25 +3,28 @@
   description = "horrible dotfiles for amazing distro";
 
   inputs = {
-    # nixpkgs
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
-    # nixpkgs unstable
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
-    # home-manager
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; # nixpkgs stable branch
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # nixpkgs unstable branch
     home-manager = {
+      # this manages your dotfiles for the most part
       url = "github:nix-community/home-manager/release-23.11";
 
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    # wsl support
     NixOS-WSL = {
+      # this makes nixos on wsl a thing
       url = "github:nix-community/NixOS-WSL";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     sops-nix = {
+      # this manages secrets
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    emacs-overlay = {
+      url = "github:nix-community/emacs-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {
diff --git a/overlays/default.nix b/overlays/default.nix
index 82a51cb3..323e1f1c 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -2,6 +2,9 @@
   # This one brings our custom packages from the 'pkgs' directory
   additions = final: _prev: import ../packages {pkgs = final;};
 
+  nixpkgs.overlays = [
+    inputs.emacs-overlay
+  ];
   # This one contains whatever you want to overlay
   # You can change versions, add patches, set compilation flags, anything really.
   # https://nixos.wiki/wiki/Overlays