git config is in development

This commit is contained in:
Griffin Smith 2020-05-04 13:17:59 -04:00
parent 976ff9bbd3
commit d22a0381a5
2 changed files with 22 additions and 29 deletions

View file

@ -13,9 +13,11 @@ let machine = ./machines/chupacabra.nix; in
./modules/shell.nix ./modules/shell.nix
./modules/tarsnap.nix ./modules/tarsnap.nix
./modules/vim.nix ./modules/vim.nix
./modules/alsi.nix
./modules/lib/cloneRepo.nix ./modules/lib/cloneRepo.nix
./modules/urbint
machine machine
]; ];
@ -47,6 +49,9 @@ let machine = ./machines/chupacabra.nix; in
peek peek
signal-desktop signal-desktop
apvlv # pdf viewer apvlv # pdf viewer
vlc
irssi
gnutls
# System utilities # System utilities
htop htop
@ -60,18 +65,12 @@ let machine = ./machines/chupacabra.nix; in
zip zip
tree tree
ncat ncat
unzip
# Security # Security
gnupg gnupg
keybase
# Programming openssl
jq
gitAndTools.hub
gitAndTools.tig
shellcheck
httpie
entr
gnumake
# Spotify...etc # Spotify...etc
spotify spotify
@ -87,25 +86,6 @@ let machine = ./machines/chupacabra.nix; in
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
programs.git = {
enable = true;
userEmail = "root@gws.fyi";
userName = "Griffin Smith";
ignores = [
"*.sw*"
".classpath"
".project"
".settings/"
".dir-locals.el"
".stack-work-profiling"
".projectile"
];
extraConfig = {
github.user = "glittershark";
merge.conflictstyle = "diff3";
};
};
programs.password-store.enable = true; programs.password-store.enable = true;
services.redshift = { services.redshift = {
@ -125,4 +105,11 @@ let machine = ./machines/chupacabra.nix; in
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
}; };
gtk = {
enable = true;
gtk3.bookmarks = [
"file:///home/grfn/code"
];
};
} }

View file

@ -21,6 +21,12 @@
sha256 = "0zz2lrwn3y3rb8gzaiwxgz02dvy3s552zc70zvfqc0zh5dhydgn7"; sha256 = "0zz2lrwn3y3rb8gzaiwxgz02dvy3s552zc70zvfqc0zh5dhydgn7";
}) { inherit pkgs; }).yarn2nix }) { inherit pkgs; }).yarn2nix
julia julia
(pkgs.callPackage (pkgs.fetchFromGitHub {
owner = "hlolli";
repo = "clj2nix";
rev = "3ab3480a25e850b35d1f532a5e4e7b3202232383";
sha256 = "1lry026mlpxp1j563qs13nhxf37i2zpl7lh0lgfdwc44afybqka6";
}) {})
]; ];
programs.git = { programs.git = {