flake.nix

@@ -86,13 +86,5 @@
           ./hosts/msiserver/home.nix
         ];
       };
-      homeConfigurations."val@caveserver" = inputs.home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages."x86_64-linux";
-        extraSpecialArgs = { inherit inputs; };
-
-        modules = [
-          ./hosts/caveserver/home.nix
-        ];
-      };
     };
 }

home/modules/git.nix

@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }:
+{ lib, config, ... }:
 
 let
   cfg = config.snowhawk.git;
@@ -6,14 +6,9 @@ in
 {
   options.snowhawk.git = {
     enable = lib.mkEnableOption "git";
-    oauth = lib.mkEnableOption "enable git-credential-oauth";
   };
 
   config = lib.mkIf cfg.enable {
-    home.packages = lib.mkIf cfg.oauth [
-      pkgs.git-credential-oauth
-    ];
-
     programs.git = {
       enable = true;
       userName = "Zynh Ludwig";
@@ -53,7 +48,7 @@ in
         credential = {
           helper = [
             "cache --timeout 7200"
-            (lib.mkIf cfg.oauth "oauth")
+            "oauth"
           ];
 
           "https://git.zynh.me" = {

hosts/caveserver/home.nix

@@ -1,37 +0,0 @@
-{ pkgs, inputs, config, ... }:
-
-{
-  imports = [
-    ../../home/modules
-  ];
-
-  snowhawk.neovim = {
-    enable = true;
-    package = inputs.neovim-overlay.packages.${pkgs.system}.default;
-  };
-  snowhawk.user.enable = false;
-  snowhawk.defaultPrograms.enable = false;
-  snowhawk.ssh.enable = true;
-
-
-  home.username = "val";
-  home.homeDirectory = "/home/val";
-
-  home.sessionPath = [
-    "${config.home.homeDirectory}/.cargo/bin"
-  ];
-
-  home.packages = with pkgs; [
-    nix-output-monitor
-    (writeShellScriptBin "rebuild" ''
-      home-manager switch -v |& nom
-    '')
-
-    go
-    rustup
-  ];
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-  home.stateVersion = "23.11";
-}

hosts/msiserver/home.nix

@@ -23,7 +23,7 @@
   home.packages = with pkgs; [
     nix-output-monitor
     (writeShellScriptBin "rebuild" ''
-      home-manager switch -v |& nom
+      sudo nixos-rebuild switch --log-format internal-json -v |& nom --json
     '')
 
     go

hosts/nixos/configuration.nix

@@ -75,6 +75,10 @@
       fzf
       tree
 
+      nix-output-monitor
+
+      git-credential-oauth
+
       xclip
 
       rustup

hosts/nixos/home.nix

@@ -16,7 +16,6 @@
   xsession.numlock.enable = true;
 
   home.packages = with pkgs; [
-    nix-output-monitor
     (writeShellScriptBin "rebuild" ''
       sudo nixos-rebuild switch --log-format internal-json -v |& nom --json
     '')

hosts/snowhawk/configuration.nix

@@ -64,6 +64,8 @@
       steam-run
 
       xivlauncher
+
+      git-credential-oauth
     ];
   };
 

hosts/sprite/configuration.nix

@@ -77,6 +77,8 @@
 
       nix-output-monitor
 
+      git-credential-oauth
+
       xclip
 
       rustup