Add zotero, move package defaults inside packages dir

nixos/home-manager/common.nix

@@ -3,24 +3,4 @@
 {
   nixpkgs.config.allowUnfree = true;
   programs.home-manager.enable = true;
-  programs.ssh = {
-    enable = true;
-    includes = [ "config.d/*" ];
-    forwardAgent = true;
-    serverAliveInterval = 15;
-    serverAliveCountMax = 3;
-    controlMaster = "auto";
-    controlPersist = "5s";
-  };
-  programs.git = {
-    enable = true;
-    userName = "Evie Litherland-Smith";
-  };
-  programs.starship = {
-    enable = true;
-    enableBashIntegration = true;
-    enableZshIntegration = true;
-    enableFishIntegration = true;
-    settings = builtins.fromTOML (builtins.readFile ./config/starship.toml);
-  };
 }

nixos/home-manager/packages/default.nix

@@ -6,4 +6,24 @@
     ./gui
     ./env
   ];
+  programs.ssh = {
+    enable = true;
+    includes = [ "config.d/*" ];
+    forwardAgent = true;
+    serverAliveInterval = 15;
+    serverAliveCountMax = 3;
+    controlMaster = "auto";
+    controlPersist = "5s";
+  };
+  programs.git = {
+    enable = true;
+    userName = "Evie Litherland-Smith";
+  };
+  programs.starship = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+    enableFishIntegration = true;
+    settings = builtins.fromTOML (builtins.readFile ./config/starship.toml);
+  };
 }

nixos/home-manager/packages/env/fish.nix

@@ -4,7 +4,8 @@
   programs.fish = {
     enable = true;
     shellAbbrs = {
-      update = "sudo nixos-rebuild switch";
+      update = "sudo nixos-rebuild switch --upgrade";
+      nr = "sudo nixos-rebuild";
       lg = "lazygit";
       vim = "nvim";
     };

nixos/home-manager/vanguard-xenia.nix

@@ -4,6 +4,7 @@
     ./packages
     ./packages/gui/gaming.nix
     ./packages/gui/nomachine.nix
+    ./packages/gui/zotero.nix
   ];
   # Home Manager needs a bit of information about you and the
   # paths it should manage.