diff options
| -rw-r--r-- | config/emacs.org | 3 | ||||
| -rw-r--r-- | config/nix.org | 1 | ||||
| -rw-r--r-- | nix/init.el | 3 | ||||
| -rw-r--r-- | nix/modules/home/default.nix | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/config/emacs.org b/config/emacs.org index d17f1f8..7b3f2d4 100644 --- a/config/emacs.org +++ b/config/emacs.org @@ -562,6 +562,9 @@ emacs keybindings. "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/config/nix.org b/config/nix.org index 4aff74c..ca4bec7 100644 --- a/config/nix.org +++ b/config/nix.org @@ -2706,7 +2706,6 @@ I have many imports that we'll go through next. ./user.nix ./gtk.nix ./secrets.nix - ./pantalaimon.nix ]; options = { 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 = { |