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/2configs')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index f866bbca..614f195f 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/2configs')

diff --git a/jeschli/2configs/haskell.nix b/jeschli/2configs/haskell.nix
new file mode 100644
index 00000000..2e00d067
--- /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 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/2configs')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 614f195f..0a81048f 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 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/2configs')

diff --git a/jeschli/2configs/emacs-org-agenda.nix b/jeschli/2configs/emacs-org-agenda.nix
index f9139fcf..91678896 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/2configs')

diff --git a/jeschli/2configs/emacs-org-agenda.nix b/jeschli/2configs/emacs-org-agenda.nix
index 91678896..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
-- 
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/2configs')

diff --git a/jeschli/2configs/elisp b/jeschli/2configs/elisp
new file mode 160000
index 00000000..a2cb18b5
--- /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/2configs/emacs.nix | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

(limited to 'jeschli/2configs')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 0a81048f..cffa1c74 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 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/2configs')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index cffa1c74..fb087a95 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/2configs')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index fb087a95..797a397b 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 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/2configs')

diff --git a/jeschli/2configs/elisp b/jeschli/2configs/elisp
index a2cb18b5..d93aa293 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/2configs')

diff --git a/jeschli/2configs/elisp b/jeschli/2configs/elisp
index d93aa293..ae1a03dd 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/2configs')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 7400663a..5bdd6d51 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/2configs')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 5bdd6d51..c57a06f8 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/2configs')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index c57a06f8..caece8c9 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 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/2configs')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index caece8c9..cb1bef94 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/2configs')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index cb1bef94..73a2320d 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/2configs')

diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 73a2320d..5c35bc28 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/2configs')

diff --git a/jeschli/2configs/haskell.nix b/jeschli/2configs/haskell.nix
index 2e00d067..46ae24fb 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 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/2configs')

diff --git a/jeschli/2configs/elisp b/jeschli/2configs/elisp
index ae1a03dd..279d6a01 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/2configs')

diff --git a/jeschli/2configs/own-pkgs/ublock-origin/default.nix b/jeschli/2configs/own-pkgs/ublock-origin/default.nix
index 45465d48..002fa3ef 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 --
 14 files changed, 3 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

(limited to 'jeschli/2configs')

diff --git a/jeschli/2configs/firefox.nix b/jeschli/2configs/firefox.nix
index d171fa82..1e1e1691 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 9be6250d..00000000
--- 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.mozilla.org/show_bug.cgi?id=1557620
-              // lockPref("privacy.resistFingerprinting", true);
-            ''
-            else ""
-        }
-        ${
-          if disableTelemetry == true then
-            ''
-              // Telemetry
-              lockPref("browser.newtabpage.activity-stream.feeds.telemetry", false);
-              lockPref("browser.ping-centre.telemetry", false);
-              lockPref("devtools.onboarding.telemetry.logged", false);
-              lockPref("toolkit.telemetry.archive.enabled", false);
-              lockPref("toolkit.telemetry.bhrPing.enabled", false);
-              lockPref("toolkit.telemetry.enabled", false);
-              lockPref("toolkit.telemetry.firstShutdownPing.enabled", false);
-              lockPref("toolkit.telemetry.hybridContent.enabled", false);
-              lockPref("toolkit.telemetry.newProfilePing.enabled", false);
-              lockPref("toolkit.telemetry.shutdownPingSender.enabled", false);
-              lockPref("toolkit.telemetry.reportingpolicy.firstRun", false);
-              lockPref("dom.push.enabled", false);
-              lockPref("browser.newtabpage.activity-stream.feeds.snippets", false);
-              lockPref("security.ssl.errorReporting.enabled", false);
-            ''
-          else ""
-        }
-
-       ${
-          if disableGoogleSafebrowsing == true then
-          ''
-            // Google data sharing
-            lockPref("browser.safebrowsing.blockedURIs.enabled", false);
-            lockPref("browser.safebrowsing.downloads.enabled", false);
-            lockPref("browser.safebrowsing.malware.enabled", false);
-            lockPref("browser.safebrowsing.passwords.enabled", false);
-            lockPref("browser.safebrowsing.provider.google4.dataSharing.enabled", false);
-            lockPref("browser.safebrowsing.malware.enabled", false);
-            lockPref("browser.safebrowsing.phishing.enabled", false);
-            lockPref("browser.safebrowsing.provider.mozilla.gethashURL", "");
-            lockPref("browser.safebrowsing.provider.mozilla.updateURL", "");
-          ''
-          else ""
-       }
-
-        // User customization
-        ${extraPrefs}
-      '';
-    in stdenv.mkDerivation {
-      inherit name;
-
-      desktopItem = makeDesktopItem {
-        name = browserName;
-        exec = "${browserName}${nameSuffix} %U";
-        inherit icon;
-        comment = "";
-        desktopName = "${desktopName}${nameSuffix}${lib.optionalString gdkWayland " (Wayland)"}";
-        genericName = "Web Browser";
-        categories = "Application;Network;WebBrowser;";
-        mimeType = stdenv.lib.concatStringsSep ";" [
-          "text/html"
-          "text/xml"
-          "application/xhtml+xml"
-          "application/vnd.mozilla.xul+xml"
-          "x-scheme-handler/http"
-          "x-scheme-handler/https"
-          "x-scheme-handler/ftp"
-        ];
-      };
-
-      nativeBuildInputs = [ makeWrapper lndir ];
-      buildInputs = lib.optional (browser ? gtk3) browser.gtk3;
-
-      buildCommand = lib.optionalString stdenv.isDarwin ''
-        mkdir -p $out/Applications
-        cp -R --no-preserve=mode,ownership ${browser}/Applications/${browserName}.app $out/Applications
-        rm -f $out${browser.execdir or "/bin"}/${browserName}
-      '' + ''
-
-        # Link the runtime. The executable itself has to be copied,
-        # because it will resolve paths relative to its true location.
-        # Any symbolic links have to be replicated as well.
-        cd "${browser}"
-        find . -type d -exec mkdir -p "$out"/{} \;
-
-        find . -type f \( -not -name "${browserName}" \) -exec ln -sT "${browser}"/{} "$out"/{} \;
-
-        find . -type f -name "${browserName}" -print0 | while read -d $'\0' f; do
-          cp -P --no-preserve=mode,ownership "${browser}/$f" "$out/$f"
-          chmod a+rwx "$out/$f"
-        done
-
-        # fix links and absolute references
-        cd "${browser}"
-
-        find . -type l -print0 | while read -d $'\0' l; do
-          target="$(readlink "$l" | ${replace}/bin/replace-literal -es -- "${browser}" "$out")"
-          ln -sfT "$target" "$out/$l"
-        done
-
-        # This will not patch binaries, only "text" files.
-        # Its there for the wrapper mostly.
-        cd "$out"
-        ${replace}/bin/replace-literal -esfR -- "${browser}" "$out"
-
-        # create the wrapper
-
-        executablePrefix="$out${browser.execdir or "/bin"}"
-        executablePath="$executablePrefix/${browserName}"
-
-        if [ ! -x "$executablePath" ]
-        then
-            echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${browserName}'"
-            exit 1
-        fi
-
-        if [ ! -L "$executablePath" ]
-        then
-          # Careful here, the file at executablePath may already be
-          # a wrapper. That is why we postfix it with -old instead
-          # of -wrapped.
-          oldExe="$executablePrefix"/".${browserName}"-old
-          mv "$executablePath" "$oldExe"
-        else
-          oldExe="$(readlink -v --canonicalize-existing "$executablePath")"
-        fi
-
-
-        makeWrapper "$oldExe" "$out${browser.execdir or "/bin"}/${browserName}${nameSuffix}" \
-            --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
-            --suffix LD_LIBRARY_PATH ':' "$libs" \
-            --suffix-each GTK_PATH ':' "$gtk_modules" \
-            --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
-            --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \
-            --suffix PATH ':' "$out${browser.execdir or "/bin"}" \
-            --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \
-            --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \
-            ${lib.optionalString gdkWayland ''
-              --set GDK_BACKEND "wayland" \
-            ''}${lib.optionalString (browser ? gtk3)
-                ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
-                  --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share'
-                ''
-            }
-
-        if [ -e "${browser}/share/icons" ]; then
-            mkdir -p "$out/share"
-            ln -s "${browser}/share/icons" "$out/share/icons"
-        else
-            for res in 16 32 48 64 128; do
-            mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps"
-            icon=( "${browser}/lib/"*"/browser/chrome/icons/default/default''${res}.png" )
-              if [ -e "$icon" ]; then ln -s "$icon" \
-                "$out/share/icons/hicolor/''${res}x''${res}/apps/${browserName}.png"
-              fi
-            done
-        fi
-
-        install -D -t $out/share/applications $desktopItem/share/applications/*
-
-        mkdir -p $out/lib/mozilla
-        for ext in ${toString nativeMessagingHosts}; do
-            lndir -silent $ext/lib/mozilla $out/lib/mozilla
-        done
-
-        # For manpages, in case the program supplies them
-        mkdir -p $out/nix-support
-        echo ${browser} > $out/nix-support/propagated-user-env-packages
-
-        # user customization
-        mkdir -p $out/lib/firefox
-
-        # creating policies.json
-        mkdir -p "$out/lib/firefox/distribution"
-
-        cat > "$out/lib/firefox/distribution/policies.json" < ${policiesJson}
-
-        # preparing for autoconfig
-        mkdir -p "$out/lib/firefox/defaults/pref"
-
-        cat > "$out/lib/firefox/defaults/pref/autoconfig.js" <<EOF
-          pref("general.config.filename", "mozilla.cfg");
-          pref("general.config.obscure_value", 0);
-        EOF
-
-        cat > "$out/lib/firefox/mozilla.cfg" < ${mozillaCfg}
-
-        mkdir -p $out/lib/firefox/distribution/extensions
-
-        for i in ${toString extensions}; do
-          ln -s -t $out/lib/firefox/distribution/extensions $i/*
-        done
-      '';
-
-      preferLocalBuild = true;
-
-      # Let each plugin tell us (through its `mozillaPlugin') attribute
-      # where to find the plugin in its tree.
-      plugins = map (x: x + x.mozillaPlugin) plugins;
-      libs = lib.makeLibraryPath libs + ":" + lib.makeSearchPathOutput "lib" "lib64" libs;
-      gtk_modules = map (x: x + x.gtkModule) gtk_modules;
-
-      passthru = { unwrapped = browser; };
-
-      disallowedRequisites = [ stdenv.cc ];
-
-      meta = browser.meta // {
-        description =
-          browser.meta.description
-          + " (with plugins: "
-          + lib.concatStrings (lib.intersperse ", " (map (x: x.name) plugins))
-          + ")";
-        hydraPlatforms = [];
-        priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package
-      };
-    };
-in
-  lib.makeOverridable wrapper
diff --git a/jeschli/2configs/own-pkgs/audio-fingerprint-defender/default.nix b/jeschli/2configs/own-pkgs/audio-fingerprint-defender/default.nix
deleted file mode 100644
index 05815e13..00000000
--- a/jeschli/2configs/own-pkgs/audio-fingerprint-defender/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, unzip, jq, zip  }:
-
-stdenv.mkDerivation rec {
-    pname = "audio-fingerprint-defender-${version}";
-    version = "0.1.3";
-
-    extid = "@audio-fingerprint-defender";
-    signed = false;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3363623/audiocontext_fingerprint_defender-${version}-an+fx.xpi";
-      sha256 = "0yfk5vqwjg4g25c98psj56sw3kv8imxav3nss4hbibflgla1h5pb";
-    };
-
-    phases = [ "buildPhase" ];
-
-    buildInputs = [ zip unzip jq ];
-
-    buildPhase = ''
-      mkdir -p $out/${extid}
-      unzip ${src} -d $out/${extid}
-      NEW_MANIFEST=$(jq '. + {"applications": { "gecko": { "id": "${extid}" }}}' $out/${extid}/manifest.json)
-      echo "$NEW_MANIFEST" > $out/${extid}/manifest.json
-      cd $out/${extid}
-      zip -r -FS $out/${extid}.xpi *
-      rm -r $out/${extid}
-      '';
-
-  meta = with stdenv.lib; {
-    description = "Audio context fingerprint defender firefox browser addon";
-    homepage = https://mybrowseraddon.com/audiocontext-defender.html;
-    license = {
-      fullName = "Mozilla Public License Version 2.0";
-      shortName = "moz2";
-      spdxId = "mozilla-2.0";
-      url = "https://www.mozilla.org/en-US/MPL/2.0/"; };
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/2configs/own-pkgs/canvas-fingerprint-defender/default.nix b/jeschli/2configs/own-pkgs/canvas-fingerprint-defender/default.nix
deleted file mode 100644
index 21b4b3f9..00000000
--- a/jeschli/2configs/own-pkgs/canvas-fingerprint-defender/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, unzip, jq, zip  }:
-
-stdenv.mkDerivation rec {
-    pname = "canvas-fingerprint-defender-${version}";
-    version = "0.1.5";
-
-    extid = "@canvas-fingerprint-defender";
-    signed = false;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3362272/canvas_fingerprint_defender-${version}-an+fx.xpi?src=recommended";
-      sha256 = "1hg00zsrw7ij7bc222j83g2wm3ml1aj34zg5im1802cjq4qqvbld";
-    };
-
-    phases = [ "buildPhase" ];
-
-    buildInputs = [ zip unzip jq ];
-
-    buildPhase = ''
-      mkdir -p $out/${extid}
-      unzip ${src} -d $out/${extid}
-      NEW_MANIFEST=$(jq '. + {"applications": { "gecko": { "id": "${extid}" }}}' $out/${extid}/manifest.json)
-      echo "$NEW_MANIFEST" > $out/${extid}/manifest.json
-      cd $out/${extid}
-      zip -r -FS $out/${extid}.xpi *
-      rm -r $out/${extid}
-      '';
-
-  meta = with stdenv.lib; {
-    description = "Canvas fingerprint defender firefox browser addon";
-    homepage = https://mybrowseraddon.com/webgl-defender.html;
-    license = {
-      fullName = "Mozilla Public License Version 2.0";
-      shortName = "moz2";
-      spdxId = "mozilla-2.0";
-      url = "https://www.mozilla.org/en-US/MPL/2.0/"; };
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/2configs/own-pkgs/dark-reader/default.nix b/jeschli/2configs/own-pkgs/dark-reader/default.nix
deleted file mode 100644
index 44f4f905..00000000
--- a/jeschli/2configs/own-pkgs/dark-reader/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl  }:
-
-stdenv.mkDerivation rec {
-    pname = "dark-reader-${version}";
-    version = "4.8.1";
-
-    extid = "addon@darkreader.org";
-    signed = true;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3404143/dark_reader-${version}-an+fx.xpi";
-      sha256 = "0ic0i56jhmxymvy68bs5hqcjvdvw3vks5r58i2ygmpsm190rlldb";
-    };
-
-    phases = [ "installPhase" ];
-
-    installPhase = ''
-      install -D ${src} "$out/${extid}.xpi"
-      '';
-
-  meta = with stdenv.lib; {
-    description = "Dark mode for every website. Take care of your eyes, use dark theme for night and daily browsing.";
-    homepage = https://github.com/darkreader/darkreader;
-    license = licenses.mit;
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/2configs/own-pkgs/font-fingerprint-defender/default.nix b/jeschli/2configs/own-pkgs/font-fingerprint-defender/default.nix
deleted file mode 100644
index 26751bee..00000000
--- a/jeschli/2configs/own-pkgs/font-fingerprint-defender/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, unzip, jq, zip  }:
-
-stdenv.mkDerivation rec {
-    pname = "font-fingerprint-defender-${version}";
-    version = "0.1.0";
-
-    extid = "@font-fingerprint-defender";
-    signed = false;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3387637/font_fingerprint_defender-${version}-an+fx.xpi";
-      sha256 = "1aidkvisnx6qd7hn2x756rvzmbnaz6laqbwq0j5yd86g1kc56dr0";
-    };
-
-    phases = [ "buildPhase" ];
-
-    buildInputs = [ zip unzip jq ];
-
-    buildPhase = ''
-      mkdir -p $out/${extid}
-      unzip ${src} -d $out/${extid}
-      NEW_MANIFEST=$(jq '. + {"applications": { "gecko": { "id": "${extid}" }}}' $out/${extid}/manifest.json)
-      echo "$NEW_MANIFEST" > $out/${extid}/manifest.json
-      cd $out/${extid}
-      zip -r -FS $out/${extid}.xpi *
-      rm -r $out/${extid}
-      '';
-
-  meta = with stdenv.lib; {
-    description = "Font fingerprint defender firefox browser addon";
-    homepage = https://mybrowseraddon.com/font-defender.html;
-    license = {
-      fullName = "Mozilla Public License Version 2.0";
-      shortName = "moz2";
-      spdxId = "mozilla-2.0";
-      url = "https://www.mozilla.org/en-US/MPL/2.0/"; };
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/2configs/own-pkgs/hopper/default.nix b/jeschli/2configs/own-pkgs/hopper/default.nix
deleted file mode 100644
index 569fc6aa..00000000
--- a/jeschli/2configs/own-pkgs/hopper/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, pkgs, makeWrapper, lib }:
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-  pname    = "hopper";
-  version = "4.5.16";
-  rev = "v${lib.versions.major version}";
-
-  src = fetchurl {
-    url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz";
-    sha256 = "0gjnn7f6ibfx46k4bbj8ra7k04s0mrpq7316brgzks6x5yd1m584";
-  };
-
-  sourceRoot = ".";
-
-  ldLibraryPath = with pkgs; stdenv.lib.makeLibraryPath  [
-libbsd.out libffi.out gmpxx.out python27Full.out python27Packages.libxml2.out qt5.qtbase zlib  xlibs.libX11.out xorg_sys_opengl.out xlibs.libXrender.out gcc-unwrapped.lib
-  ];
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  installPhase = ''
-     mkdir -p $out/bin
-     mkdir -p $out/lib
-     mkdir -p $out/share
-     cp $sourceRoot/opt/hopper-${rev}/bin/Hopper $out/bin/hopper
-     cp -r $sourceRoot/opt/hopper-${rev}/lib $out
-     cp -r $sourceRoot/usr/share $out/share
-    patchelf \
-    --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \
-    $out/bin/hopper
-    # Details: https://nixos.wiki/wiki/Qt
-     wrapProgram $out/bin/hopper \
-    --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \
-    --suffix QT_PLUGIN_PATH : ${pkgs.qt5.qtbase}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins
-  '';
-
-  meta = {
-    homepage = "https://www.hopperapp.com/index.html";
-    description = "A macOS and Linux Disassembler";
-    license = stdenv.lib.licenses.unfree;
-    maintainers = [ stdenv.lib.maintainers.luis ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/jeschli/2configs/own-pkgs/https-everywhere/default.nix b/jeschli/2configs/own-pkgs/https-everywhere/default.nix
deleted file mode 100644
index 66fede43..00000000
--- a/jeschli/2configs/own-pkgs/https-everywhere/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl  }:
-
-stdenv.mkDerivation rec {
-    pname = "https-everywhere-${version}";
-    version = "2019.6.27";
-
-    extid = "https-everywhere@eff.org";
-    signed = true;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3060290/https_everywhere-${version}-an+fx.xpi";
-      sha256 = "0743lhn9phn7n6c0886h9ddn1n8vhzbl0vrw177zs43995aj3frp";
-    };
-
-    phases = [ "installPhase" ];
-
-    installPhase = ''
-      install -D ${src} "$out/${extid}.xpi"
-
-      '';
-
-  meta = {
-    description = "Https everywhere browser addon";
-    homepage = https://www.eff.org/https-everywhere;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/2configs/own-pkgs/pyocclient/default.nix b/jeschli/2configs/own-pkgs/pyocclient/default.nix
deleted file mode 100644
index cd91f617..00000000
--- a/jeschli/2configs/own-pkgs/pyocclient/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, python37Packages  }:
-
-python37Packages.buildPythonPackage rec {
-  pname = "pyocclient";
-  version = "0.4";
-
-  src = python37Packages.fetchPypi {
-    inherit pname version;
-    sha256 = "19k3slrk2idixsdw61in9a3jxglvkigkn5kvwl37lj8hrwr4yq6q";
-  };
-
-  doCheck = false;
-
-  propagatedBuildInputs = with python37Packages; [
-    requests
-    six
-    ];
-
-  meta = with lib; {
-    homepage = https://github.com/owncloud/pyocclient/;
-    description = "Nextcloud / Owncloud library for python";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ];
-  };
-
-}
diff --git a/jeschli/2configs/own-pkgs/rmount/default.nix b/jeschli/2configs/own-pkgs/rmount/default.nix
deleted file mode 100644
index 22631f42..00000000
--- a/jeschli/2configs/own-pkgs/rmount/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchgit, makeWrapper, lib, pkgs ? import <nixpkgs> {} }:
-with pkgs;
-
-stdenv.mkDerivation rec {
-  name    = "rmount-${version}";
-  version = "1.0.1";
-  rev = "v${version}";
-
-  src = fetchgit {
-    rev = "9df124780d2e66f01c70afaecf92090669c5ffb6";
-    url    = "https://github.com/Luis-Hebendanz/rmount";
-    sha256 = "0ydb6sspfnfa3y6gg1r8sk4r58il6636lpqwb2rw7dzmb4b8hpd2";
-  };
-
-  buildInputs = [ stdenv makeWrapper ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/share/man/man1
-    cp ${src}/rmount.man $out/share/man/man1/rmount.1
-    cp ${src}/rmount.bash $out/bin/rmount-noenv
-    cp ${src}/config.json $out/share/config.json
-    chmod +x $out/bin/rmount-noenv
-
-    makeWrapper $out/bin/rmount-noenv $out/bin/rmount \
-    --prefix PATH : ${lib.makeBinPath [ nmap jq cifs-utils sshfs ]}
-  '';
-
-  meta = {
-      homepage = "https://github.com/Luis-Hebendanz/rmount";
-      description = "Remote mount utility which parses a json file";
-      license = stdenv.lib.licenses.mit;
-    };
-}
diff --git a/jeschli/2configs/own-pkgs/ublock-origin/default.nix b/jeschli/2configs/own-pkgs/ublock-origin/default.nix
deleted file mode 100644
index 002fa3ef..00000000
--- a/jeschli/2configs/own-pkgs/ublock-origin/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl  }:
-
-stdenv.mkDerivation rec {
-    pname = "ublock-origin-${version}";
-    version = "1.21.2";
-
-    extid = "uBlock0@raymondhill.net";
-    signed = true;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3361355/ublock_origin-${version}-an+fx.xpi";
-      sha256 = "0ypdq3z61mrymknl37qlq6379bx9f2fsgbgr0czbhqs9f2vwszkc";
-    };
-
-    phases = [ "installPhase" ];
-
-    installPhase = ''
-      install -D ${src} "$out/${extid}.xpi"
-      '';
-
-  meta = with stdenv.lib; {
-    description = "ublock origin firefox browser addon";
-    homepage = https://github.com/gorhill/uBlock;
-    license = licenses.gpl3;
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/2configs/own-pkgs/user-agent-switcher/default.nix b/jeschli/2configs/own-pkgs/user-agent-switcher/default.nix
deleted file mode 100644
index c96f1112..00000000
--- a/jeschli/2configs/own-pkgs/user-agent-switcher/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, unzip, jq, zip  }:
-
-stdenv.mkDerivation rec {
-    pname = "user-agent-switcher-${version}";
-    version = "0.3.2";
-
-    extid = "@user-agent-switcher";
-    signed = false;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3370255/user_agent_switcher_and_manager-${version}-an+fx.xpi";
-      sha256 = "0lrw1xf6fsxr47bifkayfxpysv8s2p9ghmbmw2s7ymhrgy42i6v5";
-    };
-
-    phases = [ "buildPhase" ];
-
-    buildInputs = [ zip unzip jq ];
-
-    buildPhase = ''
-      mkdir -p $out/${extid}
-      unzip ${src} -d $out/${extid}
-      NEW_MANIFEST=$(jq '. + {"applications": { "gecko": { "id": "${extid}" }}}' $out/${extid}/manifest.json)
-      echo "$NEW_MANIFEST" > $out/${extid}/manifest.json
-      cd $out/${extid}
-      zip -r -FS $out/${extid}.xpi *
-      rm -r $out/${extid}
-      '';
-
-  meta = with stdenv.lib; {
-    description = "User agent switcher";
-    homepage = https://add0n.com/useragent-switcher.html;
-    license = {
-      fullName = "Mozilla Public License Version 2.0";
-      shortName = "moz2";
-      spdxId = "mozilla-2.0";
-      url = "https://www.mozilla.org/en-US/MPL/2.0/"; };
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/2configs/own-pkgs/webgl-fingerprint-defender/default.nix b/jeschli/2configs/own-pkgs/webgl-fingerprint-defender/default.nix
deleted file mode 100644
index 4e608d18..00000000
--- a/jeschli/2configs/own-pkgs/webgl-fingerprint-defender/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, unzip, jq, zip  }:
-
-stdenv.mkDerivation rec {
-    pname = "webgl-fingerprint-defender-${version}";
-    version = "0.1.2";
-
-    extid = "@webgl-fingerprint-defender";
-    signed = false;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3362869/webgl_fingerprint_defender-${version}-a