From 5de4b1af802b2fad323bc16764e489cdeb30c716 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 15 Dec 2024 21:24:10 +0100 Subject: brockman: add package option --- krebs/3modules/brockman.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/krebs/3modules/brockman.nix b/krebs/3modules/brockman.nix index 3f0dd0861..a3acf83cf 100644 --- a/krebs/3modules/brockman.nix +++ b/krebs/3modules/brockman.nix @@ -6,6 +6,7 @@ let in { options.krebs.brockman = { enable = mkEnableOption "brockman"; + package = mkPackageOption pkgs "brockman" { }; config = mkOption { type = types.attrs; }; # TODO make real config here }; @@ -26,7 +27,7 @@ in { serviceConfig = { Restart = "always"; ExecStart = '' - ${pkgs.brockman}/bin/brockman ${pkgs.writeText "brockman.json" (builtins.toJSON cfg.config)} + ${cfg.package}/bin/brockman ${pkgs.writeText "brockman.json" (builtins.toJSON cfg.config)} ''; User = config.users.extraUsers.brockman.name; PrivateTmp = true; -- cgit v1.2.3 From 69ee3c9ddeb0bac0526b3a5cf86c1fe0332374b6 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 15 Dec 2024 21:24:22 +0100 Subject: ma: update vacation note --- makefu/vacation-note.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefu/vacation-note.md b/makefu/vacation-note.md index 3cdc190b2..7bd5c3234 100644 --- a/makefu/vacation-note.md +++ b/makefu/vacation-note.md @@ -2,8 +2,8 @@ From 2015-07-28 until 2023-07-28 here lived the configuration of makefu. # New Location All configutation can now be found at [Github: makefu/nixos-config]( -https://github.com/makefu/nixos-config ) or [cgit: nixos-config]( -https://cgit.euer.krebsco.de/nixos-config ) respectively. +https://github.com/makefu/nixos-config ) and [forgejo: nixos-config]( +https://cgit.euer.krebsco.de/makefu/nixos-config ) respectively. # Background With nix flakes it became possible to finally split the configuration up -- cgit v1.2.3 From e84a81735fc095ea5b43b728e9a2aa6b28bb29bc Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 12 May 2025 21:01:05 +0200 Subject: kartei/makefu: add abook.euer --- kartei/makefu/default.nix | 7 +++++++ kartei/makefu/ssh/susanne.pub | 1 + 2 files changed, 8 insertions(+) create mode 100644 kartei/makefu/ssh/susanne.pub diff --git a/kartei/makefu/default.nix b/kartei/makefu/default.nix index 2baf6ef5a..915ba531b 100644 --- a/kartei/makefu/default.nix +++ b/kartei/makefu/default.nix @@ -205,6 +205,7 @@ in { gum = rec { extraZones = { "krebsco.de" = '' + abook.euer IN A ${nets.internet.ip4.addr} admin.work.euer IN A ${nets.internet.ip4.addr} api.work.euer IN A ${nets.internet.ip4.addr} atuin.euer IN A ${nets.internet.ip4.addr} @@ -241,12 +242,14 @@ in { play.work.euer IN A ${nets.internet.ip4.addr} push.work.euer IN A ${nets.internet.ip4.addr} rss.euer IN A ${nets.internet.ip4.addr} + mdrss.euer IN A ${nets.internet.ip4.addr} share.euer IN A ${nets.internet.ip4.addr} ul.work.euer IN A ${nets.internet.ip4.addr} wg.euer IN A ${nets.internet.ip4.addr} wiki.euer IN A ${nets.internet.ip4.addr} wikisearch IN A ${nets.internet.ip4.addr} work.euer IN A ${nets.internet.ip4.addr} + shop.euer IN A ${nets.internet.ip4.addr} mediengewitter IN CNAME over.dose.io. nixos.unstable IN CNAME krebscode.github.io. @@ -371,6 +374,10 @@ in { pgp.pubkeys.default = builtins.readFile ./pgp/default.asc; pgp.pubkeys.brain = builtins.readFile ./pgp/brain.asc; }; + susanne = { + mail = "susanne@shackspace.de"; + pubkey = pub-for "susanne"; + }; makefu-omo = { inherit (makefu) mail pgp; pubkey = pub-for "makefu.omo"; diff --git a/kartei/makefu/ssh/susanne.pub b/kartei/makefu/ssh/susanne.pub new file mode 100644 index 000000000..c8ab55661 --- /dev/null +++ b/kartei/makefu/ssh/susanne.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDIm3+udjYo+7nv+Rb4GJJarQJh+ATrLdkUuIaQOst7oS1Qb5PjAYCooOuJDQdZwVKHrqm3DF5XVcn6KxA6s7RxHvjIZfhSZUBg4nxF7Md+ZReHNm84AnL6yYHRCwuuZUQ008mipJklZuaYHMIprF0sfHWvPGxjElYJQaLudP1ZcdaRvSusEpOQ6Phlbln4w+3CezbL1BgsYnZtaQzb6LISYLco/eZ5DS/uLZeSYgzhX1KorO8YtGpaE6XvuruqTuQFcT62HKJ8XT4wwp43ZdqKECY/ee7A4MFlvCl7E3TWDRbhxsh8pdL2q+4SGEWrAtDMHxjxrXMoBXlinZ35OjtV3QnCDIFm1p6p84n9OCnu2wjD1J2/CtntKwV82fI2W7kUDHndsOYiHF4v9jBcnYQaOyeWRljtWc02YVHfxIoP7toqSE7gXGDdb1Kwj6l8dGS3qGAmnRTu7tUeJOD0fgd/OUrO8M/fgUaAcU3dnn5nYNSbTMsD6eIsX6tyhKYSv7c= susi@noether -- cgit v1.2.3 From 6e7c7e592ba13cd8d4ef748efaf1ac80e322af90 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 12 May 2025 21:02:54 +0200 Subject: shack/share: migrate extraConfig to settings --- krebs/2configs/shack/share.nix | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/krebs/2configs/shack/share.nix b/krebs/2configs/shack/share.nix index bc483e8d0..0ba22af78 100644 --- a/krebs/2configs/shack/share.nix +++ b/krebs/2configs/shack/share.nix @@ -26,21 +26,17 @@ "guest ok" = "yes"; }; }; - extraConfig = '' - guest account = smbguest - map to guest = bad user - # disable printing - load printers = no - printing = bsd - printcap name = /dev/null - disable spoolss = yes - - # for legacy systems - client min protocol = NT1 - server min protocol = NT1 - workgroup = WORKGROUP - server string = ${config.networking.hostName} - netbios name = ${config.networking.hostName} - ''; + settings.global = { + "guest account" = "smbguest"; + "map to guest" = "bad user"; + # disable printing + "load printers" = "no"; + "printing" = "bsd"; + "printcap name" = "/dev/null"; + "disable spoolss" = "yes"; + "workgroup" = "WORKGROUP"; + "server string" = config.networking.hostName; + "netbios name" = config.networking.hostName; + }; }; } -- cgit v1.2.3 From 2012bb2fd9eaa86c4c5cd992f489a7766955c8fb Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 12 May 2025 21:03:21 +0200 Subject: shack/worlddomination: use latest delivery --- krebs/2configs/shack/worlddomination.nix | 40 +++----------------------------- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/krebs/2configs/shack/worlddomination.nix b/krebs/2configs/shack/worlddomination.nix index b7a8f18df..66a4095db 100644 --- a/krebs/2configs/shack/worlddomination.nix +++ b/krebs/2configs/shack/worlddomination.nix @@ -7,11 +7,11 @@ let src = pkgs.fetchFromGitHub { owner = "shackspace"; repo = "worlddomination"; - rev = "c7aedcde7cd1fcb870b5356a6125e1a384b0776c"; - sha256 = "0y6haz5apwa33lz64l7b2x78wrrckbw39j4wzyd1hfk46478xi2y"; + rev = "934387c3525e819e6b5981c417a7561d70b8b61a"; + sha256 = "sha256-AbRqxxY6hYNg4qkk/akuw4f+wJh4nx1hfEA4Lp5B+1E="; }; buildInputs = [ - (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [ + (pkgs.python310.withPackages (pythonPackages: with pythonPackages; [ docopt LinkHeader aiocoap @@ -30,41 +30,7 @@ let }; pythonPackages = pkgs.python3Packages; # https://github.com/chrysn/aiocoap - grequests = pythonPackages.buildPythonPackage rec { - pname = "grequests"; - version = "0.3.1"; - name = "${pname}-${version}"; - src = pkgs.fetchFromGitHub { - owner = "kennethreitz"; - repo = "grequests"; - rev = "d1e70eb"; - sha256 = "0drfx4fx65k0g5sj0pw8z3q1s0sp7idn2yz8xfb45nd6v82i37hc"; - }; - - doCheck = false; - - propagatedBuildInputs = with pythonPackages; [ requests gevent ]; - - meta = with lib;{ - description = "Asynchronous HTTP requests"; - homepage = https://github.com/kennethreitz/grequests; - license = with licenses; [ bsd2 ]; - maintainers = with maintainers; [ matejc ]; - }; - }; - - aiocoap = pythonPackages.buildPythonPackage { - name = "aiocoap-0.3"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/9c/f6/d839e4b14258d76e74a39810829c13f8dd31de2bfe0915579b2a609d1bbe/aiocoap-0.3.tar.gz"; sha256 = "402d4151db6d8d0b1d66af5b6e10e0de1521decbf12140637e5b8d2aa9c5aef6"; }; - propagatedBuildInputs = [ ]; - doCheck = false; # 2 errors, dunnolol - meta = with pkgs.lib; { - homepage = ""; - license = licenses.mit; - description = "Python CoAP library"; - }; - }; LinkHeader = pythonPackages.buildPythonPackage { name = "LinkHeader-0.4.3"; src = pkgs.fetchurl { url = "https://files.pythonhosted.org/packages/27/d4/eb1da743b2dc825e936ef1d9e04356b5701e3a9ea022c7aaffdf4f6b0594/LinkHeader-0.4.3.tar.gz"; sha256 = "7fbbc35c0ba3fbbc530571db7e1c886e7db3d718b29b345848ac9686f21b50c3"; }; -- cgit v1.2.3 From 8e36bd9d82fe80cc41dc916a2aa3cae9e606f6d4 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 12 May 2025 21:03:44 +0200 Subject: shack/ssh-keys: add susanne pubkey --- krebs/2configs/shack/ssh-keys.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/krebs/2configs/shack/ssh-keys.nix b/krebs/2configs/shack/ssh-keys.nix index 80957f3a5..183a81f99 100644 --- a/krebs/2configs/shack/ssh-keys.nix +++ b/krebs/2configs/shack/ssh-keys.nix @@ -2,6 +2,7 @@ { users.users.root.openssh.authorizedKeys.keys = [ config.krebs.users."0x4A6F".pubkey + config.krebs.users.susanne.pubkey config.krebs.users.hase.pubkey config.krebs.users.neos.pubkey config.krebs.users.raute.pubkey -- cgit v1.2.3 From 84a0574b4ec81d84c532db593315f3d90a03cf21 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 24 Jun 2025 21:46:05 +0200 Subject: ma: add book.euer --- kartei/makefu/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/kartei/makefu/default.nix b/kartei/makefu/default.nix index 915ba531b..9df79afbf 100644 --- a/kartei/makefu/default.nix +++ b/kartei/makefu/default.nix @@ -211,6 +211,7 @@ in { atuin.euer IN A ${nets.internet.ip4.addr} board.euer IN A ${nets.internet.ip4.addr} bookmark.euer IN A ${nets.internet.ip4.addr} + book.euer IN A ${nets.internet.ip4.addr} boot IN A ${nets.internet.ip4.addr} boot.euer IN A ${nets.internet.ip4.addr} build.euer IN A ${nets.internet.ip4.addr} -- cgit v1.2.3 From 7335fc02c42abdf157f703634f9455d654e19178 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 9 Aug 2025 19:02:33 +0200 Subject: puyak: disable worker --- krebs/1systems/puyak/config.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index 542106d5f..0c361cc42 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -11,7 +11,7 @@ # brain hosts/puyak/root ../../2configs/hw/getty-for-esp.nix - ../../2configs/buildbot/worker.nix + # ../../2configs/buildbot/worker.nix ## initrd unlocking # (brain hosts/puyak/luks-ssd;echo) | ssh root@$(brain krebs-secrets/puyak/initrd/hostname) 'cat /crypt-ramfs/passphrase' @@ -67,7 +67,7 @@ } # create samba share for anonymous usage with the laser and 3d printer pc - ../../2configs/shack/share.nix + # ../../2configs/shack/share.nix # mobile.lounge.mpd.shack ../../2configs/shack/mobile.mpd.nix @@ -159,7 +159,6 @@ services.logind.lidSwitchExternalPower = "ignore"; - environment.systemPackages = [ pkgs.zsh ]; system.activationScripts."disengage fancontrol" = '' -- cgit v1.2.3