From 180366625998e84eb76c078780beb6404e232bda Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 30 Jan 2020 03:48:54 +0100 Subject: l: rename iso to wizard --- lass/1systems/iso/default.nix | 211 -------------------------- lass/1systems/iso/generate-iso.sh | 7 - lass/1systems/wizard/config.nix | 286 +++++++++++++++++++++++++++++++++++ lass/1systems/wizard/generate-iso.sh | 7 + lass/1systems/wizard/test.nix | 10 ++ 5 files changed, 303 insertions(+), 218 deletions(-) delete mode 100644 lass/1systems/iso/default.nix delete mode 100755 lass/1systems/iso/generate-iso.sh create mode 100644 lass/1systems/wizard/config.nix create mode 100755 lass/1systems/wizard/generate-iso.sh create mode 100644 lass/1systems/wizard/test.nix diff --git a/lass/1systems/iso/default.nix b/lass/1systems/iso/default.nix deleted file mode 100644 index a77a74fbe..000000000 --- a/lass/1systems/iso/default.nix +++ /dev/null @@ -1,211 +0,0 @@ -{ config, pkgs, ... }: -with import ; - -let - - wizard = pkgs.writers.writeBash "wizard" '' - shopt -s extglob - - echo -n ' - welcome to the computer wizard - first we will check for internet connectivity - (press enter to continue) - ' - read -n 1 -s - if ! ping -c1 lassul.us; then - echo 'no internet detectio, you will have to provide credentials' - read -n 1 -s - nmtui - fi - - # ping -c1 lassuls.us || ${pkgs.writeDash "nm-dmenu" '' - # set -x - # export PATH=$PATH:${pkgs.dmenu}/bin:${pkgs.networkmanagerapplet}/bin - # exec ${pkgs.networkmanager_dmenu}/bin/networkmanager_dmenu "$@" - # ''} - - mode=$(echo -n ' - 1. help of the wizard - 2. let the wizard watch and help if needed - 3. I will do it alone - ' | ${pkgs.fzf}/bin/fzf --reverse) - case "$mode" in - 1*) - echo 'mode_1' > /tmp/mode - systemctl start hidden-ssh-announce.service - tmux new -s help - ;; - 2*) - echo 'mode_2' > /tmp/mode - ;; - 3*) - echo 'mode_3' > /tmp/mode - ;; - *) - echo 'no mode selected' - ;; - esac - ''; - -in { - imports = [ - - - - { - nixpkgs.config.packageOverrides = import pkgs; - krebs.enable = true; - krebs.build.user = config.krebs.users.lass; - krebs.build.host = {}; - } - # { - # systemd.services.wizard = { - # description = "Computer Wizard"; - # wantedBy = [ "multi-user.target" ]; - # serviceConfig = { - # ExecStart = pkgs.writers.writeDash "wizard" '' - # set -efu - # cat <; + +let + + icon = pkgs.writeText "icon" '' + // + // + _ // + .' . // '. + '_ '_\/_' `_ + . . \\ . . + .==. ` \\' .' + .\| //bd\\ \, + \_'`._\\__//_.'`.; + `.__ __,' \\ + | | \\ + | | ` + | | + | | + |____| + l42 ==' '== + ''; + + messenger = pkgs.writeText "message" '' + . + | \/| + (\ _ ) )|/| + (/ _----. /.'.' + .-._________.. .' @ _\ .' + '.._______. '. / (_| .') + '._____. / '-/ | _.' + '.______ ( ) ) \ + '..____ '._ ) ) + .' __.--\ , , // (( + '.' mrf| \/ (_.'( + ' \ .' + \ ( + \ '. + \ \ '.) + '-'-' + ''; + + waiting = pkgs.writeText "waiting" '' + Z + Z + z + z + * ' + / \ + /___\ + ( - - ) + ) L ( .--------------. + __()(-)()__ | \ | + .~~ )()()() ~. | . : + / )()() ` | `-.__________) + | )() ~ | : : + | ) | : | + | _ | | [ ## : + \ ~~-. | , oo_______.' + `_ ( \) _____/~~~~ `--___ + | ~`-) ) `-. `--- ( - a:f - + | '///` | `-. + | | | | `-. + | | | | `-. + | | |\ | + | | | \| + `-. | | | + `-| ' + ''; + + wizard = pkgs.writers.writeDash "wizard" '' + cat ${icon} + + echo -n '${'' + welcome to the computer wizard + first we will check for internet connectivity + + ''}' + + read -p '(press enter to continue...)' key + until ping -c1 8.8.8.8; do + ${pkgs.nm-dmenu}/bin/nm-dmenu + done + + mode=$(echo -n '${'' + 1. Help of the wizard + 2. Install NixOS + 3. I know what I need to do + ''}' | ${pkgs.fzf}/bin/fzf --reverse) + case "$mode" in + 1*) + echo 'mode_1' > /tmp/mode + clear + echo 'waiting for the messenger to reach the wizard' + cat ${messenger} + + # get pubkeys + mkdir -p /root/.ssh/ + touch /root/.ssh/authorized_keys + curl -Ss 'https://lassul.us/mors.pub' >> /root/.ssh/authorized_keys + curl -Ss 'https://lassul.us/blue.pub' >> /root/.ssh/authorized_keys + curl -Ss 'https://lassul.us/yubi.pub' >> /root/.ssh/authorized_keys + + # write via irc + systemctl start hidden-ssh-announce.service + tmux new-session -s help ${pkgs.writers.writeDash "waiting" '' + cat ${waiting} + read -p 'waiting for the wizard to wake up' key + ${pkgs.bashInteractive}/bin/bash + ''} + ;; + 2*) + echo 'mode_2' > /tmp/mode + ${pkgs.nixos-installer}/bin/nixos-installer + ;; + 3*) + echo 'mode_3' > /tmp/mode + ;; + *) + echo 'no mode selected' + ;; + esac + ''; + +in { + imports = [ + + + + # + { + nixpkgs.config.packageOverrides = import pkgs; + krebs.enable = true; + krebs.build.user = config.krebs.users.lass; + krebs.build.host = {}; + } + # { + # systemd.services.wizard = { + # description = "Computer Wizard"; + # wantedBy = [ "multi-user.target" ]; + # serviceConfig = { + # ExecStart = pkgs.writers.writeDash "wizard" '' + # set -efu + # cat < Date: Mon, 10 Feb 2020 13:24:11 +0100 Subject: Revert "l hilum.r: get autoiso.cfg easier via git" This reverts commit 472b52e98a2d36604c7f090b6e73fb2ee5b83796. --- lass/1systems/hilum/config.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lass/1systems/hilum/config.nix b/lass/1systems/hilum/config.nix index 470dd3aff..7a506591b 100644 --- a/lass/1systems/hilum/config.nix +++ b/lass/1systems/hilum/config.nix @@ -21,7 +21,14 @@ source /grub/autoiso.cfg } ''; - extraFiles."/grub/autoiso.cfg" = "${pkgs.grub2.src}/docs/autoiso.cfg"; + extraFiles."/grub/autoiso.cfg" = (pkgs.stdenv.mkDerivation { + name = "autoiso.cfg"; + src = pkgs.grub2.src; + phases = [ "unpackPhase" "installPhase" ]; + installPhase = '' + cp docs/autoiso.cfg $out + ''; + }); }; services.logind.lidSwitch = "ignore"; -- cgit v1.2.3 From e82a2561e0a1884f5596a1f093daf27e4ba7e471 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 11 Feb 2020 19:46:59 +0100 Subject: nixpkgs: eb65d1d -> c49da64 --- krebs/nixpkgs.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 4ab0e86d4..769bacbe0 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,7 +1,7 @@ { "url": "https://github.com/NixOS/nixpkgs-channels", - "rev": "eb65d1dae626f4b149566c4cbccdad7ec24af189", - "date": "2020-01-13T10:34:45+00:00", - "sha256": "0zl4zakmw2s7gnkc2bmnjl71xg55n0kqrcm834kjq49lwwmdk225", + "rev": "c49da6435f314e04fc58ca29807221817ac2ac6b", + "date": "2020-02-07T12:52:16+01:00", + "sha256": "17zsqhaf098bvcfarnq0h9601z6smkfd1kz1px6xfg6xqfmr80r7", "fetchSubmodules": false } -- cgit v1.2.3