1
1
Fork 0

Compare commits

...

4 Commits

Author SHA1 Message Date
Tim Van Baak 8cbbcf70fd imperium: add ffmpeg 2024-06-19 15:24:35 -07:00
Tim Van Baak 4ea90b228e beatific: Add git aliases 2024-06-19 15:24:35 -07:00
Tim Van Baak 35e4366df9 imperium: add yt-dlp wrapper 2024-06-19 15:24:35 -07:00
Tim Van Baak 5045e27ad8 beatific: add pdf tools 2024-06-19 15:24:35 -07:00
2 changed files with 14 additions and 1 deletions

View File

@ -57,6 +57,9 @@
users.users.tvb = { users.users.tvb = {
extraGroups = [ "networkmanager" ]; extraGroups = [ "networkmanager" ];
packages = [
(pkgs.writeShellScriptBin "yt-dlp" ''exec $HOME/.yt-dlp/bin/yt-dlp "$@"'')
];
}; };
# Configs needed to run TF2 on integrated graphics # Configs needed to run TF2 on integrated graphics
@ -69,6 +72,7 @@
beatific.extraPrograms = true; beatific.extraPrograms = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
comic-mono comic-mono
ffmpeg
firefox firefox
gnome.gnome-terminal gnome.gnome-terminal
libreoffice libreoffice

View File

@ -108,6 +108,7 @@ in {
htmlq # jq for html htmlq # jq for html
jq # jq for json jq # jq for json
nebula nebula
poppler_utils # provides pdfto* utils, allows lesspipe to read pdfs
psmisc # provides killall psmisc # provides killall
python3 python3
rsync rsync
@ -125,7 +126,15 @@ in {
programs = { programs = {
git = { git = {
enable = true; 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; htop.enable = true;
}; };