From a1da8a8408c3be99cf0da2a16eefe138687ec04e Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Sat, 16 Nov 2019 04:10:53 +0100
Subject: j emacs: +spacemacs theme

---
 jeschli/2configs/emacs.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index f866bbc..614f195 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -210,6 +210,7 @@ let
     epkgs.melpaPackages.evil
     epkgs.melpaPackages.google-this
     epkgs.melpaPackages.monokai-alt-theme
+    epkgs.melpaPackages.spacemacs-theme
     epkgs.melpaPackages.zenburn-theme
 
 # development
-- 
cgit v1.2.3


From 01b9ce8cd33eb1a77cb811eba40aed5a46789093 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 19:40:28 +0100
Subject: j haskell: intial commit

---
 jeschli/2configs/haskell.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 jeschli/2configs/haskell.nix

diff --git a/jeschli/2configs/haskell.nix b/jeschli/2configs/haskell.nix
new file mode 100644
index 0000000..2e00d06
--- /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; }; })
+  ];
+}
-- 
cgit v1.2.3


From 7abf41032bd3b7163850d7f58ae6bc0de0048d71 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 19:30:49 +0100
Subject: j reagenzglas: add haskell

---
 jeschli/1systems/reagenzglas/config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 7596f17..518dcbc 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -7,6 +7,7 @@
     <stockholm/jeschli/2configs/emacs.nix>
     <stockholm/jeschli/2configs/firefox.nix>
     <stockholm/jeschli/2configs/rust.nix>
+    <stockholm/jeschli/2configs/haskell.nix>
     <stockholm/jeschli/2configs/python.nix>
        ./desktop.nix
        ./i3-configuration.nix
-- 
cgit v1.2.3


From f2dc735e6e50d4d09db10219ca5ba56ef278fcd1 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 19:32:02 +0100
Subject: j reagenzglas: reformat environment.systemPackages

---
 jeschli/1systems/reagenzglas/config.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 518dcbc..344aa67 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -37,10 +37,12 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    wget vim git
-    rofi
     ag
     alacritty
+    git
+    rofi
+    vim
+    wget
   ];
 
   users.users.ombi = {
-- 
cgit v1.2.3


From 12e556783ee5c51c316228eaaa23721f1e1507fe Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 19:32:45 +0100
Subject: j reagenzglas: add copyq

---
 jeschli/1systems/reagenzglas/config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 344aa67..cf229db 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -39,6 +39,7 @@
   environment.systemPackages = with pkgs; [
     ag
     alacritty
+    copyq
     git
     rofi
     vim
-- 
cgit v1.2.3


From c99406ac8762023262c708f9dc40a48c2a374b11 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 19:33:09 +0100
Subject: j reagenzglas: add direnv

---
 jeschli/1systems/reagenzglas/config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index cf229db..3ace77b 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -40,6 +40,7 @@
     ag
     alacritty
     copyq
+    direnv
     git
     rofi
     vim
-- 
cgit v1.2.3


From dc8bc8d3733813b53ffd7dec542dbcedd8d616ef Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 19:33:33 +0100
Subject: j reagenzglas: add go

---
 jeschli/1systems/reagenzglas/config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 3ace77b..f8c7d34 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -41,6 +41,7 @@
     alacritty
     copyq
     direnv
+    go
     git
     rofi
     vim
-- 
cgit v1.2.3


From 21dffdc8fadada7789f56bc2a600234efa0be437 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 19:34:08 +0100
Subject: j emacs: set racer paths for use with a shell-nix

---
 jeschli/2configs/emacs.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 614f195..0a81048 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -123,6 +123,8 @@ let
   #
   # This requires rls and racer to be installed on the system
   rustDevelopment = ''
+    (setq racer-rust-src-path nil) ;; read from shell-nix
+    (setq racer-cmd "racer") ;; read from shell-nix
     (add-hook 'rust-mode-hook #'racer-mode)
     (add-hook 'rust-mode-hook (lambda()
       (local-set-key (kbd "C-c C-d") 'racer-describe)
-- 
cgit v1.2.3


From 6e5d209e963a7850c73608999f95ac104657026c Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 19:37:07 +0100
Subject: j reagenzglas: i3-config: i3-sensible-terminal -> alacritty

---
 jeschli/1systems/reagenzglas/i3-configuration.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jeschli/1systems/reagenzglas/i3-configuration.nix b/jeschli/1systems/reagenzglas/i3-configuration.nix
index c9968c1..93809a8 100644
--- a/jeschli/1systems/reagenzglas/i3-configuration.nix
+++ b/jeschli/1systems/reagenzglas/i3-configuration.nix
@@ -21,8 +21,8 @@ let
     floating_modifier $mod
     
     # start a terminal
-    bindsym $mod+Return exec i3-sensible-terminal
-    
+    bindsym $mod+Return exec alacritty
+
     # kill focused window
     bindsym $mod+Shift+q kill
     
-- 
cgit v1.2.3


From 593da3dd339befbc65846709b4f7c9ee40ff0072 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 19:37:44 +0100
Subject: j reagenzglas: i3 config bind rofi to meta+x

---
 jeschli/1systems/reagenzglas/i3-configuration.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jeschli/1systems/reagenzglas/i3-configuration.nix b/jeschli/1systems/reagenzglas/i3-configuration.nix
index 93809a8..f7bb3af 100644
--- a/jeschli/1systems/reagenzglas/i3-configuration.nix
+++ b/jeschli/1systems/reagenzglas/i3-configuration.nix
@@ -32,6 +32,7 @@ let
     # start dmenu (a program launcher)
     bindsym $mod+d exec ${pkgs.rofi}/bin/rofi -modi drun#run -combi-modi drun#run -show combi -show-icons -display-combi run
  
+    bindsym $mod+x exec ${pkgs.rofi}/bin/rofi -modi window -show window -auto-select
     # There also is the (new) i3-dmenu-desktop which only displays applications
     # shipping a .desktop file. It is a wrapper around dmenu, so you need that
     # installed.
-- 
cgit v1.2.3


From 5bfa88f4197fa2326c3af2bf47167c7758ac2178 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 19:38:52 +0100
Subject: j reagenzglas: i3 config: remove trailing whitespaces

---
 jeschli/1systems/reagenzglas/i3-configuration.nix | 61 ++++++++++++-----------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/jeschli/1systems/reagenzglas/i3-configuration.nix b/jeschli/1systems/reagenzglas/i3-configuration.nix
index f7bb3af..576553e 100644
--- a/jeschli/1systems/reagenzglas/i3-configuration.nix
+++ b/jeschli/1systems/reagenzglas/i3-configuration.nix
@@ -5,89 +5,90 @@ with pkgs;
 let
   i3_config_file = pkgs.writeText "config" ''
     set $mod Mod4
-    
+
     font pango:monospace 8
-    
+
     #font pango:DejaVu Sans Mono 8
-    
+
     # Before i3 v4.8, we used to recommend this one as the default:
     # font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
     # The font above is very space-efficient, that is, it looks good, sharp and
     # clear in small sizes. However, its unicode glyph coverage is limited, the old
     # X core fonts rendering does not support right-to-left and this being a bitmap
     # font, it doesn’t scale on retina/hidpi displays.
-    
+
     # Use Mouse+$mod to drag floating windows to their wanted position
     floating_modifier $mod
-    
+
     # start a terminal
     bindsym $mod+Return exec alacritty
 
     # kill focused window
     bindsym $mod+Shift+q kill
-    
+
     # start dmenu (a program launcher)
     # bindsym $mod+d exec dmenu_run
 
     # start dmenu (a program launcher)
     bindsym $mod+d exec ${pkgs.rofi}/bin/rofi -modi drun#run -combi-modi drun#run -show combi -show-icons -display-combi run
- 
+
     bindsym $mod+x exec ${pkgs.rofi}/bin/rofi -modi window -show window -auto-select
+
     # There also is the (new) i3-dmenu-desktop which only displays applications
     # shipping a .desktop file. It is a wrapper around dmenu, so you need that
     # installed.
     # bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
-    
+
     # change focus
     bindsym $mod+j focus left
     bindsym $mod+k focus down
     bindsym $mod+l focus up
     bindsym $mod+semicolon focus right
-    
+
     # alternatively, you can use the cursor keys:
     bindsym $mod+Left focus left
     bindsym $mod+Down focus down
     bindsym $mod+Up focus up
     bindsym $mod+Right focus right
-    
+
     # move focused window
     bindsym $mod+Shift+j move left
     bindsym $mod+Shift+k move down
     bindsym $mod+Shift+l move up
     bindsym $mod+Shift+colon move right
-    
+
     # alternatively, you can use the cursor keys:
     bindsym $mod+Shift+Left move left
     bindsym $mod+Shift+Down move down
     bindsym $mod+Shift+Up move up
     bindsym $mod+Shift+Right move right
-    
+
     # split in horizontal orientation
     bindsym $mod+h split h
-    
+
     # split in vertical orientation
     bindsym $mod+v split v
-    
+
     # enter fullscreen mode for the focused container
     bindsym $mod+f fullscreen toggle
-    
+
     # change container layout (stacked, tabbed, toggle split)
     bindsym $mod+s layout stacking
     bindsym $mod+w layout tabbed
     bindsym $mod+e layout toggle split
-    
+
     # toggle tiling / floating
     bindsym $mod+Shift+space floating toggle
-    
+
     # change focus between tiling / floating windows
     bindsym $mod+space focus mode_toggle
-    
+
     # focus the parent container
     bindsym $mod+a focus parent
-    
+
     # focus the child container
     #bindsym $mod+d focus child
-    
+
     # Define names for default workspaces for which we configure key bindings later on.
     # We use variables to avoid repeating the names in multiple places.
     set $ws1 "1"
@@ -100,7 +101,7 @@ let
     set $ws8 "8"
     set $ws9 "9"
     set $ws10 "10"
-    
+
     # switch to workspace
     bindsym $mod+1 workspace $ws1
     bindsym $mod+2 workspace $ws2
@@ -112,7 +113,7 @@ let
     bindsym $mod+8 workspace $ws8
     bindsym $mod+9 workspace $ws9
     bindsym $mod+0 workspace $ws10
-    
+
     # move focused container to workspace
     bindsym $mod+Shift+1 move container to workspace $ws1
     bindsym $mod+Shift+2 move container to workspace $ws2
@@ -124,18 +125,18 @@ let
     bindsym $mod+Shift+8 move container to workspace $ws8
     bindsym $mod+Shift+9 move container to workspace $ws9
     bindsym $mod+Shift+0 move container to workspace $ws10
-    
+
     # reload the configuration file
     bindsym $mod+Shift+c reload
     # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
     bindsym $mod+Shift+r restart
     # exit i3 (logs you out of your X session)
     bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
-    
+
     # resize window (you can also use the mouse for that)
     mode "resize" {
             # These bindings trigger as soon as you enter the resize mode
-    
+
             # Pressing left will shrink the window’s width.
             # Pressing right will grow the window’s width.
             # Pressing up will shrink the window’s height.
@@ -144,27 +145,27 @@ let
             bindsym k resize grow height 10 px or 10 ppt
             bindsym l resize shrink height 10 px or 10 ppt
             bindsym semicolon resize grow width 10 px or 10 ppt
-    
+
             # same bindings, but for the arrow keys
             bindsym Left resize shrink width 10 px or 10 ppt
             bindsym Down resize grow height 10 px or 10 ppt
             bindsym Up resize shrink height 10 px or 10 ppt
             bindsym Right resize grow width 10 px or 10 ppt
-    
+
             # back to normal: Enter or Escape or $mod+r
             bindsym Return mode "default"
             bindsym Escape mode "default"
             bindsym $mod+r mode "default"
     }
-    
+
     bindsym $mod+r mode "resize"
-    
+
     # Start i3bar to display a workspace bar (plus the system information i3status
     # finds out, if available)
     bar {
             status_command i3status
     }
-  ''; 
+  '';
 
 in {
 
-- 
cgit v1.2.3


From 731d85d4f01d6cc2cc7586ab5a392404d8b4d7ea Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 23:48:13 +0100
Subject: j eamcs: Fix org-capture wrong-argument bug

---
 jeschli/2configs/emacs-org-agenda.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jeschli/2configs/emacs-org-agenda.nix b/jeschli/2configs/emacs-org-agenda.nix
index f9139fc..9167889 100644
--- a/jeschli/2configs/emacs-org-agenda.nix
+++ b/jeschli/2configs/emacs-org-agenda.nix
@@ -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)
 
-- 
cgit v1.2.3


From 39bea194704bfb16cb89922856f42566e4353f83 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Thu, 12 Dec 2019 10:55:55 +0100
Subject: j emacs: Update refile file

---
 jeschli/2configs/emacs-org-agenda.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/jeschli/2configs/emacs-org-agenda.nix b/jeschli/2configs/emacs-org-agenda.nix
index 9167889..0420dc4 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
-- 
cgit v1.2.3


From 56dcd9475966d2580ed0a96c2393531988cb04ae Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Fri, 20 Dec 2019 08:56:06 +0100
Subject: j reagenzglas: add audio

---
 jeschli/1systems/reagenzglas/config.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index f8c7d34..a3bc7b5 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -54,13 +54,16 @@
   };
 
   users.users.jeschli = {
-     isNormalUser = true;
+    isNormalUser = true;
+    extraGroups = [ "audio" ];
   };
 
 #  services.xserver.synaptics.enable = true;
   services.xserver.libinput.enable = true;
   services.xserver.libinput.disableWhileTyping = true;
 
+  hardware.pulseaudio.enable = true;
+
   #Enable ssh daemon
   services.openssh.enable = true;
 
-- 
cgit v1.2.3


From 6de8ec42621e46cf7d9fedb69e79a8c5b1caa769 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Sat, 16 Nov 2019 04:10:53 +0100
Subject: j emacs: +spacemacs theme

---
 jeschli/2configs/emacs.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index f866bbc..614f195 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -210,6 +210,7 @@ let
     epkgs.melpaPackages.evil
     epkgs.melpaPackages.google-this
     epkgs.melpaPackages.monokai-alt-theme
+    epkgs.melpaPackages.spacemacs-theme
     epkgs.melpaPackages.zenburn-theme
 
 # development
-- 
cgit v1.2.3


From ce20682498565dab632b3e30b91607c0535a657a Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 19:40:28 +0100
Subject: j haskell: intial commit

---
 jeschli/2configs/haskell.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 jeschli/2configs/haskell.nix

diff --git a/jeschli/2configs/haskell.nix b/jeschli/2configs/haskell.nix
new file mode 100644
index 0000000..2e00d06
--- /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; }; })
+  ];
+}
-- 
cgit v1.2.3


From cbb58225254e15fb3f57942314fe9d23d8c9bd29 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 19:30:49 +0100
Subject: j reagenzglas: add haskell

---
 jeschli/1systems/reagenzglas/config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 7596f17..518dcbc 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -7,6 +7,7 @@
     <stockholm/jeschli/2configs/emacs.nix>
     <stockholm/jeschli/2configs/firefox.nix>
     <stockholm/jeschli/2configs/rust.nix>
+    <stockholm/jeschli/2configs/haskell.nix>
     <stockholm/jeschli/2configs/python.nix>
        ./desktop.nix
        ./i3-configuration.nix
-- 
cgit v1.2.3


From d28e3870aa385014f86a8b97298188f316e8c9cb Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 19:32:02 +0100
Subject: j reagenzglas: reformat environment.systemPackages

---
 jeschli/1systems/reagenzglas/config.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 518dcbc..344aa67 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -37,10 +37,12 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    wget vim git
-    rofi
     ag
     alacritty
+    git
+    rofi
+    vim
+    wget
   ];
 
   users.users.ombi = {
-- 
cgit v1.2.3


From 7cfb5779616c2def0d5c84cea1709b0ed7159dbe Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 19:32:45 +0100
Subject: j reagenzglas: add copyq

---
 jeschli/1systems/reagenzglas/config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 344aa67..cf229db 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -39,6 +39,7 @@
   environment.systemPackages = with pkgs; [
     ag
     alacritty
+    copyq
     git
     rofi
     vim
-- 
cgit v1.2.3


From ada21cc6419534fc150426fb43b9900cfe8ccc7a Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 19:33:09 +0100
Subject: j reagenzglas: add direnv

---
 jeschli/1systems/reagenzglas/config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index cf229db..3ace77b 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -40,6 +40,7 @@
     ag
     alacritty
     copyq
+    direnv
     git
     rofi
     vim
-- 
cgit v1.2.3


From 33c607370d6e78a9862a4ff735a5fc840a1211d0 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 19:33:33 +0100
Subject: j reagenzglas: add go

---
 jeschli/1systems/reagenzglas/config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 3ace77b..f8c7d34 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -41,6 +41,7 @@
     alacritty
     copyq
     direnv
+    go
     git
     rofi
     vim
-- 
cgit v1.2.3


From f4728e525ae08ba588c19c99046b1ad3cf7ce6bb Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 19:34:08 +0100
Subject: j emacs: set racer paths for use with a shell-nix

---
 jeschli/2configs/emacs.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 614f195..0a81048 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -123,6 +123,8 @@ let
   #
   # This requires rls and racer to be installed on the system
   rustDevelopment = ''
+    (setq racer-rust-src-path nil) ;; read from shell-nix
+    (setq racer-cmd "racer") ;; read from shell-nix
     (add-hook 'rust-mode-hook #'racer-mode)
     (add-hook 'rust-mode-hook (lambda()
       (local-set-key (kbd "C-c C-d") 'racer-describe)
-- 
cgit v1.2.3


From ba64228cd72fc855b1819dd70e3d2530266e6af5 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 19:37:07 +0100
Subject: j reagenzglas: i3-config: i3-sensible-terminal -> alacritty

---
 jeschli/1systems/reagenzglas/i3-configuration.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jeschli/1systems/reagenzglas/i3-configuration.nix b/jeschli/1systems/reagenzglas/i3-configuration.nix
index c9968c1..93809a8 100644
--- a/jeschli/1systems/reagenzglas/i3-configuration.nix
+++ b/jeschli/1systems/reagenzglas/i3-configuration.nix
@@ -21,8 +21,8 @@ let
     floating_modifier $mod
     
     # start a terminal
-    bindsym $mod+Return exec i3-sensible-terminal
-    
+    bindsym $mod+Return exec alacritty
+
     # kill focused window
     bindsym $mod+Shift+q kill
     
-- 
cgit v1.2.3


From 0a419c647ed51bbeb5d45ec568e2efa3bda4c358 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 19:37:44 +0100
Subject: j reagenzglas: i3 config bind rofi to meta+x

---
 jeschli/1systems/reagenzglas/i3-configuration.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jeschli/1systems/reagenzglas/i3-configuration.nix b/jeschli/1systems/reagenzglas/i3-configuration.nix
index 93809a8..f7bb3af 100644
--- a/jeschli/1systems/reagenzglas/i3-configuration.nix
+++ b/jeschli/1systems/reagenzglas/i3-configuration.nix
@@ -32,6 +32,7 @@ let
     # start dmenu (a program launcher)
     bindsym $mod+d exec ${pkgs.rofi}/bin/rofi -modi drun#run -combi-modi drun#run -show combi -show-icons -display-combi run
  
+    bindsym $mod+x exec ${pkgs.rofi}/bin/rofi -modi window -show window -auto-select
     # There also is the (new) i3-dmenu-desktop which only displays applications
     # shipping a .desktop file. It is a wrapper around dmenu, so you need that
     # installed.
-- 
cgit v1.2.3


From e4ab2b9eece82370e4e05a5686208dbacdb45f0d Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 19:38:52 +0100
Subject: j reagenzglas: i3 config: remove trailing whitespaces

---
 jeschli/1systems/reagenzglas/i3-configuration.nix | 61 ++++++++++++-----------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/jeschli/1systems/reagenzglas/i3-configuration.nix b/jeschli/1systems/reagenzglas/i3-configuration.nix
index f7bb3af..576553e 100644
--- a/jeschli/1systems/reagenzglas/i3-configuration.nix
+++ b/jeschli/1systems/reagenzglas/i3-configuration.nix
@@ -5,89 +5,90 @@ with pkgs;
 let
   i3_config_file = pkgs.writeText "config" ''
     set $mod Mod4
-    
+
     font pango:monospace 8
-    
+
     #font pango:DejaVu Sans Mono 8
-    
+
     # Before i3 v4.8, we used to recommend this one as the default:
     # font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
     # The font above is very space-efficient, that is, it looks good, sharp and
     # clear in small sizes. However, its unicode glyph coverage is limited, the old
     # X core fonts rendering does not support right-to-left and this being a bitmap
     # font, it doesn’t scale on retina/hidpi displays.
-    
+
     # Use Mouse+$mod to drag floating windows to their wanted position
     floating_modifier $mod
-    
+
     # start a terminal
     bindsym $mod+Return exec alacritty
 
     # kill focused window
     bindsym $mod+Shift+q kill
-    
+
     # start dmenu (a program launcher)
     # bindsym $mod+d exec dmenu_run
 
     # start dmenu (a program launcher)
     bindsym $mod+d exec ${pkgs.rofi}/bin/rofi -modi drun#run -combi-modi drun#run -show combi -show-icons -display-combi run
- 
+
     bindsym $mod+x exec ${pkgs.rofi}/bin/rofi -modi window -show window -auto-select
+
     # There also is the (new) i3-dmenu-desktop which only displays applications
     # shipping a .desktop file. It is a wrapper around dmenu, so you need that
     # installed.
     # bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
-    
+
     # change focus
     bindsym $mod+j focus left
     bindsym $mod+k focus down
     bindsym $mod+l focus up
     bindsym $mod+semicolon focus right
-    
+
     # alternatively, you can use the cursor keys:
     bindsym $mod+Left focus left
     bindsym $mod+Down focus down
     bindsym $mod+Up focus up
     bindsym $mod+Right focus right
-    
+
     # move focused window
     bindsym $mod+Shift+j move left
     bindsym $mod+Shift+k move down
     bindsym $mod+Shift+l move up
     bindsym $mod+Shift+colon move right
-    
+
     # alternatively, you can use the cursor keys:
     bindsym $mod+Shift+Left move left
     bindsym $mod+Shift+Down move down
     bindsym $mod+Shift+Up move up
     bindsym $mod+Shift+Right move right
-    
+
     # split in horizontal orientation
     bindsym $mod+h split h
-    
+
     # split in vertical orientation
     bindsym $mod+v split v
-    
+
     # enter fullscreen mode for the focused container
     bindsym $mod+f fullscreen toggle
-    
+
     # change container layout (stacked, tabbed, toggle split)
     bindsym $mod+s layout stacking
     bindsym $mod+w layout tabbed
     bindsym $mod+e layout toggle split
-    
+
     # toggle tiling / floating
     bindsym $mod+Shift+space floating toggle
-    
+
     # change focus between tiling / floating windows
     bindsym $mod+space focus mode_toggle
-    
+
     # focus the parent container
     bindsym $mod+a focus parent
-    
+
     # focus the child container
     #bindsym $mod+d focus child
-    
+
     # Define names for default workspaces for which we configure key bindings later on.
     # We use variables to avoid repeating the names in multiple places.
     set $ws1 "1"
@@ -100,7 +101,7 @@ let
     set $ws8 "8"
     set $ws9 "9"
     set $ws10 "10"
-    
+
     # switch to workspace
     bindsym $mod+1 workspace $ws1
     bindsym $mod+2 workspace $ws2
@@ -112,7 +113,7 @@ let
     bindsym $mod+8 workspace $ws8
     bindsym $mod+9 workspace $ws9
     bindsym $mod+0 workspace $ws10
-    
+
     # move focused container to workspace
     bindsym $mod+Shift+1 move container to workspace $ws1
     bindsym $mod+Shift+2 move container to workspace $ws2
@@ -124,18 +125,18 @@ let
     bindsym $mod+Shift+8 move container to workspace $ws8
     bindsym $mod+Shift+9 move container to workspace $ws9
     bindsym $mod+Shift+0 move container to workspace $ws10
-    
+
     # reload the configuration file
     bindsym $mod+Shift+c reload
     # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
     bindsym $mod+Shift+r restart
     # exit i3 (logs you out of your X session)
     bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
-    
+
     # resize window (you can also use the mouse for that)
     mode "resize" {
             # These bindings trigger as soon as you enter the resize mode
-    
+
             # Pressing left will shrink the window’s width.
             # Pressing right will grow the window’s width.
             # Pressing up will shrink the window’s height.
@@ -144,27 +145,27 @@ let
             bindsym k resize grow height 10 px or 10 ppt
             bindsym l resize shrink height 10 px or 10 ppt
             bindsym semicolon resize grow width 10 px or 10 ppt
-    
+
             # same bindings, but for the arrow keys
             bindsym Left resize shrink width 10 px or 10 ppt
             bindsym Down resize grow height 10 px or 10 ppt
             bindsym Up resize shrink height 10 px or 10 ppt
             bindsym Right resize grow width 10 px or 10 ppt
-    
+
             # back to normal: Enter or Escape or $mod+r
             bindsym Return mode "default"
             bindsym Escape mode "default"
             bindsym $mod+r mode "default"
     }
-    
+
     bindsym $mod+r mode "resize"
-    
+
     # Start i3bar to display a workspace bar (plus the system information i3status
     # finds out, if available)
     bar {
             status_command i3status
     }
-  ''; 
+  '';
 
 in {
 
-- 
cgit v1.2.3


From aba86847ca9096d3e94759fae36108851150c51b Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 11 Dec 2019 23:48:13 +0100
Subject: j eamcs: Fix org-capture wrong-argument bug

---
 jeschli/2configs/emacs-org-agenda.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jeschli/2configs/emacs-org-agenda.nix b/jeschli/2configs/emacs-org-agenda.nix
index f9139fc..9167889 100644
--- a/jeschli/2configs/emacs-org-agenda.nix
+++ b/jeschli/2configs/emacs-org-agenda.nix
@@ -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)
 
-- 
cgit v1.2.3


From 8428620fc37a9e56965890e7953aebd209d51a43 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Thu, 12 Dec 2019 10:55:55 +0100
Subject: j emacs: Update refile file

---
 jeschli/2configs/emacs-org-agenda.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/jeschli/2configs/emacs-org-agenda.nix b/jeschli/2configs/emacs-org-agenda.nix
index 9167889..0420dc4 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
-- 
cgit v1.2.3


From acd683c0a90937dc11ae9877f1a9233e02d9861e Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Fri, 20 Dec 2019 08:56:06 +0100
Subject: j reagenzglas: add audio

---
 jeschli/1systems/reagenzglas/config.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index f8c7d34..a3bc7b5 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -54,13 +54,16 @@
   };
 
   users.users.jeschli = {
-     isNormalUser = true;
+    isNormalUser = true;
+    extraGroups = [ "audio" ];
   };
 
 #  services.xserver.synaptics.enable = true;
   services.xserver.libinput.enable = true;
   services.xserver.libinput.disableWhileTyping = true;
 
+  hardware.pulseaudio.enable = true;
+
   #Enable ssh daemon
   services.openssh.enable = true;
 
-- 
cgit v1.2.3


From 6b638416b6a9418f9e8d4fd37f5a5771f004c3c4 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Tue, 11 Feb 2020 17:50:51 +0100
Subject: j configs: add elisp for emacs config as submodule

---
 jeschli/2configs/elisp | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 jeschli/2configs/elisp

diff --git a/jeschli/2configs/elisp b/jeschli/2configs/elisp
new file mode 160000
index 0000000..a2cb18b
--- /dev/null
+++ b/jeschli/2configs/elisp
@@ -0,0 +1 @@
+Subproject commit a2cb18b59ed0c5707e3fd87b5fd6a20a0074b73c
-- 
cgit v1.2.3


From 406ac24925dc38c728e4812930fcff613399ec94 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Tue, 11 Feb 2020 17:52:46 +0100
Subject: j emacs as exwm; add chrome

---
 jeschli/1systems/reagenzglas/config.nix | 11 +++++++++--
 jeschli/2configs/emacs.nix              | 34 +++++++++++++++++++++++++++------
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index a3bc7b5..91c2ed5 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -9,8 +9,8 @@
     <stockholm/jeschli/2configs/rust.nix>
     <stockholm/jeschli/2configs/haskell.nix>
     <stockholm/jeschli/2configs/python.nix>
-       ./desktop.nix
-       ./i3-configuration.nix
+#       ./desktop.nix
+#       ./i3-configuration.nix
        ./hardware-configuration.nix
     ];
 
@@ -39,6 +39,8 @@
   environment.systemPackages = with pkgs; [
     ag
     alacritty
+    google-chrome
+    chromium
     copyq
     direnv
     go
@@ -67,6 +69,11 @@
   #Enable ssh daemon
   services.openssh.enable = true;
 
+  #Enable clight
+  services.clight.enable = true;
+  services.geoclue2.enable = true;
+  location.provider = "geoclue2";
+
   users.users.root.openssh.authorizedKeys.keys = [
     "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDM1xtX/SF2IzfAIzrXvH4HsW05eTBX8U8MYlEPadq0DS/nHC45hW2PSEUOVsH0UhBRAB+yClVLyN+JAYsuOoQacQqAVq9R7HAoFITdYTMJCxVs4urSRv0pWwTopRIh1rlI+Q0QfdMoeVtO2ZKG3KoRM+APDy2dsX8LTtWjXmh/ZCtpGl1O8TZtz2ZyXyv9OVDPnQiFwPU3Jqs2Z036c+kwxWlxYc55FRuqwRtQ48c/ilPMu+ZvQ22j1Ch8lNuliyAg1b8pZdOkMJF3R8b46IQ8FEqkr3L1YQygYw2M50B629FPgHgeGPMz3mVd+5lzP+okbhPJjMrUqZAUwbMGwGzZ ombi@nixos"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKFXgtbgeivxlMKkoEJ4ANhtR+LRMSPrsmL4U5grFUME jeschli@nixos"
diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 0a81048..cffa1c7 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -9,7 +9,7 @@ let
     ];
   };
 
-  orgAgendaView = import ./emacs-org-agenda.nix;
+#  orgAgendaView = import ./emacs-org-agenda.nix;
 
   packageRepos = ''
     (require 'package) ;; You might already have this line
@@ -179,7 +179,6 @@ let
     ${theme}
     ${windowCosmetics}
 
-    ${orgAgendaView}
     ${myFunctionKeys}
     ${lspMode}
   '';
@@ -202,9 +201,14 @@ let
     epkgs.melpaPackages.academic-phrases
 
     epkgs.melpaPackages.gitlab
-    epkgs.melpaPackages.helm
     epkgs.melpaPackages.weechat
 
+# helm
+    epkgs.melpaPackages.helm
+    epkgs.melpaPackages.helm-fuzzier
+    epkgs.melpaPackages.helm-ag
+
+
 # emacs convenience
     epkgs.melpaPackages.ag
     epkgs.melpaPackages.company
@@ -235,12 +239,15 @@ let
     epkgs.melpaPackages.org-mime
     epkgs.melpaPackages.orgit
 
-
     epkgs.elpaPackages.which-key
+
+    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
@@ -260,6 +267,21 @@ let
   '';
 in {
   environment.systemPackages = [
-    myEmacs myEmacsWithDaemon myEmacsClient
+    myEmacs myEmacsWithDaemon myEmacsClient emacsWithOverlay
   ];
+
+  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;
+    }];
+  };
 }
-- 
cgit v1.2.3


From 4e5c8f85f5c79c41b186d53cfa7831dd7e0e483c Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Tue, 18 Feb 2020 21:10:19 +0100
Subject: j: root@baeckerei add success to reagenzglas

---
 jeschli/1systems/reagenzglas/config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 91c2ed5..43d9ebf 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -77,6 +77,7 @@
   users.users.root.openssh.authorizedKeys.keys = [
     "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDM1xtX/SF2IzfAIzrXvH4HsW05eTBX8U8MYlEPadq0DS/nHC45hW2PSEUOVsH0UhBRAB+yClVLyN+JAYsuOoQacQqAVq9R7HAoFITdYTMJCxVs4urSRv0pWwTopRIh1rlI+Q0QfdMoeVtO2ZKG3KoRM+APDy2dsX8LTtWjXmh/ZCtpGl1O8TZtz2ZyXyv9OVDPnQiFwPU3Jqs2Z036c+kwxWlxYc55FRuqwRtQ48c/ilPMu+ZvQ22j1Ch8lNuliyAg1b8pZdOkMJF3R8b46IQ8FEqkr3L1YQygYw2M50B629FPgHgeGPMz3mVd+5lzP+okbhPJjMrUqZAUwbMGwGzZ ombi@nixos"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKFXgtbgeivxlMKkoEJ4ANhtR+LRMSPrsmL4U5grFUME jeschli@nixos"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG7C3bgoL9VeVl8pgu8sp3PCOs6TXk4R9y7JKJAHGsfm root@baeckerei"
   ];
 
   # This value determines the NixOS release with which your system is to be
-- 
cgit v1.2.3


From bcbb6e59e25e6e2dbaafcc7eb7f7f25878f85f2f Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 28 Mar 2020 18:54:51 +0100
Subject: jeschli: pin emacs-overlay version

---
 jeschli/2configs/emacs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index f866bbc..1ede962 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -4,7 +4,7 @@ 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;
       }))
     ];
   };
-- 
cgit v1.2.3


From 1a00b18f2bc0900fc74f0bce58b9ec25c0632baa Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Mon, 30 Mar 2020 08:18:10 +0200
Subject: j emacs: org beautification

---
 jeschli/2configs/emacs.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index cffa1c7..fb087a9 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -232,7 +232,11 @@ let
 # python
     epkgs.melpaPackages.elpy
 
-# org-mode
+    # org-mode
+    epkgs.melpaPackages.org-super-agenda
+    epkgs.melpaPackages.org-bullets
+    epkgs.melpaPackages.org-ql
+
     epkgs.elpaPackages.bbdb
     epkgs.orgPackages.org-plus-contrib
     epkgs.melpaPackages.smex
-- 
cgit v1.2.3


From 8e438b686384a3aa1ea0d7fbccdc3c9032c171e6 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Mon, 30 Mar 2020 08:18:46 +0200
Subject: j emacs: disable exwm

---
 jeschli/2configs/emacs.nix | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index fb087a9..797a397 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -274,18 +274,19 @@ in {
     myEmacs myEmacsWithDaemon myEmacsClient emacsWithOverlay
   ];
 
-  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;
-    }];
-  };
+## 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;
+#    }];
+#  };
 }
-- 
cgit v1.2.3


From a4af264cd6a6c63814c3202b4bb3bd1e8161fd9d Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Mon, 30 Mar 2020 08:19:16 +0200
Subject: j reagenzglas: reenable i3

---
 jeschli/1systems/reagenzglas/config.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 43d9ebf..d019bb3 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -9,8 +9,8 @@
     <stockholm/jeschli/2configs/rust.nix>
     <stockholm/jeschli/2configs/haskell.nix>
     <stockholm/jeschli/2configs/python.nix>
-#       ./desktop.nix
-#       ./i3-configuration.nix
+       ./desktop.nix
+       ./i3-configuration.nix
        ./hardware-configuration.nix
     ];
 
-- 
cgit v1.2.3


From 3577bea0fcc38ddd132251cefcd118ff6cd6cd5d Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Mon, 30 Mar 2020 08:19:46 +0200
Subject: j emacs: set to latest init.el

---
 jeschli/2configs/elisp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jeschli/2configs/elisp b/jeschli/2configs/elisp
index a2cb18b..d93aa29 160000
--- a/jeschli/2configs/elisp
+++ b/jeschli/2configs/elisp
@@ -1 +1 @@
-Subproject commit a2cb18b59ed0c5707e3fd87b5fd6a20a0074b73c
+Subproject commit d93aa293a63e02e25cfeb5fcc2b16e0ffe6776fe
-- 
cgit v1.2.3


From 46d14d8bb8003dce64770c4ba5abbbf5903e971e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 12 Apr 2020 09:45:06 +0200
Subject: tv xmonad: add pavucontrol

---
 tv/5pkgs/haskell/xmonad-tv/src/Paths.hs | 3 +++
 tv/5pkgs/haskell/xmonad-tv/src/main.hs  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs b/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs
index 3a879b5..dd21511 100644
--- a/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs
+++ b/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs
@@ -12,6 +12,9 @@ pactl = findExecutable "pactl"
 passmenu :: FilePath
 passmenu = findExecutable "passmenu"
 
+pavucontrol :: FilePath
+pavucontrol = findExecutable "pavucontrol"
+
 slock :: FilePath
 slock = findExecutable "slock"
 
diff --git a/tv/5pkgs/haskell/xmonad-tv/src/main.hs b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
index c528017..400c87a 100644
--- a/tv/5pkgs/haskell/xmonad-tv/src/main.hs
+++ b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
@@ -160,6 +160,7 @@ myKeys conf = Map.fromList $
     , ((0, xF86XK_AudioLowerVolume), audioLowerVolume)
     , ((0, xF86XK_AudioRaiseVolume), audioRaiseVolume)
     , ((0, xF86XK_AudioMute), audioMute)
+    , ((_4, xF86XK_AudioMute), pavucontrol [])
 
     , ((_4, xK_Prior), forkFile Paths.xcalib ["-invert", "-alter"] Nothing)
     ]
@@ -175,6 +176,8 @@ myKeys conf = Map.fromList $
     _4SM = _4 .|. _S .|. _M
 
     pactl args = forkFile Paths.pactl args Nothing
+    pavucontrol args = forkFile Paths.pavucontrol args Nothing
+
     audioLowerVolume = pactl ["--", "set-sink-volume", "@DEFAULT_SINK@", "-5%"]
     audioRaiseVolume = pactl ["--", "set-sink-volume", "@DEFAULT_SINK@", "+5%"]
     audioMute = pactl ["--", "set-sink-mute", "@DEFAULT_SINK@", "toggle"]
-- 
cgit v1.2.3


From 5dbb73d30e7120648e4f6b17a2112aa7b2116577 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Tue, 14 Apr 2020 20:31:02 +0200
Subject: j emacs: update elisp submodule

---
 jeschli/2configs/elisp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jeschli/2configs/elisp b/jeschli/2configs/elisp
index d93aa29..ae1a03d 160000
--- a/jeschli/2configs/elisp
+++ b/jeschli/2configs/elisp
@@ -1 +1 @@
-Subproject commit d93aa293a63e02e25cfeb5fcc2b16e0ffe6776fe
+Subproject commit ae1a03ddee80d73ac166af75cdb1d93d24fa44b9
-- 
cgit v1.2.3


From 65769bfbbe28003d96f1532256f0aadc4e3ad6c6 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Tue, 14 Apr 2020 20:42:06 +0200
Subject: j emacs: remove dead code

---
 jeschli/2configs/emacs.nix | 178 +--------------------------------------------
 1 file changed, 2 insertions(+), 176 deletions(-)

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 7400663..5bdd6d5 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -9,180 +9,6 @@ let
     ];
   };
 
-#  orgAgendaView = import ./emacs-org-agenda.nix;
-
-  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)
-  '';
-
-  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)
-  '';
-
-  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)))
-  '';
-
-  ido = ''
-    (require 'ido)
-    (ido-mode t)
-  '';
-
-  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)
-  '';
-
-  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
-  '';
-
-  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")))
-    )
-  '';
-
-  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 = ''
-    (setq racer-rust-src-path nil) ;; read from shell-nix
-    (setq racer-cmd "racer") ;; read from shell-nix
-    (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)
-  '';
-
-  myFunctionKeys = ''
-    (fset 'kill-actual-buffer
-      [?\C-x ?k return])
-
-    (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}
-
-    ${myFunctionKeys}
-    ${lspMode}
-  '';
-
   #emacsWithCustomPackages
   emacsPkgs= epkgs: [
     # testing lsp mode
@@ -259,11 +85,11 @@ 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
   '';
 
   myEmacsClient = pkgs.writeDashBin "meclient" ''
-- 
cgit v1.2.3


From 9d72468c8b41109aacd817afca8652a3620c3d7a Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Tue, 14 Apr 2020 20:42:37 +0200
Subject: j emacs: let emacsclient accept files from terminal

---
 jeschli/2configs/emacs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 5bdd6d5..c57a06f 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -93,7 +93,7 @@ let
   '';
 
   myEmacsClient = pkgs.writeDashBin "meclient" ''
-    exec ${emacsWithOverlay}/bin/emacsclient --create-frame
+    exec ${emacsWithOverlay}/bin/emacsclient --create-frame "$@"
   '';
 in {
   environment.systemPackages = [
-- 
cgit v1.2.3


From 938749727ebf062202053f078204e81d1f407a13 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Tue, 14 Apr 2020 20:43:33 +0200
Subject: j emacs: cleanup and add documentation of used emacs pkgs

---
 jeschli/2configs/emacs.nix | 127 ++++++++++++++++++++++-----------------------
 1 file changed, 62 insertions(+), 65 deletions(-)

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index c57a06f..caece8c 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -9,72 +9,69 @@ let
     ];
   };
 
-  #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
-
+  # 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 ;
+
+    ## helm (stable)
+    # emacs completion engine
+    [ helm helm-ag ] ++
+
+    ## deft (testing)
+    # text search for a directory
+    [ deft ] ++
+
+    ## lsp mode (unstable)
+    # Language Server Protocol mode
+    # Used for rust
+    [ company-lsp dap-mode helm-lsp lsp-mode lsp-treemacs lsp-ui ] ++
+
+    ## emacs convenience (stable)
+    # Mixed and general purpose
+    [ ag company direnv evil google-this spacemacs-theme ] ++
+
+    ## common lisp (testing)
+    [ slime ] ++
+
+    ## magit (stable)
+    [ magit ] ++
+
+    ## bunch of programming languages (unstable)
+    [ go-mode haskell-mode nix-mode ] ++
+
+    ## rust (unstable)
+    [ racer rust-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.weechat
-
-# helm
-    epkgs.melpaPackages.helm
-    epkgs.melpaPackages.helm-fuzzier
-    epkgs.melpaPackages.helm-ag
-
-
-# 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.spacemacs-theme
-    epkgs.melpaPackages.zenburn-theme
-
-# 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
-
-# python
-    epkgs.melpaPackages.elpy
-
-    # org-mode
-    epkgs.melpaPackages.org-super-agenda
-    epkgs.melpaPackages.org-bullets
-    epkgs.melpaPackages.org-ql
-
-    epkgs.elpaPackages.bbdb
-    epkgs.orgPackages.org-plus-contrib
-    epkgs.melpaPackages.smex
-    epkgs.melpaPackages.org-mime
-    epkgs.melpaPackages.orgit
-
-    epkgs.elpaPackages.which-key
-
-    epkgs.exwm
-    epkgs.melpaPackages.desktop-environment
-    epkgs.melpaPackages.helm-exwm
-  ];
+      [ org-super-agenda org-bullets org-ql ] ++
+    # unstable
+      [ smex org-mime orgit ]
+    ) ++
+
+    # stable
+    (with epkgs.orgPackages ;
+      [ org-plus-contrib ]) ++
+
+    (with epkgs.elpaPackages ;
+      [ bbdb which-key ]);
+
+#    ## EXWM related (unstable)
+#    epkgs.exwm
+#    epkgs.melpaPackages.desktop-environment
+#    epkgs.melpaPackages.helm-exwm
+#  ];
 
   emacsWithOverlay = pkgsWithOverlay.emacsWithPackagesFromUsePackage {
     config = builtins.readFile ./elisp/init.el;
-- 
cgit v1.2.3


From 79b0711a5c78c379e852c3c5d90931f440bc5813 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Tue, 14 Apr 2020 20:44:36 +0200
Subject: j reagenzglas: add steam

---
 jeschli/1systems/reagenzglas/config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index d019bb3..e42eb95 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -8,6 +8,7 @@
     <stockholm/jeschli/2configs/firefox.nix>
     <stockholm/jeschli/2configs/rust.nix>
     <stockholm/jeschli/2configs/haskell.nix>
+    <stockholm/jeschli/2configs/steam.nix>
     <stockholm/jeschli/2configs/python.nix>
        ./desktop.nix
        ./i3-configuration.nix
-- 
cgit v1.2.3


From 35972758df55ca12ad77c33261b741d6faf921a1 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Tue, 14 Apr 2020 20:45:12 +0200
Subject: j reagenzglas: add gitAndTools.hub

---
 jeschli/1systems/reagenzglas/config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index e42eb95..86c33f7 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -46,6 +46,7 @@
     direnv
     go
     git
+    gitAndTools.hub
     rofi
     vim
     wget
-- 
cgit v1.2.3


From 17630336d47adc801ab38bf7184d5ad04bdb5306 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Tue, 14 Apr 2020 20:45:49 +0200
Subject: j reagenzglas: add steel bank common lisp (sbcl)

---
 jeschli/1systems/reagenzglas/config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 86c33f7..b3b3355 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -47,6 +47,7 @@
     go
     git
     gitAndTools.hub
+    sbcl
     rofi
     vim
     wget
-- 
cgit v1.2.3


From e03a28a8a21313e2082bafc91da0e0a5066a4104 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Tue, 14 Apr 2020 20:46:47 +0200
Subject: j reagenzglas: touchpad dis/enable by F1/F2.

---
 jeschli/1systems/reagenzglas/i3-configuration.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jeschli/1systems/reagenzglas/i3-configuration.nix b/jeschli/1systems/reagenzglas/i3-configuration.nix
index 576553e..88f6342 100644
--- a/jeschli/1systems/reagenzglas/i3-configuration.nix
+++ b/jeschli/1systems/reagenzglas/i3-configuration.nix
@@ -34,6 +34,9 @@ let
 
     bindsym $mod+x exec ${pkgs.rofi}/bin/rofi -modi window -show window -auto-select
 
+    bindsym $mod+F1 exec xinput --list | grep Touchpad | sed 's/.*id=\([0-9][0-9]\).*/\1/' | xargs xinput disable
+    bindsym $mod+F2 exec xinput --list | grep Touchpad | sed 's/.*id=\([0-9][0-9]\).*/\1/' | xargs xinput enable
+
     # There also is the (new) i3-dmenu-desktop which only displays applications
     # shipping a .desktop file. It is a wrapper around dmenu, so you need that
     # installed.
-- 
cgit v1.2.3


From e613c199203b9f90cc7e4f97c7b1825abb02aa56 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 18 Apr 2020 18:48:54 +0200
Subject: lib: add stripAttr

---
 lib/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/default.nix b/lib/default.nix
index 14e6e27..5a948bb 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -49,6 +49,8 @@ let
 
     indent = replaceChars ["\n"] ["\n  "];
 
+    stripAttr = converge (filterAttrsRecursive (n: v: v != {} && v != null));
+
     mapNixDir = f: x: {
       list = foldl' mergeAttrs {} (map (mapNixDir1 f) x);
       path = mapNixDir1 f x;
-- 
cgit v1.2.3


From 48a08d4616a133dedf29ef538d5f950f81b17314 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Tue, 21 Apr 2020 19:52:57 +0200
Subject: j reagenzglas: slim -> lightdm

---
 jeschli/1systems/reagenzglas/desktop.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jeschli/1systems/reagenzglas/desktop.nix b/jeschli/1systems/reagenzglas/desktop.nix
index 0c42981..88eae08 100644
--- a/jeschli/1systems/reagenzglas/desktop.nix
+++ b/jeschli/1systems/reagenzglas/desktop.nix
@@ -7,8 +7,8 @@
     enable = true;
     xkbOptions = "caps:super";
     exportConfiguration