Skip to content

Commit

Permalink
fix: isk
Browse files Browse the repository at this point in the history
  • Loading branch information
jz8132543 committed Jun 22, 2024
1 parent d549e4a commit b6135c9
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion home-manager/modules/desktop/gnome.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ["<Control><Super>Right"];
switch-to-workspace-left = ["<Control><Super>Left"];
};
Expand Down
24 changes: 12 additions & 12 deletions nixos/hosts/arx8/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
# };
# };
}
6 changes: 3 additions & 3 deletions nixos/hosts/isk/hardware-configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
18 changes: 9 additions & 9 deletions nixos/modules/base/environment/isNAT/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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}";}
Expand Down

0 comments on commit b6135c9

Please sign in to comment.