From f7c7b28a66c21393fba7416da9e6d37921e3f8e1 Mon Sep 17 00:00:00 2001
From: moons <moons@moons14.com>
Date: Thu, 9 Jul 2026 15:15:48 +0900
Subject: [PATCH] noctalia

---
 modules/applications/niri/home.nix       |   2 +-
 modules/applications/noctalia/home.nix   | 103 ++++++++++++-----------
 modules/applications/noctalia/system.nix |  11 +++
 3 files changed, 66 insertions(+), 50 deletions(-)

diff --git a/modules/applications/niri/home.nix b/modules/applications/niri/home.nix
index 9f6195f..6d9458e 100644
--- a/modules/applications/niri/home.nix
+++ b/modules/applications/niri/home.nix
@@ -60,7 +60,7 @@ in
           outputs = {
             # x1g13 monitor
             "eDP-1" = {
-              scale = 1.0;
+              scale = 1.2;
               position = {
                 x = 2240;
                 y = 1440;
diff --git a/modules/applications/noctalia/home.nix b/modules/applications/noctalia/home.nix
index 2bfb7b5..e2124dc 100644
--- a/modules/applications/noctalia/home.nix
+++ b/modules/applications/noctalia/home.nix
@@ -54,6 +54,59 @@ in
               };
             };
             desktop_widgets.enabled = false;
+            widget = {
+              cpu = {
+                type = "sysmon";
+                stat = "cpu_usage";
+              };
+              cpu-graph = {
+                type = "sysmon";
+                stat = "cpu_usage";
+                display = "graph";
+                show_label = false;
+              };
+              ram = {
+                type = "sysmon";
+                stat = "ram_used";
+              };
+              media = {
+                type = "media";
+                hide_when_no_media = true;
+                title_scroll = "always";
+              };
+              battery = {
+                type = "battery";
+                display_mode = "graphic";
+                warning_threshold = 30;
+              };
+              brightness = {
+                type = "brightness";
+                show_label = false;
+              };
+              input-volume = {
+                type = "volume";
+                device = "input";
+              };
+              output-volume = {
+                type = "volume";
+                device = "output";
+              };
+              clock = {
+                type = "clock";
+                format = "{:%Y/%m/%d %H:%M}";
+                vertical_format = "{:%Y/%m/%d\n%H:%M}";
+                tooltip_format = "{:%Y/%m/%d %H:%M (%a)}";
+              };
+              network-connection = {
+                type = "custom_button";
+                glyph = "access-point";
+                command = "nm-connection-editor";
+              };
+              tray = {
+                type = "tray";
+              };
+            };
+
             bar = {
               order = [ "main" ];
               main = {
@@ -73,6 +126,7 @@ in
                   "media"
                   "spacer"
                   "notifications"
+                  "tray"
                   "spacer"
                   "battery"
                   "input-volume"
@@ -83,55 +137,6 @@ in
                   "control-center"
                 ];
               };
-              widget = {
-                cpu = {
-                  type = "sysmon";
-                  stat = "cpu_usage";
-                };
-                cpu-graph = {
-                  type = "sysmon";
-                  stat = "cpu_usage";
-                  display = "graph";
-                  show_label = false;
-                };
-                ram = {
-                  type = "sysmon";
-                  stat = "ram_used";
-                };
-                media = {
-                  type = "media";
-                  hide_when_no_media = true;
-                  title_scroll = "always";
-                };
-                battery = {
-                  type = "battery";
-                  display_mode = "graphic";
-                  warning_threshold = 30;
-                };
-                brightness = {
-                  type = "brightness";
-                  show_label = false;
-                };
-                input-volume = {
-                  type = "volume";
-                  device = "input";
-                };
-                output-volume = {
-                  type = "volume";
-                  device = "output";
-                };
-                clock = {
-                  type = "clock";
-                  format = "{:%Y/%m/%d %H:%M}";
-                  vertical_format = "{:%Y/%m/%d\n%H:%M}";
-                  tooltip_format = "{:%Y/%m/%d %H:%M (%a)}";
-                };
-                network-connection = {
-                  type = "custom_button";
-                  glyph = "access-point";
-                  command = "nm-connection-editor";
-                };
-              };
             };
             colorSchemes.predefinedScheme = "dracula";
             general = {
diff --git a/modules/applications/noctalia/system.nix b/modules/applications/noctalia/system.nix
index 58a0d90..72cbb99 100644
--- a/modules/applications/noctalia/system.nix
+++ b/modules/applications/noctalia/system.nix
@@ -13,9 +13,20 @@ in
     enable = lib.mkEnableOption "noctalia system package";
   };
 
+  imports = [
+    inputs.noctalia.nixosModules.default
+  ];
+
   config = lib.mkIf cfg.enable {
+
     environment.systemPackages = with pkgs; [
       inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default
     ];
+
+    programs.noctalia = {
+      enable = true;
+      recommendedServices.enable = true;
+      systemd.enable = true;
+    };
   };
 }