Skip to content

Commit

Permalink
testing
Browse files Browse the repository at this point in the history
  • Loading branch information
shaunsingh committed Nov 18, 2023
1 parent 628ba34 commit fb8a88f
Showing 1 changed file with 28 additions and 24 deletions.
52 changes: 28 additions & 24 deletions modules/shared/home-manager/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,17 @@
- Appendix A. Configuration Options: https://nix-community.gitlab.io/home-manager/options.html
*/
{
config = {
themes.base16 = {
enable = true;
path = "${inputs.base16-oxocarbon}/base16-oxocarbon-dark.yaml";
};
};

home = {
packages = builtins.attrValues {
inherit (pkgs)
bat
ripgrep
difftastic
nixpkgs-fmt
Expand Down Expand Up @@ -74,12 +82,8 @@
};
};

themes.base16 = {
enable = true;
path = "${inputs.base16-oxocarbon}/base16-oxocarbon-dark.yaml";
};

programs = {

zoxide = {
enable = true;
options = [ "--cmd cd" ];
Expand Down Expand Up @@ -127,25 +131,25 @@
nix_shell.symbol = " ";
};
};
git = {
enable = true;
userName = "shaunsingh";
userEmail = "[email protected]";
ignores = [ "**/.idea/" "**/.vscode/settings.json" "**/.direnv/" "**/.DS_Store" ];
extraConfig = {
pull = { ff = "only"; };
init.defaultBranch = "main";
extraConfig = {
diff.tool = "difftastic";
pager.difftool = true;

difftool = {
prompt = false;
difftastic.cmd = ''${lib.getExe pkgs.difftastic} "$LOCAL" "$REMOTE"'';
};
};
};
};
# git = {
# enable = true;
# userName = "shaunsingh";
# userEmail = "[email protected]";
# ignores = [ "**/.idea/" "**/.vscode/settings.json" "**/.direnv/" "**/.DS_Store" ];
# extraConfig = {
# pull = { ff = "only"; };
# init.defaultBranch = "main";
# extraConfig = {
# diff.tool = "difftastic";
# pager.difftool = true;
#
# difftool = {
# prompt = false;
# difftastic.cmd = ''${lib.getExe pkgs.difftastic} "$LOCAL" "$REMOTE"'';
# };
# };
# };
# };
fish = {
enable = true;
shellAliases = {
Expand Down

0 comments on commit fb8a88f

Please sign in to comment.