From 4890ae1737fdb2f93738e95d0038965ea7daa922 Mon Sep 17 00:00:00 2001 From: Alyxia Sother Date: Mon, 12 Jun 2023 12:21:31 +0200 Subject: [PATCH 1/3] [nix] Set nvim as the EDITOR --- nix/hosts/alymac/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nix/hosts/alymac/default.nix b/nix/hosts/alymac/default.nix index 59a2b55..c1fdd2b 100644 --- a/nix/hosts/alymac/default.nix +++ b/nix/hosts/alymac/default.nix @@ -1,6 +1,8 @@ { pkgs, lib, dotfiles, ... }: let + textEditor = "nvim"; + packageSets = with pkgs; rec { system = [ gnutls @@ -130,6 +132,9 @@ in home = { packages = packageSets.everything; + sessionVariables = { + EDITOR = textEditor; + }; file.".npmrc".text = '' prefix = ''${HOME}/.npm-packages From 98628706692ebf4f3b5478bd180f3797583069b4 Mon Sep 17 00:00:00 2001 From: Alyxia Sother Date: Mon, 12 Jun 2023 12:24:26 +0200 Subject: [PATCH 2/3] [nix] Add some more git configuration --- nix/hosts/alymac/git.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/nix/hosts/alymac/git.nix b/nix/hosts/alymac/git.nix index 76f662c..d7b2afa 100644 --- a/nix/hosts/alymac/git.nix +++ b/nix/hosts/alymac/git.nix @@ -1,4 +1,4 @@ -{ pkgs, dotfiles, ... }: +{ pkgs, ... }: { programs.git = { @@ -7,13 +7,24 @@ userName = "Alyxia Sother"; userEmail = "alyxia@riseup.net"; - signing = { key = "01E16C4E775A37E4"; signByDefault = true; }; - delta.enable = true; + delta = { + enable = true; + options = { + line-numbers = true; + features = "decorations"; + syntax-theme = "ansi"; + }; + }; + + extraConfig = { + tag.gpgsign = true; + init.defaultBranch = "master"; + }; }; programs.gitui.enable = true; From 55abee0819636e0706391a39abe399a63f36cf97 Mon Sep 17 00:00:00 2001 From: Alyxia Sother Date: Mon, 12 Jun 2023 12:45:09 +0200 Subject: [PATCH 3/3] [nix] Set up the gh cli --- nix/hosts/alymac/git.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nix/hosts/alymac/git.nix b/nix/hosts/alymac/git.nix index d7b2afa..136be7e 100644 --- a/nix/hosts/alymac/git.nix +++ b/nix/hosts/alymac/git.nix @@ -22,10 +22,17 @@ }; extraConfig = { - tag.gpgsign = true; init.defaultBranch = "master"; }; }; + programs.gh = { + enable = true; + # Why the *fuck* are these packages as opposed to GitHub links??? + extensions = with pkgs; [ + gh-actions-cache + ]; + }; + programs.gitui.enable = true; }