From 43da9edb4598eef509c481ae0b305384418c45de Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Fri, 5 May 2023 19:41:58 -0700 Subject: home/profiles: move (almost) all modules to profiles This is a major refactor, similar to what was done for the hosts, but in a single commit. --- home/git/commit.template | 11 --------- home/git/default.nix | 63 ------------------------------------------------ home/git/gitignore | 12 --------- 3 files changed, 86 deletions(-) delete mode 100644 home/git/commit.template delete mode 100644 home/git/default.nix delete mode 100644 home/git/gitignore (limited to 'home/git') diff --git a/home/git/commit.template b/home/git/commit.template deleted file mode 100644 index b116a68..0000000 --- a/home/git/commit.template +++ /dev/null @@ -1,11 +0,0 @@ - -# (If applied, this commit will...) - -# Explain why this change is being made - -# --- COMMIT END --- -# Remember to -# Use the imperative mood, present tense: `change' not `changed' nor `changes' -# Do not end the subject line with a period -# Use the body to explain what and why vs. how -# Can use multiple lines with "-" for bullet points in body diff --git a/home/git/default.nix b/home/git/default.nix deleted file mode 100644 index e840f54..0000000 --- a/home/git/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, config, pkgs, ... }: - -let - cfg = config.my.home.git; - sshPub = builtins.fromTOML (builtins.readFile ../../configs/ssh-pubkeys.toml); -in -{ - options.my.home.git = with lib; { - enable = mkEnableOption "git configuration"; - }; - - config = lib.mkIf cfg.enable { - home.file.".ssh/allowed_signers".text = lib.concatMapStrings (x: "franck@fcuny.net ${x}\n") (with sshPub; [ aptos work git ykey-laptop ]); - - programs.git = { - enable = true; - aliases = { - s = "status --short --branch"; - amend = "commit --amend --no-edit"; - }; - signing = { - key = "key::${sshPub.ykey-laptop}"; - signByDefault = true; - }; - extraConfig = { - core.whitespace = "trailing-space,space-before-tab"; - color.ui = "true"; - - diff = { - age.textconv = "${pkgs.age}/bin/age --identity ${config.home.homeDirectory}/.age/key.txt --decrypt"; - }; - - gpg = { - format = "ssh"; - ssh.allowedSignersFile = "~/.ssh/allowed_signers"; - }; - # abort if the remote branch does not match the local one - push.default = "simple"; - - init.defaultBranch = "main"; - - pull.rebase = true; - rebase = { - # Automatically create a temporary stash entry before the - # operation begins, and apply it after the operation ends. - autoStash = true; - # Print a warning if some commits are removed - missingCommitsCheck = "warn"; - }; - - branch.autosetuprebase = "remote"; - branch.sort = "authordate"; - - commit.template = "${config.xdg.dataHome}/git/commit.template"; - }; - userName = "Franck Cuny"; - userEmail = "franck@fcuny.net"; - ignores = [ (builtins.readFile ./gitignore) ]; - }; - xdg.dataFile."git/commit.template" = { source = ./commit.template; }; - home.packages = with pkgs; [ tools.git-blame-stats gitAndTools.pre-commit ]; - }; -} diff --git a/home/git/gitignore b/home/git/gitignore deleted file mode 100644 index 83adbce..0000000 --- a/home/git/gitignore +++ /dev/null @@ -1,12 +0,0 @@ -*.elc -*pyc -*~ -.DS_Store -.\\# -.dir-locals.el -.direnv/* -.projectile -.pytest_cache/ -tags -/result -/.pre-commit-config.yaml -- cgit 1.4.1