i can't remember what caused this...

hosts/profiles/core/default.nix

@@ -32,7 +32,7 @@ in
   };
 
   environment.systemPackages = with pkgs; [
-    pinentry_gnome
+    pinentry-gnome
     cached-nix-shell
   ];
 

hosts/profiles/desktop/default.nix

@@ -99,7 +99,7 @@ in
     papirus-icon-theme
     calendar-cli
     wyrd
-    tic-80
+    # tic-80
     ytfzf
     yt-dlp
   ];
@@ -123,9 +123,12 @@ in
     };
     xserver = {
       enable = true;
-      xkb.layout = "us,dvorak";
+      # TODO should be xkb.layout
+      layout = "us";
+      # xkb.variant = "dvorak";
       desktopManager.wallpaper.mode = "fill";
       displayManager = {
+        # startx.enable = true;
         defaultSession = "none+bspwm";
         sessionCommands = ''
           ${pkgs.xorg.xrdb}/bin/xrdb -merge <<EOF

hosts/profiles/freshrss/default.nix

@@ -17,13 +17,14 @@
 
   services.postgresql = {
     enable = true; # Ensure postgresql is enabled
-    authentication = ''
-      local freshrss all ident map=freshrss-users
-    '';
-    identMap = # Map the freshrss user to postgresql
-      ''
-        freshrss-users freshrss freshrss
-      '';
+    # authentication = ''
+    #   local freshrss all ident map=freshrss-users
+    # '';
+    # identMap = # Map the freshrss user to postgresql
+    #   ''
+    #     freshrss-users freshrss freshrss
+    #     freshrss-users postgres freshrss
+    #   '';
     ensureDatabases = [ "freshrss" ];
     ensureUsers = [{ 
       name = "freshrss"; 

hosts/profiles/gitea/default.nix

@@ -46,13 +46,14 @@
   environment.systemPackages = [ pkgs.pandoc ];
   services.postgresql = {
     enable = true; # Ensure postgresql is enabled
-    authentication = ''
-      local gitea all ident map=gitea-users
-    '';
-    identMap = # Map the gitea user to postgresql
-      ''
-        gitea-users gitea gitea
-      '';
+    # authentication = ''
+    #   local gitea all ident map=gitea-users
+    # '';
+    # identMap = # Map the gitea user to postgresql
+    #   ''
+    #     gitea-users gitea gitea
+    #     gitea-users postgres gitea
+    #   '';
     ensureDatabases = [ "gitea" ];
     ensureUsers = [{ 
       name = "gitea"; 

hosts/profiles/microbin/default.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 {
   services.microbin.enable = true;
-  services.microbin.hostname = "bin.sealight.xyz";
-  services.microbin.port = 4949;
+  services.microbin.settings.PUBLIC_PATH = "bin.sealight.xyz"; 
+  services.microbin.settings.MICROBIN_PORT = 4949;
   networking.firewall.allowedTCPPorts = [ 4949 ];
   services.nginx.virtualHosts."bin.sealight.xyz" = {
     enableACME = true;

hosts/profiles/music/default.nix

@@ -16,7 +16,7 @@
     orca-c
     supercollider
     dirt
-    sunvox
+    # sunvox
     vcv-rack
     lmms
     bespokesynth
@@ -38,7 +38,7 @@
     alsa.enable = true;
     alsa.support32Bit = false;
     pulse.enable = true;
-   jack.enable = true;
+    jack.enable = true;
     # Deprecated as of 23.05
     # config = {
     #   pipewire."context.properties"."default.clock.rate" = "48000";

hosts/profiles/postgres_upgrade_script/default.nix

@@ -6,13 +6,12 @@
       # TODO it's perhaps advisable to stop all services that depend on postgresql
       systemctl stop postgresql
 
-      # TODO replace `<new version>` with the psqlSchema here
       # The schema can be found by running:
-      # nix-instantiate '<nixpkgs>' --eval -A postgresql_14.psqlSchema
-      export NEWDATA="/var/lib/postgresql/<new version>"
+      # nix eval --raw nixpkgs#postgresql_15.psqlSchema
+      export NEWDATA="/var/lib/postgresql/15"
 
       # TODO specify the postgresql package you'd like to upgrade to
-      export NEWBIN="${pkgs.postgresql_14}/bin"
+      export NEWBIN="${pkgs.postgresql_15}/bin"
 
       export OLDDATA="${config.services.postgresql.dataDir}"
       export OLDBIN="${config.services.postgresql.package}/bin"

hosts/profiles/ulogger-server/default.nix

@@ -6,7 +6,7 @@
     ensureDatabases = [ "ulogger" ];
     ensureUsers = [{
       name = "ulogger";
-      nsureDBOwnership = true;
+      ensureDBOwnership = true;
     }];
   };
 

hosts/profiles/wallabag/default.nix

@@ -25,7 +25,8 @@
   services.wallabag = {
     enable = true;
     hostName = "read.mossnet.lan";
-    package = pkgs.wallabag;
+    package = pkgs.my-wallabag;
+    dataDir = "/var/lib/wallabag";
     conf = ''
       # This file is a "template" of what your parameters.yml file should look like
       parameters:
@@ -42,7 +43,7 @@
           # with PostgreSQL and SQLite, you must set "utf8"
           database_charset: utf8
 
-          domain_name: http://read.mossnet.lan/
+          domain_name: http://read.mossnet.lan
           server_name: "mossnet wallabag instance"
 
           mailer_dsn: null://