feat: rewrite to more nixy flakes

home.nix

@@ -1,19 +1,21 @@
 {
     pkgs,
-    lib ? pkgs.lib,
+    lib,
+    env,
     ...
 }:
 
 let
-    mpkgs = import ./pkgs/default.nix { };
-    inherit (mpkgs.config) neovim fish;
-
-    env = import ./.env.nix { inherit pkgs; };
-
+    # env = import ./.env.nix { inherit pkgs; };
     home = /home/anton;
 in
 {
-    imports = [ ];
+    imports = [
+        ./home/vesktop.nix
+        ./home/kitty.nix
+        ./home/i3.nix
+    ]
+    ++ lib.optional (env ? homeManager) env.homeManager;
 
     home.username = lib.mkDefault "anton";
     home.homeDirectory = lib.mkDefault home;
@@ -27,7 +29,6 @@ in
         vscode
         godotPackages_4_5.godot
 
-        neovim
         btop
         xclip
         tree
@@ -36,9 +37,6 @@ in
         hyperfine
         bat
 
-        typst
-        tinymist
-
         # required by spotify
         ffmpeg_4
     ];
@@ -51,36 +49,42 @@ in
         package = pkgs.posy-cursors;
     };
 
-    xsession = {
-        enable = true;
-        windowManager.i3 = import ./home/i3.nix { inherit pkgs; };
-    };
-
     programs.btop.enable = true;
     programs.fastfetch.enable = true;
 
-    programs.kitty = import ./home/kitty.nix { inherit pkgs; };
-
-    programs.fish = {
+    programs.direnv = {
         enable = true;
-        shellInit = ''
-            set fish_function_path $fish_function_path ${fish}/functions
-        '';
-        interactiveShellInit = ''
-            source ${fish}/config.fish
-        '';
+        nix-direnv.enable = true;
     };
 
+    programs.fish =
+        let
+            config = pkgs.configs.fish;
+        in
+        {
+            enable = true;
+            shellInit = ''
+                set fish_function_path $fish_function_path ${config}/functions
+            '';
+            interactiveShellInit = ''
+                source ${config}/config.fish
+            '';
+        };
+
     # Fix Fish command not found issues
     programs.command-not-found.enable = false;
 
     programs.neovim = {
         enable = true;
         defaultEditor = true;
-        extraConfig = ''
-            			set runtimepath+=${neovim}
-            			source ${neovim}/init.lua
-        '';
+        extraConfig =
+            let
+                config = pkgs.configs.neovim;
+            in
+            ''
+                set runtimepath+=${config}
+                source ${config}/init.lua
+            '';
     };
 
     programs.rofi = {
@@ -92,14 +96,14 @@ in
     programs.git = {
         enable = true;
 
-        signing =
-            if (env.git or { }) ? signingKey then
-                {
-                    key = env.git.signingKey;
-                    signByDefault = true;
-                }
-            else
-                { signByDefault = false; };
+        # signing =
+        #     if (env.git or { }) ? signingKey then
+        #         {
+        #             key = env.git.signingKey;
+        #             signByDefault = true;
+        #         }
+        #     else
+        #         { signByDefault = false; };
 
         settings = {
             user.name = "Anton";
@@ -135,12 +139,12 @@ in
 
     programs.tetrio-desktop = {
         enable = true;
-        package = mpkgs.tetrio.desktop;
+        package = pkgs.tetrio.desktop;
 
         plus = {
             enable = true;
-            package = mpkgs.tetrio.plus;
-            skin.package = mpkgs.tetrio.skins.simple-connected;
+            package = pkgs.tetrio.plus;
+            skin.package = pkgs.tetrio.skins.simple-connected;
         };
 
         settings = {
@@ -193,7 +197,7 @@ in
         };
     };
 
-    programs.vesktop = import ./home/vesktop.nix;
+    # programs.vesktop = pkgs.callPackage { };
 
     services.gpg-agent = {
         enable = true;
@@ -217,5 +221,5 @@ in
         NIXPKGS_ALLOW_UNFREE = 1;
     };
 
-    home.stateVersion = mpkgs.system.stateVersion;
+    home.stateVersion = "25.11";
 }