7 files changed, 39 insertions, 50 deletions
diff --git a/hosts/local/fw11/configuration.nix b/hosts/local/fw11/configuration.nix
index b3b6b0f..bd9aa30 100644
--- a/hosts/local/fw11/configuration.nix
+++ b/hosts/local/fw11/configuration.nix
@@ -1,7 +1,21 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-{...}: {
+{
+  inputs,
+  pkgs,
+  ...
+}: let
+  wrappers =
+    inputs.wrapper-manager.lib.build
+    {
+      inherit pkgs;
+      modules = [
+        ../../../wrappers/chromium
+        ../../../wrappers/brave
+      ];
+    };
+in {
   imports = [
     # Include the results of the hardware scan.
     ../../base.nix
@@ -12,6 +26,10 @@
     # ../android.nix
   ];
 
+  environment.systemPackages = [
+    wrappers
+  ];
+
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -27,6 +45,7 @@
 
   # Set your time zone.
   time.timeZone = "Asia/Bangkok";
+  # time.timeZone = "Europe/Madrid";
 
   # Enable CUPS to print documents.
   # services.printing.enable = true;
@@ -38,9 +57,7 @@
   # firmware update
   services.fwupd.enable = true;
 
-  # android
-  # programs.adb.enable = true;
-  # users.users.y.extraGroups = ["adbusers"];
+  services.flatpak.enable = true;
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
@@ -49,5 +66,5 @@
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
 
-  system.stateVersion = "23.05"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
 }
diff --git a/hosts/local/fw11/hardware-configuration.nix b/hosts/local/fw11/hardware-configuration.nix
index 6b4e8bf..359ff8f 100644
--- a/hosts/local/fw11/hardware-configuration.nix
+++ b/hosts/local/fw11/hardware-configuration.nix
@@ -15,17 +15,18 @@
   # to modeswitch usb dongle sudo usb_modeswitch -KW -v 0bda -p 1a2b
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/349f55f5-8726-47be-826c-33ae8da92346";
+    { device = "/dev/disk/by-uuid/176785ba-cd35-4d09-b7df-37e8b9843c33";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/0739-1303";
+    { device = "/dev/disk/by-uuid/043D-21E3";
       fsType = "vfat";
+      options = ["fmask=0077" "dmask=0077"];
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/5d13663a-3177-4338-b07a-4b0e10581084"; }
+    [ 
     ];
 
   # The global useDHCP flag is deprecated, therefore explicitly set to false here.
diff --git a/hosts/local/wayland.nix b/hosts/local/wayland.nix
index 256c84d..57fd4cc 100644
--- a/hosts/local/wayland.nix
+++ b/hosts/local/wayland.nix
@@ -73,7 +73,6 @@
     obsidian
     signal-desktop
     tdesktop
-    brave
     gimp
     vlc
     mpv
@@ -81,7 +80,6 @@
     thunderbird
     kmail
     firefox
-    chromium
     pavucontrol
     # icons
     polkit_gnome
@@ -113,9 +111,11 @@
 
   i18n.inputMethod = {
     type = "fcitx5";
+    enable = true;
     fcitx5 = {
       # enabled = true;
       addons = with pkgs; [
+        rime-data
         fcitx5-rime
         fcitx5-mozc
         fcitx5-configtool
@@ -125,6 +125,7 @@
       waylandFrontend = true;
     };
   };
+  services.xserver.desktopManager.runXdgAutostartIfNone = true;
 
   fonts = {
     enableDefaultPackages = true;
diff --git a/hosts/network.nix b/hosts/network.nix
index 433a206..4e82191 100644
--- a/hosts/network.nix
+++ b/hosts/network.nix
@@ -28,5 +28,9 @@
     pkgs.iptables
   ];
 
+  services.tailscale = {
+    enable = true;
+  };
+
   #    services.opensnitch.enable = true;
 }
diff --git a/hosts/syncthing.nix b/hosts/syncthing.nix
index 09b0d9b..48e978d 100644
--- a/hosts/syncthing.nix
+++ b/hosts/syncthing.nix
@@ -1,9 +1,9 @@
 { pkgs, ...}:
 {
-  services.syncthing = {
-    enable = true;
-    user = "y";
-    dataDir = "/home/y/sync/data";
-    configDir = "/home/y/sync/.config";
-  };
+#  services.syncthing = {
+#    enable = true;
+#    user = "y";
+#    dataDir = "/home/y/sync/data";
+#    configDir = "/home/y/sync/.config";
+#  };
 }
diff --git a/hosts/wrappers/chromium/default.nix b/hosts/wrappers/chromium/default.nix
deleted file mode 100644
index 7f070d2..0000000
--- a/hosts/wrappers/chromium/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  wrappers.ungoogled-chromium = {
-    basePackage = pkgs.ungoogled-chromium;
-    env.NIXOS_OZONE_WL = {
-      force = true;
-      value = null;
-    };
-    flags = [
-      "--enable-features=${
-        lib.concatStringsSep "," [
-          "ClearDataOnExit"
-          "WebUIDarkMode"
-          "WaylandWindowDecorations"
-        ]
-      }"
-      "--ozone-platform-hint=auto"
-      "--ozone-platform=wayland"
-      "--force-dark-mode"
-      "--gtk-version=4"
-      "--enable-wayland-ime"
-    ];
-  };
-}
diff --git a/hosts/wrappers/git/default.nix b/hosts/wrappers/git/default.nix
deleted file mode 100644
index ffea5a4..0000000
--- a/hosts/wrappers/git/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{pkgs, ...}: {
-  wrappers.git = {
-    basePackage = pkgs.gitFull;
-    extraPackages = [pkgs.git-extras];
-    env.GIT_CONFIG_GLOBAL.value = ../../../misc/gitconfig;
-  };
-}