From e6e0ced192a7837b6a487e5aef17c76fbba9fc5b Mon Sep 17 00:00:00 2001
From: moons <moons@moons14.com>
Date: Tue, 7 Jul 2026 21:41:05 +0900
Subject: [PATCH] fix

---
 modules/applications/noctalia/home.nix | 26 +++++++++++++++++++-------
 modules/applications/ssh/home.nix      |  4 ++++
 modules/applications/swayidle.nix      | 18 +++++++++++-------
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/modules/applications/noctalia/home.nix b/modules/applications/noctalia/home.nix
index 75e8446..37e7f52 100644
--- a/modules/applications/noctalia/home.nix
+++ b/modules/applications/noctalia/home.nix
@@ -45,10 +45,18 @@ in
         programs.noctalia = {
           enable = true;
           settings = {
-            theme.mode = "auto";
+            theme = {
+              mode = "auto";
+              source = "wallpaper";
+              templates = {
+                enable_builtin_templates = false;
+                enable_community_templates = false;
+              };
+            };
+            desktop_widgets.enabled = false;
             bar = {
+              margin_ends = 15;
               density = "default";
-              position = "top";
               showCapsule = true;
               backgroundOpacity = 0.8;
               floating = true;
@@ -124,20 +132,24 @@ in
             };
             dock = {
               enabled = true;
-              displayMode = "auto_hide";
-              backgroundOpacity = 0.8;
-              floatingRatio = 1;
+              position = "left";
+              auto_hide = true;
+              show_dots = true;
+              background_opacity = 0.8;
               size = 1;
               onlySameOutput = true;
+              reserve_space = false;
               monitors = [ "eDP-1" ];
-              pinnedApps = [
+              pinned = [
                 "com.mitchellh.ghostty"
-                "org.gnome.Nautilus"
                 "google-chrome"
                 "code"
               ];
               colorizeIcons = false;
             };
+            shell = {
+              clipboard_enabled = false;
+            };
             controlCenter = {
               position = "close_to_bar_button";
               shortcuts = {
diff --git a/modules/applications/ssh/home.nix b/modules/applications/ssh/home.nix
index 98a30fe..dcaad3a 100644
--- a/modules/applications/ssh/home.nix
+++ b/modules/applications/ssh/home.nix
@@ -40,6 +40,10 @@ in
               AddKeysToAgent = "no";
             };
 
+            "*.sfc.wide.ad.jp" = {
+              identityFile = "~/.ssh/id_ed25519_sk_rk";
+              identitiesOnly = true;
+            };
             "*" = {
               AddKeysToAgent = "no";
               SetEnv = {
diff --git a/modules/applications/swayidle.nix b/modules/applications/swayidle.nix
index d51ff73..f044052 100644
--- a/modules/applications/swayidle.nix
+++ b/modules/applications/swayidle.nix
@@ -9,20 +9,20 @@ let
   cfg = config.my.applications.swayidle;
 
   noctaliaPkg = inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default;
-  noctalia = lib.getExe noctaliaPkg;
 
-  bash = lib.getExe pkgs.bash;
+  noctalia = lib.getExe noctaliaPkg;
   brightnessctl = lib.getExe pkgs.brightnessctl;
   niri = lib.getExe pkgs.niri;
   rm = "${pkgs.coreutils}/bin/rm";
 
   brightnessState = "$XDG_RUNTIME_DIR/swayidle-brightness";
 
-  noctaliaCall = target: action: "${bash} -lc '${noctalia} ipc call ${target} ${action}'";
+  noctaliaMsg = command: "${noctalia} msg ${command}";
 
-  lockCmd = noctaliaCall "lockScreen" "lock";
+  lockCmd = noctaliaMsg "session lock";
 
-  # AC 接続中は何もしない。つまり battery-only の処理にする。
+  # AC 接続中は何もしない。
+  # つまり、以下のアイドル処理をバッテリー駆動時のみにする。
   skipIfOnAC = ''
     for supply in /sys/class/power_supply/*; do
       if [ -f "$supply/type" ] \
@@ -51,7 +51,8 @@ let
 
   lockAndSuspend = pkgs.writeShellScript "swayidle-lock-and-suspend" ''
     ${skipIfOnAC}
-    ${noctaliaCall "sessionMenu" "lockAndSuspend"}
+
+    ${noctaliaMsg "session lock-and-suspend"}
   '';
 
   afterResume = pkgs.writeShellScript "swayidle-after-resume" ''
@@ -69,7 +70,10 @@ in
       {
         services.swayidle = {
           enable = true;
-          systemdTargets = [ "graphical-session.target" ];
+
+          systemdTargets = [
+            "graphical-session.target"
+          ];
 
           timeouts = [
             {