From 75439737613d86975856c4bff0a1257f58fd1b1f Mon Sep 17 00:00:00 2001
From: Preston Pan <ret2pop@nullring.xyz>
Date: Sun, 1 Mar 2026 15:13:12 -0800
Subject: Add new emacs keybindings

---
 nix/init.el                  | 3 +++
 nix/modules/home/default.nix | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'nix')

diff --git a/nix/init.el b/nix/init.el
index 10d6046..e977c85 100644
--- a/nix/init.el
+++ b/nix/init.el
@@ -454,6 +454,9 @@
     "g p" '(magit-pull :wk "Pull from git")
     "g s" '(magit-status :wk "Change status of files")
     "g i" '(magit-init :wk "init new git project")
+    "g r" '(magit-rebase :wk "Rebase branch")
+    "g m" '(magit-merge :wk "Merge branches")
+    "g b" '(magit-branch :wk "Git branch")
 
     "o p" '(treemacs :wk "Project Drawer")
     "o P" '(treemacs-projectile :wk "Import Projectile project to treemacs")
diff --git a/nix/modules/home/default.nix b/nix/modules/home/default.nix
index 3eb4ad5..6e92c86 100644
--- a/nix/modules/home/default.nix
+++ b/nix/modules/home/default.nix
@@ -22,7 +22,6 @@
     ./user.nix
     ./gtk.nix
     ./secrets.nix
-    ./pantalaimon.nix
   ];
 
   options = {
-- 
cgit v1.3