feat(i3): add clipmenu shortcut

This reverts commit b9d0258132.

configs/i3.nix

@@ -212,11 +212,7 @@ in {
         "${modifier}+r" = "mode resize";
         "${modifier}+v" = "split v";
         "${modifier}+w" = "layout tabbed";
-        "${modifier}+q" = "exec ${pkgs.writers.writeDash "newsboat-sync" ''
-          notify-send --app-name="newsboat" "Updating ..."
-          newsboat -x reload
-          notify-send --app-name="newsboat" "Finished updating."
-        ''}";
+        "${modifier}+q" = "exec ${config.services.clipmenu.package}/bin/clipmenu";
 
         "${modifier}+Return" = "exec ${(defaultApplications pkgs).terminal}";
         "${modifier}+t" = "exec ${(defaultApplications pkgs).fileManager}";

flake.nix

@@ -98,7 +98,6 @@
         };
 
       nixosModules = {
-        hledger = import modules/hledger.nix;
         htgen = import modules/htgen.nix;
         moodle-dl = import modules/moodle-dl.nix;
         networkmanager-declarative = import modules/networkmanager-declarative.nix;

modules/hledger.nix

@@ -1,77 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.niveum.hledger;
-  hledger-git = pkgs.writers.writeDashBin "hledger-git" ''
-    LEDGER_DIR="$(dirname $LEDGER_FILE)"
-    GIT="${pkgs.git}/bin/git -C ''${LEDGER_DIR}"
-    if [ "$1" = entry ]; then
-      ${cfg.package}/bin/hledger balance -V > "$LEDGER_DIR/balance.txt"
-      $GIT add balance.txt
-      $GIT commit --all --message="$(date -Im)"
-    else
-      $GIT $*
-    fi
-  '';
-  hledger-edit = pkgs.writers.writeDashBin "hledger-edit" ''
-    LEDGER_DIR="$(dirname $LEDGER_FILE)"
-    $EDITOR ''${LEDGER_DIR}/current.journal
-  '';
-in {
-  options.services.hledger = {
-    enable = mkEnableOption "hledger";
-    ledgerFile = mkOption {
-      type = types.str;
-    };
-    server = {
-      enable = mkEnableOption "hledger server";
-      port = mkOption {
-        type = types.port;
-        default = 5000;
-      };
-      host = mkOption {
-        type = types.str;
-        default = "127.0.0.1";
-      };
-      capabilities = mkOption {
-        type = types.listOf (types.enum ["view" "add" "manage"]);
-        default = ["view" "add"];
-      };
-      flags = mkOption {
-        type = types.listOf types.str;
-        default = [];
-      };
-      user = mkOption {type = types.attrs;};
-      package = mkOption {
-        type = types.package;
-        default = pkgs.hledger-web;
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    systemd.services.hledger-web = mkIf cfg.server.enable {
-      description = "hledger server";
-      wantedBy = ["multi-user.target"];
-      environment.LEDGER_FILE = cfg.ledgerFile;
-      serviceConfig = {
-        Restart = "always";
-        ExecStart = ''
-          ${cfg.server.package}/bin/hledger-web \
-          --port=${toString cfg.server.port} \
-          --host=${cfg.server.host} \
-          --capabilities=${concatStringsSep "," cfg.server.capabilities} \
-          ${concatStringsSep " " cfg.server.flags}
-        '';
-        User = cfg.server.user.name;
-        PrivateTemp = true;
-        RuntimeDirectory = "hledger-web";
-        WorkingDirectory = "%t/hledger-web";
-      };
-    };
-  };
-}

secrets.txt

@@ -24,6 +24,7 @@ secrets/kabsa-specus-privateKey.age
 secrets/kabsa-syncthing-cert.age
 secrets/kabsa-syncthing-key.age
 secrets/kfm-password.age
+secrets/ledger-basicAuth.age
 secrets/makanek-retiolum-privateKey-ed25519.age
 secrets/makanek-retiolum-privateKey-rsa.age
 secrets/makanek-specus-privateKey.age

systems/ful/configuration.nix

@@ -11,6 +11,7 @@ in {
     ./matomo.nix
     ./radio.nix
     ./panoptikon.nix
+    ./ledger.nix
     ../../configs/monitoring.nix
     ../../configs/tor.nix
     ../../configs/save-space.nix

systems/ful/ledger.nix

@@ -0,0 +1,54 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  services.hledger-web = {
+    enable = true;
+    capabilities = {
+      add = true;
+      view = true;
+      manage = false;
+    };
+    serveApi = false; # serve only the JSON API
+    baseUrl = "https://ledger.kmein.de";
+    journalFiles = [
+      "privat.journal"
+    ];
+  };
+
+  systemd.services.hledger-backup = {
+    enable = true;
+    startAt = "hourly";
+    wants = ["network-online.target"];
+    wantedBy = ["multi-user.target"];
+    script = ''
+      ${pkgs.git}/bin/git config user.name "hledger-web"
+      ${pkgs.git}/bin/git config user.email "hledger-web@${config.networking.hostName}"
+      ${pkgs.git}/bin/git commit -am $(date -Ih)
+      ${pkgs.git}/bin/git pull --rebase
+      ${pkgs.git}/bin/git push
+    '';
+    serviceConfig = {
+      User = "hledger";
+      Group = "hledger";
+      WorkingDirectory = config.services.hledger-web.stateDir;
+    };
+  };
+
+  age.secrets = {
+    ledger-basicAuth = {
+      file = ../../secrets/ledger-basicAuth.age;
+      owner = "nginx";
+      group = "nginx";
+      mode = "400";
+    };
+  };
+
+  services.nginx.virtualHosts."ledger.kmein.de" = {
+    enableACME = true;
+    basicAuthFile = config.age.secrets.ledger-basicAuth.path;
+    forceSSL = true;
+    locations."/".proxyPass = "http://127.0.0.1:${toString config.services.hledger-web.port}";
+  };
+}