pull out some extra modules

hosts/backup/default.nix

@@ -1,26 +1,17 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ./hardware-configuration.nix ../../modules/ssh.nix ];
+  imports = [
+    ./hardware-configuration.nix
+
+    ../../modules/backup-server.nix
+    ../../modules/ssh.nix
+
+    ../../lilac.nix
+  ];
 
   networking.hostName = "backup";
 
-  users.users.lilac = {
-    isNormalUser = true;
-  group = "lilac";
-  extraGroups = [ "wheel" ];
-  };
-  users.groups.lilac = {};
-  home-manager = {
-    useGlobalPkgs = true;
-  useUserPackages = true;
-
-  users.lilac = import ../../home/lilac.nix;
-  };
-  programs.zsh.enable = true;
-  users.users.lilac.shell = pkgs.zsh;
-  security.sudo.wheelNeedsPassword = false;
-
   time.timeZone = "America/Winnipeg";
 
   systemd.sleep.settings.Sleep = {
@@ -95,15 +86,5 @@ networking = {
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
   system.stateVersion = "26.05";
 
-
-
-  services.restic.server = {
-    enable = true;
-  listenAddress = "10.0.0.4:8000";
-  dataDir = "/var/lib/restic";
-  appendOnly = true;
-  extraFlags = [ "--no-auth" ];
-  };
-
   networking.firewall.interfaces.wg0.allowedTCPPorts = [ 8000 ];
 }

hosts/desktop/default.nix

@@ -4,34 +4,20 @@
   imports = [
     ./hardware-configuration.nix
 
-    ../../modules/site/blog.nix
-    ../../modules/site/code.nix
-    ../../modules/site/mail.nix
-    ../../modules/site/music.nix
-    ../../modules/site/photo.nix
-  ../../modules/site/vault.nix
+    ../../modules/backup.nix
+    ../../modules/blog.nix
+    ../../modules/code.nix
+    ../../modules/mail.nix
+    ../../modules/music.nix
+    ../../modules/photo.nix
+    ../../modules/ssh.nix
+    ../../modules/vault.nix
 
-  ../../modules/ssh.nix
+    ../../lilac.nix
   ];
 
   networking.hostName = "desktop";
 
-  users.users.lilac = {
-    isNormalUser = true;
-  group = "lilac";
-  extraGroups = [ "wheel" "render" "video" "input" "uinput" ];
-  };
-  users.groups.lilac = {};
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-
-    users.lilac = import ../../home/lilac.nix;
-  };
-  programs.zsh.enable = true;
-  users.users.lilac.shell = pkgs.zsh;
-  security.sudo.wheelNeedsPassword = false;
-
   time.timeZone = "America/Toronto";
 
   i18n.defaultLocale = "en_US.UTF-8";
@@ -132,13 +118,4 @@
   nixpkgs.config.allowUnfree = true;
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
   system.stateVersion = "26.05";
-
-  services.restic.backups.backup = {
-    repository = "rest:http://10.0.0.4:8000/backup";
-  initialize = true;
-  passwordFile = "/home/lilac/test-password";
-  paths = [ "/var/lib/immich" "/var/lib/music" "/var/lib/gitea" "/var/lib/vault-backup" ];
-  timerConfig.OnCalendar = "03:30";
-  pruneOpts = [ "--keep-daily 7" "--keep-weekly 4" "--keep-monthly 12" ];
-  };
 }

hosts/laptop/default.nix

@@ -1,10 +1,11 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [
-      ./hardware-configuration.nix
-    ];
+  imports = [
+    ./hardware-configuration.nix
+
+    ../../lilac.nix
+  ];
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -44,25 +45,18 @@
     alsa.support32Bit = true;
     pulse.enable = true;
   };
-  users.users.lilac = {
-    isNormalUser = true;
-        group = "lilac";
-        extraGroups = [ "networkmanager" "wheel" "render" "video" "input" "uinput" ];
-  };
-  users.groups.lilac = {};
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
 
-    users.lilac = import ../../home/lilac.nix;
-  };
-  programs.zsh.enable = true;
-  users.users.lilac.shell = pkgs.zsh;
-  security.sudo.wheelNeedsPassword = false;
+  hardware.graphics.enable = true;
+  hardware.graphics.enable32Bit = true;
+  hardware.enableRedistributableFirmware = true;
 
   environment.systemPackages = with pkgs; [
-    vim
-    tor-browser
+    mullvad-browser
+    signal-desktop
+    discord
+    protonmail-desktop
+    steam
+    obsidian
   ];
 
   networking = {

hosts/vps/default.nix

@@ -5,25 +5,12 @@
     ./hardware-configuration.nix
 
     ../../modules/ssh.nix
+
+    ../../lilac.nix
   ];
 
   networking.hostName = "vps";
 
-  users.users.lilac = {
-    isNormalUser = true;
-  group = "lilac";
-  extraGroups = [ "wheel" ];
-  };
-  users.groups.lilac = {};
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    users.lilac = import ../../home/lilac.nix;
-  };
-  programs.zsh.enable = true;
-  users.users.lilac.shell = pkgs.zsh;
-  security.sudo.wheelNeedsPassword = false;
-
   # forwarding inbound network traffic over wireguard
   networking = {
     firewall = {