willemml/dotfiles.nix
1
0
Fork 0
mirror of https://github.com/willemml/dotfiles.nix.git synced 2025-04-13 03:37:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Switches home-manager input fork with hishtory module

Browse source
This commit is contained in:
willemml 2023-11-11 22:08:39 -08:00
parent c0e8882fdb
commit f148ecc368
Signed by: willemml
GPG key ID: C3DE5DF6198DACBD
5 changed files with 9 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
flake.lock generated
View file

@ -175,15 +175,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1699747670, "lastModified": 1699767369,
"narHash": "sha256-pLMJ9PP/cpdkHqX1DpxiImTATgXm4Dt8fTNJeGGWSUo=", "narHash": "sha256-0hXDV5ANHsWxsr6YL7Nr9pVISn2MwxokrainqZTWpWE=",
"owner": "nix-community", "owner": "willemml",
"repo": "home-manager", "repo": "home-manager",
"rev": "fad880ea934808072cd224152854d4257034bd24", "rev": "cd8a2d388d8d80a790de8937b22cfb9a5f5aba42",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "willemml",
"ref": "feat/programs.hishtory",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }

2
flake.nix
View file

@ -14,7 +14,7 @@
flake-parts.url = "github:hercules-ci/flake-parts"; 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"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";

1
home/default.nix
View file

@ -9,7 +9,6 @@
in rec { in rec {
imports = [ imports = [
./modules/emacs.nix ./modules/emacs.nix
./modules/hishtory.nix
./packages.nix ./packages.nix
./programs/default.nix ./programs/default.nix
]; ];

26
home/modules/hishtory.nix
View file

@ -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" {};
};
}

2
home/programs/default.nix
View file

@ -62,6 +62,8 @@
hishtory = { hishtory = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
enableConfig = true;
settings.enable-control-r = true;
}; };
java = { java = {