aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Kummerlaender2020-06-22 00:34:17 +0200
committerAdrian Kummerlaender2020-06-22 00:34:17 +0200
commit5fcd04ac67c94d4ca249a8f212ebb5b423716454 (patch)
treed9e83dd428002d735a5666eebef217fec0ed4090
parentcf8075b7b2f5cd049c0a0ef46b9c8627daab4d09 (diff)
downloadnixos_home-5fcd04ac67c94d4ca249a8f212ebb5b423716454.tar
nixos_home-5fcd04ac67c94d4ca249a8f212ebb5b423716454.tar.gz
nixos_home-5fcd04ac67c94d4ca249a8f212ebb5b423716454.tar.bz2
nixos_home-5fcd04ac67c94d4ca249a8f212ebb5b423716454.tar.lz
nixos_home-5fcd04ac67c94d4ca249a8f212ebb5b423716454.tar.xz
nixos_home-5fcd04ac67c94d4ca249a8f212ebb5b423716454.tar.zst
nixos_home-5fcd04ac67c94d4ca249a8f212ebb5b423716454.zip
Setup emacs daemon and client
It seems like I finally got my setup to a state where Emacs is there to stay.
-rw-r--r--gui/conf/init.el17
-rw-r--r--gui/conf/xmonad.hs4
-rw-r--r--gui/emacs.nix5
3 files changed, 19 insertions, 7 deletions
diff --git a/gui/conf/init.el b/gui/conf/init.el
index baa8a57..e2e8dbc 100644
--- a/gui/conf/init.el
+++ b/gui/conf/init.el
@@ -10,11 +10,17 @@
(setq user-full-name "Adrian Kummerlaender"
user-mail-address "adrian@kummerlaender.eu")
-(set-frame-font "Iosevka 11" nil t)
-(menu-bar-mode -1)
-(toggle-scroll-bar -1)
-(tool-bar-mode -1)
-(global-visual-line-mode t)
+(defun startup (frame)
+ (select-frame frame)
+ (set-frame-font "Iosevka 11" nil t)
+ (menu-bar-mode -1)
+ (toggle-scroll-bar -1)
+ (tool-bar-mode -1)
+ (global-visual-line-mode t))
+
+(if (daemonp)
+ (add-hook 'after-make-frame-functions #'startup)
+ (startup (selected-frame)))
(setq mouse-wheel-scroll-amount '(5))
(setq mouse-wheel-progressive-speed nil)
@@ -77,6 +83,7 @@
:init
(doom-modeline-mode 1)
:config
+ (setq doom-modeline-icon t)
(setq doom-modeline-vcs-max-length 24)
(setq doom-modeline-minor-modes t))
diff --git a/gui/conf/xmonad.hs b/gui/conf/xmonad.hs
index 8de9429..6d7b513 100644
--- a/gui/conf/xmonad.hs
+++ b/gui/conf/xmonad.hs
@@ -118,7 +118,7 @@ scratchpads host =
(customFloating $ hideScreenBorder host sideBarLeft)
, NS "messaging" "telegram-desktop" ((className =? "TelegramDesktop") <&&> (title /=? "Media viewer"))
(customFloating $ hideScreenBorder host sideBarRight)
- , NS "notes" "emacs --title=notemacs ~/org/inbox.org" (title =? "notemacs")
+ , NS "notes" "emacsclient --create-frame --frame-parameters='(quote (name . \"notemacs\"))' ~/org/inbox.org" (title =? "notemacs")
(customFloating $ hideScreenBorder host dropDownLarge)
]
@@ -163,7 +163,7 @@ commonKeybindings host =
-- application launchers
, ("M-<Space>" , spawn "rofi -show combi")
, ("M-<Return>" , spawn "kitty")
- , ("M-S-<Return>" , spawn "nvim-qt --no-ext-tabline")
+ , ("M-S-<Return>" , spawn "emacsclient --create-frame")
, ("<Print>" , spawn "flameshot gui")
-- password management
diff --git a/gui/emacs.nix b/gui/emacs.nix
index e6fab00..e213fe9 100644
--- a/gui/emacs.nix
+++ b/gui/emacs.nix
@@ -62,4 +62,9 @@
mkdir -p ~/.emacs.d
ln -s ${toString ./conf/init.el} ~/.emacs.d/init.el
'';
+
+ services.emacs = {
+ enable = true;
+ client.enable = true;
+ };
}