aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gui/conf/init.el37
-rw-r--r--gui/conf/xmonad.hs4
-rw-r--r--gui/default.nix1
-rw-r--r--gui/emacs.nix20
4 files changed, 2 insertions, 60 deletions
diff --git a/gui/conf/init.el b/gui/conf/init.el
deleted file mode 100644
index 27d5f8f..0000000
--- a/gui/conf/init.el
+++ /dev/null
@@ -1,37 +0,0 @@
-(setq inhibit-startup-message t)
-(setq initial-scratch-message nil)
-
-(setq backup-directory-alist `(("." . "~/.emacs.d/backup")))
-
-(require 'package)
-(package-initialize)
-(eval-when-compile (require 'use-package))
-
-(load-theme 'leuven)
-(set-frame-font "Iosevka 11" nil t)
-(menu-bar-mode -1)
-(toggle-scroll-bar -1)
-(tool-bar-mode -1)
-(global-visual-line-mode t)
-
-(use-package org)
-
-(setq org-agenda-files (list "~/org/org.org"))
-
-(use-package evil)
-(use-package evil-leader)
-(use-package evil-org)
-
-(global-evil-leader-mode)
-(evil-leader/set-leader ",")
-(evil-mode 1)
-
-(add-hook 'org-mode-hook 'evil-org-mode)
-(evil-org-set-key-theme '(navigation insert textobjects additional todo))
-
-(setq org-fontify-whole-heading-line t)
-(setq org-adapt-indentation nil)
-
-(evil-define-key 'normal org-mode-map
- "J" 'org-next-visible-heading
- "K" 'org-previous-visible-heading)
diff --git a/gui/conf/xmonad.hs b/gui/conf/xmonad.hs
index 1505f6f..bd05d0f 100644
--- a/gui/conf/xmonad.hs
+++ b/gui/conf/xmonad.hs
@@ -118,8 +118,8 @@ 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/org.org" (title =? "notemacs")
- (customFloating $ hideScreenBorder host dropDownLarge)
+ , NS "notes" "nvim-qt --no-ext-tabline -- --cmd \"let &titlestring='orgnotes'\" ~/org/*.org" (title =? "orgnotes — Neovim")
+ (customFloating $ hideScreenBorder host dropDown)
]
hudMonitor host = monitor
diff --git a/gui/default.nix b/gui/default.nix
index 8640143..59c12f9 100644
--- a/gui/default.nix
+++ b/gui/default.nix
@@ -8,7 +8,6 @@ in {
./xmonad.nix
./kitty.nix
./vim.nix
- ./emacs.nix
./zathura.nix
./pass.nix
# applications grouped by purpose
diff --git a/gui/emacs.nix b/gui/emacs.nix
deleted file mode 100644
index e2773f0..0000000
--- a/gui/emacs.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ config, pkgs, ... }:
-
-{
- programs.emacs = {
- enable = true;
-
- extraPackages = (epkgs: (with epkgs.melpaStablePackages; [
- use-package
- leuven-theme
- ]) ++ (with epkgs.melpaPackages; [
- evil
- evil-leader
- evil-org
- ]) ++ (with epkgs.elpaPackages; [
- org
- ]));
- };
-
- home.file.".emacs.d/init.el".source = ./conf/init.el;
-}