From d19aedb81c0e5aa7a292ff00aaf870ab3c0579ea Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 20 Apr 2019 09:46:04 +0200 Subject: [PATCH 01/23] ma x.r: use stable kernel due to wifi issues --- makefu/1systems/x/config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 3c5e50c4b..32a548954 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -196,4 +196,6 @@ services.syncthing.user = lib.mkForce "makefu"; services.syncthing.dataDir = lib.mkForce "/home/makefu/.config/syncthing/"; + # latest kernel (5.0) has issues with wifi card + boot.kernelPackages = pkgs.linuxPackages; } From 95f6a06c5acfb6054236ea2f5aee42975dd909ec Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 26 Apr 2019 20:31:03 +0200 Subject: [PATCH 02/23] prison-break: move to krebs --- {makefu/5pkgs => krebs/5pkgs/simple}/prison-break/default.nix | 0 .../5pkgs => krebs/5pkgs/simple}/prison-break/straight-plugin.nix | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {makefu/5pkgs => krebs/5pkgs/simple}/prison-break/default.nix (100%) rename {makefu/5pkgs => krebs/5pkgs/simple}/prison-break/straight-plugin.nix (100%) diff --git a/makefu/5pkgs/prison-break/default.nix b/krebs/5pkgs/simple/prison-break/default.nix similarity index 100% rename from makefu/5pkgs/prison-break/default.nix rename to krebs/5pkgs/simple/prison-break/default.nix diff --git a/makefu/5pkgs/prison-break/straight-plugin.nix b/krebs/5pkgs/simple/prison-break/straight-plugin.nix similarity index 100% rename from makefu/5pkgs/prison-break/straight-plugin.nix rename to krebs/5pkgs/simple/prison-break/straight-plugin.nix From 98f0d7fef497037f82711cc62db61008e26280b2 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 26 Apr 2019 20:36:31 +0200 Subject: [PATCH 03/23] ma network-manager: add prison-break --- makefu/2configs/hw/network-manager.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/makefu/2configs/hw/network-manager.nix b/makefu/2configs/hw/network-manager.nix index 3b9d04549..d7b262b91 100644 --- a/makefu/2configs/hw/network-manager.nix +++ b/makefu/2configs/hw/network-manager.nix @@ -30,4 +30,7 @@ state = [ "/etc/NetworkManager/system-connections" #NM stateful config files ]; + networking.networkmanager.dispatcherScripts = [ + { source = "${pkgs.prison-break}/bin/prison-break"; } + ]; } From 3f04bdd19a877020aa6713f166c8aeb756739b7f Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 8 May 2019 13:53:48 +0200 Subject: [PATCH 04/23] ma mqtt: be more insecure --- makefu/2configs/mqtt.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/makefu/2configs/mqtt.nix b/makefu/2configs/mqtt.nix index c56521812..8b77df962 100644 --- a/makefu/2configs/mqtt.nix +++ b/makefu/2configs/mqtt.nix @@ -5,6 +5,9 @@ host = "0.0.0.0"; users = {}; # TODO: secure that shit + aclExtraConf = '' + pattern readwrite /# + ''; allowAnonymous = true; }; } From 1a42b74ddd167037c337ec91ad05ba9d044124af Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 8 May 2019 13:54:04 +0200 Subject: [PATCH 05/23] ma backup/ssh: add wbob --- makefu/2configs/backup/ssh/wbob.pub | 1 + 1 file changed, 1 insertion(+) create mode 100644 makefu/2configs/backup/ssh/wbob.pub diff --git a/makefu/2configs/backup/ssh/wbob.pub b/makefu/2configs/backup/ssh/wbob.pub new file mode 100644 index 000000000..52d56d956 --- /dev/null +++ b/makefu/2configs/backup/ssh/wbob.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOUZcfi2SXxCo1if0oU3x9qPK8/O5FmiXy2HFZyTp/P1 makefu@x From 98d0dc01af77fa29fe6a1e23369d11e5b7ac7d8d Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 8 May 2019 13:54:37 +0200 Subject: [PATCH 06/23] ma bureautomation: add thierry --- makefu/2configs/bureautomation/hass.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/makefu/2configs/bureautomation/hass.nix b/makefu/2configs/bureautomation/hass.nix index 02465520c..ace1d10ce 100644 --- a/makefu/2configs/bureautomation/hass.nix +++ b/makefu/2configs/bureautomation/hass.nix @@ -146,6 +146,7 @@ in { "device_tracker.ecki_tablet" "device_tracker.daniel_phone" "device_tracker.carsten_phone" + "device_tracker.thierry_phone" # "person.thorsten" # "person.felix" # "person.ecki" From afed4c7e2d31fe5e1200033f4903da12798a3466 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 8 May 2019 13:55:00 +0200 Subject: [PATCH 07/23] ma taskd: define dataDir as state --- makefu/2configs/taskd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/makefu/2configs/taskd.nix b/makefu/2configs/taskd.nix index 5ca3b9904..122ad66a7 100644 --- a/makefu/2configs/taskd.nix +++ b/makefu/2configs/taskd.nix @@ -1,5 +1,6 @@ {config, ... }: { + state = [ config.services.taskserver.dataDir ]; services.taskserver.enable = true; services.taskserver.fqdn = config.krebs.build.host.name; services.taskserver.listenHost = "::"; From 6067519d8d12af2b9dc9f8abfd2a86206effd4e4 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 8 May 2019 13:55:28 +0200 Subject: [PATCH 08/23] ma task-client: remove shell-aliases --- makefu/2configs/task-client.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/makefu/2configs/task-client.nix b/makefu/2configs/task-client.nix index 470193d6c..1fdddb9b1 100644 --- a/makefu/2configs/task-client.nix +++ b/makefu/2configs/task-client.nix @@ -4,11 +4,4 @@ pkgs.taskwarrior ]; - environment.shellAliases = { - tshack = "task project:shack"; - twork = "task project:soc"; - tpki = "task project:pki"; - tkrebs = "task project:krebs"; - t = "task project: "; - }; } From 6f82bc0e459db88bc9a671565e43aee504dd0e8f Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 8 May 2019 13:56:04 +0200 Subject: [PATCH 09/23] ma zsh.nix: manually load direnv --- makefu/2configs/home-manager/zsh.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefu/2configs/home-manager/zsh.nix b/makefu/2configs/home-manager/zsh.nix index 267a2e878..d24969ef0 100644 --- a/makefu/2configs/home-manager/zsh.nix +++ b/makefu/2configs/home-manager/zsh.nix @@ -25,12 +25,12 @@ then [ -d .direnv ] || mkdir .direnv local tmp=$(nix-shell --show-trace "$@" \ - --run "\"$direnv\" dump bash") + --run "\"$direnv\" dump zsh") echo "$tmp" > "$cache" fi local path_backup=$PATH term_backup=$TERM - direnv_load cat "$cache" + . "$cache" export PATH=$PATH:$path_backup TERM=$term_backup From 795ba0b57fec8fd5c7ce732a8d478c7cada762f8 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 8 May 2019 13:56:33 +0200 Subject: [PATCH 10/23] ma pkgs.prison-break: bump to 1.0.1 --- krebs/5pkgs/simple/prison-break/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/krebs/5pkgs/simple/prison-break/default.nix b/krebs/5pkgs/simple/prison-break/default.nix index 051a46184..8c7fc65c3 100644 --- a/krebs/5pkgs/simple/prison-break/default.nix +++ b/krebs/5pkgs/simple/prison-break/default.nix @@ -3,12 +3,12 @@ with pkgs.python3.pkgs; buildPythonPackage rec { pname = "prison-break"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "makefu"; repo = pname; - rev = "1.0.0"; - sha256 = "0ab42z6qr42vz4fc077irn9ykrrylagx1dzlw8dqcanf49dxd961"; + rev = version; + sha256 = "1q9bw1hbz0cayclixplyc85kaq05mg6n2zz8mbydljvknidd4p6a"; }; propagatedBuildInputs = [ docopt From 28f095aa0940166b6628882b539d55cdabff9828 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 8 May 2019 13:57:29 +0200 Subject: [PATCH 11/23] ma stats/arafetch: use latest version --- makefu/2configs/stats/arafetch.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/makefu/2configs/stats/arafetch.nix b/makefu/2configs/stats/arafetch.nix index c16629cc5..6ab9d3774 100644 --- a/makefu/2configs/stats/arafetch.nix +++ b/makefu/2configs/stats/arafetch.nix @@ -2,7 +2,7 @@ with import ; let pkg = with pkgs.python3Packages;buildPythonPackage rec { - rev = "762d747"; + rev = "775d0c2"; name = "arafetch-${rev}"; propagatedBuildInputs = [ requests @@ -13,7 +13,7 @@ let src = pkgs.fetchgit { url = "http://cgit.euer.krebsco.de/arafetch"; inherit rev; - sha256 = "164xiqbrr914lz0nh3i1dxz8iwg6vm2af3i3803cd3242nznw0ws"; + sha256 = "0z35avn7vmbd1661ca1zkc9i4lwcm03kpwgiqxddpkp1yxhl548p"; }; }; home = "/var/lib/arafetch"; @@ -34,7 +34,7 @@ in { path = [ pkg pkgs.git pkgs.wget ]; serviceConfig = { User = "arafetch"; - Restart = "always"; + # Restart = "always"; WorkingDirectory = home; PrivateTmp = true; ExecStart = pkgs.writeDash "start-weekrun" '' From 4ee6d7e34e0d5546ab2d74a26a6e64edc85e43e3 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 8 May 2019 13:58:28 +0200 Subject: [PATCH 12/23] ma vim: disable languageClient again --- makefu/2configs/editor/vim.nix | 1 - makefu/2configs/editor/vimrc | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/makefu/2configs/editor/vim.nix b/makefu/2configs/editor/vim.nix index 8a58e44de..d14a611b4 100644 --- a/makefu/2configs/editor/vim.nix +++ b/makefu/2configs/editor/vim.nix @@ -23,7 +23,6 @@ in { vimrcConfig.vam.pluginDictionaries = [ { names = [ "undotree" # "YouCompleteMe" - "LanguageClient-neovim" "vim-better-whitespace" ]; } # vim-nix handles indentation better but does not perform sanity { names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; } diff --git a/makefu/2configs/editor/vimrc b/makefu/2configs/editor/vimrc index 96c505ba8..8cdab55db 100644 --- a/makefu/2configs/editor/vimrc +++ b/makefu/2configs/editor/vimrc @@ -96,14 +96,3 @@ augroup Binary au BufWritePost *.bin if &bin | %!xxd au BufWritePost *.bin set nomod | endif augroup END - -let g:LanguageClient_serverCommands = { -\ 'python': ['pyls'] -\ } -nnoremap :call LanguageClient_contextMenu() -nnoremap gh :call LanguageClient_textDocument_hover() -nnoremap gd :call LanguageClient_textDocument_definition() -nnoremap gr :call LanguageClient_textDocument_references() -nnoremap gs :call LanguageClient_textDocument_documentSymbol() -nnoremap :call LanguageClient_textDocument_rename() -nnoremap gf :call LanguageClient_textDocument_formatting() From f6a0f6bfd274927bfaafdc411f93827ebf029358 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 8 May 2019 13:58:51 +0200 Subject: [PATCH 13/23] ma fs: more documentation --- makefu/2configs/fs/sda-crypto-root-home.nix | 26 ++++++++++++++++++++- makefu/2configs/fs/sda-crypto-root.nix | 3 +-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/makefu/2configs/fs/sda-crypto-root-home.nix b/makefu/2configs/fs/sda-crypto-root-home.nix index e790ed6a8..4f0cf8c6b 100644 --- a/makefu/2configs/fs/sda-crypto-root-home.nix +++ b/makefu/2configs/fs/sda-crypto-root-home.nix @@ -8,7 +8,31 @@ # / (main-root) # /home (main-home) -with import ; +# clean the boot sector: +# dd if=/dev/zero of=/dev/sda count=2048 +# Installation Instruction on ISO: +# fdisk /dev/sda + # boot 500M + # rest rest +# cryptsetup luksFormat /dev/sda2 +# mkfs.ext4 -L nixboot /dev/sda1 +# cryptsetup luksOpen /dev/sda2 cryptoluks +# pvcreate /dev/mapper/cryptoluks +# vgcreate main /dev/mapper/cryptoluks +# lvcreate -L 200Gib main -n root +# lvcreate -L 800Gib main -n home +# mkfs.ext4 /dev/main/root +# mkfs.ext4 /dev/main/home +# mount /dev/mapper/main-root /mnt +# mkdir -p /mnt/{boot,home,var/src} /var/src +# mount /dev/sda1 /mnt/boot +# mount /dev/mapper/main-home /mnt/home +# touch /mnt/var/src/.populate +# mount -o bind /mnt/var/src /var/src +# nix-channel --add https://nixos.org/channels/nixos-19.03 nixpkgs && # nix-channel --update +# nix-env -iA nixpkgs.gitMinimal +# (on deploy-host) $(nix-build ~/stockholm/makefu/krops.nix --no-out-link --argstr name x --argstr target 10.42.22.91 -A deploy --show-trace) +# NIXOS_CONFIG=/var/src/nixos-config nixos-install -I /var/src --no-root-passwd --no-channel-copy { imports = [ diff --git a/makefu/2configs/fs/sda-crypto-root.nix b/makefu/2configs/fs/sda-crypto-root.nix index 55cfd74f5..e49843cfe 100644 --- a/makefu/2configs/fs/sda-crypto-root.nix +++ b/makefu/2configs/fs/sda-crypto-root.nix @@ -9,8 +9,7 @@ # boot 500M # rest rest # cryptsetup luksFormat /dev/sda2 -# -with import ; +# mkfs.ext4 -L nixboot /dev/sda1 { boot = { loader.grub.enable = true; From da44703a861c56e954cb350ec65b87b30b6e4ace Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 8 May 2019 13:59:13 +0200 Subject: [PATCH 14/23] ma printer: cups as state dir --- makefu/2configs/printer.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/makefu/2configs/printer.nix b/makefu/2configs/printer.nix index 0889ebbc1..d297483b2 100644 --- a/makefu/2configs/printer.nix +++ b/makefu/2configs/printer.nix @@ -32,4 +32,5 @@ in { tcp 192.168.1.5 ''; #home printer SCX-3205W }; + state = [ "/var/lib/cups" ]; } From 8de1b7553ced70a449655024fbcbad431ab0a1ca Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 8 May 2019 14:00:01 +0200 Subject: [PATCH 15/23] ma mail.euer: use new mailserver release, set state --- makefu/2configs/mail/mail.euer.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/makefu/2configs/mail/mail.euer.nix b/makefu/2configs/mail/mail.euer.nix index f8f82e76b..d27b888a7 100644 --- a/makefu/2configs/mail/mail.euer.nix +++ b/makefu/2configs/mail/mail.euer.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { imports = [ - (builtins.fetchTarball "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/v2.2.0/nixos-mailserver-v2.2.0.tar.gz") + (builtins.fetchTarball "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/v2.2.1/nixos-mailserver-v2.2.1.tar.gz") ]; mailserver = { @@ -32,8 +32,12 @@ }; services.dovecot2.extraConfig = '' - ssl_dh = Date: Wed, 8 May 2019 22:34:01 +0200 Subject: [PATCH 16/23] ma pkgs.pico2wave: init --- makefu/5pkgs/pico2wave/default.nix | 44 ++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 makefu/5pkgs/pico2wave/default.nix diff --git a/makefu/5pkgs/pico2wave/default.nix b/makefu/5pkgs/pico2wave/default.nix new file mode 100644 index 000000000..5302e8bf3 --- /dev/null +++ b/makefu/5pkgs/pico2wave/default.nix @@ -0,0 +1,44 @@ +{ stdenv, lib, fetchurl +, popt +, libredirect +, dpkg +, makeWrapper +, autoPatchelfHook +, ... +}: +# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=svox-pico-bin +let + pkgrel="8"; + _arch = "amd64"; +in +stdenv.mkDerivation rec { + name = "pico2wave"; # svox-pico-bin + version = "1.0+git20130326"; + srcs = [ + (fetchurl { url = "http://mirrors.kernel.org/ubuntu/pool/multiverse/s/svox/libttspico0_${version}-${pkgrel}_${_arch}.deb"; sha256 = "0b8r7r8by5kamnm960bsicimnj1a40ghy3475nzy1jvwj5xgqhrj"; }) + (fetchurl { url = "http://mirrors.kernel.org/ubuntu/pool/multiverse/s/svox/libttspico-dev_${version}-${pkgrel}_${_arch}.deb"; sha256 = "1knjiwi117h02nbf7k6ll080vl65gxwx3rpj0fq5xkvxbqpjjbvz"; }) + (fetchurl { url = "http://mirrors.kernel.org/ubuntu/pool/multiverse/s/svox/libttspico-data_${version}-${pkgrel}_all.deb"; sha256 = "0k0x5jh5qzzasrg766pfmls3ksj18wwdbssysvpxkq98aqg4fgmx"; }) + (fetchurl { url = "http://mirrors.kernel.org/ubuntu/pool/multiverse/s/svox/libttspico-utils_${version}-${pkgrel}_${_arch}.deb"; sha256 = "11yk25fh4n7qz4xjg0dri68ygc3aapj1bk9cvhcwkfvm46j5lrjv"; }) + ] ; + + nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook ]; + + dontBuild = true; + + buildInputs = [ popt ]; + + unpackPhase = lib.concatMapStringsSep ";" (src: "dpkg-deb -x ${src} .") srcs; + + installPhase = '' + mkdir -p $out + cp -r usr/. $out/ + + mv $out/lib/*-linux-gnu/* $out/lib/ + rmdir $out/lib/*-linux-gnu + + wrapProgram "$out/bin/pico2wave" \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS /usr/share/pico/lang=$out/share/pico/lang + ''; + +} From c07c0412418e3979e609fd5200a34dd1830e9334 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 9 May 2019 08:42:23 +0200 Subject: [PATCH 17/23] prison-break: finish move from makefu to krebs namespace --- makefu/2configs/hw/network-manager.nix | 5 ++++- makefu/2configs/nur.nix | 6 +++--- makefu/5pkgs/default.nix | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/makefu/2configs/hw/network-manager.nix b/makefu/2configs/hw/network-manager.nix index d7b262b91..e781c7ed1 100644 --- a/makefu/2configs/hw/network-manager.nix +++ b/makefu/2configs/hw/network-manager.nix @@ -1,4 +1,7 @@ { pkgs, lib, ... }: +let + prison-break = pkgs.callPackage ../../../krebs/5pkgs/simple/prison-break {}; +in { users.users.makefu = { extraGroups = [ "networkmanager" ]; @@ -31,6 +34,6 @@ "/etc/NetworkManager/system-connections" #NM stateful config files ]; networking.networkmanager.dispatcherScripts = [ - { source = "${pkgs.prison-break}/bin/prison-break"; } + { source = "${prison-break}/bin/prison-break"; } ]; } diff --git a/makefu/2configs/nur.nix b/makefu/2configs/nur.nix index dda00063a..3cb4981e0 100644 --- a/makefu/2configs/nur.nix +++ b/makefu/2configs/nur.nix @@ -1,7 +1,7 @@ { pkgs, ... }:{ nixpkgs.config.packageOverrides = pkgs: { - nur = pkgs.callPackage (import (builtins.fetchGit { - url = "https://github.com/nix-community/NUR"; - })) {}; + nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") { + inherit pkgs; + }; }; } diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix index 1ae10459f..a3c489ccc 100644 --- a/makefu/5pkgs/default.nix +++ b/makefu/5pkgs/default.nix @@ -40,6 +40,7 @@ in { qcma = super.pkgs.libsForQt5.callPackage ./custom/qcma { }; inherit (callPackage ./devpi {}) devpi-web ; nodemcu-uploader = super.pkgs.callPackage ./nodemcu-uploader {}; + prison-break = abort "`prison-break` moved from this namespace to `nur.repos.krebs.prison-break`"; } // (mapAttrs (_: flip callPackage {}) From 8f87254a2aa47630bc711c34a6322a974c6c040f Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 10 May 2019 21:03:36 +0200 Subject: [PATCH 18/23] puyak.r: allow access from raute and ulrich --- krebs/1systems/puyak/config.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index 67257eacd..af11c6944 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -73,6 +73,13 @@ system.activationScripts."disengage fancontrol" = '' echo level disengaged > /proc/acpi/ibm/fan ''; + + # to access vorstand vm + users.users.root.openssh.authorizedKeys.keys = [ + config.krebs.users.ulrich.pubkey + config.krebs.users.raute.pubkey + ]; + users.users.joerg = { openssh.authorizedKeys.keys = [ config.krebs.users.Mic92.pubkey ]; isNormalUser = true; From b65e9c07628aab89478ca634ae682ea7d07d338c Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 11 May 2019 11:34:15 +0200 Subject: [PATCH 19/23] pkgs.prison-break: 1.0.1 -> 1.2.0 --- krebs/5pkgs/simple/prison-break/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/simple/prison-break/default.nix b/krebs/5pkgs/simple/prison-break/default.nix index 8c7fc65c3..672e0b3a0 100644 --- a/krebs/5pkgs/simple/prison-break/default.nix +++ b/krebs/5pkgs/simple/prison-break/default.nix @@ -3,12 +3,12 @@ with pkgs.python3.pkgs; buildPythonPackage rec { pname = "prison-break"; - version = "1.0.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "makefu"; repo = pname; rev = version; - sha256 = "1q9bw1hbz0cayclixplyc85kaq05mg6n2zz8mbydljvknidd4p6a"; + sha256 = "07wy6f06vj9s131c16gw1xl1jf9gq5xiqia8awfb26s99gxlv7l9"; }; propagatedBuildInputs = [ docopt From 135dc5297ab71045a1f58e053c4584f694988146 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 14 May 2019 09:18:08 +0200 Subject: [PATCH 20/23] ma pkgs.prison-break: move back to own namespace, use nur.repos.makefu.prison-break for krebs --- krebs/5pkgs/default.nix | 1 + {krebs/5pkgs/simple => makefu/5pkgs}/prison-break/default.nix | 0 .../simple => makefu/5pkgs}/prison-break/straight-plugin.nix | 0 3 files changed, 1 insertion(+) rename {krebs/5pkgs/simple => makefu/5pkgs}/prison-break/default.nix (100%) rename {krebs/5pkgs/simple => makefu/5pkgs}/prison-break/straight-plugin.nix (100%) diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 4cdaedebf..3cb471c77 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -16,6 +16,7 @@ foldl' mergeAttrs {} reaktor2 = self.haskellPackages.reaktor2; ReaktorPlugins = self.callPackage ./simple/Reaktor/plugins.nix {}; + prison-break = nur.repos.makefu.prison-break; # https://github.com/proot-me/PRoot/issues/106 proot = self.writeDashBin "proot" '' diff --git a/krebs/5pkgs/simple/prison-break/default.nix b/makefu/5pkgs/prison-break/default.nix similarity index 100% rename from krebs/5pkgs/simple/prison-break/default.nix rename to makefu/5pkgs/prison-break/default.nix diff --git a/krebs/5pkgs/simple/prison-break/straight-plugin.nix b/makefu/5pkgs/prison-break/straight-plugin.nix similarity index 100% rename from krebs/5pkgs/simple/prison-break/straight-plugin.nix rename to makefu/5pkgs/prison-break/straight-plugin.nix From 1340e3fb77beaf1d35d21bd885ce3673a84307a7 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 14 May 2019 09:30:48 +0200 Subject: [PATCH 21/23] ma network-manager: use prison-break from pkgs --- makefu/2configs/hw/network-manager.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/makefu/2configs/hw/network-manager.nix b/makefu/2configs/hw/network-manager.nix index e781c7ed1..d7b262b91 100644 --- a/makefu/2configs/hw/network-manager.nix +++ b/makefu/2configs/hw/network-manager.nix @@ -1,7 +1,4 @@ { pkgs, lib, ... }: -let - prison-break = pkgs.callPackage ../../../krebs/5pkgs/simple/prison-break {}; -in { users.users.makefu = { extraGroups = [ "networkmanager" ]; @@ -34,6 +31,6 @@ in "/etc/NetworkManager/system-connections" #NM stateful config files ]; networking.networkmanager.dispatcherScripts = [ - { source = "${prison-break}/bin/prison-break"; } + { source = "${pkgs.prison-break}/bin/prison-break"; } ]; } From 66ade66c5d1932ebac8aa73d9078c73599da8cde Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 14 May 2019 20:34:20 +0200 Subject: [PATCH 22/23] pkgs.prison-break: drop from krebs namespace --- krebs/5pkgs/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 3cb471c77..4cdaedebf 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -16,7 +16,6 @@ foldl' mergeAttrs {} reaktor2 = self.haskellPackages.reaktor2; ReaktorPlugins = self.callPackage ./simple/Reaktor/plugins.nix {}; - prison-break = nur.repos.makefu.prison-break; # https://github.com/proot-me/PRoot/issues/106 proot = self.writeDashBin "proot" '' From f541eae020a229b99afe531139be246f8aecb695 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 15 May 2019 16:06:44 +0200 Subject: [PATCH 23/23] external/hosts: add horisa host of ulrich which weirdly is in the krebs/retiolum repo, but not in our hosts --- krebs/3modules/external/default.nix | 14 ++++++++++++++ krebs/3modules/external/tinc/horisa.pub | 8 ++++++++ 2 files changed, 22 insertions(+) create mode 100644 krebs/3modules/external/tinc/horisa.pub diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index 9bfc920a3..080c259aa 100644 --- a/krebs/3modules/external/default.nix +++ b/krebs/3modules/external/default.nix @@ -167,6 +167,20 @@ in { }; }; }; + horisa = { + cores = 2; + owner = config.krebs.users.ulrich; # main laptop + nets = { + retiolum = { + ip4.addr = "10.243.226.213"; + ip6.addr = "42:0:e644:9099:4f8:b9aa:3856:4e85"; + aliases = [ + "horisa.r" + ]; + tinc.pubkey = tinc-for "horisa"; + }; + }; + }; idontcare = { owner = config.krebs.users.Mic92; nets = rec { diff --git a/krebs/3modules/external/tinc/horisa.pub b/krebs/3modules/external/tinc/horisa.pub new file mode 100644 index 000000000..06d686ce3 --- /dev/null +++ b/krebs/3modules/external/tinc/horisa.pub @@ -0,0 +1,8 @@ +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA1hhBqCku98gimv0yXr6DFwE2HUemigyqX8o7IsPOW5XT/K8o+V40 +Oxk3r0+c7IYREvug/raxoullf5TMJFzTzqzX4njgsiTs25V8D7hVT4jcRKTcXmBn +XpjtD+tIeDW1E6dIMMDbxKCyfd/qaeg83G7gPobeFYr4JNqQLXrnotlWMO9S13UT ++EgSP2pixv/dGIqX8WRg23YumO8jZKbso/sKKFMIEOJvnh/5EcWb24+q2sDRCitP +sWJ5j/9M1Naec/Zl27Ac2HyMWRk39F9Oo+iSbc47QvjKTEmn37P4bBg3hY9FSSFo +M90wG/NRbw1Voz6BgGlwOAoA+Ln0rVKqDQIDAQAB +-----END RSA PUBLIC KEY-----