diff --git a/nix/hosts/alymac/default.nix b/nix/hosts/alymac/default.nix index c1fdd2b..59a2b55 100644 --- a/nix/hosts/alymac/default.nix +++ b/nix/hosts/alymac/default.nix @@ -1,8 +1,6 @@ { pkgs, lib, dotfiles, ... }: let - textEditor = "nvim"; - packageSets = with pkgs; rec { system = [ gnutls @@ -132,9 +130,6 @@ in home = { packages = packageSets.everything; - sessionVariables = { - EDITOR = textEditor; - }; file.".npmrc".text = '' prefix = ''${HOME}/.npm-packages diff --git a/nix/hosts/alymac/git.nix b/nix/hosts/alymac/git.nix index 136be7e..76f662c 100644 --- a/nix/hosts/alymac/git.nix +++ b/nix/hosts/alymac/git.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, dotfiles, ... }: { programs.git = { @@ -7,31 +7,13 @@ userName = "Alyxia Sother"; userEmail = "alyxia@riseup.net"; + signing = { key = "01E16C4E775A37E4"; signByDefault = true; }; - delta = { - enable = true; - options = { - line-numbers = true; - features = "decorations"; - syntax-theme = "ansi"; - }; - }; - - extraConfig = { - init.defaultBranch = "master"; - }; - }; - - programs.gh = { - enable = true; - # Why the *fuck* are these packages as opposed to GitHub links??? - extensions = with pkgs; [ - gh-actions-cache - ]; + delta.enable = true; }; programs.gitui.enable = true;