From c82dd5e36f5e256a4c841a2ff7d76d3a3bcd9076 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 21 Jan 2025 21:58:09 -0600
Subject: [PATCH 01/20] feat: hledger test

---
 config/instances/config/hledger.nix           | 34 +++++++++++
 .../desktop/hyprland/config/windowrulev2.nix  |  4 ++
 nixos/modules/services/acme.nix               |  1 +
 nixos/modules/services/hledger.nix            | 56 +++++++++++++++++++
 4 files changed, 95 insertions(+)
 create mode 100644 config/instances/config/hledger.nix
 create mode 100644 nixos/modules/services/hledger.nix

diff --git a/config/instances/config/hledger.nix b/config/instances/config/hledger.nix
new file mode 100644
index 0000000..0f84e49
--- /dev/null
+++ b/config/instances/config/hledger.nix
@@ -0,0 +1,34 @@
+{ instancesFunctions }:
+let
+  inherit (instancesFunctions)
+    domain0
+    servicePath
+    sslPath
+    sopsPath
+    ;
+
+  hledgerLabel = "Hledger";
+  hledgerName = "hledger";
+  hledgerSubdomain = "source";
+in
+{
+  label = hledgerLabel;
+  name = hledgerName;
+  email = {
+    address0 = "noreply@${domain0}";
+  };
+  sops = {
+    path0 = "${sopsPath}/${hledgerName}";
+  };
+  subdomain = hledgerSubdomain;
+  paths = {
+    path0 = "${servicePath}/${hledgerLabel}";
+  };
+  ports = {
+    port0 = 5000;
+  };
+  ssl = {
+    cert = "${sslPath}/${hledgerSubdomain}.${domain0}/fullchain.pem";
+    key = "${sslPath}/${hledgerSubdomain}.${domain0}/key.pem";
+  };
+}
diff --git a/home/modules/gui/desktop/hyprland/config/windowrulev2.nix b/home/modules/gui/desktop/hyprland/config/windowrulev2.nix
index 0af2065..b15d025 100755
--- a/home/modules/gui/desktop/hyprland/config/windowrulev2.nix
+++ b/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) [
diff --git a/nixos/modules/services/acme.nix b/nixos/modules/services/acme.nix
index 2958efa..d3c7f76 100755
--- a/nixos/modules/services/acme.nix
+++ b/nixos/modules/services/acme.nix
@@ -44,6 +44,7 @@ in
           "ollama"
           "syncthing"
           "vaultwarden"
+          "hledger"
         ]
       )
       ++ (map
diff --git a/nixos/modules/services/hledger.nix b/nixos/modules/services/hledger.nix
new file mode 100644
index 0000000..92e153a
--- /dev/null
+++ b/nixos/modules/services/hledger.nix
@@ -0,0 +1,56 @@
+{
+  flake,
+  ...
+}:
+let
+  inherit (flake.config.people)
+    user0
+    ;
+  inherit (flake.config.machines.devices)
+    server
+    ;
+  inherit (flake.config.services.instances)
+    hledger
+    web
+    ;
+  service = hledger;
+  localhost = web.localhost.address0;
+  host = "${service.subdomain}.${web.domains.url0}";
+in
+{
+  hledger-web = {
+    enable = true;
+    host = localhost;
+    baseUrl = host;
+    stateDir = service.paths.path0;
+    port = service.ports.port0;
+    allow = "edit";
+  };
+
+  caddy = {
+    virtualHosts = {
+      "${host}" = {
+        extraConfig = ''
+          reverse_proxy ${localhost}:${toString service.ports.port0}
+
+          tls ${service.ssl.cert} ${service.ssl.key}
+        '';
+      };
+    };
+  };
+
+  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 ${user0} ${user0} -"
+  ];
+}

From 3db03776cc97339f705221d129fb95772141e844 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 21 Jan 2025 22:01:38 -0600
Subject: [PATCH 02/20] feat: hledger test

---
 nixos/modules/services/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/default.nix b/nixos/modules/services/default.nix
index aa0e1e8..ce69a35 100755
--- a/nixos/modules/services/default.nix
+++ b/nixos/modules/services/default.nix
@@ -10,6 +10,7 @@
       "logrotate"
       "minecraft"
       "ollama"
+      "hledger"
       "upRootNutrition"
       # "peertube"
       "postgresql"

From 60f7118212b091e7a6b0621064f9c680972d29c8 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 21 Jan 2025 22:03:48 -0600
Subject: [PATCH 03/20] feat: hledger test

---
 config/instances/config/hledger.nix |  2 +-
 nixos/modules/services/hledger.nix  | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/config/instances/config/hledger.nix b/config/instances/config/hledger.nix
index 0f84e49..75cc0c5 100644
--- a/config/instances/config/hledger.nix
+++ b/config/instances/config/hledger.nix
@@ -9,7 +9,7 @@ let
 
   hledgerLabel = "Hledger";
   hledgerName = "hledger";
-  hledgerSubdomain = "source";
+  hledgerSubdomain = "finances";
 in
 {
   label = hledgerLabel;
diff --git a/nixos/modules/services/hledger.nix b/nixos/modules/services/hledger.nix
index 92e153a..374158f 100644
--- a/nixos/modules/services/hledger.nix
+++ b/nixos/modules/services/hledger.nix
@@ -18,13 +18,15 @@ let
   host = "${service.subdomain}.${web.domains.url0}";
 in
 {
-  hledger-web = {
-    enable = true;
-    host = localhost;
-    baseUrl = host;
-    stateDir = service.paths.path0;
-    port = service.ports.port0;
-    allow = "edit";
+  services = {
+    hledger-web = {
+      enable = true;
+      host = localhost;
+      baseUrl = host;
+      stateDir = service.paths.path0;
+      port = service.ports.port0;
+      allow = "edit";
+    };
   };
 
   caddy = {

From 8d661c10aa3db2d9e21163e4b4baabbb5fdf4080 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 21 Jan 2025 22:04:19 -0600
Subject: [PATCH 04/20] feat: hledger test

---
 nixos/modules/services/hledger.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/hledger.nix b/nixos/modules/services/hledger.nix
index 374158f..7026009 100644
--- a/nixos/modules/services/hledger.nix
+++ b/nixos/modules/services/hledger.nix
@@ -27,16 +27,15 @@ in
       port = service.ports.port0;
       allow = "edit";
     };
-  };
+    caddy = {
+      virtualHosts = {
+        "${host}" = {
+          extraConfig = ''
+            reverse_proxy ${localhost}:${toString service.ports.port0}
 
-  caddy = {
-    virtualHosts = {
-      "${host}" = {
-        extraConfig = ''
-          reverse_proxy ${localhost}:${toString service.ports.port0}
-
-          tls ${service.ssl.cert} ${service.ssl.key}
-        '';
+            tls ${service.ssl.cert} ${service.ssl.key}
+          '';
+        };
       };
     };
   };

From 1da13e96b69641bc46c4711a8f79eb363b7a792f Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 21 Jan 2025 22:05:10 -0600
Subject: [PATCH 05/20] feat: hledger test

---
 profiles/user0/configs/server.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/user0/configs/server.nix b/profiles/user0/configs/server.nix
index 6ed7e0e..f0a02a7 100755
--- a/profiles/user0/configs/server.nix
+++ b/profiles/user0/configs/server.nix
@@ -5,7 +5,7 @@ let
     ;
 
   moduleImports = map (module: self.homeModules.${module}) [
-    "cli"
+    "server"
   ];
 in
 {

From b6e41d866abf7efc9bbb50b87c91f09dff9f2638 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 21 Jan 2025 22:52:36 -0600
Subject: [PATCH 06/20] feat: hledger test

---
 config/instances/config/hledger.nix                |  0
 .../config/bookmarks/config/flake/selfHosted.nix   | 14 ++++++++++++--
 nixos/modules/services/hledger.nix                 | 10 ++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 config/instances/config/hledger.nix
 mode change 100644 => 100755 nixos/modules/services/hledger.nix

diff --git a/config/instances/config/hledger.nix b/config/instances/config/hledger.nix
old mode 100644
new mode 100755
diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix
index 7029de9..3cb6626 100755
--- a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix
+++ b/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 = "https://${instances.hledger.subdomain}.${instances.web.domains.url0}";
+      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"
diff --git a/nixos/modules/services/hledger.nix b/nixos/modules/services/hledger.nix
old mode 100644
new mode 100755
index 7026009..7523526
--- a/nixos/modules/services/hledger.nix
+++ b/nixos/modules/services/hledger.nix
@@ -1,5 +1,6 @@
 {
   flake,
+  pkgs,
   ...
 }:
 let
@@ -40,6 +41,15 @@ in
     };
   };
 
+  environment = {
+    # enableAllTerminfo = true;
+    systemPackages = builtins.attrValues {
+      inherit (pkgs)
+        hledger
+        ;
+    };
+  };
+
   fileSystems."/var/lib/${service.name}" = {
     device = service.paths.path0;
     fsType = "none";

From 694b6da25c8658b101ba50ef628333533099a6f0 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 21 Jan 2025 22:57:20 -0600
Subject: [PATCH 07/20] feat: hledger test

---
 nixos/modules/services/hledger.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/hledger.nix b/nixos/modules/services/hledger.nix
index 7523526..39df005 100755
--- a/nixos/modules/services/hledger.nix
+++ b/nixos/modules/services/hledger.nix
@@ -62,6 +62,6 @@ in
   };
 
   systemd.tmpfiles.rules = [
-    "Z ${service.paths.path0} 0755 ${user0} ${user0} -"
+    "Z ${service.paths.path0} 0755 ${service.name} ${service.name} -"
   ];
 }

From b7f7f506224bfdec23613ffc51b10404c6feb3ab Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 21 Jan 2025 22:58:21 -0600
Subject: [PATCH 08/20] feat: hledger test

---
 nixos/modules/services/hledger.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/hledger.nix b/nixos/modules/services/hledger.nix
index 39df005..4d5e682 100755
--- a/nixos/modules/services/hledger.nix
+++ b/nixos/modules/services/hledger.nix
@@ -50,18 +50,18 @@ in
     };
   };
 
-  fileSystems."/var/lib/${service.name}" = {
-    device = service.paths.path0;
-    fsType = "none";
-    options = [
-      "bind"
-    ];
-    depends = [
-      server.storage0.mount
-    ];
-  };
+  # 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} -"
-  ];
+  # systemd.tmpfiles.rules = [
+  #   "Z ${service.paths.path0} 0755 ${service.name} ${service.name} -"
+  # ];
 }

From efbbeaa9425cda7614c7c105da3d115518272d62 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 21 Jan 2025 23:00:38 -0600
Subject: [PATCH 09/20] feat: hledger test

---
 nixos/modules/services/hledger.nix | 34 ++++++++++++++++++------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/hledger.nix b/nixos/modules/services/hledger.nix
index 4d5e682..7264a7d 100755
--- a/nixos/modules/services/hledger.nix
+++ b/nixos/modules/services/hledger.nix
@@ -50,18 +50,26 @@ in
     };
   };
 
-  # fileSystems."/var/lib/${service.name}" = {
-  #   device = service.paths.path0;
-  #   fsType = "none";
-  #   options = [
-  #     "bind"
-  #   ];
-  #   depends = [
-  #     server.storage0.mount
-  #   ];
-  # };
+  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} -"
-  # ];
+  systemd.tmpfiles.rules = [
+    "Z ${service.paths.path0} 0755 ${service.name} ${service.name} -"
+  ];
+
+  networking = {
+    firewall = {
+      allowedTCPPorts = [
+        service.ports.port0
+      ];
+    };
+  };
 }

From e27fe1da36af77897d53a0f05e11888eff7242e4 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 21 Jan 2025 23:17:21 -0600
Subject: [PATCH 10/20] feat: hledger test

---
 nixos/modules/services/hledger.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/hledger.nix b/nixos/modules/services/hledger.nix
index 7264a7d..f43f1f6 100755
--- a/nixos/modules/services/hledger.nix
+++ b/nixos/modules/services/hledger.nix
@@ -23,7 +23,7 @@ in
     hledger-web = {
       enable = true;
       host = localhost;
-      baseUrl = host;
+      baseUrl = "https://${host}";
       stateDir = service.paths.path0;
       port = service.ports.port0;
       allow = "edit";

From 2c74e855d12c8681e6490ed7745132bae2210b4a Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 21 Jan 2025 23:22:49 -0600
Subject: [PATCH 11/20] feat: hledger test

---
 nixos/modules/services/hledger.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/hledger.nix b/nixos/modules/services/hledger.nix
index f43f1f6..e1c0e05 100755
--- a/nixos/modules/services/hledger.nix
+++ b/nixos/modules/services/hledger.nix
@@ -4,9 +4,6 @@
   ...
 }:
 let
-  inherit (flake.config.people)
-    user0
-    ;
   inherit (flake.config.machines.devices)
     server
     ;
@@ -26,6 +23,9 @@ in
       baseUrl = "https://${host}";
       stateDir = service.paths.path0;
       port = service.ports.port0;
+      journalFiles = [
+        ".hledger.journal"
+      ];
       allow = "edit";
     };
     caddy = {

From fed916f55a1353cd57efa111434434e1932681d5 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 21 Jan 2025 23:29:56 -0600
Subject: [PATCH 12/20] feat: hledger test

---
 nixos/modules/services/hledger.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/hledger.nix b/nixos/modules/services/hledger.nix
index e1c0e05..007e902 100755
--- a/nixos/modules/services/hledger.nix
+++ b/nixos/modules/services/hledger.nix
@@ -42,7 +42,6 @@ in
   };
 
   environment = {
-    # enableAllTerminfo = true;
     systemPackages = builtins.attrValues {
       inherit (pkgs)
         hledger
@@ -50,6 +49,15 @@ in
     };
   };
 
+  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";

From 957ba844bdd312836f632cd74a0f16edc4bd7aa2 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 21 Jan 2025 23:41:19 -0600
Subject: [PATCH 13/20] feat: hledger test

---
 nixos/modules/services/hledger.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/hledger.nix b/nixos/modules/services/hledger.nix
index 007e902..2935f56 100755
--- a/nixos/modules/services/hledger.nix
+++ b/nixos/modules/services/hledger.nix
@@ -32,7 +32,10 @@ in
       virtualHosts = {
         "${host}" = {
           extraConfig = ''
-            reverse_proxy ${localhost}:${toString service.ports.port0}
+            redir /.well-known/carddav /remote.php/dav/ 301
+            redir /.well-known/caldav /remote.php/dav/ 301
+
+            reverse_proxy ${localhost}:${toString service.ports.port1}
 
             tls ${service.ssl.cert} ${service.ssl.key}
           '';

From 176ab511aa308a03afdbc87533cc0e84e50caa4c Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 21 Jan 2025 23:41:45 -0600
Subject: [PATCH 14/20] feat: hledger test

---
 nixos/modules/services/hledger.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/hledger.nix b/nixos/modules/services/hledger.nix
index 2935f56..217647b 100755
--- a/nixos/modules/services/hledger.nix
+++ b/nixos/modules/services/hledger.nix
@@ -35,7 +35,7 @@ in
             redir /.well-known/carddav /remote.php/dav/ 301
             redir /.well-known/caldav /remote.php/dav/ 301
 
-            reverse_proxy ${localhost}:${toString service.ports.port1}
+            reverse_proxy ${localhost}:${toString service.ports.port0}
 
             tls ${service.ssl.cert} ${service.ssl.key}
           '';

From 368e46628afa6511bb344ce47b62b048e1f8b1e9 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Wed, 22 Jan 2025 00:12:34 -0600
Subject: [PATCH 15/20] feat: hledger test

---
 nixos/modules/environment.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/environment.nix b/nixos/modules/environment.nix
index d4202bc..6af7bea 100755
--- a/nixos/modules/environment.nix
+++ b/nixos/modules/environment.nix
@@ -5,7 +5,7 @@
 }:
 {
   environment = {
-    # enableAllTerminfo = true;
+    enableAllTerminfo = true;
     systemPackages = builtins.attrValues {
       inherit (pkgs)
         git

From 6a093dfcc62dc35e3441be542fbc12548b0e5e52 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Wed, 22 Jan 2025 00:16:36 -0600
Subject: [PATCH 16/20] feat: hledger test

---
 nixos/modules/services/hledger.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/hledger.nix b/nixos/modules/services/hledger.nix
index 217647b..3f5e5a8 100755
--- a/nixos/modules/services/hledger.nix
+++ b/nixos/modules/services/hledger.nix
@@ -44,13 +44,13 @@ in
     };
   };
 
-  environment = {
-    systemPackages = builtins.attrValues {
-      inherit (pkgs)
-        hledger
-        ;
-    };
-  };
+  # environment = {
+  #   systemPackages = builtins.attrValues {
+  #     inherit (pkgs)
+  #       hledger
+  #       ;
+  #   };
+  # };
 
   users = {
     users.${service.name} = {

From d1452456480e04a4fd47d2f946adaec020704a65 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Wed, 22 Jan 2025 00:19:22 -0600
Subject: [PATCH 17/20] feat: hledger test

---
 nixos/modules/services/hledger.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/hledger.nix b/nixos/modules/services/hledger.nix
index 3f5e5a8..910482e 100755
--- a/nixos/modules/services/hledger.nix
+++ b/nixos/modules/services/hledger.nix
@@ -44,13 +44,14 @@ in
     };
   };
 
-  # environment = {
-  #   systemPackages = builtins.attrValues {
-  #     inherit (pkgs)
-  #       hledger
-  #       ;
-  #   };
-  # };
+  environment = {
+    systemPackages = builtins.attrValues {
+      inherit (pkgs)
+        hledger
+        hledger-ui
+        ;
+    };
+  };
 
   users = {
     users.${service.name} = {

From 77f1db64d250d94b6a1159d828371c4fb9726f30 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Wed, 22 Jan 2025 00:54:45 -0600
Subject: [PATCH 18/20] feat: hledger test

---
 config/instances/config/hledger.nix           | 22 +------------------
 .../bookmarks/config/flake/selfHosted.nix     |  2 +-
 nixos/default.nix                             |  1 +
 nixos/modules/{services => }/hledger.nix      | 14 ------------
 nixos/modules/services/acme.nix               | 13 -----------
 nixos/modules/services/default.nix            |  1 -
 6 files changed, 3 insertions(+), 50 deletions(-)
 rename nixos/modules/{services => }/hledger.nix (77%)

diff --git a/config/instances/config/hledger.nix b/config/instances/config/hledger.nix
index 75cc0c5..18120cc 100755
--- a/config/instances/config/hledger.nix
+++ b/config/instances/config/hledger.nix
@@ -1,34 +1,14 @@
-{ instancesFunctions }:
 let
-  inherit (instancesFunctions)
-    domain0
-    servicePath
-    sslPath
-    sopsPath
-    ;
-
   hledgerLabel = "Hledger";
   hledgerName = "hledger";
-  hledgerSubdomain = "finances";
 in
 {
   label = hledgerLabel;
   name = hledgerName;
-  email = {
-    address0 = "noreply@${domain0}";
-  };
-  sops = {
-    path0 = "${sopsPath}/${hledgerName}";
-  };
-  subdomain = hledgerSubdomain;
   paths = {
-    path0 = "${servicePath}/${hledgerLabel}";
+    path0 = "/mnt/media/storage/${hledgerLabel}";
   };
   ports = {
     port0 = 5000;
   };
-  ssl = {
-    cert = "${sslPath}/${hledgerSubdomain}.${domain0}/fullchain.pem";
-    key = "${sslPath}/${hledgerSubdomain}.${domain0}/key.pem";
-  };
 }
diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix
index 3cb6626..ff65a4a 100755
--- a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix
+++ b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix
@@ -66,7 +66,7 @@ in
     }
     {
       name = instances.hledger.label;
-      url = "https://${instances.hledger.subdomain}.${instances.web.domains.url0}";
+      url = "http://localhost.${builtins.toString instances.ports.port0}";
       tags = [
         instances.hledger.name
         "hledger"
diff --git a/nixos/default.nix b/nixos/default.nix
index 5cfa623..ae32b8f 100755
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -60,6 +60,7 @@ in
         inherit (modules)
           syncthing
           ollama
+          hledger
           # plasma
           # sddm
           ;
diff --git a/nixos/modules/services/hledger.nix b/nixos/modules/hledger.nix
similarity index 77%
rename from nixos/modules/services/hledger.nix
rename to nixos/modules/hledger.nix
index 910482e..8d1f273 100755
--- a/nixos/modules/services/hledger.nix
+++ b/nixos/modules/hledger.nix
@@ -28,20 +28,6 @@ in
       ];
       allow = "edit";
     };
-    caddy = {
-      virtualHosts = {
-        "${host}" = {
-          extraConfig = ''
-            redir /.well-known/carddav /remote.php/dav/ 301
-            redir /.well-known/caldav /remote.php/dav/ 301
-
-            reverse_proxy ${localhost}:${toString service.ports.port0}
-
-            tls ${service.ssl.cert} ${service.ssl.key}
-          '';
-        };
-      };
-    };
   };
 
   environment = {
diff --git a/nixos/modules/services/acme.nix b/nixos/modules/services/acme.nix
index d3c7f76..0ddb5c4 100755
--- a/nixos/modules/services/acme.nix
+++ b/nixos/modules/services/acme.nix
@@ -38,24 +38,11 @@ in
           value = dnsConfig;
         })
         [
-          "nextcloud"
           "jellyfin"
           "minecraft"
           "ollama"
           "syncthing"
           "vaultwarden"
-          "hledger"
-        ]
-      )
-      ++ (map
-        (service: {
-          name = "${instanceName service}.${domain1}";
-          value = dnsConfig;
-        })
-        [
-          "nextcloud"
-          "matrix"
-          "owncast"
         ]
       )
       ++ (map
diff --git a/nixos/modules/services/default.nix b/nixos/modules/services/default.nix
index ce69a35..aa0e1e8 100755
--- a/nixos/modules/services/default.nix
+++ b/nixos/modules/services/default.nix
@@ -10,7 +10,6 @@
       "logrotate"
       "minecraft"
       "ollama"
-      "hledger"
       "upRootNutrition"
       # "peertube"
       "postgresql"

From 4db692907802787e8ab7007058df6b2b399056f4 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Wed, 22 Jan 2025 00:57:41 -0600
Subject: [PATCH 19/20] feat: hledger test

---
 config/instances/config/hledger.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config/instances/config/hledger.nix b/config/instances/config/hledger.nix
index 18120cc..dbe6562 100755
--- a/config/instances/config/hledger.nix
+++ b/config/instances/config/hledger.nix
@@ -1,9 +1,14 @@
+{ instancesFunctions }:
 let
+  inherit (instancesFunctions)
+    dummy
+    ;
   hledgerLabel = "Hledger";
   hledgerName = "hledger";
 in
 {
   label = hledgerLabel;
+  email = dummy;
   name = hledgerName;
   paths = {
     path0 = "/mnt/media/storage/${hledgerLabel}";

From f642608281c2cec4904e3ef9b3225546c4f32bcb Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Wed, 22 Jan 2025 02:13:08 -0600
Subject: [PATCH 20/20] feat: added hledger and restructured some home stuff

---
 config/instances/config/hledger.nix                   |  1 -
 home/modules/cli/fun/aniCli/default.nix               | 11 +++++++++++
 home/modules/cli/fun/default.nix                      | 10 ++++++++++
 .../{utilities => fun}/fastFetch/config/settings.nix  |  0
 .../cli/{utilities => fun}/fastFetch/default.nix      |  0
 .../cli/{utilities => fun}/libgenCli/default.nix      |  0
 .../cli/{utilities => fun}/nyanCat/default.nix        |  0
 .../cli/{utilities => fun}/yaBridge/default.nix       |  0
 .../{utilities => fun}/yt-dlp/config/extraConfig.nix  |  0
 .../cli/{utilities => fun}/yt-dlp/config/settings.nix |  0
 .../modules/cli/{utilities => fun}/yt-dlp/default.nix |  0
 .../config/bookmarks/config/flake/selfHosted.nix      |  2 +-
 nixos/modules/hledger.nix                             |  3 +--
 13 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100755 home/modules/cli/fun/aniCli/default.nix
 create mode 100755 home/modules/cli/fun/default.nix
 rename home/modules/cli/{utilities => fun}/fastFetch/config/settings.nix (100%)
 rename home/modules/cli/{utilities => fun}/fastFetch/default.nix (100%)
 rename home/modules/cli/{utilities => fun}/libgenCli/default.nix (100%)
 rename home/modules/cli/{utilities => fun}/nyanCat/default.nix (100%)
 rename home/modules/cli/{utilities => fun}/yaBridge/default.nix (100%)
 rename home/modules/cli/{utilities => fun}/yt-dlp/config/extraConfig.nix (100%)
 rename home/modules/cli/{utilities => fun}/yt-dlp/config/settings.nix (100%)
 rename home/modules/cli/{utilities => fun}/yt-dlp/default.nix (100%)

diff --git a/config/instances/config/hledger.nix b/config/instances/config/hledger.nix
index dbe6562..50a82e1 100755
--- a/config/instances/config/hledger.nix
+++ b/config/instances/config/hledger.nix
@@ -8,7 +8,6 @@ let
 in
 {
   label = hledgerLabel;
-  email = dummy;
   name = hledgerName;
   paths = {
     path0 = "/mnt/media/storage/${hledgerLabel}";
diff --git a/home/modules/cli/fun/aniCli/default.nix b/home/modules/cli/fun/aniCli/default.nix
new file mode 100755
index 0000000..bd02397
--- /dev/null
+++ b/home/modules/cli/fun/aniCli/default.nix
@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      ani-cli
+      ;
+  };
+}
diff --git a/home/modules/cli/fun/default.nix b/home/modules/cli/fun/default.nix
new file mode 100755
index 0000000..f106bc5
--- /dev/null
+++ b/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;
+}
diff --git a/home/modules/cli/utilities/fastFetch/config/settings.nix b/home/modules/cli/fun/fastFetch/config/settings.nix
similarity index 100%
rename from home/modules/cli/utilities/fastFetch/config/settings.nix
rename to home/modules/cli/fun/fastFetch/config/settings.nix
diff --git a/home/modules/cli/utilities/fastFetch/default.nix b/home/modules/cli/fun/fastFetch/default.nix
similarity index 100%
rename from home/modules/cli/utilities/fastFetch/default.nix
rename to home/modules/cli/fun/fastFetch/default.nix
diff --git a/home/modules/cli/utilities/libgenCli/default.nix b/home/modules/cli/fun/libgenCli/default.nix
similarity index 100%
rename from home/modules/cli/utilities/libgenCli/default.nix
rename to home/modules/cli/fun/libgenCli/default.nix
diff --git a/home/modules/cli/utilities/nyanCat/default.nix b/home/modules/cli/fun/nyanCat/default.nix
similarity index 100%
rename from home/modules/cli/utilities/nyanCat/default.nix
rename to home/modules/cli/fun/nyanCat/default.nix
diff --git a/home/modules/cli/utilities/yaBridge/default.nix b/home/modules/cli/fun/yaBridge/default.nix
similarity index 100%
rename from home/modules/cli/utilities/yaBridge/default.nix
rename to home/modules/cli/fun/yaBridge/default.nix
diff --git a/home/modules/cli/utilities/yt-dlp/config/extraConfig.nix b/home/modules/cli/fun/yt-dlp/config/extraConfig.nix
similarity index 100%
rename from home/modules/cli/utilities/yt-dlp/config/extraConfig.nix
rename to home/modules/cli/fun/yt-dlp/config/extraConfig.nix
diff --git a/home/modules/cli/utilities/yt-dlp/config/settings.nix b/home/modules/cli/fun/yt-dlp/config/settings.nix
similarity index 100%
rename from home/modules/cli/utilities/yt-dlp/config/settings.nix
rename to home/modules/cli/fun/yt-dlp/config/settings.nix
diff --git a/home/modules/cli/utilities/yt-dlp/default.nix b/home/modules/cli/fun/yt-dlp/default.nix
similarity index 100%
rename from home/modules/cli/utilities/yt-dlp/default.nix
rename to home/modules/cli/fun/yt-dlp/default.nix
diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix
index ff65a4a..ec0a9ae 100755
--- a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix
+++ b/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix
@@ -66,7 +66,7 @@ in
     }
     {
       name = instances.hledger.label;
-      url = "http://localhost.${builtins.toString instances.ports.port0}";
+      url = "http://localhost.${builtins.toString instances.hledger.ports.port0}";
       tags = [
         instances.hledger.name
         "hledger"
diff --git a/nixos/modules/hledger.nix b/nixos/modules/hledger.nix
index 8d1f273..ed947f1 100755
--- a/nixos/modules/hledger.nix
+++ b/nixos/modules/hledger.nix
@@ -13,14 +13,13 @@ let
     ;
   service = hledger;
   localhost = web.localhost.address0;
-  host = "${service.subdomain}.${web.domains.url0}";
 in
 {
   services = {
     hledger-web = {
       enable = true;
       host = localhost;
-      baseUrl = "https://${host}";
+      # baseUrl = "https://${host}";
       stateDir = service.paths.path0;
       port = service.ports.port0;
       journalFiles = [