From 99a0ed171985e507d666b924115aa430b76116ed Mon Sep 17 00:00:00 2001 From: Christine Elisabeth Koppel Date: Sat, 7 Feb 2026 14:08:52 +0100 Subject: [PATCH] - Dedicated Database: Add MariaDB ports - Songsheet: Update the compose comments, as the database uses the dedicated database - General: Re-added Librewolf onto the module. --- nix-system-configs/database/configuration.nix | 2 +- .../modules/desktop-manager/sway_greetd_homemanager.nix | 3 ++- nix-system-configs/modules/secrets/secrets.example.nix | 1 + .../modules/songsheet/wavelog/docker-compose.yml | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nix-system-configs/database/configuration.nix b/nix-system-configs/database/configuration.nix index cb98bde..1f503a0 100644 --- a/nix-system-configs/database/configuration.nix +++ b/nix-system-configs/database/configuration.nix @@ -158,7 +158,7 @@ services.openssh.enable = true; # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [5432]; # PostgreSQL default port + networking.firewall.allowedTCPPorts = [5432 3306]; # PostgreSQL default port # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. # networking.firewall.enable = false; diff --git a/nix-system-configs/modules/desktop-manager/sway_greetd_homemanager.nix b/nix-system-configs/modules/desktop-manager/sway_greetd_homemanager.nix index e95b410..efe791b 100644 --- a/nix-system-configs/modules/desktop-manager/sway_greetd_homemanager.nix +++ b/nix-system-configs/modules/desktop-manager/sway_greetd_homemanager.nix @@ -48,7 +48,8 @@ in { pkgs.httpie pkgs.alacritty # Terminal emulator pkgs.hyfetch # Add fetching packages - pkgs.macchina + pkgs.macchina # Other "neofetch" + pkgs.librewolf # Web browser, Firefox but better pkgs.wayland # Wayland display server pkgs.wlroots # Wayland compositor library pkgs.maple-mono.NF # Font for better terminal appearance diff --git a/nix-system-configs/modules/secrets/secrets.example.nix b/nix-system-configs/modules/secrets/secrets.example.nix index 40cf2d3..2738542 100644 --- a/nix-system-configs/modules/secrets/secrets.example.nix +++ b/nix-system-configs/modules/secrets/secrets.example.nix @@ -5,6 +5,7 @@ ... }: { # TODO Figure out a better way to manage secrets. + # CHECK OUT https://github.com/ryantm/agenix local.secrets = { gitUserName = "Your Name"; gitUserEmail = "you@example.com"; diff --git a/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml b/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml index 4b84568..3294ca6 100644 --- a/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml +++ b/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml @@ -1,12 +1,12 @@ services: - wavelog-db: + wavelog-db: # THIS IS NOW DANGLING BUT WILL BE THERE TO PREVENT BREAKAGE OF THE MAIN COMPOSE FILE image: mariadb:11.3 container_name: wavelog-db environment: MARIADB_RANDOM_ROOT_PASSWORD: yes MARIADB_DATABASE: wavelog MARIADB_USER: wavelog - MARIADB_PASSWORD: oijawfjiojoijoiawfoij191229888dajkvhiuviuaiuhvaihuauis1123312 # THIS DATABASE WILL BE MIGRATED PROABLY - TODO CHECK OUT https://github.com/ryantm/agenix + MARIADB_PASSWORD: oijawfjiojoijoiawfoij191229888dajkvhiuviuaiuhvaihuauis1123312 # THIS DATABASE IS NOW MIGRATED PROPERLY volumes: - wavelog-dbdata:/var/lib/mysql restart: unless-stopped