From 8aa1d65d736a02fd4916cd59ba22c4bb34766783 Mon Sep 17 00:00:00 2001
From: rotterdam <foxtrot@rotterdam>
Date: Mon, 3 Apr 2023 20:39:51 -0300
Subject: [PATCH] migrated home-manager from a nixos module to a standalone
 thing

---
 flake.nix                          | 20 ++++++++++++++++++--
 hosts/common/users.nix             |  6 ------
 hosts/desktops/common/users.nix    |  2 --
 hosts/servers/alexandria/users.nix |  2 --
 users/common/home.nix              |  6 +-----
 users/common/programs.nix          |  2 +-
 users/desktops/common/home.nix     |  6 +-----
 users/desktops/common/programs.nix |  2 +-
 users/desktops/common/services.nix |  2 +-
 users/desktops/user.nix            |  2 +-
 users/servers/user.nix             |  2 +-
 11 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8a03d57..0f47c1c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -57,8 +57,6 @@
           modules = [
             ./hosts/desktops/rotterdam.nix
             agenix.nixosModules.default
-            kmonad.nixosModules.default
-            home-manager.nixosModules.default
             {
               nixpkgs.overlays =
                 [ baduhai-nur.overlay agenix.overlays.default ];
@@ -99,6 +97,24 @@
         };
       };
 
+      homeConfigurations = {
+        server = home-manager.lib.homeManagerConfiguration {
+          pkgs = nixpkgs.legacyPackages.x86_64-linux;
+          extraSpecialArgs = { inherit inputs; };
+          modules = [
+            ./users/servers/user.nix
+          ];
+        };
+
+        desktop = home-manager.lib.homeManagerConfiguration {
+          pkgs = nixpkgs.legacyPackages.x86_64-linux;
+          extraSpecialArgs = { inherit inputs; };
+          modules = [
+            ./users/desktops/user.nix
+          ];
+        };
+      };
+
       deploy = {
         autoRollback = false;
         magicRollback = false;
diff --git a/hosts/common/users.nix b/hosts/common/users.nix
index aaedb05..435f81b 100644
--- a/hosts/common/users.nix
+++ b/hosts/common/users.nix
@@ -21,10 +21,4 @@
       hashedPassword = "!";
     };
   };
-
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    extraSpecialArgs = specialArgs;
-  };
 }
diff --git a/hosts/desktops/common/users.nix b/hosts/desktops/common/users.nix
index f60c0c7..627985f 100644
--- a/hosts/desktops/common/users.nix
+++ b/hosts/desktops/common/users.nix
@@ -18,6 +18,4 @@
       "adbusers"
     ];
   };
-
-  home-manager.users.user = import ../../../users/desktops/user.nix;
 }
diff --git a/hosts/servers/alexandria/users.nix b/hosts/servers/alexandria/users.nix
index 8087cbb..b8e884a 100644
--- a/hosts/servers/alexandria/users.nix
+++ b/hosts/servers/alexandria/users.nix
@@ -13,6 +13,4 @@
       };
     };
   };
-
-  home-manager.users.user = import ../../../users/servers/user.nix;
 }
diff --git a/users/common/home.nix b/users/common/home.nix
index 6e35a7e..3d96806 100644
--- a/users/common/home.nix
+++ b/users/common/home.nix
@@ -1,4 +1,4 @@
-{ specialArgs, inputs, config, pkgs, lib, ... }:
+{ inputs, config, pkgs, lib, ... }:
 
 {
   home = {
@@ -7,10 +7,6 @@
     stateVersion = "22.05";
     sessionVariables = { EDITOR = "micro"; };
     file = {
-      ".config/btop/themes/catppuccin_mocha.theme".source =
-        "${inputs.dotfiles}/.config/btop/themes/catppuccin_mocha.theme";
-      ".config/fish/themes/Catppuccin Mocha.theme".source =
-        "${inputs.dotfiles}/.config/fish/themes/Catppuccin Mocha.theme";
       ".config/starship.toml".source =
         "${inputs.dotfiles}/.config/starship.toml";
     };
diff --git a/users/common/programs.nix b/users/common/programs.nix
index 952e564..05848e4 100644
--- a/users/common/programs.nix
+++ b/users/common/programs.nix
@@ -1,4 +1,4 @@
-{ specialArgs, inputs, config, pkgs, lib, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   programs = {
diff --git a/users/desktops/common/home.nix b/users/desktops/common/home.nix
index 7da97e2..3891fe0 100644
--- a/users/desktops/common/home.nix
+++ b/users/desktops/common/home.nix
@@ -1,4 +1,4 @@
-{ specialArgs, inputs, config, pkgs, lib, ... }:
+{ inputs, config, pkgs, lib, ... }:
 
 {
   home = {
@@ -16,10 +16,6 @@
         "${inputs.dotfiles}/.config/MangoHud/MangoHud.conf";
       ".config/solvespace/settings.json".source =
         "${inputs.dotfiles}/.config/solvespace/settings.json";
-      ".local/share/color-schemes/CatppuccinLatte.colors".source =
-        "${inputs.dotfiles}/.local/share/color-schemes/CatppuccinLatte.colors";
-      ".local/share/color-schemes/CatppuccinMocha.colors".source =
-        "${inputs.dotfiles}/.local/share/color-schemes/CatppuccinMocha.colors";
       # Autostart programs
       ".config/autostart/koi.desktop".source =
         config.lib.file.mkOutOfStoreSymlink
diff --git a/users/desktops/common/programs.nix b/users/desktops/common/programs.nix
index 871668f..bb67db1 100644
--- a/users/desktops/common/programs.nix
+++ b/users/desktops/common/programs.nix
@@ -1,4 +1,4 @@
-{ specialArgs, inputs, config, pkgs, lib, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   fonts.fontconfig.enable = true;
diff --git a/users/desktops/common/services.nix b/users/desktops/common/services.nix
index 8db94fc..58634da 100644
--- a/users/desktops/common/services.nix
+++ b/users/desktops/common/services.nix
@@ -1,4 +1,4 @@
-{ specialArgs, inputs, config, pkgs, lib, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   services = { kdeconnect.enable = true; };
diff --git a/users/desktops/user.nix b/users/desktops/user.nix
index 0e97d53..e79e317 100644
--- a/users/desktops/user.nix
+++ b/users/desktops/user.nix
@@ -1,4 +1,4 @@
-{ specialArgs, inputs, config, pkgs, lib, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   imports = [
diff --git a/users/servers/user.nix b/users/servers/user.nix
index 749122b..0b27563 100644
--- a/users/servers/user.nix
+++ b/users/servers/user.nix
@@ -1,4 +1,4 @@
-{ specialArgs, inputs, config, pkgs, lib, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   imports = [