From 44135f803ead33d0e31c878cd9cf0374a806d274 Mon Sep 17 00:00:00 2001
From: polwex <polwex@sortug.com>
Date: Fri, 26 Jul 2024 19:04:26 +0700
Subject: fw

---
 hosts/local/fw11/hardware-configuration.nix |  7 ++++---
 hosts/local/wayland.nix                     |  1 -
 hosts/syncthing.nix                         | 12 ++++++------
 hosts/wrappers/chromium/default.nix         | 27 ---------------------------
 hosts/wrappers/git/default.nix              |  7 -------
 outputs.nix                                 | 11 +++++++----
 wrappers/chromium/default.nix               | 27 +++++++++++++++++++++++++++
 wrappers/git/default.nix                    |  7 +++++++
 8 files changed, 51 insertions(+), 48 deletions(-)
 delete mode 100644 hosts/wrappers/chromium/default.nix
 delete mode 100644 hosts/wrappers/git/default.nix
 create mode 100644 wrappers/chromium/default.nix
 create mode 100644 wrappers/git/default.nix

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..3b7c6c4 100644
--- a/hosts/local/wayland.nix
+++ b/hosts/local/wayland.nix
@@ -81,7 +81,6 @@
     thunderbird
     kmail
     firefox
-    chromium
     pavucontrol
     # icons
     polkit_gnome
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;
-  };
-}
diff --git a/outputs.nix b/outputs.nix
index 7b2675b..4e93758 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -4,10 +4,13 @@
   nix-darwin,
   nur,
   git-hooks,
+  wrapper-manager,
   ...
 } @ inputs: let
+  lol = import ./wrappers/ungoogled-chromium;
   args = {inherit inputs;};
-in {
-  nixosConfigurations = import ./hosts/nixos.nix args;
-  darwinConfigurations = import ./hosts/darwin.nix inputs;
-}
+in
+  builtins.trace "lol is: ${builtins.toJSON (builtins.deepSeq lol lol)}" {
+    nixosConfigurations = import ./hosts/nixos.nix args;
+    darwinConfigurations = import ./hosts/darwin.nix inputs;
+  }
diff --git a/wrappers/chromium/default.nix b/wrappers/chromium/default.nix
new file mode 100644
index 0000000..7f070d2
--- /dev/null
+++ b/wrappers/chromium/default.nix
@@ -0,0 +1,27 @@
+{
+  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/wrappers/git/default.nix b/wrappers/git/default.nix
new file mode 100644
index 0000000..ffea5a4
--- /dev/null
+++ b/wrappers/git/default.nix
@@ -0,0 +1,7 @@
+{pkgs, ...}: {
+  wrappers.git = {
+    basePackage = pkgs.gitFull;
+    extraPackages = [pkgs.git-extras];
+    env.GIT_CONFIG_GLOBAL.value = ../../../misc/gitconfig;
+  };
+}
-- 
cgit v1.2.3