summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jeschli/1systems/bolide/config.nix1
-rw-r--r--jeschli/1systems/reagenzglas/config.nix25
-rw-r--r--jeschli/2configs/emacs.nix35
-rw-r--r--jeschli/2configs/python.nix9
-rw-r--r--jeschli/2configs/rust.nix7
-rw-r--r--jeschli/krops.nix4
-rw-r--r--krebs/1systems/puyak/config.nix2
-rw-r--r--krebs/1systems/wolf/config.nix4
-rw-r--r--krebs/2configs/shack/glados/multi/wasser.nix2
-rw-r--r--krebs/2configs/shack/mqtt_sub.nix2
-rw-r--r--krebs/2configs/shack/muell_caller.nix3
-rw-r--r--krebs/2configs/shack/muell_mail.nix5
-rw-r--r--krebs/2configs/shack/muellshack.nix3
-rw-r--r--krebs/2configs/shack/node-light.nix3
-rw-r--r--krebs/2configs/shack/powerraw.nix6
-rw-r--r--krebs/2configs/shack/prometheus/server.nix7
-rw-r--r--krebs/2configs/shack/radioactive.nix3
-rw-r--r--krebs/3modules/bepasty-server.nix2
-rw-r--r--krebs/3modules/ci.nix2
-rw-r--r--krebs/3modules/external/default.nix27
-rw-r--r--krebs/3modules/external/palo.nix23
-rw-r--r--krebs/3modules/lass/default.nix41
-rw-r--r--krebs/3modules/lass/pgp/yubikey.pgp109
-rw-r--r--krebs/3modules/lass/ssh/yubikey.rsa1
-rw-r--r--krebs/3modules/makefu/default.nix2
-rw-r--r--krebs/3modules/power-action.nix2
-rw-r--r--krebs/3modules/rtorrent.nix24
-rw-r--r--krebs/5pkgs/haskell/email-header.nix21
-rw-r--r--krebs/5pkgs/simple/bitlbee-discord/default.nix29
-rw-r--r--krebs/5pkgs/simple/cholerab/default.nix17
-rw-r--r--krebs/5pkgs/simple/go-shortener/default.nix8
-rw-r--r--krebs/5pkgs/simple/newsbot-js/default.nix8
-rw-r--r--krebs/nixpkgs.json6
-rwxr-xr-xkrebs/update-nixpkgs.sh2
-rw-r--r--lass/1systems/daedalus/config.nix3
-rw-r--r--lass/1systems/hilum/config.nix28
-rw-r--r--lass/1systems/icarus/config.nix11
-rw-r--r--lass/1systems/morpheus/config.nix41
-rw-r--r--lass/1systems/morpheus/physical.nix32
-rw-r--r--lass/1systems/prism/config.nix39
-rw-r--r--lass/1systems/xerxes/config.nix28
-rw-r--r--lass/1systems/xerxes/physical.nix10
-rw-r--r--lass/1systems/yellow/config.nix2
-rw-r--r--lass/2configs/baseX.nix5
-rw-r--r--lass/2configs/browsers.nix97
-rw-r--r--lass/2configs/default.nix21
-rw-r--r--lass/2configs/exim-smarthost.nix5
-rw-r--r--lass/2configs/games.nix18
-rw-r--r--lass/2configs/gc.nix2
-rw-r--r--lass/2configs/git.nix2
-rw-r--r--lass/2configs/hw/x220.nix21
-rw-r--r--lass/2configs/pass.nix2
-rw-r--r--lass/2configs/radio.nix6
-rw-r--r--lass/2configs/starcraft.nix33
-rw-r--r--lass/2configs/steam.nix5
-rw-r--r--lass/2configs/ts3.nix4
-rw-r--r--lass/2configs/websites/domsen.nix49
-rw-r--r--lass/2configs/websites/lassulus.nix54
-rw-r--r--lass/2configs/websites/util.nix98
-rw-r--r--lass/2configs/yubikey.nix25
-rw-r--r--lass/2configs/zsh.nix1
-rw-r--r--lass/3modules/autowifi.nix95
-rw-r--r--lass/3modules/browsers.nix87
-rw-r--r--lass/3modules/default.nix1
-rw-r--r--lass/5pkgs/autowifi/autowifi.py228
-rw-r--r--lass/5pkgs/autowifi/default.nix1
-rw-r--r--lass/5pkgs/bank/default.nix14
-rw-r--r--lass/5pkgs/custom/xmonad-lass/default.nix15
-rw-r--r--lass/5pkgs/default.nix16
-rw-r--r--lass/5pkgs/otpmenu/default.nix10
-rw-r--r--lass/krops.nix12
-rw-r--r--makefu/0tests/data/secrets/mysql_rootPassword0
-rw-r--r--makefu/1systems/x/config.nix31
-rw-r--r--makefu/2configs/bureautomation/multi/10h_timers.nix4
-rw-r--r--makefu/2configs/bureautomation/multi/frosch.nix95
-rw-r--r--makefu/2configs/deployment/owncloud.nix86
-rw-r--r--makefu/2configs/hw/tp-x230.nix1
-rw-r--r--makefu/2configs/hw/tp-x2x0.nix1
-rw-r--r--makefu/2configs/hw/upower.nix6
-rw-r--r--makefu/2configs/nginx/euer.mon.nix2
-rw-r--r--makefu/2configs/nginx/euer.wiki.nix35
-rw-r--r--makefu/2configs/tools/pcmanfm-extra.nix2
-rw-r--r--makefu/3modules/opentracker.nix2
-rw-r--r--makefu/5pkgs/default.nix16
-rw-r--r--makefu/5pkgs/pico2wave/default.nix7
-rw-r--r--makefu/5pkgs/pkg2zip/default.nix6
-rw-r--r--makefu/5pkgs/python-firetv/default.nix40
-rw-r--r--makefu/5pkgs/shiori/default.nix6
-rw-r--r--makefu/5pkgs/shiori/deps.nix50
-rw-r--r--makefu/5pkgs/uhub/default.nix48
-rw-r--r--makefu/krops.nix2
91 files changed, 1112 insertions, 894 deletions
diff --git a/jeschli/1systems/bolide/config.nix b/jeschli/1systems/bolide/config.nix
index d859833ac..49b814793 100644
--- a/jeschli/1systems/bolide/config.nix
+++ b/jeschli/1systems/bolide/config.nix
@@ -14,6 +14,7 @@ in
<stockholm/jeschli/2configs/urxvt.nix>
<stockholm/jeschli/2configs/i3.nix>
<stockholm/jeschli/2configs/emacs.nix>
+ <stockholm/jeschli/2configs/rust.nix>
];
krebs.build.host = config.krebs.hosts.bolide;
diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index 2eefb23fb..b56b76acb 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -1,23 +1,11 @@
{ config, pkgs, ... }:
-with pkgs;
-let
- rebuild_script = pkgs.writeTextFile {
- name="rebuild";
- text=''
- #!/usr/bin/env sh
- set -eu
- sudo cp -r /etc/nixos ~/old-nixos
- sudo cp -r $HOME/nixos /etc/
- sudo nixos-rebuild switch
- '';
- executable=true;
- };
-in
+
{
imports =
[
<stockholm/jeschli>
<stockholm/jeschli/2configs/emacs.nix>
+ <stockholm/jeschli/2configs/python.nix>
./desktop.nix
./i3-configuration.nix
./hardware-configuration.nix
@@ -27,7 +15,7 @@ in
boot.loader.systemd-boot.enable = true;
# Wireless network with network manager
- krebs.build.host = config.krebs.hosts.brauerei;
+ krebs.build.host = config.krebs.hosts.reagenzglas;
# networking.hostName = "nixos"; # Define your hostname.
networking.networkmanager.enable = true;
@@ -49,14 +37,9 @@ in
wget vim git
firefox
rofi
+ ag
];
- # How I rebuild the system
- environment.shellAliases = {
- rebuild = rebuild_script;
- };
-
- # Define a user account. Don't forget to set a password with ‘passwd’.
users.users.ombi = {
isNormalUser = true;
extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index bc9cfdb4b..d243017f1 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -1,6 +1,14 @@
{ config, pkgs, ... }:
let
+ pkgsWithOverlay = import <nixpkgs-unstable> {
+ overlays = [
+ (import (builtins.fetchTarball {
+ url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
+ }))
+ ];
+ };
+
orgAgendaView = import ./emacs-org-agenda.nix;
packageRepos = ''
@@ -47,6 +55,9 @@ let
magit = ''
(global-set-key (kbd "C-x g") 'magit-status) ; "Most Magit commands are commonly invoked from the status buffer"
+
+ (with-eval-after-load 'magit
+ (require 'forge))
'';
windowCosmetics = ''
@@ -145,8 +156,6 @@ let
(global-set-key (kbd "<f8>") 'delete-other-windows)
'';
-
-
dotEmacs = pkgs.writeText "dot-emacs" ''
${packageRepos}
@@ -164,9 +173,11 @@ let
${myFunctionKeys}
'';
- emacsWithCustomPackages = (pkgs.emacsPackagesNgGen pkgs.emacs).emacsWithPackages (epkgs: [
+ #emacsWithCustomPackages
+ emacsPkgs= epkgs: [
#testing
epkgs.melpaPackages.gitlab
+ epkgs.melpaPackages.forge
# emacs convenience
epkgs.melpaPackages.ag
@@ -177,7 +188,7 @@ let
epkgs.melpaPackages.monokai-alt-theme
# development
- epkgs.melpaStablePackages.magit
+ epkgs.melpaPackages.magit
epkgs.melpaPackages.nix-mode
epkgs.melpaPackages.go-mode
epkgs.melpaPackages.haskell-mode
@@ -196,20 +207,26 @@ let
epkgs.melpaPackages.org-mime
epkgs.elpaPackages.which-key
- ]);
+ ];
+emacsWithOverlay = (pkgsWithOverlay.emacsWithPackagesFromUsePackage {
+ config = builtins.readFile dotEmacs; # builtins.readFile ./emacs.el;
+ # Package is optional, defaults to pkgs.emacs
+ package = pkgsWithOverlay.emacsGit;
+ # Optionally provide extra packages not in the configuration file
+ extraEmacsPackages = emacsPkgs;
+ });
myEmacs = pkgs.writeDashBin "my-emacs" ''
- exec ${emacsWithCustomPackages}/bin/emacs -q -l ${dotEmacs} "$@"
+ exec ${emacsWithOverlay}/bin/emacs -q -l ${dotEmacs} "$@"
'';
myEmacsWithDaemon = pkgs.writeDashBin "my-emacs-daemon" ''
- exec ${emacsWithCustomPackages}/bin/emacs -q -l ${dotEmacs} --daemon
+ exec ${emacsWithOverlay}/bin/emacs -q -l ${dotEmacs} --daemon
'';
myEmacsClient = pkgs.writeDashBin "meclient" ''
- exec ${emacsWithCustomPackages}/bin/emacsclient --create-frame
+ exec ${emacsWithOverlay}/bin/emacsclient --create-frame
'';
-
in {
environment.systemPackages = [
myEmacs myEmacsWithDaemon myEmacsClient
diff --git a/jeschli/2configs/python.nix b/jeschli/2configs/python.nix
new file mode 100644
index 000000000..0c32e1fc8
--- /dev/null
+++ b/jeschli/2configs/python.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+{
+ environment.systemPackages = with pkgs; [
+ python37
+ python37Packages.pip
+ pipenv
+ ];
+}
diff --git a/jeschli/2configs/rust.nix b/jeschli/2configs/rust.nix
new file mode 100644
index 000000000..dbd90ebf5
--- /dev/null
+++ b/jeschli/2configs/rust.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+ environment.systemPackages = with pkgs; [
+ rustup
+ ];
+}
diff --git a/jeschli/krops.nix b/jeschli/krops.nix
index 30b06c1e6..9a8a76676 100644
--- a/jeschli/krops.nix
+++ b/jeschli/krops.nix
@@ -29,9 +29,9 @@
in {
# usage: $(nix-build --no-out-link --argstr name HOSTNAME -A deploy)
- deploy = pkgs.krops.writeDeploy "${name}-deploy" {
+ deploy = { target ? "root@${name}/var/src" }: pkgs.krops.writeDeploy "${name}-deploy" {
source = source { test = false; };
- target = "root@${name}/var/src";
+ inherit target;
};
# usage: $(nix-build --no-out-link --argstr name HOSTNAME --argstr target PATH -A test)
diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix
index 6321b6cc4..6493c6df4 100644
--- a/krebs/1systems/puyak/config.nix
+++ b/krebs/1systems/puyak/config.nix
@@ -14,6 +14,8 @@
<stockholm/krebs/2configs/news.nix>
<stockholm/krebs/2configs/news-spam.nix>
<stockholm/krebs/2configs/shack/prometheus/node.nix>
+ <stockholm/krebs/2configs/shack/prometheus/server.nix>
+ <stockholm/krebs/2configs/shack/prometheus/unifi.nix>
<stockholm/krebs/2configs/shack/gitlab-runner.nix>
## Collect local statistics via collectd and send to collectd
diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix
index 6e53637e6..e47c43fe1 100644
--- a/krebs/1systems/wolf/config.nix
+++ b/krebs/1systems/wolf/config.nix
@@ -62,9 +62,9 @@ in
<stockholm/krebs/2configs/shack/netbox.nix>
# prometheus.shack
- <stockholm/krebs/2configs/shack/prometheus/server.nix>
+ #<stockholm/krebs/2configs/shack/prometheus/server.nix>
<stockholm/krebs/2configs/shack/prometheus/node.nix>
- <stockholm/krebs/2configs/shack/prometheus/unifi.nix>
+ #<stockholm/krebs/2configs/shack/prometheus/unifi.nix>
# grafana.shack
<stockholm/krebs/2configs/shack/grafana.nix>
diff --git a/krebs/2configs/shack/glados/multi/wasser.nix b/krebs/2configs/shack/glados/multi/wasser.nix
index da5cac36d..578bb0750 100644
--- a/krebs/2configs/shack/glados/multi/wasser.nix
+++ b/krebs/2configs/shack/glados/multi/wasser.nix
@@ -12,7 +12,7 @@ let
retain = false;
qos = 1;
};
- seconds = 30;
+ seconds = 20;
in
{
switch = [
diff --git a/krebs/2configs/shack/mqtt_sub.nix b/krebs/2configs/shack/mqtt_sub.nix
index a8427dde4..bd0b6df85 100644
--- a/krebs/2configs/shack/mqtt_sub.nix
+++ b/krebs/2configs/shack/mqtt_sub.nix
@@ -29,6 +29,8 @@ in {
User = "nobody";
ExecStart = "${pkg}/bin/sub-new";
PrivateTmp = true;
+ Restart = "always";
+ RestartSec = "15";
};
};
}
diff --git a/krebs/2configs/shack/muell_caller.nix b/krebs/2configs/shack/muell_caller.nix
index 19768cb2e..33f6b8c89 100644
--- a/krebs/2configs/shack/muell_caller.nix