From 81e9f8b8b5e02edca0cec7680fb43f0cd64200ae 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(+)

(limited to 'jeschli')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index f866bbca9..614f195fa 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 e75eb3ec0876f0df477d48f642dbce904acce519 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

(limited to 'jeschli')

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; }; })
+  ];
+}
-- 
cgit v1.2.3


From aeab0fd92480bd8ff7339790c4e048546ffaccdf 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(+)

(limited to 'jeschli')

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 7596f17d6..518dcbca7 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 493f78edab0cf254a34acfa88115c42830e26394 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(-)

(limited to 'jeschli')

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 518dcbca7..344aa67b2 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 3adf052d3201c7c0c646f4227cf6614535fc2550 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(+)

(limited to 'jeschli')

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 344aa67b2..cf229dba7 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 27a6c546c29a1168a8796ba617b96b7d4ecc4ac9 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(+)

(limited to 'jeschli')

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index cf229dba7..3ace77bff 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 ff5430a015feda6608932120e190dbc5ae65232e 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(+)

(limited to 'jeschli')

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 3ace77bff..f8c7d344e 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 c4806aa4f791b11358fa9e8f3b52cad400212dca 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(+)

(limited to 'jeschli')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 614f195fa..0a81048fa 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 fecc8f7a3384055ab6e54c42f10cf0118f8acd24 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(-)

(limited to 'jeschli')

diff --git a/jeschli/1systems/reagenzglas/i3-configuration.nix b/jeschli/1systems/reagenzglas/i3-configuration.nix
index c9968c17a..93809a821 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 4918f057dfb714ff1414f3fbb2cba3687d22991b 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(+)

(limited to 'jeschli')

diff --git a/jeschli/1systems/reagenzglas/i3-configuration.nix b/jeschli/1systems/reagenzglas/i3-configuration.nix
index 93809a821..f7bb3afa5 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 f941030622f35ed35e354f9b87991b72947434ed 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(-)

(limited to 'jeschli')

diff --git a/jeschli/1systems/reagenzglas/i3-configuration.nix b/jeschli/1systems/reagenzglas/i3-configuration.nix
index f7bb3afa5..576553e79 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 8f3b78f5b84db3275ae81cb10a663b1be28785f9 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(-)

(limited to 'jeschli')

diff --git a/jeschli/2configs/emacs-org-agenda.nix b/jeschli/2configs/emacs-org-agenda.nix
index f9139fcfe..916788968 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 5b5c38432b56ea3dedf822254f0b041eaca70b58 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(-)

(limited to 'jeschli')

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


From 8d24736da4c4bda9b1073c2e3c408378a11d39bd 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(-)

(limited to 'jeschli')

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index f8c7d344e..a3bc7b5b0 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 8cd1b405b04c17d4d411a3607b85548b7c868d12 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

(limited to 'jeschli')

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


From eb6669994ed94ceae9acbf25aae86eabec0e856f 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(-)

(limited to 'jeschli')

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index a3bc7b5b0..91c2ed548 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 0a81048fa..cffa1c744 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 ae267972786437b2e2942e11873bf6c098d270d3 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(+)

(limited to 'jeschli')

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 91c2ed548..43d9ebf5d 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 a8322014cb96d6620787deb15c905dd9507b9e19 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(-)

(limited to 'jeschli')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index cffa1c744..fb087a95f 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 bd780544d8823ba8845ec1014fb85c720f401463 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(-)

(limited to 'jeschli')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index fb087a95f..797a397ba 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 5ddd65598006b1e7c48351247af0eb6813f4d2d7 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(-)

(limited to 'jeschli')

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 43d9ebf5d..d019bb3d3 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 3460cea01716371a1dcc62c42aa8dcce7ac4ff29 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(-)

(limited to 'jeschli')

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


From 290b6a542527a0a48c11fc2b00aee2b4d7f7df06 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(-)

(limited to 'jeschli')

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


From 5fa5426989baf0e44f0525775e6c4548f2d2d3a0 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(-)

(limited to 'jeschli')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 7400663a2..5bdd6d519 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 f8416778977803649e2b00f70ad8c5f4590f6d1b 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(-)

(limited to 'jeschli')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 5bdd6d519..c57a06f8c 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 467590736424f0bf0c51d50742b886728207a9d8 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(-)

(limited to 'jeschli')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index c57a06f8c..caece8c9e 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 29c67ba9533a67edfbff02fa4dc28dfbd90237f0 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(+)

(limited to 'jeschli')

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index d019bb3d3..e42eb95c5 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 18b14b8c0727e1223e4cb88ebfa3637966cee4a4 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(+)

(limited to 'jeschli')

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index e42eb95c5..86c33f78d 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 6fd3dbd548fdb7298579a11f4bad2852d5c61b3d 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(+)

(limited to 'jeschli')

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 86c33f78d..b3b335585 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 d971fff4277bf2f605ffa5b9a074dfc5df2937a7 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(+)

(limited to 'jeschli')

diff --git a/jeschli/1systems/reagenzglas/i3-configuration.nix b/jeschli/1systems/reagenzglas/i3-configuration.nix
index 576553e79..88f63426d 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 b5c0cef86fe6b477b0f156860665ad6f36eabb24 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(-)

(limited to 'jeschli')

diff --git a/jeschli/1systems/reagenzglas/desktop.nix b/jeschli/1systems/reagenzglas/desktop.nix
index 0c4298109..88eae086f 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
-- 
cgit v1.2.3


From d947b167df49894e11b9685906bbbe8736b11aef Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Tue, 21 Apr 2020 19:54:45 +0200
Subject: j emacs: add window-purpose

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

(limited to 'jeschli')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index caece8c9e..cb1bef949 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -17,6 +17,9 @@ let
   emacsPkgs = epkgs:
     (with epkgs.melpaPackages ;
 
+    ## windows-purpose (testing)
+    [ window-purpose ] ++
+
     ## helm (stable)
     # emacs completion engine
     [ helm helm-ag ] ++
-- 
cgit v1.2.3


From d20962339130e27acf883e6e4149ba3d13db1994 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Tue, 21 Apr 2020 19:56:00 +0200
Subject: j emacs: stable for bbdb which-key

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

(limited to 'jeschli')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index cb1bef949..73a2320d4 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -67,6 +67,7 @@ let
     (with epkgs.orgPackages ;
       [ org-plus-contrib ]) ++
 
+    # stable
     (with epkgs.elpaPackages ;
       [ bbdb which-key ]);
 
-- 
cgit v1.2.3


From 8684b9b771ac038b632b61bfefad75a1a6642c53 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Tue, 21 Apr 2020 19:58:14 +0200
Subject: j emacs: use ./elisp/init.el

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

(limited to 'jeschli')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 73a2320d4..5c35bc280 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -90,7 +90,7 @@ let
   '';
 
   myEmacsWithDaemon = pkgs.writeDashBin "my-emacs-daemon" ''
-    exec ${emacsWithOverlay}/bin/emacs -q --daemon
+    exec ${emacsWithOverlay}/bin/emacs -q --daemon -l ${./elisp/init.el}
   '';
 
   myEmacsClient = pkgs.writeDashBin "meclient" ''
-- 
cgit v1.2.3


From 56792b9fedcbd1e5b1a9515b5e656a2923b37cd5 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Tue, 21 Apr 2020 20:36:14 +0200
Subject: j haskell: remove stylish-haskell

---
 jeschli/2configs/haskell.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'jeschli')

diff --git a/jeschli/2configs/haskell.nix b/jeschli/2configs/haskell.nix
index 2e00d0673..46ae24fb0 100644
--- a/jeschli/2configs/haskell.nix
+++ b/jeschli/2configs/haskell.nix
@@ -13,7 +13,6 @@ in
     haskellPackages.hlint
     haskellPackages.hoogle
     haskellPackages.stack
-    haskellPackages.stylish-haskell
     (all-hies.selection { selector = p: {inherit (p) ghc864; }; })
   ];
 }
-- 
cgit v1.2.3


From 7abaec32f92491d8ac53c4178c631423a3639019 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 22 Apr 2020 12:32:12 +0200
Subject: j reagenzglas: remove haskell

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

(limited to 'jeschli')

diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index b3b335585..dec69563f 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -7,7 +7,6 @@
     <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
-- 
cgit v1.2.3


From 119a7cfe5a87323ec7231c263abc444229564a1c Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 22 Apr 2020 12:33:21 +0200
Subject: j elisp: update to latest commit

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

(limited to 'jeschli')

diff --git a/jeschli/2configs/elisp b/jeschli/2configs/elisp
index ae1a03dde..279d6a01f 160000
--- a/jeschli/2configs/elisp
+++ b/jeschli/2configs/elisp
@@ -1 +1 @@
-Subproject commit ae1a03ddee80d73ac166af75cdb1d93d24fa44b9
+Subproject commit 279d6a01f5abbab5d28d3a57549b7fec800a510e
-- 
cgit v1.2.3


From e620c25782906e66fedf9cff06a159c440e679f8 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Wed, 22 Apr 2020 16:06:29 +0200
Subject: j ublock-origin: licenses.gnu3 -> licenses.gpl3

---
 jeschli/2configs/own-pkgs/ublock-origin/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'jeschli')

diff --git a/jeschli/2configs/own-pkgs/ublock-origin/default.nix b/jeschli/2configs/own-pkgs/ublock-origin/default.nix
index 45465d482..002fa3efc 100644
--- a/jeschli/2configs/own-pkgs/ublock-origin/default.nix
+++ b/jeschli/2configs/own-pkgs/ublock-origin/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "ublock origin firefox browser addon";
     homepage = https://github.com/gorhill/uBlock;
-    license = licenses.gnu3;
+    license = licenses.gpl3;
     maintainers = [];
     platforms = stdenv.lib.platforms.all;
   };
-- 
cgit v1.2.3


From 89d9adf09c97d8916a35c03658991c89641335e8 Mon Sep 17 00:00:00 2001
From: Jeschli <jeschli@gmail.com>
Date: Thu, 23 Apr 2020 19:47:18 +0200
Subject: j firefox: overlay from 2configs -> 5pkgs/firefox

---
 jeschli/2configs/firefox.nix                       |  15 +-
 jeschli/2configs/overlays/firefox-with-config.nix  | 488 ---------------------
 .../audio-fingerprint-defender/default.nix         |  40 --
 .../canvas-fingerprint-defender/default.nix        |  40 --
 jeschli/2configs/own-pkgs/dark-reader/default.nix  |  28 --
 .../own-pkgs/font-fingerprint-defender/default.nix |  40 --
 jeschli/2configs/own-pkgs/hopper/default.nix       |  45 --
 .../2configs/own-pkgs/https-everywhere/default.nix |  29 --
 jeschli/2configs/own-pkgs/pyocclient/default.nix   |  26 --
 jeschli/2configs/own-pkgs/rmount/default.nix       |  34 --
 .../2configs/own-pkgs/ublock-origin/default.nix    |  28 --
 .../own-pkgs/user-agent-switcher/default.nix       |  40 --
 .../webgl-fingerprint-defender/default.nix         |  40 --
 jeschli/2configs/own-pkgs/wl-clipboard/default.nix |  25 --
 .../firefox/audio-fingerprint-defender/default.nix |  40 ++
 .../canvas-fingerprint-defender/default.nix        |  40 ++
 jeschli/5pkgs/firefox/dark-reader/default.nix      |  28 ++
 jeschli/5pkgs/firefox/default.nix                  |  18 +
 jeschli/5pkgs/firefox/firefox-with-config.nix      | 488 +++++++++++++++++++++
 .../firefox/font-fingerprint-defender/default.nix  |  40 ++
 jeschli/5pkgs/firefox/hopper/default.nix           |  45 ++
 jeschli/5pkgs/firefox/https-everywhere/default.nix |  29 ++
 jeschli/5pkgs/firefox/pyocclient/default.nix       |  26 ++
 jeschli/5pkgs/firefox/rmount/default.nix           |  34 ++
 jeschli/5pkgs/firefox/ublock-origin/default.nix    |  28 ++
 .../5pkgs/firefox/user-agent-switcher/default.nix  |  40 ++
 .../firefox/webgl-fingerprint-defender/default.nix |  40 ++
 jeschli/5pkgs/firefox/wl-clipboard/default.nix     |  25 ++
 28 files changed, 924 insertions(+), 915 deletions(-)
 delete mode 100644 jeschli/2configs/overlays/firefox-with-config.nix
 delete mode 100644 jeschli/2configs/own-pkgs/audio-fingerprint-defender/default.nix
 delete mode 100644 jeschli/2configs/own-pkgs/canvas-fingerprint-defender/default.nix
 delete mode 100644 jeschli/2configs/own-pkgs/dark-reader/default.nix
 delete mode 100644 jeschli/2configs/own-pkgs/font-fingerprint-defender/default.nix
 delete mode 100644 jeschli/2configs/own-pkgs/hopper/default.nix
 delete mode 100644 jeschli/2configs/own-pkgs/https-everywhere/default.nix
 delete mode 100644 jeschli/2configs/own-pkgs/pyocclient/default.nix
 delete mode 100644 jeschli/2configs/own-pkgs/rmount/default.nix
 delete mode 100644 jeschli/2configs/own-pkgs/ublock-origin/default.nix
 delete mode 100644 jeschli/2configs/own-pkgs/user-agent-switcher/default.nix
 delete mode 100644 jeschli/2configs/own-pkgs/webgl-fingerprint-defender/default.nix
 delete mode 100644 jeschli/2configs/own-pkgs/wl-clipboard/default.nix
 create mode 100644 jeschli/5pkgs/firefox/audio-fingerprint-defender/default.nix
 create mode 100644 jeschli/5pkgs/firefox/canvas-fingerprint-defender/default.nix
 create mode 100644 jeschli/5pkgs/firefox/dark-reader/default.nix
 create mode 100644 jeschli/5pkgs/firefox/default.nix
 create mode 100644 jeschli/5pkgs/firefox/firefox-with-config.nix
 create mode 100644 jeschli/5pkgs/firefox/font-fingerprint-defender/default.nix
 create mode 100644 jeschli/5pkgs/firefox/hopper/default.nix
 create mode 100644 jeschli/5pkgs/firefox/https-everywhere/default.nix
 create mode 100644 jeschli/5pkgs/firefox/pyocclient/default.nix
 create mode 100644 jeschli/5pkgs/firefox/rmount/default.nix
 create mode 100644 jeschli/5pkgs/firefox/ublock-origin/default.nix
 create mode 100644 jeschli/5pkgs/firefox/user-agent-switcher/default.nix
 create mode 100644 jeschli/5pkgs/firefox/webgl-fingerprint-defender/default.nix
 create mode 100644 jeschli/5pkgs/firefox/wl-clipboard/default.nix

(limited to 'jeschli')

diff --git a/jeschli/2configs/firefox.nix b/jeschli/2configs/firefox.nix
index d171fa82d..1e1e16918 100644
--- a/jeschli/2configs/firefox.nix
+++ b/jeschli/2configs/firefox.nix
@@ -2,20 +2,11 @@
 
 let
 
-  # Firefox addons
-  https-everywhere = pkgs.callPackage ./own-pkgs/https-everywhere {};
-  ublock-origin = pkgs.callPackage ./own-pkgs/ublock-origin {};
-  webgl-fingerprint-defender = pkgs.callPackage ./own-pkgs/webgl-fingerprint-defender {};
-  canvas-fingerprint-defender = pkgs.callPackage ./own-pkgs/canvas-fingerprint-defender {};
-  audio-fingerprint-defender = pkgs.callPackage ./own-pkgs/audio-fingerprint-defender {};
-  font-fingerprint-defender = pkgs.callPackage ./own-pkgs/font-fingerprint-defender {};
-  user-agent-switcher = pkgs.callPackage ./own-pkgs/user-agent-switcher {};
-  dark-reader = pkgs.callPackage ./own-pkgs/dark-reader {};
-
-  wrapper = pkgs.callPackage ./overlays/firefox-with-config.nix { };
+  wrapper = pkgs.callPackage ../5pkgs/firefox/firefox-with-config.nix { };
   myFirefox = wrapper pkgs.firefox-unwrapped {
 
-  extraExtensions = [
+  # these plugins are defined in 5pkgs/firefox
+  extraExtensions = with pkgs ; [
     dark-reader
     https-everywhere
     ublock-origin
diff --git a/jeschli/2configs/overlays/firefox-with-config.nix b/jeschli/2configs/overlays/firefox-with-config.nix
deleted file mode 100644
index 9be6250d7..000000000
--- a/jeschli/2configs/overlays/firefox-with-config.nix
+++ /dev/null
@@ -1,488 +0,0 @@
-{ stdenv, lib, pkgs, makeDesktopItem, makeWrapper, lndir, replace, config
-
-## various stuff that can be plugged in
-, flashplayer, hal-flash
-, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2
-, jrePlugin, icedtea_web
-, bluejeans, djview4, adobe-reader
-, google_talk_plugin, fribid, gnome3/*.gnome-shell*/
-, esteidfirefoxplugin ? ""
-, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow
-, udev
-, kerberos
-
-}:
-
-## configurability of the wrapper itself
-
-browser:
-
-let
-  wrapper =
-    { browserName ? browser.browserName or (builtins.parseDrvName browser.name).name
-    , name ? (browserName + "-" + (builtins.parseDrvName browser.name).version)
-    , desktopName ? # browserName with first letter capitalized
-      (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName)
-    , nameSuffix ? ""
-    , icon ? browserName
-    , extraPlugins ? []
-    , extraPrefs ? ""
-    , extraExtensions ? [ ]
-    , allowNonSigned ? false
-    , disablePocket ? false
-    , disableTelemetry ? true
-    , disableDrmPlugin ? false
-    , showPunycodeUrls ? true
-    , disableFirefoxStudies ? true
-    , disableFirefoxSync ? false
-    , useSystemCertificates ? true
-    , dontCheckDefaultBrowser ? false
-    # For more information about anti tracking
-    # vist https://wiki.kairaven.de/open/app/firefox
-    , activateAntiTracking ? true
-    , disableFeedbackCommands ? true
-    , disableDNSOverHTTPS ? true
-    , disableGoogleSafebrowsing ? false
-    , clearDataOnShutdown ? false
-    , homepage ? "about:blank"
-    # For more information about policies visit
-    # https://github.com/mozilla/policy-templates#enterprisepoliciesenabled
-    , extraPolicies ? {}
-    , extraNativeMessagingHosts ? []
-    , gdkWayland ? false
-    }:
-
-    assert gdkWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used
-
-    let
-
-      # If extraExtensions has been set disable manual extensions
-      disableManualExtensions = if lib.count (x: true) extraExtensions > 0 then true else false;
-
-      cfg = config.${browserName} or {};
-      enableAdobeFlash = cfg.enableAdobeFlash or false;
-      ffmpegSupport = browser.ffmpegSupport or false;
-      gssSupport = browser.gssSupport or false;
-      jre = cfg.jre or false;
-      icedtea = cfg.icedtea or false;
-      supportsJDK =
-        stdenv.hostPlatform.system == "i686-linux" ||
-        stdenv.hostPlatform.system == "x86_64-linux" ||
-        stdenv.hostPlatform.system == "armv7l-linux" ||
-        stdenv.hostPlatform.system == "aarch64-linux";
-
-      plugins =
-        assert !(jre && icedtea);
-        if builtins.hasAttr "enableVLC" cfg
-        then throw "The option \"${browserName}.enableVLC\" has been removed since Firefox no longer supports npapi plugins"
-        else
-        ([ ]
-          ++ lib.optional enableAdobeFlash flashplayer
-          ++ lib.optional (cfg.enableDjvu or false) (djview4)
-          ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser)
-          ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin
-          ++ lib.optional icedtea icedtea_web
-          ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
-          ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
-          ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell
-          ++ lib.optional (cfg.enableBluejeans or false) bluejeans
-          ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader
-          ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin
-          ++ extraPlugins
-        );
-      nativeMessagingHosts =
-        ([ ]
-          ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass)
-          ++ lib.optional (cfg.enableBukubrow or false) bukubrow
-          ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell
-          ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
-          ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration
-          ++ extraNativeMessagingHosts
-        );
-      libs =   lib.optional stdenv.isLinux udev
-            ++ lib.optional ffmpegSupport ffmpeg
-            ++ lib.optional gssSupport kerberos
-            ++ lib.optionals (cfg.enableQuakeLive or false)
-            (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
-            ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
-            ++ lib.optional (config.pulseaudio or true) libpulseaudio;
-      gtk_modules = [ libcanberra-gtk2 ];
-
-      enterprisePolicies =
-      {
-        policies = {
-          DisableAppUpdate = true;
-        } // lib.optionalAttrs disableManualExtensions (
-        {
-          ExtensionSettings = {
-            "*" = {
-                blocked_install_message = "You can't have manual extension mixed with nix extensions";
-                installation_mode = "blocked";
-              };
-
-          } // lib.foldr (e: ret:
-              ret // {
-                "${e.extid}" = {
-                  installation_mode = "allowed";
-                };
-              }
-            ) {} extraExtensions;
-          }
-      ) // lib.optionalAttrs disablePocket (
-        {
-          DisablePocket = true;
-        }
-      ) // lib.optionalAttrs disableTelemetry (
-        {
-          DisableTelemetry = true;
-        }
-      ) // lib.optionalAttrs disableFirefoxStudies (
-        {
-          DisableFirefoxStudies = true;
-        }
-      ) // lib.optionalAttrs disableFirefoxSync (
-        {
-          DisableFirefoxAccounts = true;
-        }
-      ) // lib.optionalAttrs useSystemCertificates (
-        {
-          # Disable useless firefox certificate store
-          Certificates = {
-            ImportEnterpriseRoots = true;
-          };
-        }
-      ) // lib.optionalAttrs (
-        if lib.count (x: true) extraExtensions > 0 then true else false) (
-        {
-          # Don't try to update nix installed addons
-          DisableSystemAddonUpdate = true;
-
-          # But update manually installed addons
-          ExtensionUpdate = false;
-        }
-      ) // lib.optionalAttrs dontCheckDefaultBrowser (
-        {
-          DontCheckDefaultBrowser = true;
-        }
-      )// lib.optionalAttrs disableDNSOverHTTPS (
-        {
-          DNSOverHTTPS = {
-            Enabled = false;
-          };
-        }
-      ) // lib.optionalAttrs clearDataOnShutdown (
-        {
-          SanitizeOnShutdown = true;
-        }
-      ) // lib.optionalAttrs disableFeedbackCommands (
-        {
-          DisableFeedbackCommands = true;
-        }
-      ) // lib.optionalAttrs ( if homepage == "" then false else true) (
-        {
-          Homepage = {
-            URL = homepage;
-            Locked = true;
-          };
-        }
-      ) // extraPolicies ;} ;
-
-
-      extensions = builtins.map (a:
-        if ! (builtins.hasAttr "signed" a) || ! (builtins.isBool a.signed) then
-          throw "Addon ${a.pname} needs boolean attribute 'signed' "
-        else if ! (builtins.hasAttr "extid" a) || ! (builtins.isString a.extid) then
-          throw "Addon ${a.pname} needs a string attribute 'extid'"
-        else if a.signed == false && !allowNonSigned then
-          throw "Disable signature checking in firefox if you want ${a.pname} addon"
-        else  a
-      ) extraExtensions;
-
-      policiesJson = builtins.toFile "policies.json"
-        (builtins.toJSON enterprisePolicies);
-
-      mozillaCfg = builtins.toFile "mozilla.cfg" ''
-        // First line must be a comment
-
-        // Remove default top sites
-        lockPref("browser.newtabpage.pinned", "");
-        lockPref("browser.newtabpage.activity-stream.default.sites", "");
-
-        // Deactivate first run homepage
-        lockPref("browser.startup.firstrunSkipsHomepage", false);
-
-        // If true, don't show the privacy policy tab on first run
-        lockPref("datareporting.policy.dataSubmissionPolicyBypassNotification", true);
-
-        ${
-          if allowNonSigned == true then
-            ''lockPref("xpinstall.signatures.required", false)''
-          else
-            ""
-        }
-
-       ${
-        if showPunycodeUrls == true then
-          ''
-            lockPref("network.IDN_show_punycode", true);
-          ''
-          else
-            ""
-        }
-
-        ${
-          if disableManualExtensions == true then
-          ''
-            lockPref("extensions.getAddons.showPane", false);
-            lockPref("extensions.htmlaboutaddons.recommendations.enabled", false);
-            lockPref("app.update.auto", false);
-            ''
-          else
-            ""
-        }
-
-        ${
-          if disableDrmPlugin == true then
-          ''
-            lockPref("media.gmp-gmpopenh264.enabled", false);
-            lockPref("media.gmp-widevinecdm.enabled", false);
-            ''
-          else
-            ""
-        }
-
-        ${
-          if activateAntiTracking == true then
-            ''
-              // Tracking
-              lockPref("browser.send_pings", false);
-              lockPref("browser.send_pings.require_same_host", true);
-              lockPref("network.dns.disablePrefetch", true);
-              lockPref("browser.contentblocking.trackingprotection.control-center.ui.enabled", false);
-              lockPref("browser.search.geoip.url", "");
-              lockPref("privacy.firstparty.isolate",  true);
-              lockPref("privacy.userContext.enabled", true);
-              lockPref("privacy.userContext.ui.enabled", true);
-              lockPref("privacy.firstparty.isolate.restrict_opener_access", false);
-              lockPref("network.http.referer.XOriginPolicy", 1);
-              lockPref("network.http.referer.hideOnionSource", true);
-              lockPref(" privacy.spoof_english", true);
-
-             // This option is currently not usable because of bug:
-             // https://bugzilla.mozi