From 462a0b85931a0dd94305d18e8c70022619bbf089 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Mon, 22 Jul 2024 17:10:40 -0500
Subject: [PATCH] Update slippi, add emacs, update router config to route
 a.lyte.dev

---
 flake.lock                       |  6 +++---
 flake.nix                        |  1 +
 modules/home-manager/default.nix | 17 +++++++++++++++++
 modules/nixos/default.nix        | 13 +++++++++++++
 nixos/router.nix                 |  1 +
 5 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 78dcacc..bd9348d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -477,11 +477,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1720625270,
-        "narHash": "sha256-7JGUXmp6LxPkinxy9kEnrdbZQPF8QGZwvRxWU/ZwJKY=",
+        "lastModified": 1721686199,
+        "narHash": "sha256-4rMu207y5HCLkRDbZXdFhFqAfDKxwCJ1r9UOsXmef4Q=",
         "owner": "lytedev",
         "repo": "slippi-nix",
-        "rev": "e86b5e46d53a929303b9ad6539cb6e64e7a8c5b4",
+        "rev": "2b9673de8ec491be1c3ad8d23461b1fe5f2736b0",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 3293983..beb7f90 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,6 +20,7 @@
     hardware.url = "github:nixos/nixos-hardware";
     hyprland.url = "github:hyprwm/Hyprland";
     slippi.url = "github:lytedev/slippi-nix";
+    # slippi.url = "git+file:///home/daniel/code/open-source/slippi-nix";
 
     # nnf.url = "github:thelegy/nixos-nftables-firewall?rev=71fc2b79358d0dbacde83c806a0f008ece567b7b";
   };
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 30ee7a1..36a7af9 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -34,6 +34,23 @@
 
   broot = {};
 
+  emacs = {pkgs, ...}: {
+    programs.emacs = {
+      enable = true;
+      # extraConfig = ''
+      # '';
+      extraPackages = epkgs: (with epkgs; [
+        magit
+      ]);
+    };
+
+    programs.fish = {
+      shellAliases = {
+        e = "emacs";
+      };
+    };
+  };
+
   cargo = {config, ...}: {
     home.file."${config.home.homeDirectory}/.cargo/config.toml" = {
       enable = true;
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index d856ce4..7282955 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -243,11 +243,24 @@
     '';
   };
 
+  emacs = {pkgs, ...}: {
+    environment.systemPackages = with pkgs; [
+      emacs
+    ];
+
+    home-manager.users.daniel = {
+      imports = with homeManagerModules; [
+        emacs
+      ];
+    };
+  };
+
   development-tools = {pkgs, ...}: {
     imports = with nixosModules; [
       postgres
       podman
       troubleshooting-tools
+      emacs
     ];
 
     environment.sessionVariables.NIXOS_OZONE_WL = "1";
diff --git a/nixos/router.nix b/nixos/router.nix
index c98400c..7ff6c7e 100644
--- a/nixos/router.nix
+++ b/nixos/router.nix
@@ -42,6 +42,7 @@
         "nix.h.lyte.dev"
         "git.lyte.dev"
         "video.lyte.dev"
+        "a.lyte.dev"
         "bw.lyte.dev"
         "files.lyte.dev"
         "vpn.h.lyte.dev"