diff --git a/home/chrome.nix b/home/chrome.nix index ba00cc4..ec525de 100644 --- a/home/chrome.nix +++ b/home/chrome.nix @@ -33,8 +33,8 @@ in # ublock origin (createChromiumExtension { id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; - sha256 = "01wvxrcn6sv8da1cljhaq386ls5s055lka4axdqdbn98xw74cbqy"; - version = "1.40.8"; + sha256 = "187350i172xivgp4p9n2awx6pjs3m667v32v1dh5sm2pfkdn7d8g"; + version = "1.42.4"; }) # uMatrix (createChromiumExtension { diff --git a/home/firefox.nix b/home/firefox.nix new file mode 100644 index 0000000..44c307d --- /dev/null +++ b/home/firefox.nix @@ -0,0 +1,46 @@ +{ pkgs, ... }: +{ + programs.firefox = { + # package = pkgs.librewolf; + # package = pkgs.firefox-wayland; + profiles."main" = { + id = 0; + bookmarks = { + "github".url = "https://github.com"; + }; + settings = { + "browser.tabs.unloadOnLowMemory" = false; + # to enable userChrome + "toolkit.legacyUserProfileCustomizations.stylesheets" = true; + }; + userChrome = '' +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +// about:config - toolkit.legacyUserProfileCustomizations.stylesheets + +// tab-toolbar - all versions +#titlebar { + display: none; +} +#tabbrowser-tabs, +#TabsToolbar, +#main-window:not([tabsintitlebar="true"]) #TabsToolbar { + visibility: collapse !important; +} +// hide sidebar-headers (Tree Style Tab) +#sidebar-header { + display: none; +} +#sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] #sidebar-header { + display: none; +} + +#main-window[tabsintitlebar="true"]:not([extradragspace="true"]) #TabsToolbar > .toolbar-items { + opacity: 0; + pointer-events: none; +} + + ''; + }; + }; +} diff --git a/nixos/default.nix b/nixos/default.nix index c8605c2..f1cd872 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -11,7 +11,8 @@ nixpkgs.config.allowUnfree = true; networking.useDHCP = false; - networking.firewall.enable = true; # is already enabled ... + # for k3s + #networking.firewall.enable = true; # is already enabled ... networking.firewall.allowedUDPPorts = [ 5355 ]; # LLMNR services.openssh = { diff --git a/nixos/desktop-gnome.nix b/nixos/desktop-gnome.nix index 0dd2fdf..6f548f8 100644 --- a/nixos/desktop-gnome.nix +++ b/nixos/desktop-gnome.nix @@ -12,7 +12,9 @@ environment.systemPackages = with pkgs; [ gnome.networkmanager-openvpn + gnome.gnome-power-manager gnomeExtensions.pop-shell + gnomeExtensions.sound-output-device-chooser ]; programs.kdeconnect.package = pkgs.gnomeExtensions.gsconnect; } diff --git a/nixos/desktop-sway.nix b/nixos/desktop-sway.nix index 8393e2b..f102a27 100644 --- a/nixos/desktop-sway.nix +++ b/nixos/desktop-sway.nix @@ -5,7 +5,9 @@ systemd.network.networks.wifi = { matchConfig = { Name = "wlan0"; - SSID = "!HotoHo-v6"; + SSID = [ + "!HotoHo-v6" + ]; }; DHCP = "ipv4"; networkConfig = { @@ -16,7 +18,9 @@ systemd.network.networks.wifi-v6 = { matchConfig = { Name = "wlan0"; - SSID = "HotoHo-v6"; + SSID = [ + "HotoHo-v6" + ]; }; networkConfig = { DNSSEC = false; @@ -24,6 +28,35 @@ IPv6PrivacyExtensions = true; }; }; + systemd.network.networks.wifi-unsec = { + matchConfig = { + Name = "wlan0"; + SSID = [ + "wanderverein" # fake to keep + # "urbanForest" + ]; + }; + DHCP = "ipv4"; + networkConfig = { + IPv6AcceptRA = true; + IPv6PrivacyExtensions = true; + DNSSEC = false; + DNS = [ + "2001:4860:4860::8888" + "8.8.8.8" + ]; + }; + dhcpV4Config = { + UseDomains = false; + UseDNS = false; + }; + dhcpV6Config = { + UseDNS = false; + }; + ipv6AcceptRAConfig = { + UseDNS = false; + }; + }; systemd.network.networks.eth = { matchConfig.Name = "enp*"; DHCP = "ipv4"; diff --git a/nixos/desktop.nix b/nixos/desktop.nix index 055a418..5d59cb3 100644 --- a/nixos/desktop.nix +++ b/nixos/desktop.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { networking.wireless.iwd = { enable = true; @@ -7,8 +7,8 @@ AddressRandomization = "network"; # EnableNetworkConfiguration = false; - RoamThreshold = -70; - RoamThreshold5G = -90; + # RoamThreshold = -70; + # RoamThreshold5G = -90; RoamRetryInterval = 10; }; # Network.EnableIPv6 = true; @@ -30,7 +30,7 @@ environment.systemPackages = with pkgs; [ iw - pulseaudio-modules-bt + # pulseaudio-modules-bt ]; programs.browserpass.enable = true; @@ -48,4 +48,13 @@ # openFirewall = true; - by enable }; + services.udev.extraRules = lib.mkMerge [ + # autosuspend USB devices + ''ACTION=="add", SUBSYSTEM=="usb", TEST=="power/control", ATTR{power/control}="auto"'' + # autosuspend PCI devices + ''ACTION=="add", SUBSYSTEM=="pci", TEST=="power/control", ATTR{power/control}="auto"'' + # disable Ethernet Wake-on-LAN + ''ACTION=="add", SUBSYSTEM=="net", NAME=="enp*", RUN+="${pkgs.ethtool}/sbin/ethtool -s $name wol d"'' + ]; + services.upower.enable = true; }