From d820259c3249f2bbfcdf2d068fb0380636d3f475 Mon Sep 17 00:00:00 2001
From: jahanson <joe@veri.dev>
Date: Thu, 30 May 2024 23:12:28 -0500
Subject: [PATCH] Moving stuff around

---
 nixos/modules/nixos/services/default.nix         |  1 -
 nixos/modules/nixos/services/podman/default.nix  |  2 +-
 .../nixos/services/postgresql/default.nix        |  2 +-
 nixos/profiles/role-workstation.nix              | 16 +++++++---------
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/nixos/services/default.nix b/nixos/modules/nixos/services/default.nix
index 9c852a1..9147327 100644
--- a/nixos/modules/nixos/services/default.nix
+++ b/nixos/modules/nixos/services/default.nix
@@ -4,7 +4,6 @@
     ./forgejo
     ./glances
     ./monitoring.nix
-    ./nfs
     ./nginx
     ./nix-serve
     ./podman
diff --git a/nixos/modules/nixos/services/podman/default.nix b/nixos/modules/nixos/services/podman/default.nix
index 0e6326b..9fb5002 100644
--- a/nixos/modules/nixos/services/podman/default.nix
+++ b/nixos/modules/nixos/services/podman/default.nix
@@ -32,7 +32,7 @@ in
         lazydocker
       ];
       
-      config.programs.fish.shellAliases = {
+      programs.fish.shellAliases = {
         # lazydocker --> lazypodman
         lazypodman="sudo DOCKER_HOST=unix:///run/podman/podman.sock lazydocker";
       };
diff --git a/nixos/modules/nixos/services/postgresql/default.nix b/nixos/modules/nixos/services/postgresql/default.nix
index 8acfae3..3b42b6f 100644
--- a/nixos/modules/nixos/services/postgresql/default.nix
+++ b/nixos/modules/nixos/services/postgresql/default.nix
@@ -55,7 +55,7 @@ in
     # enable backups
     services.postgresqlBackup = mkIf cfg.backup {
       enable = lib.mkForce true;
-      location = backupLocation;
+      location = cfg.backupLocation;
     };
 
     ### firewall config
diff --git a/nixos/profiles/role-workstation.nix b/nixos/profiles/role-workstation.nix
index 7566531..c103b1e 100644
--- a/nixos/profiles/role-workstation.nix
+++ b/nixos/profiles/role-workstation.nix
@@ -1,12 +1,10 @@
-{ config, lib, pkgs, imports, boot, self, inputs, ... }:
+{ config, lib, pkgs, ... }:
 # Role for workstations
 # Covers desktops/laptops, expected to have a GUI and do workloads
 # Will have home-manager installs
 
 with config;
 {
-
-
   mySystem = {
 
     de.gnome.enable = true;
@@ -15,20 +13,20 @@ with config;
     # TODO decide if i drop to bash on pis?
     shell.fish.enable = true;
 
-    nfs.nas = {
-      enable = true;
-      lazy = true;
-    };
+    # TODO make nfs server configurable
+    # nfs.nas = {
+    #   enable = true;
+    #   lazy = true;
+    # };
+
     system.resticBackup.local.enable = false;
     system.resticBackup.remote.enable = false;
 
   };
 
   boot = {
-
     binfmt.emulatedSystems = [ "aarch64-linux" ]; # Enabled for raspi4 compilation
     plymouth.enable = true; # hide console with splash screen
-
   };
 
   nix.settings = {