summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2020-06-02 23:35:17 +0200
committertv <tv@krebsco.de>2020-06-02 23:35:17 +0200
commit09c9f8f7fb04be39390b6f65966789c1bf6333e5 (patch)
treeb0cb0f718b40517b0645a38169e67b1088566f64
parent09e620c79b70e495e9651e8e5c1b160dd1b5fb8d (diff)
parent211e2ca6b9a1d8b4dd92071065b0b595123fe282 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat
-rw-r--r--.gitmodules6
-rw-r--r--jeschli/1systems/reagenzglas/config.nix25
-rw-r--r--jeschli/1systems/reagenzglas/desktop.nix4
-rw-r--r--jeschli/1systems/reagenzglas/i3-configuration.nix69
m---------jeschli/2configs/elisp0
-rw-r--r--jeschli/2configs/emacs-org-agenda.nix20
-rw-r--r--jeschli/2configs/emacs.nix311
-rw-r--r--jeschli/2configs/firefox.nix15
-rw-r--r--jeschli/2configs/haskell.nix18
-rw-r--r--jeschli/2configs/i3.nix3
-rw-r--r--jeschli/5pkgs/firefox/audio-fingerprint-defender/default.nix (renamed from jeschli/2configs/own-pkgs/audio-fingerprint-defender/default.nix)0
-rw-r--r--jeschli/5pkgs/firefox/canvas-fingerprint-defender/default.nix (renamed from jeschli/2configs/own-pkgs/canvas-fingerprint-defender/default.nix)0
-rw-r--r--jeschli/5pkgs/firefox/dark-reader/default.nix (renamed from jeschli/2configs/own-pkgs/dark-reader/default.nix)0
-rw-r--r--jeschli/5pkgs/firefox/default.nix18
-rw-r--r--jeschli/5pkgs/firefox/firefox-with-config.nix (renamed from jeschli/2configs/overlays/firefox-with-config.nix)0
-rw-r--r--jeschli/5pkgs/firefox/font-fingerprint-defender/default.nix (renamed from jeschli/2configs/own-pkgs/font-fingerprint-defender/default.nix)0
-rw-r--r--jeschli/5pkgs/firefox/hopper/default.nix (renamed from jeschli/2configs/own-pkgs/hopper/default.nix)0
-rw-r--r--jeschli/5pkgs/firefox/https-everywhere/default.nix (renamed from jeschli/2configs/own-pkgs/https-everywhere/default.nix)0
-rw-r--r--jeschli/5pkgs/firefox/pyocclient/default.nix (renamed from jeschli/2configs/own-pkgs/pyocclient/default.nix)0
-rw-r--r--jeschli/5pkgs/firefox/rmount/default.nix (renamed from jeschli/2configs/own-pkgs/rmount/default.nix)0
-rw-r--r--jeschli/5pkgs/firefox/ublock-origin/default.nix (renamed from jeschli/2configs/own-pkgs/ublock-origin/default.nix)2
-rw-r--r--jeschli/5pkgs/firefox/user-agent-switcher/default.nix (renamed from jeschli/2configs/own-pkgs/user-agent-switcher/default.nix)0
-rw-r--r--jeschli/5pkgs/firefox/webgl-fingerprint-defender/default.nix (renamed from jeschli/2configs/own-pkgs/webgl-fingerprint-defender/default.nix)0
-rw-r--r--jeschli/5pkgs/firefox/wl-clipboard/default.nix (renamed from jeschli/2configs/own-pkgs/wl-clipboard/default.nix)0
-rw-r--r--krebs/1systems/wolf/config.nix4
-rw-r--r--krebs/3modules/charybdis.nix7
-rw-r--r--krebs/3modules/default.nix1
-rw-r--r--krebs/3modules/external/default.nix28
-rw-r--r--krebs/3modules/lass/default.nix1
-rw-r--r--krebs/3modules/makefu/default.nix2
-rw-r--r--krebs/3modules/nin/default.nix111
-rw-r--r--krebs/3modules/reaktor2.nix12
-rw-r--r--krebs/3modules/rtorrent.nix11
-rw-r--r--krebs/5pkgs/simple/go-shortener/node-packages.nix66
-rwxr-xr-xkrebs/5pkgs/simple/go-shortener/update.sh4
-rw-r--r--krebs/5pkgs/simple/realwallpaper/default.nix2
-rw-r--r--krebs/nixpkgs-unstable.json6
-rw-r--r--krebs/nixpkgs.json6
-rwxr-xr-xkrebs/update-nixpkgs.sh2
-rw-r--r--lass/1systems/icarus/config.nix11
-rw-r--r--lass/1systems/icarus/physical.nix9
-rw-r--r--lass/1systems/mors/config.nix11
-rw-r--r--lass/1systems/prism/config.nix32
-rw-r--r--lass/1systems/shodan/config.nix15
-rw-r--r--lass/1systems/uriel/config.nix1
-rw-r--r--lass/2configs/baseX.nix4
-rw-r--r--lass/2configs/blue.nix1
-rw-r--r--lass/2configs/exim-smarthost.nix2
-rw-r--r--lass/2configs/gg23.nix77
-rw-r--r--lass/2configs/hass/default.nix106
-rw-r--r--lass/2configs/hass/lib.nix263
-rw-r--r--lass/2configs/hass/rooms/bett.nix8
-rw-r--r--lass/2configs/hass/rooms/essen.nix9
-rw-r--r--lass/2configs/hass/rooms/nass.nix10
-rw-r--r--lass/2configs/hass/zigbee.nix151
-rw-r--r--lass/2configs/home-media.nix23
-rw-r--r--lass/2configs/network-manager.nix18
-rw-r--r--lass/2configs/ppp.nix32
-rw-r--r--lass/2configs/radio.nix77
-rw-r--r--lass/2configs/websites/lassulus.nix7
-rw-r--r--lass/3modules/default.nix2
-rw-r--r--lass/3modules/hass.nix34
-rw-r--r--lass/3modules/umts.nix112
-rw-r--r--lass/3modules/xjail.nix10
-rw-r--r--lass/5pkgs/custom/xmonad-lass/default.nix29
-rw-r--r--lass/5pkgs/emot-menu/default.nix3
-rw-r--r--lass/5pkgs/nm-dmenu/default.nix6
-rw-r--r--lass/5pkgs/review-mail-queue/default.nix39
-rw-r--r--lib/default.nix2
-rw-r--r--lib/types.nix6
-rw-r--r--makefu/0tests/data/secrets/ebk-notify.yml (renamed from nin/0tests/dummysecrets/ssh.id_ed25519)0
-rw-r--r--makefu/1systems/gum/config.nix3
-rw-r--r--makefu/1systems/omo/config.nix24
-rw-r--r--makefu/1systems/x/config.nix8
-rw-r--r--makefu/2configs/bureautomation/default.nix1
-rw-r--r--makefu/2configs/default.nix6
-rw-r--r--makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix39
-rw-r--r--makefu/2configs/deployment/docker/template.md33
-rw-r--r--makefu/2configs/deployment/feed.euer.krebsco.de/default.nix52
-rw-r--r--makefu/2configs/deployment/feed.euer.krebsco.de/filter.yml44
-rw-r--r--makefu/2configs/deployment/gecloudpad/default.nix5
-rw-r--r--makefu/2configs/deployment/owncloud.nix5
-rw-r--r--makefu/2configs/editor/vim.nix3
-rw-r--r--makefu/2configs/git/cgit-retiolum.nix1
-rw-r--r--makefu/2configs/gui/base.nix11
-rw-r--r--makefu/2configs/gui/urxvtd.nix2
-rw-r--r--makefu/2configs/gui/wbob-kiosk.nix9
-rw-r--r--makefu/2configs/ham/androidtv/adbshell.nix4
-rw-r--r--makefu/2configs/ham/androidtv/default.nix4
-rw-r--r--makefu/2configs/ham/androidtv/purepythonadb.nix6
-rw-r--r--makefu/2configs/ham/default.nix6
-rw-r--r--makefu/2configs/ham/multi/the_playlist.nix83
-rw-r--r--makefu/2configs/ham/zigbee2mqtt/default.nix1
-rw-r--r--makefu/2configs/home-manager/cli.nix9
-rw-r--r--makefu/2configs/home-manager/desktop.nix1
-rw-r--r--makefu/2configs/home-manager/zsh.nix12
-rw-r--r--makefu/2configs/hw/bluetooth.nix6
-rw-r--r--makefu/2configs/legacy_only.nix8
-rw-r--r--makefu/2configs/minimal.nix2
-rw-r--r--makefu/2configs/nur.nix4
-rw-r--r--makefu/2configs/share/omo.nix12
-rw-r--r--makefu/2configs/tools/dev.nix1
-rw-r--r--makefu/2configs/tools/extra-gui.nix2
-rw-r--r--makefu/2configs/tools/studio.nix3
-rw-r--r--makefu/5pkgs/tinymediamanager/default.nix38
-rw-r--r--makefu/krops.nix2
-rw-r--r--nin/0tests/dummysecrets/hashedPasswords.nix1
-rw-r--r--nin/1systems/axon/config.nix132
-rw-r--r--nin/1systems/hiawatha/config.nix126
-rw-r--r--nin/1systems/onondaga/config.nix23
-rw-r--r--nin/2configs/ableton.nix20
-rw-r--r--nin/2configs/copyq.nix38
-rw-r--r--nin/2configs/default.nix173
-rw-r--r--nin/2configs/games.nix70
-rw-r--r--nin/2configs/git.nix60
-rw-r--r--nin/2configs/im.nix19
-rw-r--r--nin/2configs/retiolum.nix28
-rw-r--r--nin/2configs/skype.nix27
-rw-r--r--nin/2configs/termite.nix22
-rw-r--r--nin/2configs/vim.nix355
-rw-r--r--nin/2configs/weechat.nix21
-rw-r--r--nin/default.nix7
-rw-r--r--nin/krops.nix35
m---------submodules/brockman0
m---------submodules/krops0
125 files changed, 1499 insertions, 1972 deletions
diff --git a/.gitmodules b/.gitmodules
index aee01051a..7ecb497ea 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,6 @@
[submodule "lass/5pkgs/autowifi"]
path = lass/5pkgs/autowifi
url = https://github.com/Lassulus/autowifi
-[submodule "submodules/brockman"]
- path = submodules/brockman
- url = https://github.com/kmein/brockman.git
+[submodule "jeschli/2configs/elisp"]
+ path = jeschli/2configs/elisp
+ url = https://github.com/Jeschli/misc-elisp-scripts.git
diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 7596f17d6..dec69563f 100644
--- a/