From 48c4ac4f59bca41675b7ff9b09bdb82e24a41e13 Mon Sep 17 00:00:00 2001 From: Alexander Khodyrev Date: Tue, 26 Aug 2025 21:44:21 +0300 Subject: [PATCH] modue stuff --- flake.nix | 71 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/flake.nix b/flake.nix index 42fbfe3..1e72e80 100644 --- a/flake.nix +++ b/flake.nix @@ -15,37 +15,40 @@ home-manager, ... }@inputs: - let - inherit (lib) mkEnableOption mkPackageOption mkIf; - lib = nixpkgs.lib; - in - flake-utils.lib.eachDefaultSystem ( - system: + ( let - pkgs = nixpkgs.legacyPackages.${system}; + inherit (lib) mkEnableOption mkPackageOption mkIf; + lib = nixpkgs.lib; in - { - packages.default = pkgs.buildGoModule { - pname = "llm-shell-hint"; - version = "0.1.0"; - src = ./.; - vendorHash = "sha256-7sFDSzjqA6TbWpTbiyxdIGAZ4UB3MoHP/OPUQw6rdz8="; - }; + flake-utils.lib.eachDefaultSystem ( + system: + let + pkgs = nixpkgs.legacyPackages.${system}; + in + { + packages.default = pkgs.buildGoModule { + pname = "llm-shell-hint"; + version = "0.1.0"; + src = ./.; + vendorHash = "sha256-7sFDSzjqA6TbWpTbiyxdIGAZ4UB3MoHP/OPUQw6rdz8="; + }; - apps.default = { - type = "app"; - program = "${self.packages.${system}.default}/bin/llm-shell-hint"; - }; - - devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ - go - nixfmt - gopls - gotools - ]; - }; + apps.default = { + type = "app"; + program = "${self.packages.${system}.default}/bin/llm-shell-hint"; + }; + devShells.default = pkgs.mkShell { + buildInputs = with pkgs; [ + go + nixfmt + gopls + gotools + ]; + }; + } + ) + // { homeManagerModules.default = { config, @@ -95,19 +98,25 @@ tomlFormat = pkgs.formats.toml { }; configFile = tomlFormat.generate "llm-shell-hint-config" cfg.settings; in - mkIf cfg.enable { + lib.mkIf cfg.enable { home.packages = [ self.packages."${system}".llm-shell-hint ]; programs.bash.initExtra = mkIf cfg.enableBashIntegration '' - ${lib.getExe self.packages."${system}".llm-shell-hint} init bash --config-file "${configFile}" | source + ${ + lib.getExe self.packages."${system}".llm-shell-hint + } init bash --config-file "${configFile}" | source ''; programs.zsh.initExtra = mkIf cfg.enableZshIntegration '' - ${lib.getExe self.packages."${system}".llm-shell-hint} init zsh --config-file "${configFile}" | source + ${ + lib.getExe self.packages."${system}".llm-shell-hint + } init zsh --config-file "${configFile}" | source ''; programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration '' - ${lib.getExe self.packages."${system}".llm-shell-hint} init fish --config-file "${configFile}" | source + ${ + lib.getExe self.packages."${system}".llm-shell-hint + } init fish --config-file "${configFile}" | source ''; }; };