Compare commits
4 Commits
a0b30d6ceb
...
8cbbcf70fd
Author | SHA1 | Date |
---|---|---|
Tim Van Baak | 8cbbcf70fd | |
Tim Van Baak | 4ea90b228e | |
Tim Van Baak | 35e4366df9 | |
Tim Van Baak | 5045e27ad8 |
|
@ -57,6 +57,9 @@
|
|||
|
||||
users.users.tvb = {
|
||||
extraGroups = [ "networkmanager" ];
|
||||
packages = [
|
||||
(pkgs.writeShellScriptBin "yt-dlp" ''exec $HOME/.yt-dlp/bin/yt-dlp "$@"'')
|
||||
];
|
||||
};
|
||||
|
||||
# Configs needed to run TF2 on integrated graphics
|
||||
|
@ -69,6 +72,7 @@
|
|||
beatific.extraPrograms = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
comic-mono
|
||||
ffmpeg
|
||||
firefox
|
||||
gnome.gnome-terminal
|
||||
libreoffice
|
||||
|
|
|
@ -108,6 +108,7 @@ in {
|
|||
htmlq # jq for html
|
||||
jq # jq for json
|
||||
nebula
|
||||
poppler_utils # provides pdfto* utils, allows lesspipe to read pdfs
|
||||
psmisc # provides killall
|
||||
python3
|
||||
rsync
|
||||
|
@ -125,7 +126,15 @@ in {
|
|||
programs = {
|
||||
git = {
|
||||
enable = true;
|
||||
config.init.defaultBranch = "master";
|
||||
config = {
|
||||
init.defaultBranch = "master";
|
||||
merge.conflictstyle = "diff3";
|
||||
alias = {
|
||||
amend = "commit --amend";
|
||||
fixup = "commit --amend --no-edit";
|
||||
pick = "cherry-pick";
|
||||
};
|
||||
};
|
||||
};
|
||||
htop.enable = true;
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue