From f0529eed856b9f92eb9383186c8ec83883d20850 Mon Sep 17 00:00:00 2001
From: tx0 <me@tx0.su>
Date: Wed, 12 Mar 2025 21:24:24 +0500
Subject: [PATCH] switch to home-manager module

---
 flake.nix                         | 21 +++++++++----------
 home/profile.nix                  |  8 ++-----
 home/system/nix.nix               | 35 -------------------------------
 home/system/nixpkgs.nix           |  9 --------
 universe.nix => home/universe.nix |  2 +-
 5 files changed, 13 insertions(+), 62 deletions(-)
 delete mode 100644 home/system/nix.nix
 delete mode 100644 home/system/nixpkgs.nix
 rename universe.nix => home/universe.nix (90%)

diff --git a/flake.nix b/flake.nix
index adc41e0..55ca9fc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,17 +26,16 @@
             ./hosts/common
             ./hosts/earth
             # universe
-          ];
-        };
-
-        homeConfigurations.tx0 = inputs.home-manager.lib.homeManagerConfiguration {
-          pkgs = import inputs.nixpkgs {
-            inherit system;
-          };
-          extraSpecialArgs = {inherit system inputs u;};
-          modules = [
-            ./home
-            ./universe.nix
+            inputs.home-manager.nixosModules.home-manager
+            {
+              home-manager = {
+                useGlobalPkgs = true;
+                useUserPackages = true;
+                backupFileExtension = "hm-old";
+                users.tx0 = import ./home;
+                extraSpecialArgs = {inherit system inputs u;};
+              };
+            }
           ];
         };
       };
diff --git a/home/profile.nix b/home/profile.nix
index 7875515..67d2335 100644
--- a/home/profile.nix
+++ b/home/profile.nix
@@ -1,14 +1,10 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
+{config, ...}: {
   home = {
     username = "tx0";
     homeDirectory = "/home/tx0";
     stateVersion = "24.11";
     sessionVariables = {
-      EDITOR = "${config.home.homeDirectory}/.nix-profile/bin/nvim";
+      EDITOR = "nvim";
       HYPRSHOT_DIR = "${config.home.homeDirectory}/Pictures/Screenshots/";
       FLAKE = "${config.home.homeDirectory}/universe/";
       NIXOS_OZONE_WL = 1;
diff --git a/home/system/nix.nix b/home/system/nix.nix
deleted file mode 100644
index db8dc90..0000000
--- a/home/system/nix.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  inputs,
-  config,
-  pkgs,
-  ...
-}: {
-  nix = {
-    package = pkgs.nix;
-    nixPath = ["nixpkgs=${inputs.nixpkgs}"];
-    settings = {
-      extra-substituters = [
-        "https://cache.garnix.io"
-        "https://nix-community.cachix.org"
-        "https://cache.nixos.org/"
-        "https://hyprland.cachix.org"
-      ];
-      extra-trusted-public-keys = [
-        "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-      ];
-      builders-use-substitutes = true;
-      auto-optimise-store = true;
-      trusted-users = [
-        config.home.username
-        "root"
-        "@wheel"
-      ];
-      warn-dirty = false;
-      extra-experimental-features = ["nix-command" "flakes"];
-      accept-flake-config = true;
-    };
-  };
-}
diff --git a/home/system/nixpkgs.nix b/home/system/nixpkgs.nix
deleted file mode 100644
index e609e23..0000000
--- a/home/system/nixpkgs.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{...}: {
-  nixpkgs.config = {
-    allowUnfree = true;
-    allowBroken = true;
-    allowAliases = true;
-    allowInsecure = true;
-    allowUnfreePredicate = _: true;
-  };
-}
diff --git a/universe.nix b/home/universe.nix
similarity index 90%
rename from universe.nix
rename to home/universe.nix
index da35245..8108fc9 100644
--- a/universe.nix
+++ b/home/universe.nix
@@ -7,7 +7,7 @@
     theme.stylix = {
       base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-medium.yaml";
       # base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
-      wallpapers = ./wallpaper.png;
+      wallpapers = ../wallpaper.png;
       useLutgen = true;
     };
   };