diff --git a/nixos/configuration.nix b/nixos/configuration.nix index fd0cbd2..dbd93ba 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -5,7 +5,7 @@ { config, pkgs, ... }: let - unstable = import { }; + unstable = import {}; in { @@ -78,7 +78,6 @@ in programs.wireshark = { enable = true; - package = pkgs.wireshark; }; programs.adb.enable = true; @@ -96,8 +95,8 @@ in # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; - networking.firewall.allowedTCPPortRanges = [{ from = 1714; to = 1764; }]; - networking.firewall.allowedUDPPortRanges = [{ from = 1714; to = 1764; }]; # for KDE connect + networking.firewall.allowedTCPPortRanges = [ { from = 1714; to = 1764; } ]; + networking.firewall.allowedUDPPortRanges = [ { from = 1714; to = 1764; } ]; # for KDE connect # Or disable the firewall altogether. # networking.firewall.enable = false; @@ -181,36 +180,9 @@ in services.smartd = { enable = true; - devices = [{ device = "/dev/sda"; } { device = "/dev/sdb"; }]; + devices = [ { device = "/dev/sda"; } { device = "/dev/sdb"; } ]; }; - # block certain sites to prevent procrastination - systemd.services.procrastinationstop = { - serviceConfig.Type = "oneshot"; - wantedBy = [ ]; - script = '' - ln -sf ${pkgs.writeText "blockedHosts" '' - ::1 twitter.com - 127.0.0.1 twitter.com - ::1 api.twitter.com - 127.0.0.1 api.twitter.com - ::1 toot.matereal.eu - 127.0.0.1 toot.matereal.eu - ::1 tagesschau.de - 127.0.0.1 tagesschau.de - ::1 dnn.de - 127.0.0.1 dnn.de - ''} /etc/hosts - ''; - }; - - systemd.services.procrastinationstart = { - serviceConfig.Type = "oneshot"; - wantedBy = [ ]; - script = '' - ln -sf /etc/static/hosts /etc/hosts - ''; - }; fonts = { fontDir.enable = true; @@ -235,12 +207,12 @@ in # declarative containers containers = { - # hash2PubSim = import ./Hash2PubTestbed.nix - # { - # inherit pkgs config; - # experimentUid = config.users.users.spiollinux.uid; - # projectDir = "/home/spiollinux/Seafile/Studium/Semester11/INF-PM-FP-ANW"; - # }; + # hash2PubSim = import ./Hash2PubTestbed.nix + # { + # inherit pkgs config; + # experimentUid = config.users.users.spiollinux.uid; + # projectDir = "/home/spiollinux/Seafile/Studium/Semester11/INF-PM-FP-ANW"; + # }; }; # stop NetworkManager from managing virtual interfaces