WIP

Reviewed-on: #16
Reviewed-by: Oystein Kristoffer Tveit <oysteikt@pvv.ntnu.no>

.envrc

@@ -0,0 +1 @@
+use flake

.gitignore

@@ -1,8 +1,9 @@
 result
 result-*
-
+**/__pycache__
+dibbler.egg-info
 dist
 
 test.db
 
-.ruff_cache
+.ruff_cache

README.md

@@ -2,13 +2,31 @@
 
 EDB-system for PVVVV
 
+## Hva er dette?
+
+Dibbler er et system laget av PVVere for PVVere for å byttelåne både matvarer og godis.
+Det er designet for en gammeldags VT terminal, og er laget for å være enkelt både å bruke og å hacke på.
+
+Programmet er skrevet i Python, og bruker en sql database for å lagre data.
+
+Samlespleiseboden er satt opp slik at folk kjøper inn varer, og får dibblerkreditt, og så kan man bruke
+denne kreditten til å kjøpe ut andre varer. Det er ikke noen form for authentisering, så hele systemet er basert på tillit.
+Det er anbefalt å koble en barkodeleser til systemet for å gjøre det enklere å både legge til og kjøpe varer.
+
+## Kom i gang
+
+Installer python, og lag og aktiver et venv. Installer så avhengighetene med `pip install`.
+
+Deretter kan du kjøre programmet med
+
+```console
+python -m dibbler -c example-config.ini create-db
+python -m dibbler -c example-config.ini loop
+```
+
 ## Nix
-### Hvordan kjøre
 
-`nix run github:Prograrmvarverkstedet/dibbler`
+### Bygge nytt image
-
-
-### Bygge nytt  image
 
 For å bygge et image trenger du en builder som takler å bygge for arkitekturen du skal lage et image for.
 
@@ -16,16 +34,16 @@ For å bygge et image trenger du en builder som takler å bygge for arkitekturen
 
 Flaket exposer en modul som autologger inn med en bruker som automatisk kjører dibbler, og setter opp et minimalistisk miljø.
 
-Før du bygger imaget burde du endre conf.py lokalt til å inneholde instillingene dine. **NB: Denne kommer til å ligge i nix storen.**
+Før du bygger imaget burde du kopiere og endre `example-config.ini` lokalt til å inneholde instillingene dine. **NB: Denne kommer til å ligge i nix storen, ikke si noe her som du ikke vil at moren din skal høre.**
 
-Du kan også endre hvilken conf.py som blir brukt direkte i pakken eller i modulen.
+Du kan også endre hvilken config-fil som blir brukt direkte i pakken eller i modulen.
 
-Se eksempelet for hvordan skrot er satt opp i flake.nix
+Se eksempelet for hvordan skrot er satt opp i `flake.nix` og `nix/skrott.nix`
 
 ### Bygge image for skrot
 Skrot har et image definert i flake.nix:
 
-1. endre conf.py
+1. endre `example-config.ini`
 2. `nix build .#images.skrot`
 3. ???
-4. non-profit
+4. non-profit

conf.py

@@ -1,13 +0,0 @@
-db_url = "postgresql://robertem@127.0.0.1/pvvvv"
-quit_allowed = True
-stop_allowed = False
-show_tracebacks = True
-input_encoding = "utf8"
-
-low_credit_warning_limit = -100
-user_recent_transaction_limit = 100
-
-# See https://pypi.org/project/brother_ql/ for label types
-# Set rotate to False for endless labels
-label_type = "62"
-label_rotate = False

default.nix

@@ -1,4 +0,0 @@
-{ pkgs ? import <nixos-unstable> { } }:
-{
-  dibbler = pkgs.callPackage ./nix/dibbler.nix { };
-}

dibbler/db.py

@@ -1,7 +1,16 @@
+from pathlib import Path
+
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 
 from dibbler.conf import config
 
-engine = create_engine(config.get("database", "url"))
+if (url := config.get("database", "url")) is not None:
+  database_url = url
+
+elif (url_file := config.get("database", "url_file")) is not None:
+  with Path(url_file).open() as file:
+    database_url = file.read().strip()
+
+engine = create_engine(database_url)
 Session = sessionmaker(bind=engine)

dibbler/lib/barcode_helpers.py

@@ -2,7 +2,7 @@ import os
 
 from PIL import ImageFont
 from barcode.writer import ImageWriter, mm2px
-from brother_ql.devicedependent import label_type_specs
+from brother_ql.labels import ALL_LABELS
 
 
 def px2mm(px, dpi=300):
@@ -12,14 +12,15 @@ def px2mm(px, dpi=300):
 class BrotherLabelWriter(ImageWriter):
     def __init__(self, typ="62", max_height=350, rot=False, text=None):
         super(BrotherLabelWriter, self).__init__()
-        assert typ in label_type_specs
+        label = next([l for l in ALL_LABELS if l.identifier == typ])
+        assert label is not None
         self.rot = rot
         if self.rot:
-            self._h, self._w = label_type_specs[typ]["dots_printable"]
+            self._h, self._w = label.dots_printable
             if self._w == 0 or self._w > max_height:
                 self._w = min(max_height, self._h / 2)
         else:
-            self._w, self._h = label_type_specs[typ]["dots_printable"]
+            self._w, self._h = label.dots_printable
             if self._h == 0 or self._h > max_height:
                 self._h = min(max_height, self._w / 2)
         self._xo = 0.0

dibbler/lib/printer_helpers.py

@@ -2,9 +2,10 @@ import os
 import datetime
 
 import barcode
-from brother_ql import BrotherQLRaster, create_label
+from brother_ql.brother_ql_create import create_label
+from brother_ql.raster import BrotherQLRaster
 from brother_ql.backends import backend_factory
-from brother_ql.devicedependent import label_type_specs
+from brother_ql.labels import ALL_LABELS
 from PIL import Image, ImageDraw, ImageFont
 
 from .barcode_helpers import BrotherLabelWriter
@@ -17,10 +18,11 @@ def print_name_label(
     label_type="62",
     printer_type="QL-700",
 ):
+    label = next([l for l in ALL_LABELS if l.identifier == label_type])
     if not rotate:
-        width, height = label_type_specs[label_type]["dots_printable"]
+        width, height = label.dots_printable
     else:
-        height, width = label_type_specs[label_type]["dots_printable"]
+        height, width = label.dots_printable
 
     font_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "ChopinScript.ttf")
     fs = 2000

dibbler/lib/statistikkHelpers.py

@@ -76,12 +76,8 @@ class Database:
     personDatoVerdi = defaultdict(list)  # dict->array
     personUkedagVerdi = defaultdict(list)
     # for global
-    personPosTransactions = (
+    personPosTransactions = {}  # personPosTransactions[trygvrad] == 100 #trygvrad har lagt 100kr i boksen
-        {}
+    personNegTransactions = {}  # personNegTransactions[trygvrad» == 70 #trygvrad har tatt 70kr fra boksen
-    )  # personPosTransactions[trygvrad] == 100 #trygvrad har lagt 100kr i boksen
-    personNegTransactions = (
-        {}
-    )  # personNegTransactions[trygvrad» == 70 #trygvrad har tatt 70kr fra boksen
     globalVareAntall = {}  # globalVareAntall[Oreo] == 3
     globalVareVerdi = {}  # globalVareVerdi[Oreo] == 30 #[kr]
     globalPersonAntall = {}  # globalPersonAntall[trygvrad] == 3

dibbler/main.py

@@ -1,4 +1,8 @@
 import argparse
+from pathlib import Path
+
+from sqlalchemy import create_engine
+from sqlalchemy.orm import Session
 
 from dibbler.conf import config
 
@@ -20,26 +24,65 @@ subparsers = parser.add_subparsers(
 subparsers.add_parser("loop", help="Run the dibbler loop")
 subparsers.add_parser("create-db", help="Create the database")
 subparsers.add_parser("slabbedasker", help="Find out who is slabbedasker")
+subparsers.add_parser("seed-data", help="Fill with mock data")
+
+
+def _get_database_url_from_config() -> str:
+    """Get the database URL from the configuration."""
+    url = config.get("database", "url")
+    if url is not None:
+        return url
+
+    url_file = config.get("database", "url_file")
+    if url_file is not None:
+        with Path(url_file).open() as file:
+            return file.read().strip()
+
+    raise ValueError("No database URL found in configuration.")
+
+
+def _connect_to_database(url: str, **engine_args) -> Session:
+    try:
+        engine = create_engine(url, **engine_args)
+        sql_session = Session(engine)
+    except Exception as err:
+        print("Error: could not connect to database.")
+        print(err)
+        exit(1)
+
+    print(f"Debug: Connected to database at '{url}'")
+    return sql_session
 
 
 def main():
     args = parser.parse_args()
     config.read(args.config)
 
+    database_url = _get_database_url_from_config()
+    sql_session = _connect_to_database(
+      database_url,
+      echo=config.getboolean("database", "echo_sql", fallback=False),
+    )
+
     if args.subcommand == "loop":
         import dibbler.subcommands.loop as loop
 
-        loop.main()
+        loop.main(sql_session)
 
     elif args.subcommand == "create-db":
         import dibbler.subcommands.makedb as makedb
 
-        makedb.main()
+        makedb.main(sql_session)
 
     elif args.subcommand == "slabbedasker":
         import dibbler.subcommands.slabbedasker as slabbedasker
 
-        slabbedasker.main()
+        slabbedasker.main(sql_session)
+
+    elif args.subcommand == "seed-data":
+        import dibbler.subcommands.seed_test_data as seed_test_data
+
+        seed_test_data.main(sql_session)
 
 
 if __name__ == "__main__":

dibbler/menus/buymenu.py

@@ -180,7 +180,7 @@ When finished, write an empty line to confirm the purchase.\n"""
                     print(f"User {t.user.name}'s credit is now {t.user.credit:d} kr")
                     if t.user.credit < config.getint("limits", "low_credit_warning_limit"):
                         print(
-                            f'USER {t.user.name} HAS LOWER CREDIT THAN {config.getint("limits", "low_credit_warning_limit"):d},',
+                            f"USER {t.user.name} HAS LOWER CREDIT THAN {config.getint('limits', 'low_credit_warning_limit'):d},",
                             "AND SHOULD CONSIDER PUTTING SOME MONEY IN THE BOX.",
                         )
 

dibbler/menus/main.py

@@ -0,0 +1,176 @@
+import sys
+import signal
+import traceback
+
+from sqlalchemy import (
+    event,
+)
+from sqlalchemy.orm import Session
+
+from libdib.repl import (
+    NumberedCmd,
+    InteractiveItemSelector,
+    prompt_yes_no,
+)
+
+from dibbler.conf import config
+
+class DibblerCli(NumberedCmd):
+    def __init__(self, sql_session: Session):
+        super().__init__()
+        self.sql_session = sql_session
+        self.sql_session_dirty = False
+
+        @event.listens_for(self.sql_session, "after_flush")
+        def mark_session_as_dirty(*_):
+            self.sql_session_dirty = True
+            self.prompt_header = "(unsaved changes)"
+
+        @event.listens_for(self.sql_session, "after_commit")
+        @event.listens_for(self.sql_session, "after_rollback")
+        def mark_session_as_clean(*_):
+            self.sql_session_dirty = False
+            self.prompt_header = None
+
+    # TODO: move to libdib.repl
+    @classmethod
+    def run_with_safe_exit_wrapper(cls, sql_session: Session):
+        tool = cls(sql_session)
+
+        if not config.getboolean("general", "stop_allowed"):
+            signal.signal(signal.SIGQUIT, signal.SIG_IGN)
+
+        if not config.getboolean("general", "stop_allowed"):
+            signal.signal(signal.SIGTSTP, signal.SIG_IGN)
+
+        while True:
+            try:
+                tool.cmdloop()
+            except KeyboardInterrupt:
+                if not tool.sql_session_dirty:
+                    exit(0)
+                try:
+                    print()
+                    if prompt_yes_no(
+                        "Are you sure you want to exit without saving?", default=False
+                    ):
+                        raise KeyboardInterrupt
+                except KeyboardInterrupt:
+                    if tool.sql_session is not None:
+                        tool.sql_session.rollback()
+                    exit(0)
+            except Exception:
+                print("Something went wrong.")
+                print(f"{sys.exc_info()[0]}: {sys.exc_info()[1]}")
+                if config.getboolean("general", "show_tracebacks"):
+                    traceback.print_tb(sys.exc_info()[2])
+
+    def default(self, maybe_barcode: str):
+        raise NotImplementedError(
+            "This command is not implemented yet. Please use the numbered commands instead."
+        )
+
+    def do_buy(self, arg: str):
+        ...
+
+    def do_product_list(self, arg: str):
+        ...
+
+    def do_show_user(self, arg: str):
+        ...
+
+    def do_user_list(self, arg: str):
+        ...
+
+    def do_adjust_credit(self, arg: str):
+        ...
+
+    def do_transfer(self, arg: str):
+        ...
+
+    def do_add_stock(self, arg: str):
+        ...
+
+    def do_add_edit(self, arg: str):
+        ...
+        # AddEditMenu(self.sql_session).cmdloop()
+
+    def do_product_search(self, arg: str):
+        ...
+
+    def do_statistics(self, arg: str):
+        ...
+
+    def do_faq(self, arg: str):
+        ...
+
+    def do_print_label(self, arg: str):
+        ...
+
+
+    def do_exit(self, _: str):
+        if self.sql_session_dirty:
+            if prompt_yes_no("Would you like to save your changes?"):
+                self.sql_session.commit()
+            else:
+                self.sql_session.rollback()
+        exit(0)
+
+    funcs = {
+        0: {
+            "f": default,
+            "doc": "Choose / Add item with its ISBN",
+        },
+        1: {
+            "f": do_buy,
+            "doc": "Buy",
+        },
+        2: {
+            "f": do_product_list,
+            "doc": "Product List",
+        },
+        3: {
+            "f": do_show_user,
+            "doc": "Show User",
+        },
+        4: {
+            "f": do_user_list,
+            "doc": "User List",
+        },
+        5: {
+            "f": do_adjust_credit,
+            "doc": "Adjust Credit",
+        },
+        6: {
+            "f": do_transfer,
+            "doc": "Transfer",
+        },
+        7: {
+            "f": do_add_stock,
+            "doc": "Add Stock",
+        },
+        8: {
+            "f": do_add_edit,
+            "doc": "Add/Edit",
+        },
+        9: {
+            "f": do_product_search,
+            "doc": "Product Search",
+        },
+        10: {
+            "f": do_statistics,
+            "doc": "Statistics",
+        },
+        11: {
+            "f": do_faq,
+            "doc": "FAQ",
+        },
+        12: {
+            "f": do_print_label,
+            "doc": "Print Label",
+        },
+        13: {
+            "f": do_exit,
+            "doc": "Exit",
+        },
+    }

dibbler/models/__init__.py

@@ -1,11 +1,11 @@
 __all__ = [
-    'Base',
+    "Base",
-    'Product',
+    "Product",
-    'Purchase',
+    "Purchase",
-    'PurchaseEntry',
+    "PurchaseEntry",
-    'Transaction',
+    "Transaction",
-    'User',
+    "User",
-    'UserProducts',
+    "UserProducts",
 ]
 
 from .Base import Base

dibbler/subcommands/loop.py

@@ -1,79 +1,12 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
 import random
-import sys
-import traceback
 
-from ..conf import config
+from sqlalchemy.orm import Session
-from ..lib.helpers import *
-from ..menus import *
 
-random.seed()
+from ..menus.main import DibblerCli
 
+def main(sql_session: Session):
+    random.seed()
 
-def main():
+    DibblerCli.run_with_safe_exit_wrapper(sql_session)
-    if not config.getboolean("general", "stop_allowed"):
-        signal.signal(signal.SIGQUIT, signal.SIG_IGN)
 
-    if not config.getboolean("general", "stop_allowed"):
+    exit(0)
-        signal.signal(signal.SIGTSTP, signal.SIG_IGN)
-
-    main = MainMenu(
-        "Dibbler main menu",
-        items=[
-            BuyMenu(),
-            ProductListMenu(),
-            ShowUserMenu(),
-            UserListMenu(),
-            AdjustCreditMenu(),
-            TransferMenu(),
-            AddStockMenu(),
-            Menu(
-                "Add/edit",
-                items=[
-                    AddUserMenu(),
-                    EditUserMenu(),
-                    AddProductMenu(),
-                    EditProductMenu(),
-                    AdjustStockMenu(),
-                    CleanupStockMenu(),
-                ],
-            ),
-            ProductSearchMenu(),
-            Menu(
-                "Statistics",
-                items=[
-                    ProductPopularityMenu(),
-                    ProductRevenueMenu(),
-                    BalanceMenu(),
-                    LoggedStatisticsMenu(),
-                ],
-            ),
-            FAQMenu(),
-            PrintLabelMenu(),
-        ],
-        exit_msg="happy happy joy joy",
-        exit_confirm_msg="Really quit Dibbler?",
-    )
-    if not config.getboolean("general", "quit_allowed"):
-        main.exit_disallowed_msg = "You can check out any time you like, but you can never leave."
-    while True:
-        # noinspection PyBroadException
-        try:
-            main.execute()
-        except KeyboardInterrupt:
-            print("")
-            print("Interrupted.")
-        except:
-            print("Something went wrong.")
-            print(f"{sys.exc_info()[0]}: {sys.exc_info()[1]}")
-            if config.getboolean("general", "show_tracebacks"):
-                traceback.print_tb(sys.exc_info()[2])
-        else:
-            break
-        print("Restarting main menu.")
-
-
-if __name__ == "__main__":
-    main()

dibbler/subcommands/makedb.py

@@ -1,11 +1,8 @@
-#!/usr/bin/python
+from sqlalchemy.orm import Session
 from dibbler.models import Base
-from dibbler.db import engine
 
 
-def main():
+def main(sql_session: Session):
-    Base.metadata.create_all(engine)
+    if not sql_session.bind:
-
+        raise RuntimeError("SQLAlchemy session is not bound to a database engine.")
-
+    Base.metadata.create_all(sql_session.bind)
-if __name__ == "__main__":
-    main()

dibbler/subcommands/seed_test_data.py

@@ -0,0 +1,45 @@
+import json
+from pathlib import Path
+
+from sqlalchemy.orm import Session
+
+from dibbler.models import Product, User
+
+JSON_FILE = Path(__file__).parent.parent.parent / "mock_data.json"
+
+
+def clear_db(sql_session: Session):
+    sql_session.query(Product).delete()
+    sql_session.query(User).delete()
+    sql_session.commit()
+
+
+def main(sql_session: Session):
+    clear_db(sql_session)
+    product_items = []
+    user_items = []
+
+    with open(JSON_FILE) as f:
+        json_obj = json.load(f)
+
+        for product in json_obj["products"]:
+            product_item = Product(
+                bar_code=product["bar_code"],
+                name=product["name"],
+                price=product["price"],
+                stock=product["stock"],
+            )
+            product_items.append(product_item)
+
+        for user in json_obj["users"]:
+            user_item = User(
+                name=user["name"],
+                card=user["card"],
+                rfid=user["rfid"],
+                credit=user["credit"],
+            )
+            user_items.append(user_item)
+
+        sql_session.add_all(product_items)
+        sql_session.add_all(user_items)
+        sql_session.commit()

dibbler/subcommands/slabbedasker.py

@@ -1,18 +1,12 @@
-#!/usr/bin/python
+from sqlalchemy.orm import Session
 
-from dibbler.db import Session
+# from dibbler.db import Session
 from dibbler.models import User
 
 
-def main():
+def main(sql_session: Session):
-    # Start an SQL session
+  # Let's find all users with a negative credit
-    session = Session()
+    slabbedasker = sql_session.query(User).filter(User.credit < 0).all()
-    # Let's find all users with a negative credit
-    slabbedasker = session.query(User).filter(User.credit < 0).all()
 
     for slubbert in slabbedasker:
         print(f"{slubbert.name}, {slubbert.credit}")
-
-
-if __name__ == "__main__":
-    main()

example-config.ini

@@ -5,7 +5,7 @@ show_tracebacks = true
 input_encoding = 'utf8'
 
 [database]
-; url = postgresql://robertem@127.0.0.1/pvvvv
+# url = "postgresql://robertem@127.0.0.1/pvvvv"
 url = sqlite:///test.db
 
 [limits]

flake.lock

@@ -5,37 +5,91 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1692799911,
+        "lastModified": 1731533236,
-        "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
+        "id": "flake-utils",
+        "type": "indirect"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
+      },
+      "original": {
+        "id": "flake-utils",
+        "type": "indirect"
+      }
+    },
+    "libdib": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1749301134,
+        "narHash": "sha256-JHLVV4ug8AgG71xhXEdmXozQfesXut6NUdXbBZNkD3c=",
+        "ref": "refs/heads/main",
+        "rev": "ca26131c22bb2833c81254dbabab6d785b9f37f0",
+        "revCount": 8,
+        "type": "git",
+        "url": "https://git.pvv.ntnu.no/Projects/libdib.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.pvv.ntnu.no/Projects/libdib.git"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1693145325,
+        "lastModified": 1749143949,
-        "narHash": "sha256-Gat9xskErH1zOcLjYMhSDBo0JTBZKfGS0xJlIRnj6Rc=",
+        "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cddebdb60de376c1bdb7a4e6ee3d98355453fe56",
+        "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
+        "owner": "NixOS",
-        "type": "indirect"
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1749143949,
+        "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
+        "libdib": "libdib",
+        "nixpkgs": "nixpkgs_2"
       }
     },
     "systems": {
@@ -52,6 +106,21 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -1,77 +1,74 @@
 {
   description = "Dibbler samspleisebod";
 
-  inputs.flake-utils.url = "github:numtide/flake-utils";
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
-  outputs = { self, nixpkgs, flake-utils }:
+    libdib.url = "git+https://git.pvv.ntnu.no/Projects/libdib.git";
-    flake-utils.lib.eachDefaultSystem (system: let
+  };
-      pkgs = nixpkgs.legacyPackages.${system};
+
-    in {
+  outputs = { self, nixpkgs, flake-utils, libdib }: let
-      packages = {
+    inherit (nixpkgs) lib;
+
+    systems = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
+
+    forAllSystems = f: lib.genAttrs systems (system: let
+      pkgs = import nixpkgs {
+        inherit system;
+        overlays = [
+          libdib.overlays.default
+        ];
+      };
+    in f system pkgs);
+  in {
+      packages = forAllSystems (system: pkgs: {
         default = self.packages.${system}.dibbler;
         dibbler = pkgs.callPackage ./nix/dibbler.nix {
-          python3Packages = pkgs.python311Packages;
+          python3Packages = pkgs.python312Packages;
         };
-      };
+        skrot = self.nixosConfigurations.skrot.config.system.build.sdImage;
+      });
 
-      apps = {
+      apps = forAllSystems (system: pkgs: {
         default = self.apps.${system}.dibbler;
         dibbler = flake-utils.lib.mkApp {
           drv = self.packages.${system}.dibbler;
         };
-      };
+      });
 
-      devShells = {
+      overlays = {
-        default = self.devShells.${system}.dibbler;
+        default = self.overlays.dibbler;
-        dibbler = pkgs.mkShell {
+        dibbler = final: prev: {
-          packages = with pkgs; [
+          inherit (self.packages.${prev.system}) dibbler;
-            python311Packages.black
-            ruff
-          ];
         };
       };
-    })
 
-    //
+      devShells = forAllSystems (system: pkgs: {
+        default = self.devShells.${system}.dibbler;
+        dibbler = pkgs.callPackage ./nix/shell.nix {
+          python = pkgs.python312;
+        };
+      });
 
-    {
+      # Note: using the module requires that you have applied the overlay first
-      # Note: using the module requires that you have applied the
-      #       overlay first
       nixosModules.default = import ./nix/module.nix;
 
-      images.skrot = self.nixosConfigurations.skrot.config.system.build.sdImage;
+      nixosConfigurations.skrot = nixpkgs.lib.nixosSystem (rec {
-
-      nixosConfigurations.skrot = nixpkgs.lib.nixosSystem {
         system = "aarch64-linux";
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [ self.overlays.dibbler ];
+        };
         modules = [
           (nixpkgs + "/nixos/modules/installer/sd-card/sd-image-aarch64.nix")
           self.nixosModules.default
-          ({...}: {
+          ./nix/skrott.nix
-            system.stateVersion = "22.05";
-
-            networking = {
-              hostName = "skrot";
-              domain = "pvv.ntnu.no";
-              nameservers = [ "129.241.0.200" "129.241.0.201" ];
-              defaultGateway = "129.241.210.129";
-              interfaces.eth0 = {
-                useDHCP = false;
-                ipv4.addresses = [{
-                  address = "129.241.210.235";
-                  prefixLength = 25;
-                }];
-              };
-            };
-            # services.resolved.enable = true;
-            # systemd.network.enable = true;
-            # systemd.network.networks."30-network" = {
-            #   matchConfig.Name = "*";
-            #   DHCP = "no";
-            #   address = [ "129.241.210.235/25" ];
-            #   gateway = [ "129.241.210.129" ];
-            # };
-          })
         ];
-      };
+      });
     };
 }

mock_data.json

@@ -0,0 +1,76 @@
+{
+    "products": [
+        {
+            "product_id": 1,
+            "bar_code": "1234567890123",
+            "name": "Wireless Mouse",
+            "price": 2999,
+            "stock": 150,
+            "hidden": false
+        },
+        {
+            "product_id": 2,
+            "bar_code": "9876543210987",
+            "name": "Mechanical Keyboard",
+            "price": 5999,
+            "stock": 75,
+            "hidden": false
+        },
+        {
+            "product_id": 3,
+            "bar_code": "1112223334445",
+            "name": "Gaming Monitor",
+            "price": 19999,
+            "stock": 20,
+            "hidden": false
+        },
+        {
+            "product_id": 4,
+            "bar_code": "5556667778889",
+            "name": "USB-C Docking Station",
+            "price": 8999,
+            "stock": 50,
+            "hidden": true
+        },
+        {
+            "product_id": 5,
+            "bar_code": "4445556667771",
+            "name": "Noise Cancelling Headphones",
+            "price": 12999,
+            "stock": 30,
+            "hidden": true
+        }
+    ],
+    "users": [
+        {
+            "name": "Albert",
+            "credit": 42069,
+            "card": "NTU12345678",
+            "rfid": "a1b2c3d4e5"
+        },
+        {
+            "name": "lorem",
+            "credit": 2000,
+            "card": "9876543210",
+            "rfid": "f6e7d8c9b0"
+        },
+        {
+            "name": "ibsum",
+            "credit": 1000,
+            "card": "11122233",
+            "rfid": ""
+        },
+        {
+            "name": "dave",
+            "credit": 7500,
+            "card": "NTU56789012",
+            "rfid": "1234abcd5678"
+        },
+        {
+            "name": "eve",
+            "credit": 3000,
+            "card": null,
+            "rfid": "deadbeef1234"
+        }
+    ]
+}

nix/dibbler.nix

@@ -1,17 +1,21 @@
 { lib
 , python3Packages
-, fetchFromGitHub
 }:
 python3Packages.buildPythonApplication {
   pname = "dibbler";
-  version = "unstable-2021-09-07";
+  version = "unstable";
   src = lib.cleanSource ../.;
 
   format = "pyproject";
 
+  # brother-ql is breaky breaky
+  # https://github.com/NixOS/nixpkgs/issues/285234
+  dontCheckRuntimeDeps = true;
+
   nativeBuildInputs = with python3Packages; [ setuptools ];
   propagatedBuildInputs = with python3Packages; [
     brother-ql
+    libdib
     matplotlib
     psycopg2
     python-barcode

nix/module.nix

@@ -1,16 +1,31 @@
 { config, pkgs, lib, ... }: let
   cfg = config.services.dibbler;
+
+  format = pkgs.formats.ini { };
 in {
   options.services.dibbler = {
+    enable = lib.mkEnableOption "dibbler, the little kiosk computer";
+
     package = lib.mkPackageOption pkgs "dibbler" { };
-    config = lib.mkOption {
+
-      default = ../conf.py;
+    settings = lib.mkOption {
+      description = "Configuration for dibbler";
+      default = { };
+      type = lib.types.submodule {
+        freeformType = format.type;
+      };
     };
   };
 
   config = let
     screen = "${pkgs.screen}/bin/screen";
-  in {
+  in lib.mkIf cfg.enable {
+    services.dibbler.settings = lib.pipe ../example-config.ini [
+      builtins.readFile
+      builtins.fromTOML
+      (lib.mapAttrsRecursive (_: lib.mkDefault))
+    ];
+
     boot = {
       consoleLogLevel = 0;
       enableContainers = false;
@@ -23,7 +38,7 @@ in {
         group = "dibbler";
         extraGroups = [ "lp" ];
         isNormalUser = true;
-        shell = ((pkgs.writeShellScriptBin "login-shell" "${screen} -x dibbler") // {shellPath = "/bin/login-shell";});
+        shell = (pkgs.writeShellScriptBin "login-shell" "${screen} -x dibbler") // {shellPath = "/bin/login-shell";};
       };
     };
 
@@ -32,7 +47,9 @@ in {
       wantedBy = [ "default.target" ];
       serviceConfig = {
         ExecStartPre = "-${screen} -X -S dibbler kill";
-        ExecStart = "${screen} -dmS dibbler -O -l ${cfg.package}/bin/dibbler --config ${cfg.config} loop";
+        ExecStart = let
+          config = format.generate "dibbler-config.ini" cfg.settings;
+        in "${screen} -dmS dibbler -O -l ${cfg.package}/bin/dibbler --config ${config} loop";
         ExecStartPost = "${screen} -X -S dibbler width 42 80";
         User = "dibbler";
         Group = "dibbler";
@@ -55,30 +72,6 @@ in {
       serviceConfig.Restart = "always"; # restart when session is closed
     };
 
-    services = {
+    services.getty.autologinUser = lib.mkForce "dibbler";
-      openssh = {
-        enable = true;
-        permitRootLogin = "yes";
-      };
-
-      getty.autologinUser = lib.mkForce "dibbler";
-      udisks2.enable = false;
-    };
-
-    networking.firewall.logRefusedConnections = false;
-    console.keyMap = "no";
-    programs.command-not-found.enable = false;
-    i18n.supportedLocales = [ "en_US.UTF-8/UTF-8" ];
-    environment.noXlibs = true;
-
-    documentation = {
-      info.enable = false;
-      man.enable = false;
-    };
-
-    security = {
-      polkit.enable = lib.mkForce false;
-      audit.enable = false;
-    };
   };
 }

nix/shell.nix

@@ -0,0 +1,21 @@
+{
+  mkShell,
+  python,
+  ruff,
+  uv,
+}:
+
+mkShell {
+  packages = [
+    ruff
+    uv
+    (python.withPackages (ps: with ps; [
+      brother-ql
+      matplotlib
+      libdib
+      psycopg2
+      python-barcode
+      sqlalchemy
+    ]))
+  ];
+}

nix/skrott.nix

@@ -0,0 +1,27 @@
+{...}: {
+  system.stateVersion = "25.05";
+  
+  services.dibbler.enable = true;
+
+  networking = {
+    hostName = "skrot";
+    domain = "pvv.ntnu.no";
+    nameservers = [ "129.241.0.200" "129.241.0.201" ];
+    defaultGateway = "129.241.210.129";
+    interfaces.eth0 = {
+      useDHCP = false;
+      ipv4.addresses = [{
+        address = "129.241.210.235";
+        prefixLength = 25;
+      }];
+    };
+  };
+  # services.resolved.enable = true;
+  # systemd.network.enable = true;
+  # systemd.network.networks."30-network" = {
+  #   matchConfig.Name = "*";
+  #   DHCP = "no";
+  #   address = [ "129.241.210.235/25" ];
+  #   gateway = [ "129.241.210.129" ];
+  # };
+}

pyproject.toml

@@ -8,7 +8,6 @@ authors = []
 description = "EDB-system for PVV"
 readme = "README.md"
 requires-python = ">=3.11"
-license = {text = "BSD-3-Clause"}
 classifiers = [
     "Programming Language :: Python :: 3",
 ]
@@ -16,11 +15,15 @@ dependencies = [
     "SQLAlchemy >= 2.0, <2.1",
     "brother-ql",
     "matplotlib",
+    "libdib",
     "psycopg2 >= 2.8, <2.10",
     "python-barcode",
 ]
 dynamic = ["version"]
 
+[tool.uv.sources]
+libdib = { git = "https://git.pvv.ntnu.no/Projects/libdib.git" }
+
 [tool.setuptools.packages.find]
 include = ["dibbler*"]
 
@@ -32,4 +35,3 @@ line-length = 100
 
 [tool.ruff]
 line-length = 100
-