Merge pull request 'Actually use user module' (#191 ) from fix_malobeo_user into master

Reviewed-on: #191 Reviewed-by: ahtlon <8+ahtlon@noreply.git.dynamicdiscord.de>
[nextcloud] fix missing inputs
2026-09-29 17:05:50 +02:00 · 2026-09-22 11:32:40 +02:00 · 2026-09-22 10:53:42 +02:00 · 2026-09-21 17:24:51 +02:00
24 changed files with 157 additions and 85 deletions
@@ -1,5 +1,5 @@
 # Disks
-The disks module can be used by importing `inputs.self.nixosModules.malobeo.disko`
+The disks module can be used by importing `inputs.malobeo.nixosModules.malobeo.disko`


 #### `let cfg = malobeo.disks`
@@ -1,5 +1,5 @@
 # Gitea-tanslator
-The module can be used by importing `inputs.self.nixosModules.malobeo.gitea-translator`
+The module can be used by importing `inputs.malobeo.nixosModules.malobeo.gitea-translator`

 This module starts a python server that fetches the gitea pull request api and translates it to a file that hydra understands.   
 To use, just set the parameters of the gitea server, then send a GET request to either `http://${host}:${port}/` or `http://${host}:${port}/gitea-pulls-sorted.json`
@@ -1,5 +1,5 @@
 # Initrd-ssh
-The initssh module can be used by importing `inputs.self.nixosModules.malobeo.initssh`
+The initssh module can be used by importing `inputs.malobeo.nixosModules.malobeo.initssh`

 #### `let cfg = malobeo.initssh`

@@ -26,4 +26,4 @@ Run ` lspci -k | grep -iA4 ethernet `
 ` [ ] `

 *Example:*
-`[ "r8169" ]`
+`[ "r8169" ]`
@@ -85,11 +85,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1790215976,
-        "narHash": "sha256-VkR1rMGyjU9jtw8ISFx5uqR9e+LEaOlhHwrseFkiIVk=",
+        "lastModified": 1787377438,
+        "narHash": "sha256-Sxu1NLTD/Ern6hFGLlZmtKCSct3YQXZI/lls8RE1XeM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "a6631107a83ceab5872f298a2ea710859c80c4cb",
+        "rev": "65258d5c65a250189fde2e35f490d15e064c4c62",
        "type": "github"
      },
      "original": {
@@ -126,11 +126,11 @@
        "spectrum": "spectrum"
      },
      "locked": {
-        "lastModified": 1790526615,
-        "narHash": "sha256-33a6iTG1uFv12/zV8yo5VvdpftMNQms6TIHhMCVN6zE=",
+        "lastModified": 1788263502,
+        "narHash": "sha256-gyVqW5U9wy6A8voJNu6SiSYTKDplo/MDl31x7FszWlk=",
        "owner": "astro",
        "repo": "microvm.nix",
-        "rev": "81f70a2002254f75b572fc34c55e7df16e9bb176",
+        "rev": "974d315e504e666eac4920d712e3ff6804dc1502",
        "type": "github"
      },
      "original": {
@@ -180,11 +180,11 @@
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1790321948,
-        "narHash": "sha256-mZGHLGi217oLIwzDM4PNRZeCNa6g2WBXURyXbNMFs7Y=",
+        "lastModified": 1788335262,
+        "narHash": "sha256-3jBEq8avfzlrsY4UpW4d5TOmm7ocseZfnitEJhqauyc=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "30d48a0ec6035f8140d0125af274f0de95f1e9b5",
+        "rev": "44d95795ee2d475b3d687325e26dcf4ca9104557",
        "type": "github"
      },
      "original": {
@@ -212,11 +212,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1790578696,
-        "narHash": "sha256-ZoxIApko70jCdbH3l20HWXOBaT2HZd87orzd2yJ9dVE=",
+        "lastModified": 1788179007,
+        "narHash": "sha256-hn1oU2rue2SYK8dAr8+WNZWtbsz1S2W5mnHlSEuh3bo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "7a0f122f5090cf4c2ade2a13a0e229d4e19ba71f",
+        "rev": "34ab99075ac4f7e40cf037eef32cb1c360bb85e9",
        "type": "github"
      },
      "original": {
@@ -228,11 +228,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1789546076,
-        "narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=",
-        "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3",
+        "lastModified": 1767892417,
+        "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
+        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1074753.b1b875982b17/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
      },
      "original": {
        "type": "tarball",
@@ -241,11 +241,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1790533781,
-        "narHash": "sha256-F+b8u43BVF5DlM0pz7JQSbtbwKy5PrHIT5zQUekXsD0=",
+        "lastModified": 1788187754,
+        "narHash": "sha256-bu1QxmXKmPuvBLN7bHP355OV9Qo13x9WCiRDH62CqRM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "cf5e76507c6e23b59f7e0ffcc7baa2a39ddd8442",
+        "rev": "5dfba6236110080a54247d6460bc2ff5dda939cc",
        "type": "github"
      },
      "original": {
@@ -280,11 +280,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1790498116,
-        "narHash": "sha256-rs9meAYxW3zzrh43yaW7htrqCD+X9+pupDPHN86fumI=",
+        "lastModified": 1788337237,
+        "narHash": "sha256-gkSH8VUtCo6hnysNmb9DbTuDepH2t5pv+QWjP75xKAk=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "5efb5a6f4f5ab192817d28557dd4d650fa14d866",
+        "rev": "fbf759290e0cb0a98dfc813a4eb7d53ad1dacb57",
        "type": "github"
      },
      "original": {
@@ -296,11 +296,11 @@
    "spectrum": {
      "flake": false,
      "locked": {
-        "lastModified": 1786032750,
-        "narHash": "sha256-+Ba/kIn5BjvV7PN8bWOo7RoqgTY/Yv2M7qeMf3wS2Ag=",
+        "lastModified": 1785761586,
+        "narHash": "sha256-MWOMVqJJERwjQGgRIv8d6rlEBqbLM3VZWxHkNKIIZNw=",
        "ref": "refs/heads/main",
-        "rev": "77d2389874bb092b8dbf05ecc5b1030372e80e98",
-        "revCount": 1417,
+        "rev": "a7762d6f54b40560dd5255ce902e6e6a5d980fe9",
+        "revCount": 1416,
        "type": "git",
        "url": "https://spectrum-os.org/git/spectrum"
      },
@@ -15,17 +15,18 @@ in
  sops.secrets.wg_private = {};

  imports =
-    [ # Include the results of the hardware scan.
+    [
+      inputs.malobeo.nixosModules.malobeo.vpn
+      inputs.malobeo.nixosModules.malobeo.initssh
+      inputs.malobeo.nixosModules.malobeo.disko
+      inputs.malobeo.nixosModules.malobeo.metrics
+      inputs.malobeo.nixosModules.malobeo.users
+      inputs.malobeo.nixosModules.malobeo.backup
+
      #./hardware-configuration.nix
      ../modules/sshd.nix
      ../modules/minimal_tools.nix
      ../modules/autoupdate.nix
-      inputs.self.nixosModules.malobeo.vpn
-      inputs.self.nixosModules.malobeo.initssh
-      inputs.self.nixosModules.malobeo.disko
-      inputs.self.nixosModules.malobeo.metrics
-      inputs.self.nixosModules.malobeo.users
-      inputs.self.nixosModules.malobeo.backup
      ./hydra.nix
      ./gitea_runner.nix
    ];
@@ -15,7 +15,7 @@

  imports =
    [
-      inputs.self.nixosModules.malobeo.gitea-translator
+      inputs.malobeo.nixosModules.malobeo.gitea-translator
    ];

  services.malobeo.gitea-translator = {
@@ -1,4 +1,4 @@
-{ self, config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, inputs, ... }:

 with lib;

@@ -22,7 +22,8 @@ in
  };

  imports = [
-    self.nixosModules.malobeo.users
+    inputs.malobeo.nixosModules.malobeo.users
+
    ../modules/sshd.nix
  ];

@@ -6,13 +6,14 @@ in
 {
  imports =
    [ # Include the results of the hardware scan.
+      inputs.malobeo.nixosModules.malobeo.disko
+      inputs.malobeo.nixosModules.malobeo.initssh
+      inputs.malobeo.nixosModules.malobeo.users
+
      #./hardware-configuration.nix
      ../modules/xserver.nix
      ../modules/sshd.nix
      ../modules/autoupdate.nix
-      inputs.self.nixosModules.malobeo.disko
-      inputs.self.nixosModules.malobeo.initssh
-      inputs.self.nixosModules.malobeo.users
    ];

  malobeo.autoUpdate = {
@@ -1,4 +1,4 @@
-{ config, self, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, inputs, ... }:

 with lib;

@@ -17,14 +17,19 @@ with lib;
  ];

  imports = [
-    self.nixosModules.malobeo.metrics
+    inputs.malobeo.nixosModules.malobeo.metrics
+    inputs.malobeo.nixosModules.malobeo.users
    inputs.tasklist.nixosModules.malobeo-tasklist

-    ../modules/malobeo_user.nix
    ../modules/sshd.nix
    ../modules/minimal_tools.nix
  ];

+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
+
  malobeo.metrics = {
    enable = true;
    enablePromtail = true;
@@ -11,18 +11,19 @@ in
  sops.secrets.njala_api_key = {};

  imports =
-    [ # Include the results of the hardware scan.
+    [ 
+      inputs.malobeo.nixosModules.malobeo.vpn
+      inputs.malobeo.nixosModules.malobeo.initssh
+      inputs.malobeo.nixosModules.malobeo.disko
+      inputs.malobeo.nixosModules.malobeo.microvm
+      inputs.malobeo.nixosModules.malobeo.metrics
+      inputs.malobeo.nixosModules.malobeo.users
+      inputs.malobeo.nixosModules.malobeo.backup
+
      #./hardware-configuration.nix
      ../modules/sshd.nix
      ../modules/minimal_tools.nix
      ../modules/autoupdate.nix
-      inputs.self.nixosModules.malobeo.vpn
-      inputs.self.nixosModules.malobeo.initssh
-      inputs.self.nixosModules.malobeo.disko
-      inputs.self.nixosModules.malobeo.microvm
-      inputs.self.nixosModules.malobeo.metrics
-      inputs.self.nixosModules.malobeo.users
-      inputs.self.nixosModules.malobeo.backup
      ./dyndns.nix
    ];

@@ -192,7 +193,7 @@ in
        proxyPass = "http://${hosts.malobeo.hosts.nextcloud.network.address}";
        extraConfig = ''
          proxy_set_header Host $host;
-          client_max_body_size ${inputs.self.nixosConfigurations.nextcloud.config.services.nextcloud.maxUploadSize};
+          client_max_body_size ${inputs.malobeo.nixosConfigurations.nextcloud.config.services.nextcloud.maxUploadSize};
          client_body_timeout 3600s;
          send_timeout 3600s;
          fastcgi_buffers 64 4K;
@@ -207,7 +208,7 @@ in
        proxyPass = "http://${hosts.malobeo.hosts.nextcloud.network.address}";
        extraConfig = ''
          proxy_set_header Host $host;
-          client_max_body_size ${inputs.self.nixosConfigurations.nextcloud.config.services.nextcloud.maxUploadSize};
+          client_max_body_size ${inputs.malobeo.nixosConfigurations.nextcloud.config.services.nextcloud.maxUploadSize};
          client_body_timeout 3600s;
          send_timeout 3600s;
          fastcgi_buffers 64 4K;
@@ -1,4 +1,4 @@
-{ self, config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, inputs, ... }:

 with lib;

@@ -10,11 +10,17 @@ with lib;

  imports = [
    inputs.malobeo.nixosModules.malobeo.metrics
+    inputs.malobeo.nixosModules.malobeo.users
+
    ../durruti/documentation.nix
-    ../modules/malobeo_user.nix
    ../modules/sshd.nix
  ];

+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
+
  malobeo.metrics = {
    enable = true;
    enablePromtail = true;
@@ -3,13 +3,14 @@
 {
  imports =
    [ # Include the results of the hardware scan.
+      inputs.malobeo.nixosModules.malobeo.printing
+
      ./hardware-configuration.nix
      ../modules/xserver.nix
      ../modules/malobeo_user.nix
      ../modules/sshd.nix
      ../modules/minimal_tools.nix
      ../modules/autoupdate.nix
-      inputs.self.nixosModules.malobeo.printing
    ];

  malobeo.autoUpdate = {
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, inputs, ... }:

 let
  sshKeys = import ../ssh_keys.nix;
@@ -6,10 +6,16 @@ in
 {
  imports =
    [ # Include the results of the hardware scan.
+      inputs.malobeo.nixosModules.malobeo.users
+
      ./hardware_configuration.nix
-      ../modules/malobeo_user.nix
    ];

+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
+
  sops.defaultSopsFile = ./secrets.yaml;
  sops.secrets.njala_api_key = {};

@@ -1,7 +1,7 @@
 {config, lib, pkgs, inputs, ...}:
 let 
  cfg = config.malobeo.users;
-  sshKeys = import ( inputs.self + /machines/ssh_keys.nix);
+  sshKeys = import ( inputs.malobeo + /machines/ssh_keys.nix);
  inherit (config.networking) hostName; 
 in
 {
@@ -1,4 +1,4 @@
-{ config, self, lib, pkgs,  ... }:
+{ config, lib, pkgs, inputs, ... }:

 with lib;

@@ -20,13 +20,19 @@ in
  };

  imports = [
-    self.nixosModules.malobeo.metrics
-    ../modules/malobeo_user.nix
+    inputs.malobeo.nixosModules.malobeo.metrics
+    inputs.malobeo.nixosModules.malobeo.users
+
    ../modules/sshd.nix
    ../modules/minimal_tools.nix
    ../modules/autoupdate.nix
  ];

+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
+
  malobeo.metrics = {
    enable = true;
    enablePromtail = true;
@@ -1,4 +1,4 @@
-{ config, self, lib, inputs, pkgs,  ... }:
+{ config, lib, inputs, pkgs,  ... }:

 with lib;
 with inputs;
@@ -13,13 +13,19 @@ in
  };

  imports = [
-    ../modules/malobeo_user.nix
+    inputs.malobeo.nixosModules.malobeo.users
+    inputs.malobeo.nixosModules.malobeo.vpn
+
    ../modules/sshd.nix
    ../modules/minimal_tools.nix
    ../modules/autoupdate.nix
-    inputs.self.nixosModules.malobeo.vpn
  ];

+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
+
  networking.firewall = {
    enable = true;
    allowedTCPPorts = [ 53 ];
@@ -1,4 +1,4 @@
-{ config, self, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, inputs, ... }:

 with lib;

@@ -30,12 +30,18 @@ in
  };

  imports = [
-    self.nixosModules.malobeo.metrics
-    ../modules/malobeo_user.nix
+    inputs.malobeo.nixosModules.malobeo.metrics
+    inputs.malobeo.nixosModules.malobeo.users
+
    ../modules/sshd.nix
    ./printer_module.nix
  ];

+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
+
  networking.firewall.allowedTCPPorts = [ 80 3100 ];

  malobeo.metrics = {
@@ -1,4 +1,4 @@
-{ config, self, lib, pkgs, inputs,  ... }:
+{ config, lib, pkgs, inputs,  ... }:

 with lib;

@@ -21,9 +21,10 @@ in

  disabledModules = [ "services/web-apps/pretalx.nix" ];
  imports = [
+    inputs.malobeo.nixosModules.malobeo.metrics
+    inputs.malobeo.nixosModules.malobeo.users
+
    "${inputs.nixpkgs-unstable}/nixos/modules/services/web-apps/pretalx.nix"
-    self.nixosModules.malobeo.metrics
-    self.nixosModules.malobeo.users
    ../modules/sshd.nix
    ../modules/minimal_tools.nix
    ../modules/autoupdate.nix
@@ -37,6 +38,7 @@ in

  malobeo.users = {
    admin = true;
+    malobeo = false;
  };


@@ -6,13 +6,18 @@ in
  imports =
    [ # Include the results of the hardware scan.
      #./hardware-configuration.nix
-      ../modules/malobeo_user.nix
+      inputs.malobeo.nixosModules.malobeo.users
+      inputs.malobeo.nixosModules.malobeo.initssh
+      inputs.malobeo.nixosModules.malobeo.disko
+
      ../modules/sshd.nix
      ../modules/minimal_tools.nix
-      inputs.self.nixosModules.malobeo.initssh
-      inputs.self.nixosModules.malobeo.disko
    ];

+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };

  boot.initrd.systemd.enable = true;
  boot.loader.systemd-boot.enable = true;
@@ -9,10 +9,16 @@ with lib;
  };

  imports = [
-    ../modules/malobeo_user.nix
+    inputs.malobeo.nixosModules.malobeo.users
+
    ../modules/sshd.nix
  ];

+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
+
  networking.firewall.allowedTCPPorts = [ 80 ];

  services.nginx = {
@@ -16,11 +16,17 @@ with lib;
  };

  imports = [
-    ../modules/malobeo_user.nix
+    inputs.malobeo.nixosModules.malobeo.users
+    inputs.malobeo.nixosModules.malobeo.metrics
+
    ../modules/sshd.nix
-    inputs.self.nixosModules.malobeo.metrics
  ];

+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
+
  networking.firewall.allowedTCPPorts = [ 80 ];

  malobeo.metrics = {
@@ -17,12 +17,18 @@ with lib;
  };

  imports = [
-    inputs.self.nixosModules.malobeo.vpn
-    ../modules/malobeo_user.nix
+    inputs.malobeo.nixosModules.malobeo.vpn
+    inputs.malobeo.nixosModules.malobeo.users
+
    ../modules/sshd.nix
    ../modules/minimal_tools.nix
  ];

+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
+
  services.malobeo.vpn = {
    enable = true;
    name = "vpn";
@@ -23,7 +23,8 @@ in {
  };

  imports = [
-    inputs.self.nixosModules.malobeo.users
+    inputs.malobeo.nixosModules.malobeo.users
+
    ../modules/sshd.nix
  ];

@@ -1,4 +1,4 @@
-{ self, config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, inputs, ... }:

 with lib;

@@ -11,11 +11,17 @@ with lib;
  imports = [
    inputs.malobeo.nixosModules.malobeo.metrics
    inputs.malobeo.nixosModules.malobeo.printing
+    inputs.malobeo.nixosModules.malobeo.users
    inputs.zineshop.nixosModules.zineshop
-    ../modules/malobeo_user.nix
+
    ../modules/sshd.nix
  ];

+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
+
  malobeo.metrics = {
    enable = true;
    enablePromtail = true;
Author	SHA1	Message	Date
ahtlon	e9c5da2710	Merge pull request 'Actually use user module' (#191 ) from fix_malobeo_user into master Hydra callback / on_pr (push) Skipped Details Hydra callback / on_push (push) Skipped Details Check flake syntax / flake-check (push) Failing after 7m15s Details Reviewed-on: #191 Reviewed-by: ahtlon <8+ahtlon@noreply.git.dynamicdiscord.de>	2026-09-29 17:05:50 +02:00
kalipso	50cae2c29b	[nextcloud] fix missing inputs Check flake syntax / flake-check (push) Successful in 9m19s Details Hydra callback / on_push (pull_request) Skipped Details Hydra callback / on_pr (pull_request) Failing after 40s Details	2026-09-22 11:32:40 +02:00
kalipso	c2e3686be1	[refactor] inputs.self -> inputs.malobeo Hydra callback / on_push (pull_request) Skipped Details Hydra callback / on_pr (pull_request) Failing after 41s Details Check flake syntax / flake-check (push) Failing after 3m39s Details if imported in external projects `inputs.self` will point to the external resource instead of malobeo leading to errors. therefore all occurences of inputs.self got replaces with inputs.malobeo	2026-09-22 10:53:42 +02:00
kalipso	a1ba8775f4	[machines] disable deprecated malobeo user Hydra callback / on_push (pull_request) Skipped Details Hydra callback / on_pr (pull_request) Failing after 44s Details Check flake syntax / flake-check (push) Failing after 7m55s Details	2026-09-21 17:24:51 +02:00