mirror of
https://github.com/willemml/dotfiles.nix.git
synced 2025-04-12 11:17:17 +00:00
Switches home-manager input fork with hishtory module
This commit is contained in:
parent
c0e8882fdb
commit
f148ecc368
5 changed files with 9 additions and 33 deletions
11
flake.lock
generated
11
flake.lock
generated
|
@ -175,15 +175,16 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1699747670,
|
||||
"narHash": "sha256-pLMJ9PP/cpdkHqX1DpxiImTATgXm4Dt8fTNJeGGWSUo=",
|
||||
"owner": "nix-community",
|
||||
"lastModified": 1699767369,
|
||||
"narHash": "sha256-0hXDV5ANHsWxsr6YL7Nr9pVISn2MwxokrainqZTWpWE=",
|
||||
"owner": "willemml",
|
||||
"repo": "home-manager",
|
||||
"rev": "fad880ea934808072cd224152854d4257034bd24",
|
||||
"rev": "cd8a2d388d8d80a790de8937b22cfb9a5f5aba42",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"owner": "willemml",
|
||||
"ref": "feat/programs.hishtory",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||
|
||||
home-manager.url = "github:nix-community/home-manager";
|
||||
home-manager.url = "github:willemml/home-manager?ref=feat/programs.hishtory";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
hyprland.url = "github:hyprwm/Hyprland";
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
in rec {
|
||||
imports = [
|
||||
./modules/emacs.nix
|
||||
./modules/hishtory.nix
|
||||
./packages.nix
|
||||
./programs/default.nix
|
||||
];
|
||||
|
|
|
@ -1,26 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption mkPackageOption;
|
||||
cfg = config.programs.hishtory;
|
||||
shellConfPath = "${cfg.package.outPath}/share/hishtory";
|
||||
in {
|
||||
config.home.packages = mkIf cfg.enable [cfg.package];
|
||||
|
||||
config.programs.bash.bashrcExtra = mkIf cfg.enableBashIntegration "source '${shellConfPath}/config.bash'";
|
||||
config.programs.fish.loginShellInit = mkIf cfg.enableFishIntegration "source '${shellConfPath}/config.fish'";
|
||||
config.programs.zsh.initExtra = mkIf cfg.enableZshIntegration "source '${shellConfPath}/config.zsh'";
|
||||
|
||||
options.programs.hishtory = {
|
||||
enable = mkEnableOption "hishtory";
|
||||
|
||||
enableZshIntegration = mkEnableOption "hishtory's Zsh integration";
|
||||
enableFishIntegration = mkEnableOption "hishtory's Fish integration";
|
||||
enableBashIntegration = mkEnableOption "hishtory's Bash integration";
|
||||
|
||||
package = mkPackageOption pkgs "hishtory" {};
|
||||
};
|
||||
}
|
|
@ -62,6 +62,8 @@
|
|||
hishtory = {
|
||||
enable = true;
|
||||
enableZshIntegration = true;
|
||||
enableConfig = true;
|
||||
settings.enable-control-r = true;
|
||||
};
|
||||
|
||||
java = {
|
||||
|
|
Loading…
Add table
Reference in a new issue