From fe554661d1d5d8fc5c675b9eb041eb1a4527e99d Mon Sep 17 00:00:00 2001 From: aciceri Date: Mon, 4 Oct 2021 12:12:07 +0200 Subject: [PATCH] Emacs updates --- pkgs/default.nix | 2 +- users/ccr/default.nix | 2 +- users/profiles/emacs/emacs.d/config/config-emacs.el | 7 +++++++ users/profiles/emacs/emacs.d/config/config-magit.el | 5 +++++ users/profiles/emacs/emacs.d/init.el | 2 ++ 5 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 users/profiles/emacs/emacs.d/config/config-emacs.el create mode 100644 users/profiles/emacs/emacs.d/config/config-magit.el diff --git a/pkgs/default.nix b/pkgs/default.nix index 924a230..1addf90 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,5 +1,5 @@ final: prev: { # keep sources this first - sources = prev.callPackage (import ./_sources/generated.nix) { }; + sources = prev.callPackage (import ./_sources/generated.nix) {}; # then, call packages with `final.callPackage` } diff --git a/users/ccr/default.nix b/users/ccr/default.nix index 2dc49f2..162c967 100644 --- a/users/ccr/default.nix +++ b/users/ccr/default.nix @@ -1,4 +1,4 @@ -{ pkgs, suites, ... }: +{ pkgs, suites, lib, ... }: { home-manager.users.ccr = { suites, ... }: { imports = with suites; shell ++ gui ++ browser ++ multimedia ++ dev ++ base; diff --git a/users/profiles/emacs/emacs.d/config/config-emacs.el b/users/profiles/emacs/emacs.d/config/config-emacs.el new file mode 100644 index 0000000..2589e26 --- /dev/null +++ b/users/profiles/emacs/emacs.d/config/config-emacs.el @@ -0,0 +1,7 @@ +(setq backup-directory-alist `(("." . "~/.saves")) + backup-by-copying t + delete-old-versions 6 + kept-old-versions 2 + version-control t) + +(provide 'config-emacs) diff --git a/users/profiles/emacs/emacs.d/config/config-magit.el b/users/profiles/emacs/emacs.d/config/config-magit.el new file mode 100644 index 0000000..0177c00 --- /dev/null +++ b/users/profiles/emacs/emacs.d/config/config-magit.el @@ -0,0 +1,5 @@ +(use-package magit + :bind (("C-x g" . magit-status) + ("C-x C-g" . magit-status))) + +(provide 'config-magit) diff --git a/users/profiles/emacs/emacs.d/init.el b/users/profiles/emacs/emacs.d/init.el index 25c8f8f..e8726ec 100644 --- a/users/profiles/emacs/emacs.d/init.el +++ b/users/profiles/emacs/emacs.d/init.el @@ -4,8 +4,10 @@ read-process-output-max (* 1024 1024)) (require 'aesthetics) +(require 'config-emacs) (require 'config-evil) (require 'config-helm) +(require 'config-magit) (require 'config-treemacs) (require 'config-lsp) (require 'nix)