diff --git a/home-manager/modules/desktop/gnome.nix b/home-manager/modules/desktop/gnome.nix index f25e8467..7c1b96a5 100644 --- a/home-manager/modules/desktop/gnome.nix +++ b/home-manager/modules/desktop/gnome.nix @@ -54,7 +54,7 @@ in { power-button-action = "nothing"; sleep-inactive-ac-type = "nothing"; }; - "org/gnome/desktops/wm/keybindings" = { + "org/gnome/desktop/wm/keybindings" = { switch-to-workspace-right = ["Right"]; switch-to-workspace-left = ["Left"]; }; diff --git a/nixos/hosts/arx8/default.nix b/nixos/hosts/arx8/default.nix index 90ee9f12..cef1645a 100644 --- a/nixos/hosts/arx8/default.nix +++ b/nixos/hosts/arx8/default.nix @@ -16,16 +16,16 @@ lenovo-legion efibootmgr ]; - services.create_ap = { - enable = true; - settings = { - INTERNET_IFACE = "wlp4s0"; - WIFI_IFACE = "wlp4s0"; - SSID = "ARX8"; - PASSPHRASE = "qwertyut"; - # HIDDEN = 1; - IEEE80211AX = 1; - FREQ_BAND = 5; - }; - }; + # services.create_ap = { + # enable = true; + # settings = { + # INTERNET_IFACE = "wlp4s0"; + # WIFI_IFACE = "wlp4s0"; + # SSID = "ARX8"; + # PASSPHRASE = "qwertyut"; + # # HIDDEN = 1; + # IEEE80211AX = 1; + # FREQ_BAND = 5; + # }; + # }; } diff --git a/nixos/hosts/isk/hardware-configuration.nix b/nixos/hosts/isk/hardware-configuration.nix index 0ac5ba6c..6064d759 100644 --- a/nixos/hosts/isk/hardware-configuration.nix +++ b/nixos/hosts/isk/hardware-configuration.nix @@ -26,9 +26,9 @@ in { address = "192.168.1.1"; interface = netdev; }; - # localCommands = '' - # ${pkgs.ethtool}/bin/ethtool -K ${netdev} tx-checksumming off - # ''; + localCommands = '' + ${pkgs.ethtool}/bin/ethtool -K ${netdev} tx-checksumming off + ''; }; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/nixos/modules/base/environment/isNAT/default.nix b/nixos/modules/base/environment/isNAT/default.nix index afa4470a..0b7572f6 100644 --- a/nixos/modules/base/environment/isNAT/default.nix +++ b/nixos/modules/base/environment/isNAT/default.nix @@ -41,15 +41,14 @@ with lib; { tcp dport 443 redirect to ${toString config.environment.altHTTPS} udp dport 443 redirect to ${toString config.environment.altHTTPS} } - chain output { - type nat hook output priority 0; policy accept; - tcp dport ${toString config.environment.altHTTP} redirect to 80 - # tcp dport ${toString config.environment.altHTTPS} redirect to 443 - # udp dport ${toString config.environment.altHTTPS} redirect to 443 - tcp dport 443 redirect to ${toString config.environment.altHTTPS} - udp dport 443 redirect to ${toString config.environment.altHTTPS} - } - + # chain output { + # type nat hook output priority 0; policy accept; + # tcp dport ${toString config.environment.altHTTP} redirect to 80 + # # tcp dport ${toString config.environment.altHTTPS} redirect to 443 + # # udp dport ${toString config.environment.altHTTPS} redirect to 443 + # tcp dport 443 daddr 127.0.0.1 redirect to ${toString config.environment.altHTTPS} + # udp dport 443 daddr 127.0.0.1 redirect to ${toString config.environment.altHTTPS} + # } chain postrouting { type nat hook postrouting priority 0; policy accept; } @@ -59,6 +58,7 @@ with lib; { firewall.allowedUDPPorts = with config.environment; [altHTTPS]; } else {}; + # {}; services.traefik.staticConfigOptions.entryPoints.https = if config.environment.isNAT then {address = lib.mkForce ":${toString config.environment.altHTTPS}";}