config/instances/config/hledger.nix

@@ -1,18 +0,0 @@
-{ instancesFunctions }:
-let
-  inherit (instancesFunctions)
-    dummy
-    ;
-  hledgerLabel = "Hledger";
-  hledgerName = "hledger";
-in
-{
-  label = hledgerLabel;
-  name = hledgerName;
-  paths = {
-    path0 = "/mnt/media/storage/${hledgerLabel}";
-  };
-  ports = {
-    port0 = 5000;
-  };
-}

home/modules/cli/fun/aniCli/default.nix

@@ -1,11 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-{
-  home.packages = builtins.attrValues {
-    inherit (pkgs)
-      ani-cli
-      ;
-  };
-}

home/modules/cli/fun/default.nix

@@ -1,10 +0,0 @@
-let
-  content = builtins.readDir ./.;
-
-  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
-
-  importList = map (name: ./. + "/${name}") dirContent;
-in
-{
-  imports = importList;
-}

home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix

@@ -64,16 +64,6 @@ in
       ];
       keyword = instances.forgejo.label;
     }
-    {
-      name = instances.hledger.label;
-      url = "http://localhost.${builtins.toString instances.hledger.ports.port0}";
-      tags = [
-        instances.hledger.name
-        "hledger"
-        "finances"
-      ];
-      keyword = instances.hledger.label;
-    }
     {
       name = "${instances.jellyfin.label} (Internet)";
       url = "https://${instances.jellyfin.name}.${instances.web.domains.url0}";
@@ -88,7 +78,7 @@ in
     }
     {
       name = instances.mastodon.label;
-      url = "https://${instances.mastodon.subdomain}.${instances.web.domains.url3}";
+      url = "https://${instances.web.domains.url1}";
       tags = [
         instances.mastodon.name
         "mast"
@@ -153,7 +143,7 @@ in
     }
     {
       name = instances.peertube.label;
-      url = "https://${instances.peertube.subdomain}.${instances.web.domains.url3}";
+      url = "https://${instances.peertube.subdomain}.${instances.web.domains.url1}";
       tags = [
         instances.peertube.name
         "peer"

home/modules/gui/desktop/hyprland/config/windowrulev2.nix

@@ -20,7 +20,6 @@ let
   kdenlive = "(org.kde.kdenlive)";
   shotcut = "(shotcut)";
   scrcpy = "(.scrcpy-wrapped)";
-  battle = "(.*Battle.net.*)";
 
   maxsizeWindows = [
     "maxsize 720 400, class:^${blueman}$"
@@ -35,8 +34,6 @@ let
     "maxsize 720 400, title:^${picture}$"
     "maxsize 720 400, title:^${save}$"
     "maxsize 720 400, title:^${discord-popout}$"
-    "maxsize 1280 720, title:^${battle}$"
-    "minsize 1280 720, title:^${battle}$"
   ];
 
   floatWindows = builtins.map (x: "float, " + x) [
@@ -53,7 +50,6 @@ let
     "title:^(${discord-popout})$"
     "title:^${bitwarden}$"
     "title:^${save}$"
-    "title:^${battle}$"
   ];
 
   pinWindows = builtins.map (x: "pin, " + x) [

nixos/default.nix

@@ -60,7 +60,6 @@ in
         inherit (modules)
           syncthing
           ollama
-          hledger
           # plasma
           # sddm
           ;

nixos/modules/environment.nix

@@ -5,7 +5,7 @@
 }:
 {
   environment = {
-    enableAllTerminfo = true;
+    # enableAllTerminfo = true;
     systemPackages = builtins.attrValues {
       inherit (pkgs)
         git

nixos/modules/hledger.nix

@@ -1,72 +0,0 @@
-{
-  flake,
-  pkgs,
-  ...
-}:
-let
-  inherit (flake.config.machines.devices)
-    server
-    ;
-  inherit (flake.config.services.instances)
-    hledger
-    web
-    ;
-  service = hledger;
-  localhost = web.localhost.address0;
-in
-{
-  services = {
-    hledger-web = {
-      enable = true;
-      host = localhost;
-      # baseUrl = "https://${host}";
-      stateDir = service.paths.path0;
-      port = service.ports.port0;
-      journalFiles = [
-        ".hledger.journal"
-      ];
-      allow = "edit";
-    };
-  };
-
-  environment = {
-    systemPackages = builtins.attrValues {
-      inherit (pkgs)
-        hledger
-        hledger-ui
-        ;
-    };
-  };
-
-  users = {
-    users.${service.name} = {
-      isSystemUser = true;
-      group = service.name;
-      home = service.paths.path0;
-    };
-    groups.${service.name} = { };
-  };
-
-  fileSystems."/var/lib/${service.name}" = {
-    device = service.paths.path0;
-    fsType = "none";
-    options = [
-      "bind"
-    ];
-    depends = [
-      server.storage0.mount
-    ];
-  };
-
-  systemd.tmpfiles.rules = [
-    "Z ${service.paths.path0} 0755 ${service.name} ${service.name} -"
-  ];
-
-  networking = {
-    firewall = {
-      allowedTCPPorts = [
-        service.ports.port0
-      ];
-    };
-  };
-}

nixos/modules/services/acme.nix

@@ -38,6 +38,7 @@ in
           value = dnsConfig;
         })
         [
+          "nextcloud"
           "jellyfin"
           "minecraft"
           "ollama"
@@ -45,6 +46,17 @@ in
           "vaultwarden"
         ]
       )
+      ++ (map
+        (service: {
+          name = "${instanceName service}.${domain1}";
+          value = dnsConfig;
+        })
+        [
+          "nextcloud"
+          "matrix"
+          "owncast"
+        ]
+      )
       ++ (map
         (service: {
           name = "${instanceName service}.${domain3}";

profiles/user0/configs/server.nix

@@ -5,7 +5,7 @@ let
     ;
 
   moduleImports = map (module: self.homeModules.${module}) [
-    "server"
+    "cli"
   ];
 in
 {