aboutsummaryrefslogtreecommitdiffstats
path: root/home
diff options
context:
space:
mode:
Diffstat (limited to 'home')
-rw-r--r--home/fish/default.nix3
-rw-r--r--home/git/default.nix10
2 files changed, 10 insertions, 3 deletions
diff --git a/home/fish/default.nix b/home/fish/default.nix
index 517dd79..565682b 100644
--- a/home/fish/default.nix
+++ b/home/fish/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
{
programs.fish = {
@@ -108,6 +108,7 @@
set -g __fish_git_prompt_color_cleanstate green --bold
set fish_greeting
+ ${pkgs.carapace} _carapace | source
${pkgs.fastfetch}/bin/fastfetch
'';
};
diff --git a/home/git/default.nix b/home/git/default.nix
index 7fe4f41..d8445cc 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -6,6 +6,13 @@
};
programs.git = {
enable = true;
+ signing = {
+ signByDefault = true;
+ format = "ssh";
+ };
+ lfs = {
+ enable = true;
+ };
settings = {
alias = {
lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
@@ -13,14 +20,13 @@
user = {
email = "petri.hienonen@gmail.com";
name = "Petri Hienonen";
- signingkey = "76028181DD730D0C";
+ signingkey = "~/.ssh/id_ed25519.pub";
};
core = {
editor = "${pkgs.neovim}/bin/nvim";
hooksPath = ".githooks/";
quotepath = false;
};
- commit.gpgSign = true;
credential.helper = "store";
init.defaultBranch = "master";
merge.conflictStyle = "diff3";