Merge branch 'main' of codeberg.org:muon/home

hosts/muho/configuration.nix

@@ -50,9 +50,10 @@ in {
   mods.server.ntfy.enable = true;
   mods.server.lemmy.enable = true;
   mods.server.audio.enable = true;
-  mods.server.murmur.enable = true;
+  # mods.server.murmur.enable = true;
   mods.server.atuin.enable = true;
-  mods.server.seedbox.enable = true;
+  # mods.server.seedbox.enable = true;
+  mods.server.enshrouded.enable = true;
 
   mods.server.dash.enable = false;
   mods.server.nginx.ports.dash = 3009;

hosts/muon/configuration.nix

@@ -16,7 +16,6 @@ in {
   with pkgs; [
     nix-alien
     r2modman
-    lutris
     godot
     rustdesk-flutter
     motion
@@ -81,7 +80,15 @@ in {
       };
     };
   };
-  networking.firewall.allowedTCPPorts = [ 80 ];
+  networking.firewall.allowedTCPPorts = [80];
+
+  # Wildcard DNS: *.word.local -> 127.0.0.1 via NetworkManager's built-in dnsmasq
+  networking.networkmanager.dns = "dnsmasq";
+  # Force resolv.conf to use local dnsmasq so wildcard DNS is actually queried
+  networking.resolvconf.useLocalResolver = true;
+  environment.etc."NetworkManager/dnsmasq.d/word-local.conf".text = ''
+    address=/.word.local/127.0.0.1
+  '';
 
   virtualisation.virtualbox.host.enable = true;
   users.extraGroups.vboxusers.members = ["user-with-access-to-virtualbox"];

hosts/mups/configuration.nix

@@ -24,7 +24,7 @@ in {
   # Modules
   mods.desktop.enable = false;
 
-  mods.theme.enable = true;
+  mods.theme.enable = false;
   mods.theme.scheme = "woodland";
   mods.theme.wallpaper = ./wallpaper.png;
 
@@ -42,6 +42,16 @@ in {
   mods.server.wireguard.enable = true;
   mods.server.nginx.enable = true;
 
+  documentation = {
+    enable = false;
+    nixos.enable = false;
+    man.enable = false;
+    info.enable = false;
+    doc.enable = false;
+  };
+
+  i18n.supportedLocales = ["en_US.UTF-8/UTF-8"];
+
   # Use the GRUB 2 boot loader.
   boot.loader.grub.enable = true;
   boot.loader.grub.device = "/dev/vda";

hosts/mups/home.nix

@@ -1,8 +1,11 @@
-{ pkgs, lib, osConfig,... }: {
+{
+  pkgs,
+  lib,
+  osConfig,
+  ...
+}: {
   # Modules
   mods.terminal.zsh.enable = true;
-  mods.terminal.development.enable = true;
-  mods.terminal.tools.enable = true;
 
   # Version of first install
   home.stateVersion = "24.05";

hosts/murk/configuration.nix

@@ -37,7 +37,6 @@ in {
     pkgs.qmk
     pkgs.jq
     pkgs.wireguard-tools
-    pkgs.opencode
   ];
 
   boot.binfmt = {

hosts/murk/home.nix

@@ -46,7 +46,6 @@ in {
       go
       rainfrog
       tealdeer
-      (callPackage ./packages/mender-cli.nix {})
     ]
     # Non-free </3
     ++ [google-cloud-sdk google-cloud-sql-proxy];

hosts/murk/packages/mender-cli.nix

@@ -1,54 +0,0 @@
-{
-  lib,
-  stdenv,
-  buildGoModule,
-  fetchFromGitHub,
-  makeWrapper,
-  installShellFiles,
-  xz,
-  go,
-}:
-buildGoModule rec {
-  pname = "mender-cli";
-  version = "1.12.0";
-
-  src = fetchFromGitHub {
-    owner = "mendersoftware";
-    repo = "mender-cli";
-    rev = version;
-    sha256 = "sha256-Pf87wTHXcFlnYsgx7ieiIJ9PWJFPUkFJYTkKJKmMFEQ=";
-  };
-
-  vendorHash = "sha256-MqyBa+wsbuXqtM4DL/QGBUWuEYlG8BRxIXq7O1LJUyM=";
-
-  nativeBuildInputs = [
-    makeWrapper
-    installShellFiles
-  ];
-
-  buildInputs = [
-    xz
-  ];
-
-  allowGoReference = true;
-
-  postFixup = ''
-    wrapProgram "$out/bin/mender-cli" \
-      --prefix PATH : ${go}/bin
-  '';
-
-  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    installShellCompletion --cmd mender-cli \
-      --bash <($out/bin/mender-cli completion bash) \
-      --fish <($out/bin/mender-cli completion fish) \
-      --zsh <($out/bin/mender-cli completion zsh) \
-  '';
-
-  meta = {
-    description = "Mender CLI tool to simplify integration between the Mender server and cloud services like continuous integration (CI)/build automation";
-    mainProgram = "mender-cli";
-    homepage = "https://github.com/mendersoftware/mender-cli/";
-    changelog = "https://github.com/mendersoftware/mender-cli/releases/tag/${version}";
-    license = lib.licenses.asl20;
-  };
-}

hosts/musk/configuration.nix

@@ -37,7 +37,6 @@ in {
     pkgs.qmk
     pkgs.jq
     pkgs.wireguard-tools
-    pkgs.opencode
   ];
 
   boot.binfmt = {

hosts/musk/home.nix

@@ -25,6 +25,7 @@ in {
   mods.desktop.productivity.enable = false;
   mods.zen.enable = true;
   mods.octo.enable = true;
+  mods.opencode.enable = true;
 
   home.packages = with pkgs;
     [
@@ -44,7 +45,7 @@ in {
       go
       rainfrog
       tealdeer
-      (callPackage ./packages/mender-cli.nix {})
+      # (callPackage ./packages/mender-cli.nix {})
     ]
     # Non-free </3
     ++ [google-cloud-sdk google-cloud-sql-proxy];

hosts/muvo/home.nix

@@ -27,8 +27,6 @@ in {
     pulseaudio
     pavucontrol
     alsa-utils
-
-    opencode
   ];
 
   # Hardware preferences

hosts/ports.nix

@@ -30,6 +30,10 @@
       search = 8081;
       videos = 8082;
       reddit = 8083;
+
+      # docker compose
+      discord = 2052;
+      livekit = 7880;
     };
     mods.server.local.ports = {
       # grav = 5001