diff --git a/users/tao.nix b/users/tao.nix index ccece69..953a271 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ inputs, pkgs, ... }: { users.users.tao.packages = with pkgs; [ leetcode-cli typst-fmt @@ -107,20 +107,9 @@ # fcitx5.addons = with pkgs; [ fcitx5-mozc fcitx5-chewing fcitx5-chinese-addons fcitx5-rime ]; # }; - # imports = [ (import "${home-manager}/nixos") ]; - # imports = [ home-manager.nixosModules.home-manager ]; - - # home-manager.nixosModules.home-manager - # { - # home-manager.useGlobalPkgs = true; - # home-manager.useUserPackages = true; - # home-manager.users.tao = import ./users/tao.nix; - # } - # home.username = "tao"; - - # home-manager.useGlobalPkgs = true; # home-manager.useUserPackages = false; + home-manager.useGlobalPkgs = true; home-manager.verbose = true; home-manager.backupFileExtension = ".hm-bak"; - home-manager.users.tao = import ./tao/home.nix; + home-manager.users.tao = (import ./tao/home.nix { inherit inputs pkgs; }); } diff --git a/users/tao/helix.nix b/users/tao/helix.nix index f890b12..651a3ac 100644 --- a/users/tao/helix.nix +++ b/users/tao/helix.nix @@ -1,4 +1,4 @@ -{ +{ inputs, pkgs, ... }: { programs.helix = { settings = { theme = "dracula"; @@ -61,5 +61,6 @@ }; enable = true; defaultEditor = true; + package = inputs.helix.packages.${pkgs.system}.default; }; } diff --git a/users/tao/home.nix b/users/tao/home.nix index ea80152..ab7a758 100644 --- a/users/tao/home.nix +++ b/users/tao/home.nix @@ -1,13 +1,10 @@ -# let -# enablePrograms = programs: builtins.mapAttrs (_: program: { enable = true; }) programs; -# in -{ +{ pkgs, inputs, ... }: { imports = [ - ./helix.nix + (import ./helix.nix { inherit pkgs inputs; }) ./hyprland.nix ]; - # programs = enablePrograms { + programs = { git = { enable = true;