so much cleanup

hosts/pi4/configuration.nix

@@ -46,13 +46,11 @@ in
 
   environment = {
     systemPackages = with pkgs; [
-      git
       libraspberrypi
       raspberrypi-eeprom
       raspberrypifw
       raspberrypiWirelessFirmware
       raspberrypi-armstubs
-      vim
     ];
     etc = {
       "ssh/ssh_host_ed25519_key".source = config.sops.secrets."pi4/sys-priv-key".path;

hosts/pi4/home.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
 let
   shellAliases = {
     ll = "ls -alh";
@@ -10,21 +10,30 @@ let
     ducks = "du -cksh * | sort -hr | head -n 15";
   };
 
-  gitAliases = {
-    co = "checkout";
-    ci = "commit";
-    cia = "commit --amend";
-    s = "status";
-    st = "status";
-    b = "branch";
-    p = "pull --rebase";
-    pu = "push";
-  };
+  excludePkgs = with pkgs; [
+    chromium
+    clinfo
+    coolercontrol.coolercontrol-gui
+    firefox
+    gamescope
+    gamescope-wsi
+    goverlay
+    gparted
+    mission-center
+    protonup
+    vesktop
+    vmware-horizon-client
+    vulkan-tools
+  ];
 in
 {
+  imports = [
+    ../../share/home/defaults.nix
+    ../../share/home/git.nix
+    ../../share/home/shell.nix
+  ];
+
   home.username = "matt";
-  home.homeDirectory = "/home/matt";
-  home.stateVersion = "23.11";
 
  sops = {
    age.keyFile = "/home/matt/.config/sops/age/keys.txt";
@@ -62,44 +71,14 @@ in
  };
 
   programs = {
-    fish.enable = false;
-    mangohud.enable = true;
-    java.enable = true;
-    home-manager.enable = true;
-
-    zsh = {
-      enable = true;
-      enableCompletion = true;
-      autosuggestion.enable = true;
-      syntaxHighlighting.enable = true;
-
-      shellAliases = shellAliases;
-
-      oh-my-zsh = {
-        enable = true;
-        plugins = [ "git" ];
-        theme = "fishy";
-      };
-    };
-    
-    git = {
-      enable = true;
-      userName = "mjallen18";
-      userEmail = "matt.l.jallen@gmail.com";
-      aliases = gitAliases;
-    };
+    java.enable = lib.mkForce true;
+    mangohud.enable = lib.mkForce true;
+    zsh.shellAliases = shellAliases;
   };
 
-  home.packages = with pkgs; [
-    age
-    btop
-    fastfetch
-    firefox
-    home-manager
-    lm_sensors
-    mission-center
-    sops
-    tree
-    vscode
-  ];
+  services = {
+    nextcloud-client.enable = lib.mkForce true;
+  };
+
+  home.packages = lib.filter (pkg: !(lib.elem pkg excludePkgs)) config.home.packages;
 }