erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Add wireshark, cleanup on fish functions

Browse source
This commit is contained in:
Erwin Boskma 2022-03-01 20:06:19 +01:00
parent e6643c0d1d
commit b071f6c695
Signed by: erwin
GPG key ID: 270B20D17394F7E5
3 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
home-manager/modules/fish/default.nix
View file

@ -11,7 +11,7 @@ in
config = mkIf (cfg.enable) { config = mkIf (cfg.enable) {
programs.fish = { programs.fish = {
enable = true; enable = true;
functions = (import ./functions.nix); functions = (import ./functions.nix { inherit (pkgs) git; });
plugins = [ plugins = [
{ {

33
home-manager/modules/fish/functions.nix
View file

@ -1,3 +1,4 @@
{ git }:
{ {
reload = { reload = {
body = '' body = ''
@ -18,25 +19,25 @@
}; };
clangfmt = { clangfmt = {
body = '' body = ''
set source_exts "h" "hpp" "c" "cpp" "cc" "cp" "c++" "cxx" "cu" "proto" set source_exts "h" "hpp" "c" "cpp" "cc" "cp" "c++" "cxx" "cu" "proto"
set files (git diff --diff-filter=ACMR --name-only $argv[1]) set files (${git}/bin/git diff --diff-filter=ACMR --name-only $argv[1])
set repo_path (realpath --relative-to=$PWD (git rev-parse --show-toplevel)) set repo_path (realpath --relative-to=$PWD (${git}/bin/git rev-parse --show-toplevel))
set clangformat (git config --get clangFormat.binary) set clangformat (${git}/bin/git config --get clangFormat.binary)
echo "Formatting files in $repo_path with $clangformat" echo "Formatting files in $repo_path with $clangformat"
for f in $files for f in $files
set file (realpath $repo_path/$f) set file (realpath $repo_path/$f)
echo "Processing $file" echo "Processing $file"
set ext (string match -r ".*\.([^\.]+)\$" $file)[2] set ext (string match -r ".*\.([^\.]+)\$" $file)[2]
if contains $ext $source_exts if contains $ext $source_exts
echo "Formatting $file" echo "Formatting $file"
$clangformat -i -style=file $file $clangformat -i -style=file $file
else else
echo "Extension $ext not found in $source_exts" echo "Extension $ext not found in $source_exts"
end
end end
end
''; '';
description = "Use clang-format to format all changed and added files"; description = "Use clang-format to format all changed and added files";
}; };

1
modules/desktop/default.nix
View file

@ -107,6 +107,7 @@ in
tdesktop tdesktop
unzip unzip
xdg-utils xdg-utils
wireshark
wl-clipboard wl-clipboard
] ++ ] ++
(with gst_all_1; [ gstreamer gstreamer.dev gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav gst-vaapi ]); (with gst_all_1; [ gstreamer gstreamer.dev gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav gst-vaapi ]);