change a few things idk

bathtub/home-overrides.nix

···
   ...
 }:
 {
-  programs.waybar.settings = {
-    bar.modules-center = lib.mkForce [ ];
+  programs.waybar = {
+    settings = {
+      bar.modules-center = lib.mkForce [ ];
+      bar.modules-right = lib.mkForce [
+        "backlight"
+        "battery"
+        "wireplumber"
+        "tray"
+        "clock"
+      ];
+    };
+    style = lib.mkForce (builtins.readFile ../files/waybar/style-bathtub.css);
   };
 }

files/waybar/style-bathtub.css

···
+window#waybar {
+  font-family: "undefined medium", "Victor Mono Nerd Font", "Noto Sans CJK JP", "Noto Sans CJK ZH";
+  background-color: rgba(0, 0, 0, 0);
+}
+
+tooltip {
+  font-family: "undefined medium", "Victor Mono Nerd Font";
+  background: #2e2629;
+  border: 2px solid #b15c66;
+	border-radius: 0;
+}
+
+.modules-left,
+.modules-right {
+	margin: 0.4em 0.4em 0em 0.4em;
+	padding-left: 1em;
+	padding-right: 1em;
+	border-radius: 2em;
+  background: rgba(46, 38, 41, 0.7);
+  color: #e3dddf;
+}
+
+.modules-right {
+	background: rgba(0, 0, 0, 0);
+	padding-right: 0;
+}
+.modules-right > widget > * {
+  background: rgba(46, 38, 41, 0.7);
+  padding: 0.5em;
+}
+
+#backlight {
+	padding-left: 1em;
+	border-radius: 2em 0 0 2em;
+}
+#wireplumber {
+	padding-right: 1em;
+	border-radius: 0 2em 2em 0;
+}
+
+#battery.warning:not(.charging) {
+  color: #b1888d;
+}
+#battery.critical:not(.charging) {
+  color: #b15c66;
+}
+
+#workspaces button {
+  color: #e3dddf;
+	border-radius: 0;
+}
+#workspaces button:hover {
+	border-radius: 0;
+}
+#workspaces button.active {
+	border-bottom: 2px solid;
+}
+
+#tray {
+	border-radius: 2em;
+	padding: 0 1em;
+	margin-left: 0.4em;
+}
+
+#clock {
+	border-radius: 2em;
+	padding: 0 1em;
+	margin-left: 0.4em;
+}

flake.lock

···
         ]
       },
       "locked": {
-        "lastModified": 1763759067,
-        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
+        "lastModified": 1765495779,
+        "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
+        "rev": "5635c32d666a59ec9a55cab87e898889869f7b71",
         "type": "github"
       },
       "original": {
···
         ]
       },
       "locked": {
-        "lastModified": 1765172714,
-        "narHash": "sha256-/cjofqGxSWpRj2XJM+Bd5VUgWDkBWSxxO//HE+zOHMY=",
+        "lastModified": 1765480374,
+        "narHash": "sha256-HlbvQAqLx7WqZFFQZ8nu5UUJAVlXiV/kqKbyueA8srw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a7887340779d5e70ef68012f3823568ee59eaa30",
+        "rev": "39cb677ed9e908e90478aa9fe5f3383dfc1a63f3",
         "type": "github"
       },
       "original": {
···
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1765120349,
-        "narHash": "sha256-MvwrHRV80hOdEwfLgI16XhApHuvj69aAgUWQ8ZBgAqE=",
+        "lastModified": 1765528203,
+        "narHash": "sha256-DTs3VkvRjW/Quu7y9hzNUrddysBXbcqv5Rpo4rtQYQI=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "0f4acff79842637e92f5f2609d3844bac9d5e592",
+        "rev": "8f74fd85c7b42f2d06347a9c9eaff6d4904854f3",
         "type": "github"
       },
       "original": {
···
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1764966114,
-        "narHash": "sha256-nC0Fsu4zSdabdR4tHHMCrTgqLms612eEDy5VCdQVZFk=",
+        "lastModified": 1765524373,
+        "narHash": "sha256-gi38XWhkb+H8iHhlXgv7MgUaQCuhmaTzKmq3yzYOg9g=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "ba29735fbbd8cf8319c71ccb55b54a0580007c80",
+        "rev": "c22d8358c293f5e66748d8ac20600e6b114f9743",
         "type": "github"
       },
       "original": {
···
         ]
       },
       "locked": {
-        "lastModified": 1764852467,
-        "narHash": "sha256-t20jUJE2S6aqh5YjUgjgP+u/uRmOV6CTGtBLKsA0/fQ=",
+        "lastModified": 1765528634,
+        "narHash": "sha256-uIavvJkDwTZD1QY/oSkDtPN9xwkLwQayoZ5xOni4SBY=",
         "owner": "nix-community",
         "repo": "nixos-apple-silicon",
-        "rev": "0ec4039ef904591afd235146a9a30945b6c8c0e3",
+        "rev": "fc1440d6e6adb24d9b2650670744bae35654c867",
         "type": "github"
       },
       "original": {
···
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1765183668,
-        "narHash": "sha256-TBA7CE44IHYfvOPBWcyLncpVrrKEiXWPdOrF8CD6W84=",
-        "owner": "nixos",
+        "lastModified": 1765536405,
+        "narHash": "sha256-HTHfcqG8WsrJG0aW3edXF5nQJK3VjPWcUTEi/r0LV7o=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fc2de1563f89f0843eba27f14576d261df0e3b80",
+        "rev": "27225de9f2030213246e0d8d62957c43d5229368",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
         "ref": "nixos-unstable-small",
         "repo": "nixpkgs",
         "type": "github"
···
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1764983851,
-        "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=",
+        "lastModified": 1765311797,
+        "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454",
+        "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b",
         "type": "github"
       },
       "original": {
···
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1765150443,
-        "narHash": "sha256-GD6nEEVPdbMSo+8BKfZ0nK8n+Zzs95tipPLCSB0IXQA=",
+        "lastModified": 1765549401,
+        "narHash": "sha256-/7jUlBsI2DCm9LOF4upS7+kMYM4K78dPpHO5pCKYV6k=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "451b1806a6da6b69f01c7fc98d751bcad8fdbf28",
+        "rev": "a80557e1425ad9438dde7652b12fd5a449df6f00",
         "type": "github"
       },
       "original": {
···
         ]
       },
       "locked": {
-        "lastModified": 1765079830,
-        "narHash": "sha256-i9GMbBLkeZ7MVvy7+aAuErXkBkdRylHofrAjtpUPKt8=",
+        "lastModified": 1765553226,
+        "narHash": "sha256-Ii16Nq5jL2wURXpV3D3tOM3vPpbKh18roHLkyZCHK4Q=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "aeb517262102f13683d7a191c7e496b34df8d24c",
+        "rev": "496a6f625f63b780ce849891868f2fad22fd49c6",
         "type": "github"
       },
       "original": {
···
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1764721075,
-        "narHash": "sha256-ChH4nq0cMEEkzkHqKlQt5Z7wxrk8ybcEHuA1YKAYmV0=",
+        "lastModified": 1765343581,
+        "narHash": "sha256-HtTPbV6z6AJPg2d0bHaJKFrnNha+SEbHvbJafKAQ614=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "1b918e29b419e89910014054e8b71d54c9235ea5",
+        "rev": "f0ad674b7009a6afd80cea59d4fbf975dd68ee95",
         "type": "github"
       },
       "original": {

flake.nix

···
       url = "github:nix-community/nixos-apple-silicon/main";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
     nixvim = {
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
···
             inputs.nixos-apple-silicon.nixosModules.apple-silicon-support
             inputs.niri.nixosModules.niri
           ];
+          system = "aarch64-linux";
         };
         forest = {
           extraModules = [
             inputs.tangled.nixosModules.knot
           ];
+          system = "x86_64-linux";
         };
         tundra = {
           extraModules = [
             inputs.niri.nixosModules.niri
             inputs.finge.nixosModules."06cb-009a-fingerprint-sensor"
           ];
+          system = "x86_64-linux";
         };
       };
     in
···
       nixosConfigurations = nixpkgs.lib.mapAttrs (
         hostname: config:
         nixpkgs.lib.nixosSystem {
+          system = config.system;
           specialArgs = { inherit inputs; };
           modules = [
             ./${hostname}

modules/desktop/desktop.nix

···
     portal = {
       enable = true;
       extraPortals = with pkgs; [
+        xdg-desktop-portal-gnome
         xdg-desktop-portal-gtk
-        xdg-desktop-portal-wlr
-        xdg-desktop-portal-shana
+        gnome-keyring
       ];
       config = {
         common = {
           default = [
-            "shana"
+            "gtk"
+          ];
+        };
+        niri = {
+          default = [
+            "gnome"
+            "gtk"
+          ];
+          "org.freedesktop.impl.portal.FileChooser" = [
             "gtk"
           ];
         };

modules/desktop/fcitx.nix

···
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
   i18n = {
     glibcLocales = pkgs.glibcLocales.override {

modules/desktop/niri.nix

···
         { command = [ "firefox" ]; }
         { command = [ "signal-desktop" ]; }
         { command = [ "nm-applet" ]; }
-        { command = [ "swww-daemon" ]; }
         {
           command = [
             "eww"
···
           dwt = true;
           tap = false;
           natural-scroll = false;
+          disabled-on-external-mouse = true;
         };
 
         mouse = {

modules/desktop/sway.nix

···
     enable = true;
     config = {
       bars = [ ];
-			modifier = "Mod4";
+      modifier = "Mod4";
       keybindings =
         let
           modifier = config.wayland.windowManager.sway.config.modifier;

tundra/specialisation.nix

···
         "iomem=relaxed"
       ];
     };
-		docker.configuration = {
+    docker.configuration = {
       virtualisation.docker = {
         enable = true;
       };
       users.users.monke.extraGroups = [ "docker" ];
-		};
+    };
   };
 }