Merge branch 'master' of git.bitlab21.com:sam/nixos

- Update Postgres configuration for dev and prod environments:
  - Change dbname from `dev_baseddata_models` to `dev_baseddata` and `baseddata_models` to `baseddata`
  - Replace host variable with `${baseddataPostgresIp}`
  - Update user and password placeholders to new paths
- Remove `environment.systemPackages` configuration

hosts/common/users/sam/default.nix

@@ -107,23 +107,23 @@ in {
         target: dev
         outputs:
           dev:
-            dbname: dev_baseddata_models
-            host: ${config.sops.placeholder."software/postgres/baseddata_models/ip"}
-            pass: '${config.sops.placeholder."software/postgres/baseddata_models/password"}'
+            dbname: dev_baseddata
+            host: ${baseddataPostgresIp}
+            pass: '${config.sops.placeholder."software/postgres/baseddata/user_password"}'
             port: 5432
             schema: models
             threads: 6
             type: postgres
-            user: ${config.sops.placeholder."software/postgres/baseddata_models/username"}
+            user: ${config.sops.placeholder."software/postgres/baseddata/user_username"}
           prod:
-            dbname: baseddata_models
-            host: ${config.sops.placeholder."software/postgres/baseddata_models/ip"}
-            pass: '${config.sops.placeholder."software/postgres/baseddata_models/password"}'
+            dbname: baseddata
+            host: ${baseddataPostgresIp}
+            pass: '${config.sops.placeholder."software/postgres/baseddata/user_password"}'
             port: 5432
             schema: models
             threads: 6
             type: postgres
-            user: ${config.sops.placeholder."software/postgres/baseddata_models/username"}
+            user: ${config.sops.placeholder."software/postgres/baseddata/user_username"}
 
     '';
   };
@@ -160,8 +160,4 @@ in {
       ${username} = import ../../../../home/${hostname}.nix;
     };
   };
-
-  environment.systemPackages = [
-    #inputs.sqlfmt.packages.x86_64-linux.sqlfmt
-  ];
 }