schmittlauch/nixconfigs
2
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Compare commits

base: schmittlauch:c635d650342571cf6b0d4e0c69e620a6598c1bad
Branches Tags
schmittlauch:mainline
schmittlauch:darwin-patch-nodejs_20
schmittlauch:workmac
schmittlauch:amd-pmf-debugging
schmittlauch:modularise-config
schmittlauch:flake-conversion
...
compare: schmittlauch:62d8807b1e9b0a413687bca47c33bbdf20265b61
Branches Tags
schmittlauch:mainline
schmittlauch:darwin-patch-nodejs_20
schmittlauch:workmac
schmittlauch:amd-pmf-debugging
schmittlauch:modularise-config
schmittlauch:flake-conversion

3 commits
c635d65034 ... 62d8807b1e

Author SHA1 Message Date
Trolli Schmittlauch
62d8807b1e switch to anki-bin until it can be built from source again 2021-01-28 13:15:49 +01:00
Trolli Schmittlauch
a8c1495216 switch back to upstream wireshark as patch does not apply anymore 2020-12-26 01:22:32 +01:00
Trolli Schmittlauch
a98047f924 disable Hash2Pub simulation container 2020-12-26 01:21:20 +01:00
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
home/home.nix
View file

@ -27,7 +27,7 @@ let
alacritty alacritty
libreoffice-fresh libreoffice-fresh
backintime-common backintime-common
anki unstable.anki-bin
signal-desktop signal-desktop
(tor-browser-bundle-bin.override { mediaSupport = true; pulseaudioSupport = true; }) (tor-browser-bundle-bin.override { mediaSupport = true; pulseaudioSupport = true; })
pdfpc pdfpc
@ -39,6 +39,8 @@ let
cawbird cawbird
olifant olifant
subsurface subsurface
yate
unstable.linphone
# for Hibiscus banking software # for Hibiscus banking software
jameica jameica

13
nixos/configuration.nix
View file

@ -77,7 +77,6 @@ in
programs.wireshark = programs.wireshark =
{ {
enable = true; enable = true;
package = pkgs.wireshark-qt.overrideAttrs (oldAttrs: rec { patches = oldAttrs.patches ++ [ ./133dbc2.diff ];});
}; };
programs.adb.enable = true; programs.adb.enable = true;
@ -201,12 +200,12 @@ in
# declarative containers # declarative containers
containers = { containers = {
hash2PubSim = import ./Hash2PubTestbed.nix # hash2PubSim = import ./Hash2PubTestbed.nix
{ # {
inherit pkgs config; # inherit pkgs config;
experimentUid = config.users.users.spiollinux.uid; # experimentUid = config.users.users.spiollinux.uid;
projectDir = "/home/spiollinux/Seafile/Studium/Semester11/INF-PM-FP-ANW"; # projectDir = "/home/spiollinux/Seafile/Studium/Semester11/INF-PM-FP-ANW";
}; # };
}; };
# stop NetworkManager from managing virtual interfaces # stop NetworkManager from managing virtual interfaces