Merge remote-tracking branch 'lass/20.03' into 20.03

4 files changed, 103 insertions, 227 deletions

diff --git a/jeschli/2configs/elisp b/jeschli/2configs/elisp
new file mode 160000
+Subproject ae1a03ddee80d73ac166af75cdb1d93d24fa44b
diff --git a/jeschli/2configs/emacs-org-agenda.nix b/jeschli/2configs/emacs-org-agenda.nix
index f9139fcfe..0420dc43d 100644
--- a/jeschli/2configs/emacs-org-agenda.nix
+++ b/jeschli/2configs/emacs-org-agenda.nix
@@ -114,29 +114,29 @@ let
               ("NEXT" ("WAITING") ("CANCELLED") ("HOLD"))
               ("DONE" ("WAITING") ("CANCELLED") ("HOLD")))))
 
-(setq org-directory "~/projects/notes_private")
-(setq org-default-notes-file "~/projects/notes_private/refile.org")
+(setq org-directory "~/projects/notes_privat")
+(setq org-default-notes-file "~/projects/notes_privat/refile.org")
 
 ;; I use C-c c to start capture mode
 (global-set-key (kbd "C-c c") 'org-capture)
 
 ;; Capture templates for: TODO tasks, Notes, appointments, phone calls, meetings, and org-protocol
 (setq org-capture-templates
-      (quote (("t" "todo" entry (file "~/git/org/refile.org")
+      (quote (("t" "todo" entry (file org-default-notes-file)
                "* TODO %?\n%U\n%a\n" :clock-in t :clock-resume t)
-              ("r" "respond" entry (file "~/git/org/refile.org")
+              ("r" "respond" entry (file org-default-notes-file)
                "* NEXT Respond to %:from on %:subject\nSCHEDULED: %t\n%U\n%a\n" :clock-in t :clock-resume t :immediate-finish t)
-              ("n" "note" entry (file "~/git/org/refile.org")
+              ("n" "note" entry (file org-default-notes-file)
                "* %? :NOTE:\n%U\n%a\n" :clock-in t :clock-resume t)
               ("j" "Journal" entry (file+datetree "~/git/org/diary.org")
                "* %?\n%U\n" :clock-in t :clock-resume t)
-              ("w" "org-protocol" entry (file "~/git/org/refile.org")
+              ("w" "org-protocol" entry (file org-default-notes-file)
                "* TODO Review %c\n%U\n" :immediate-finish t)
-              ("m" "Meeting" entry (file "~/git/org/refile.org")
+              ("m" "Meeting" entry (file org-default-notes-file)
                "* MEETING with %? :MEETING:\n%U" :clock-in t :clock-resume t)
-              ("p" "Phone call" entry (file "~/git/org/refile.org")
+              ("p" "Phone call" entry (file org-default-notes-file)
                "* PHONE %? :PHONE:\n%U" :clock-in t :clock-resume t)
-              ("h" "Habit" entry (file "~/git/org/refile.org")
+              ("h" "Habit" entry (file org-default-notes-file)
                "* NEXT %?\n%U\n%a\nSCHEDULED: %(format-time-string \"%<<%Y-%m-%d %a .+1d/3d>>\")\n:PROPERTIES:\n:STYLE: habit\n:REPEAT_TO_STATE: NEXT\n:END:\n"))))
 
 ;; Remove empty LOGBOOK drawers on clock out
@@ -144,7 +144,7 @@ let
   (interactive)
   (save-excursion
     (beginning-of-line 0)
-    (org-remove-empty-drawer-at "LOGBOOK" (point))))
+    (org-remove-empty-drawer-at (point))))
 
 (add-hook 'org-clock-out-hook 'bh/remove-empty-drawer-on-clock-out 'append)
 
diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index f866bbca9..5c35bc280 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -4,240 +4,81 @@ let
   pkgsWithOverlay = import <nixpkgs-unstable> {
     overlays = [
       (import (builtins.fetchTarball {
-        url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
+        url = https://github.com/nix-community/emacs-overlay/archive/403c14c23be188b58c0b1bc197b428041d8a0cea.tar.gz;
       }))
     ];
   };
 
-  orgAgendaView = import ./emacs-org-agenda.nix;
+  # The emacs packages that I use
+  # I differ between
+  # - stable (Packages that I use for some time - happy with it)
+  # - unstable (Packages that I use for some time - but may drop)
+  # - testing (Packages that I try out - the new stuff)
+  emacsPkgs = epkgs:
+    (with epkgs.melpaPackages ;
 
-  packageRepos = ''
-    (require 'package) ;; You might already have this line
-    (let* ((no-ssl (and (memq system-type '(windows-nt ms-dos))
-                        (not (gnutls-available-p))))
-           (url (concat (if no-ssl "http" "https") "://melpa.org/packages/")))
-      (add-to-list 'package-archives (cons "melpa" url) t)
-      (add-to-list 'package-archives
-                 '("org" . "http://orgmode.org/elpa/") t)
-    )
-    (when (< emacs-major-version 24)
-      ;; For important compatibility libraries like cl-lib
-      (add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/")))
-    (package-initialize)
-  '';
+    ## windows-purpose (testing)
+    [ window-purpose ] ++
 
-  evilMode = ''
-    ;; Evil Mode
-    (require 'evil)
-    (evil-mode 1)
-    ;; (require 'evil-org)
-    ;; (add-hook 'org-mode-hook 'evil-org-mode)
-    ;; (evil-org-set-key-theme '(navigation insert textobjects additional calendar))
-    ;; (require 'evil-org-agenda)
-    ;; (evil-org-agenda-set-keys)
-  '';
+    ## helm (stable)
+    # emacs completion engine
+    [ helm helm-ag ] ++
 
-  goMode = ''
-    (setq godoc-and-godef-command "go doc") ;godoc has no cli support any more, thats go doc now
-    (add-to-list 'exec-path "~/go/bin")
-    (add-hook 'go-mode-hook
-    (lambda ()
-      (setq-default)
-      (setq tab-width 2)
-      (setq standard-indent 2)
-      (setq indent-tabs-mode nil)))
-  '';
+    ## deft (testing)
+    # text search for a directory
+    [ deft ] ++
 
-  ido = ''
-    (require 'ido)
-    (ido-mode t)
-  '';
+    ## lsp mode (unstable)
+    # Language Server Protocol mode
+    # Used for rust
+    [ company-lsp dap-mode helm-lsp lsp-mode lsp-treemacs lsp-ui ] ++
 
-  helm = ''
-    (helm-mode 1)
-    (global-set-key (kbd "M-x") #'helm-M-x)
-    (global-set-key (kbd "C-x r b") #'helm-filtered-bookmarks)
-    (global-set-key (kbd "C-x C-f") #'helm-find-files)
-  '';
+    ## emacs convenience (stable)
+    # Mixed and general purpose
+    [ ag company direnv evil google-this spacemacs-theme ] ++
 
-  magit = ''
-    (global-set-key (kbd "C-x g") 'magit-status) ; "Most Magit commands are commonly invoked from the status buffer"
-  '';
-
-  windowCosmetics = ''
-    (menu-bar-mode -1)
-    (tool-bar-mode -1)                  ; Disable the button bar atop screen
-    (scroll-bar-mode -1)                ; Disable scroll bar
-    (toggle-scroll-bar -1)
-    (setq inhibit-startup-screen t)     ; Disable startup screen with graphics
-    (setq-default indent-tabs-mode nil) ; Use spaces instead of tabs
-    (setq default-tab-width 2)          ; Two spaces is a tab
-    (setq tab-width 2)                  ; Four spaces is a tab
-    (setq visible-bell nil)             ; Disable annoying visual bell graphic
-    (setq ring-bell-function 'ignore)   ; Disable super annoying audio bell
-  '';
+    ## common lisp (testing)
+    [ slime ] ++
 
-  orgMode = ''
-    (add-to-list 'auto-mode-alist '("\\.\\(org\\|org_archive\\|txt\\)$" . org-mode))
-    (global-set-key "\C-cl" 'org-store-link)
-    (global-set-key "\C-ca" 'org-agenda)
-    (global-set-key "\C-cb" 'org-iswitchb)
-    (global-set-key "\C-c L" 'org-insert-link-global)
-    (global-set-key "\C-c o" 'org-open-at-point-global)
-    (setq org-link-frame-setup '((file . find-file))) ; open link in same frame.
-    (if (boundp 'org-user-agenda-files)
-      (setq org-agenda-files org-user-agenda-files)
-      (setq org-agenda-files (quote ("~/projects/notes_privat")))
-    )
-  '';
+    ## magit (stable)
+    [ magit ] ++
 
-  theme = ''
-    (load-theme 'monokai-alt t)
-    (load-theme 'whiteboard t)
-    (disable-theme 'monokai-alt)
-    (disable-theme 'whiteboard)
-
-    (defun mh/load-whiteboard-theme ()
-      "load whiteboard theme"
-      (interactive)
-      (message "whiteboard loaded")
-      (disable-theme 'monokai-alt)
-      (enable-theme 'whiteboard)
-    )
-
-    (defun mh/load-monokai-theme ()
-      "load monokai theme"
-      (interactive)
-      (message "monokai loaded")
-      (disable-theme 'whiteboard)
-      (enable-theme 'monokai-alt)
-    )
-
-    (global-set-key "\C-ctw" 'mh/load-whiteboard-theme)
-    (global-set-key "\C-ctm" 'mh/load-monokai-theme)
-  '';
-
-  # Configuration for rust development
-  # inspired by
-  # https://github.com/bbatsov/prelude/blob/master/modules/prelude-rust.el
-  #
-  # This requires rls and racer to be installed on the system
-  rustDevelopment = ''
-    (add-hook 'rust-mode-hook #'racer-mode)
-    (add-hook 'rust-mode-hook (lambda()
-      (local-set-key (kbd "C-c C-d") 'racer-describe)
-      (local-set-key (kbd "C-c .") 'racer-find-definition)
-      (local-set-key (kbd "C-c ,") 'pop-tag-mark))
-    )
-    (add-hook 'racer-mode-hook #'eldoc-mode)
-    (add-hook 'racer-mode-hook #'company-mode)
-    (require 'rust-mode)
-    (define-key rust-mode-map (kbd "TAB") #'company-indent-or-complete-common)
-    (setq company-tooltip-align-annotations t)
-  '';
-
-  recentFiles = ''
-    (recentf-mode 1)
-    (setq recentf-max-menu-items 25)
-    (global-set-key "\C-x\ \C-r" 'recentf-open-files)
-  '';
+    ## bunch of programming languages (unstable)
+    [ go-mode haskell-mode nix-mode ] ++
 
-  myFunctionKeys = ''
-    (fset 'kill-actual-buffer
-      [?\C-x ?k return])
+    ## rust (unstable)
+    [ racer rust-mode ] ++
 
-    (defun mh/open-term-and-rename (name)
-      "open a new bash and rename it"
-      (interactive "sName of new terminal: ")
-      (term "/run/current-system/sw/bin/bash")
-      (rename-buffer name)
-    )
-    (global-set-key (kbd "M-<f8>") 'kill-actual-buffer)
-
-    (global-set-key (kbd "<f5>") 'mh/open-term-and-rename)
-    (global-set-key (kbd "<f6>") 'other-window)
-    (global-set-key (kbd "<f7>") 'split-window-right)
-    (global-set-key (kbd "<f8>") 'delete-other-windows)
-  '';
-
-  lspMode = ''
-    (require 'lsp-mode)
-    (add-hook 'rust-mode-hook #'lsp)
-  '';
-
-  dotEmacs = pkgs.writeText "dot-emacs" ''
-    ${packageRepos}
-
-    ${evilMode}
-    ${goMode}
-    ${helm}
-    ${magit}
-    ${orgMode}
-    ${rustDevelopment}
-    ${theme}
-    ${windowCosmetics}
-
-    ${orgAgendaView}
-    ${myFunctionKeys}
-    ${lspMode}
-  '';
-
-  #emacsWithCustomPackages
-  emacsPkgs= epkgs: [
-    # testing lsp mode
-    epkgs.melpaPackages.lsp-ui
-    epkgs.melpaPackages.company-lsp
-    epkgs.melpaPackages.lsp-treemacs
-    epkgs.melpaPackages.helm-lsp
-    epkgs.melpaPackages.dap-mode
-    epkgs.melpaPackages.lsp-mode
+    ## python (stable)
+    # Python IDE for emacs
+    [ elpy ]) ++
 
+    ## org-mode
+    # Org-Mode has several extensions
+    # and can be seen as an application of its own.
+    (with epkgs.melpaPackages ;
     # testing
-    epkgs.melpaPackages.web-mode
-    epkgs.melpaPackages.js2-mode
-    epkgs.melpaPackages.xref-js2
-
-    epkgs.melpaPackages.academic-phrases
-
-    epkgs.melpaPackages.gitlab
-    epkgs.melpaPackages.helm
-    epkgs.melpaPackages.weechat
-
-# emacs convenience
-    epkgs.melpaPackages.ag
-    epkgs.melpaPackages.company
-    epkgs.melpaPackages.direnv
-    epkgs.melpaPackages.evil
-    epkgs.melpaPackages.google-this
-    epkgs.melpaPackages.monokai-alt-theme
-    epkgs.melpaPackages.zenburn-theme
+      [ org-super-agenda org-bullets org-ql ] ++
+    # unstable
+      [ smex org-mime orgit ]
+    ) ++
 
-# development
-    epkgs.melpaPackages.magit
-    epkgs.melpaPackages.nix-mode
-    epkgs.melpaPackages.go-mode
-    epkgs.melpaPackages.haskell-mode
-# rust
-    epkgs.melpaPackages.rust-mode
-#    epkgs.melpaPackages.flycheck-rust
-    epkgs.melpaPackages.racer
+    # stable
+    (with epkgs.orgPackages ;
+      [ org-plus-contrib ]) ++
 
-# python
-    epkgs.melpaPackages.elpy
+    # stable
+    (with epkgs.elpaPackages ;
+      [ bbdb which-key ]);
 
-# org-mode
-    epkgs.elpaPackages.bbdb
-    epkgs.orgPackages.org-plus-contrib
-    epkgs.melpaPackages.smex
-    epkgs.melpaPackages.org-mime
-    epkgs.melpaPackages.orgit
-
-
-    epkgs.elpaPackages.which-key
-  ];
+#    ## EXWM related (unstable)
+#    epkgs.exwm
+#    epkgs.melpaPackages.desktop-environment
+#    epkgs.melpaPackages.helm-exwm
+#  ];
 
   emacsWithOverlay = pkgsWithOverlay.emacsWithPackagesFromUsePackage {
-    config = builtins.readFile dotEmacs; # builtins.readFile ./emacs.el;
+    config = builtins.readFile ./elisp/init.el;
     # Package is optional, defaults to pkgs.emacs
     package = pkgsWithOverlay.emacsGit;
     # Optionally provide extra packages not in the configuration file
@@ -245,18 +86,34 @@ let
   };
 
   myEmacs = pkgs.writeDashBin "my-emacs" ''
-    exec ${emacsWithOverlay}/bin/emacs -q -l ${dotEmacs} "$@"
+    exec ${emacsWithOverlay}/bin/emacs -q "$@"
   '';
 
   myEmacsWithDaemon = pkgs.writeDashBin "my-emacs-daemon" ''
-    exec ${emacsWithOverlay}/bin/emacs -q -l ${dotEmacs} --daemon
+    exec ${emacsWithOverlay}/bin/emacs -q --daemon -l ${./elisp/init.el}
   '';
 
   myEmacsClient = pkgs.writeDashBin "meclient" ''
-    exec ${emacsWithOverlay}/bin/emacsclient --create-frame
+    exec ${emacsWithOverlay}/bin/emacsclient --create-frame "$@"
   '';
 in {
   environment.systemPackages = [
-    myEmacs myEmacsWithDaemon myEmacsClient
+    myEmacs myEmacsWithDaemon myEmacsClient emacsWithOverlay
   ];
+
+## EXWM Config
+#  services.xserver = {
+#    enable = true;
+#    xkbOptions = "caps:super";
+#    exportConfiguration = true;
+#
+#    displayManager.slim.enable = true;
+#    windowManager.default = "exwm";
+#
+#    # Set up the login session
+#    windowManager.session = [{
+#      name = "exwm";
+#      start = "${emacsWithOverlay}/bin/emacs -q -l " + builtins.toString ./elisp/init.el;
+#    }];
+#  };
 }
diff --git a/jeschli/2configs/haskell.nix b/jeschli/2configs/haskell.nix
new file mode 100644
index 000000000..2e00d0673
--- /dev/null
+++ b/jeschli/2configs/haskell.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, ... }:
+let
+  all-hies = import (fetchTarball "https://github.com/infinisil/all-hies/tarball/master") {};
+in
+{
+  environment.systemPackages = with pkgs; [
+    cabal2nix
+    gcc
+    ghc
+    haskellPackages.cabal-install
+    haskellPackages.ghcid
+    haskellPackages.hindent
+    haskellPackages.hlint
+    haskellPackages.hoogle
+    haskellPackages.stack
+    haskellPackages.stylish-haskell
+    (all-hies.selection { selector = p: {inherit (p) ghc864; }; })
+  ];
+}