From bc2492378097ad1a091b0586c9a8ffc16d3ef825 Mon Sep 17 00:00:00 2001
From: Dmitrii Gudov <gudovdo@my.msu.ru>
Date: Sat, 13 Dec 2025 16:24:04 +0300
Subject: [PATCH] some flake refactor

---
 home-manager/home.nix              | 13 +++----------
 home-manager/modules/git.nix       |  6 ++++--
 home-manager/modules/hypr/hypr.nix |  3 +--
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/home-manager/home.nix b/home-manager/home.nix
index a7af4e1..ccd6fdc 100755
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -5,22 +5,15 @@
   nixpkgs.config.allowUnfree = true;
   home.packages = with pkgs; [ nixfmt-classic ];
 
-  # my.enableHypr = lib.mkDefault true;
-  # options.my.enableHypr = lib.mkOption {
-  #   type = lib.types.bool;
-  #   default = true;
-  #   description = "Enable Hyprland configuration.";
-  # };
-
   imports = [
     ./modules/zsh/zsh.nix
     ./modules/kitty.nix
     ./modules/git.nix
     ./modules/programs.nix
-    ./modules/custom/config.nix
-    ./modules/hypr/hypr.nix
     ./modules/tmux.nix
-  ];
+  ] ++ lib.optional (builtins.getEnv "DISABLE_HYPR" != "1")
+    ./modules/hypr/hypr.nix
+    ++ lib.optional (builtins.pathExists ./modules/my.nix) ./modules/my.nix;
 
   home.pointerCursor = let
     getFrom = url: hash: name: {
diff --git a/home-manager/modules/git.nix b/home-manager/modules/git.nix
index 46e7cb3..3ad17ce 100644
--- a/home-manager/modules/git.nix
+++ b/home-manager/modules/git.nix
@@ -5,7 +5,9 @@
     enable = true;
     extraConfig.pull.rebase = true;
 
-    userEmail = "your email";
-    userName = "your name";
+    settings.user = {
+      email = "gudovdo@my.msu.ru";
+      name = "Dmitrii Gudov";
+    };
   };
 }
diff --git a/home-manager/modules/hypr/hypr.nix b/home-manager/modules/hypr/hypr.nix
index db05fb5..4dfcde2 100644
--- a/home-manager/modules/hypr/hypr.nix
+++ b/home-manager/modules/hypr/hypr.nix
@@ -12,10 +12,9 @@
     # ./hyprland/colors.nix
     # ./hyprland/active.nix
     ./hyprland/keybinds.nix # done
-    ./hyprland/my.nix
     ./hyprlock.nix # done
     ./hypridle.nix # done
-  ];
+  ] ++ lib.optional (builtins.pathExists ./hyprland/my.nix) ./hyprland/my.nix;
   home.packages = with pkgs; [
     (pkgs.writeScriptBin "wallpaper" (''
       #!${pkgs.python311}/bin/python3