diff --git a/flake.nix b/flake.nix index 454f473..8e3d7da 100644 --- a/flake.nix +++ b/flake.nix @@ -45,6 +45,7 @@ FCS-Tristan-Nixbook = mkConf [ + inputs.hyprland.nixosModules.default ./hardware/fcs-tristan-nixbook.nix (auto-login "Hyprland") ./nixos/modules/work.nix diff --git a/hardware/fcs-tristan-nixbook.nix b/hardware/fcs-tristan-nixbook.nix index 1dc986e..5d63249 100644 --- a/hardware/fcs-tristan-nixbook.nix +++ b/hardware/fcs-tristan-nixbook.nix @@ -85,15 +85,20 @@ in { { home.stateVersion = "22.05"; - wayland.windowManager.hyprland.settings = { + wayland.windowManager.hyprland = { + settings = { bind = [ "SUPER_SHIFT, Q, killactive," ]; - "device:at-translated-set-2-keyboard" = { - kb_variant = "dvorak,"; - kb_layout = "gb,gb"; - kb_options = "grp:alt_shift_toggle,caps:escape"; - }; + }; + extraConfig = '' + device { + name = at-translated-set-2-keyboard + kb_variant = dvorak, + kb_layout = gb,gb + kb_options = grp:alt_shift_toggle,caps:escape + } + ''; }; } ]; diff --git a/nixos/default.nix b/nixos/default.nix index 05363ab..04e3b7e 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -26,6 +26,12 @@ in { networking.networkmanager.enable = true; + # fix nixos-containers + networking.nat.enable = true; + networking.nat.internalInterfaces = ["ve-+"]; + networking.nat.externalInterface = "eth0"; + networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; + services.tailscale.enable = true; networking.firewall.interfaces.tailscale0 = { allowedTCPPortRanges = [