diff --git a/nixos/common-hardware.nix b/nixos/common-hardware.nix index c5efe738..5a088f5c 100644 --- a/nixos/common-hardware.nix +++ b/nixos/common-hardware.nix @@ -46,11 +46,15 @@ hardware.sane = { enable = true; - netConf = "brix.local"; + netConf = '' + 10.0.0.232 + brix.local + brix.vpn + ''; + snapshot = true; + extraBackends = with pkgs; [ sane-airscan utsushi ]; }; - services.saned.enable = true; - powerManagement.enable = (lib.mkForce true); powerManagement.cpuFreqGovernor = (lib.mkForce null); powerManagement.powertop.enable = true; diff --git a/nixos/common.nix b/nixos/common.nix index fae3326a..6e654c38 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -34,7 +34,7 @@ in users.users.cyryl = { isNormalUser = true; - extraGroups = [ "wheel" "networkmanager" "video" "scanner" "lp" "docker" "vboxusers" "adbusers" "libvirtd" "dialout" ]; + extraGroups = [ "wheel" "networkmanager" "video" "scanner" "lp" "docker" "vboxusers" "adbusers" "libvirtd" "dialout" "wireshark" ]; shell = pkgs.zsh; }; @@ -44,6 +44,7 @@ in programs.light.enable = true; programs.adb.enable = true; + programs.wireshark.enable=true; virtualisation.docker = { enable = true; diff --git a/nixos/gui/default.nix b/nixos/gui/default.nix index ef924ec7..cfa306c4 100644 --- a/nixos/gui/default.nix +++ b/nixos/gui/default.nix @@ -33,10 +33,11 @@ yubico-piv-tool yubikey-personalization yubikey-personalization-gui yubikey-manager-qt slack unstable.discord gnome3.nautilus gnome3.eog unstable.hopper unstable.ghidra-bin python38Packages.binwalk-full + unstable.wireshark qemu aqemu spotify shotwell gnome-builder flatpak-builder flatpak python38Packages.lxml python38Packages.jedi meson - libreoffice + libreoffice simple-scan ]; }; }