feat: added hledger and restructured some home stuff

config/instances/config/hledger.nix

@@ -0,0 +1,18 @@
+{ 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

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

home/modules/cli/fun/default.nix

@@ -0,0 +1,10 @@
+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,6 +64,16 @@ 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}";
@@ -78,7 +88,7 @@ in
     }
     {
       name = instances.mastodon.label;
-      url = "https://${instances.web.domains.url1}";
+      url = "https://${instances.mastodon.subdomain}.${instances.web.domains.url3}";
       tags = [
         instances.mastodon.name
         "mast"
@@ -143,7 +153,7 @@ in
     }
     {
       name = instances.peertube.label;
-      url = "https://${instances.peertube.subdomain}.${instances.web.domains.url1}";
+      url = "https://${instances.peertube.subdomain}.${instances.web.domains.url3}";
       tags = [
         instances.peertube.name
         "peer"

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

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

nixos/default.nix

@@ -60,6 +60,7 @@ 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

@@ -0,0 +1,72 @@
+{
+  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,7 +38,6 @@ in
           value = dnsConfig;
         })
         [
-          "nextcloud"
           "jellyfin"
           "minecraft"
           "ollama"
@@ -46,17 +45,6 @@ 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}) [
-    "cli"
+    "server"
   ];
 in
 {