1 files changed, 22 insertions, 46 deletions

diff --git a/hosts/local/p16/configuration.nix b/hosts/local/p16/configuration.nix
index e0b81ca..47d7aaa 100644
--- a/hosts/local/p16/configuration.nix
+++ b/hosts/local/p16/configuration.nix
@@ -5,49 +5,20 @@
   inputs,
   pkgs,
   ...
-}:
-# let
-# wrappers =
-#   inputs.wrapper-manager.lib.build
-#   {
-#     inherit pkgs;
-#     modules = [
-#       ../../../wrappers/chromium
-#       ../../../wrappers/brave
-#       ../../../wrappers/zellij
-#       ../../../wrappers/alacritty
-#     ];
-#   };
-# in
-{
+}: {
   imports = [
     # Include the results of the hardware scan.
     ../../base.nix
     ../../linux.nix
     # ../../syncthing.nix
-    # ../../unfree.nix
-    ../wayland.nix
+    ../../unfree.nix
+    ../niri.nix
     ../gui.nix
-    # ./keyboard.nix
+    ./keyboard.nix
+    ../syncthing.nix
     # ../android.nix
   ];
 
-  # environment.systemPackages = [
-  #   wrappers
-  # ];
-  #
-
-  nixpkgs.config = {
-    allowUnfree = true;
-  };
-  environment = {
-    etc = {
-      "sway/config".source = ./swayconfig;
-      "xdg/waybar/config".source = ./waybarconfig;
-      "xdg/waybar/styles.css".source = ./waybarstyle.css;
-    };
-  };
-
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -57,7 +28,19 @@
 
   networking = {
     hostName = "p16"; # Define your hostname.
-    firewall.enable = false;
+    # firewall = {
+    #   allowedTCPPorts = [80 443];
+    #   allowedUDPPortRanges = [
+    #     {
+    #       from = 4000;
+    #       to = 4007;
+    #     }
+    #     {
+    #       from = 8000;
+    #       to = 8010;
+    #     }
+    #   ];
+    # };
   };
   nix.settings.trusted-users = ["root" "y"];
 
@@ -65,23 +48,16 @@
   time.timeZone = "Asia/Bangkok";
   # time.timeZone = "Europe/Madrid";
 
-  # List services that you want to enable:
+  services.fwupd.enable = true;
+  # environment.systemPackages = [pkgs.linuxKernel.packages.linux_6_17.tp_smapi];
+  services.fprintd.enable = true;
 
   services.openssh.enable = true;
   services.openssh.ports = [5555];
 
-  #flatpak
-  # services.flatpak.enable = true;
-  # xdg.portal.enable = true;
-  #/flatpak
-  # don't sleep if closed lid;
-  #services.logind.lidSwitchExternalPower = "ignore";
-  #services.logind.lidSwitchDocked = "ignore";
-  #services.logind.lidSwitch = "ignore";
-
   services.tailscale = {
     enable = true;
-    useRoutingFeatures = "both";
+    useRoutingFeatures = "client";
   };
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions