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

83 files changed, 1296 insertions, 2072 deletions

diff --git a/.gitmodules b/.gitmodules
index aee01051..aa4d0662 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,9 @@
 [submodule "lass/5pkgs/autowifi"]
 	path = lass/5pkgs/autowifi
 	url = https://github.com/Lassulus/autowifi
+[submodule "jeschli/2configs/elisp"]
+	path = jeschli/2configs/elisp
+	url = https://github.com/Jeschli/misc-elisp-scripts.git
 [submodule "submodules/brockman"]
 	path = submodules/brockman
 	url = https://github.com/kmein/brockman.git
diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 7596f17d..b3b33558 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -7,6 +7,8 @@
     <stockholm/jeschli/2configs/emacs.nix>
     <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
@@ -36,10 +38,19 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    wget vim git
-    rofi
     ag
     alacritty
+    google-chrome
+    chromium
+    copyq
+    direnv
+    go
+    git
+    gitAndTools.hub
+    sbcl
+    rofi
+    vim
+    wget
   ];
 
   users.users.ombi = {
@@ -48,19 +59,28 @@
   };
 
   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;
 
+  #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"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG7C3bgoL9VeVl8pgu8sp3PCOs6TXk4R9y7JKJAHGsfm root@baeckerei"
   ];
 
   # This value determines the NixOS release with which your system is to be
diff --git a/jeschli/1systems/reagenzglas/desktop.nix b/jeschli/1systems/reagenzglas/desktop.nix
index 0c429810..88eae086 100644
--- a/jeschli/1systems/reagenzglas/desktop.nix
+++ b/jeschli/1systems/reagenzglas/desktop.nix
@@ -7,8 +7,8 @@
     enable = true;
     xkbOptions = "caps:super";
     exportConfiguration = true;
-    
-    displayManager.slim.enable = true;
+
+    displayManager.lightdm.enable = true;
   };
 
   # Configure fonts
diff --git a/jeschli/1systems/reagenzglas/i3-configuration.nix b/jeschli/1systems/reagenzglas/i3-configuration.nix
index c9968c17..88f63426 100644
--- a/jeschli/1systems/reagenzglas/i3-configuration.nix
+++ b/jeschli/1systems/reagenzglas/i3-configuration.nix
@@ -5,88 +5,93 @@ 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 i3-sensible-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
+
+    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.
     # 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"
@@ -99,7 +104,7 @@ let
     set $ws8 "8"
     set $ws9 "9"
     set $ws10 "10"
-    
+
     # switch to workspace
     bindsym $mod+1 workspace $ws1
     bindsym $mod+2 workspace $ws2
@@ -111,7 +116,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
@@ -123,18 +128,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.
@@ -143,27 +148,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 {
 
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 f9139fcf..0420dc43 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 f866bbca..5c35bc28 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/")))