Merge branch 'main' of ssh://mizuki.guru/imnyang/nix-flakes

# Conflicts:
#	flake.lock
#	hosts/machine/mafuyu/home/packages.nix
#	modules/home/packages.nix

modules/home/devtool/btop.nix

@@ -0,0 +1,104 @@
+{
+  programs.btop = {
+    enable = true;
+
+    settings = {
+      color_theme = "Mizuki Light";
+      theme_background = true;
+    };
+
+    themes = {
+      "Mizuki Light" = ''
+        # Kawa / Mizuki light palette
+        theme[main_bg]="#fcf8f9"
+        theme[main_fg]="#191017"
+        theme[title]="#816570"
+        theme[hi_fg]="#1e66f5"
+        theme[selected_bg]="#f4ecee"
+        theme[selected_fg]="#191017"
+        theme[inactive_fg]="#a38f96"
+        theme[graph_text]="#816570"
+        theme[meter_bg]="#f2e6ea"
+        theme[proc_misc]="#ea76cb"
+        theme[cpu_box]="#1e66f5"
+        theme[mem_box]="#40a02b"
+        theme[net_box]="#d20f39"
+        theme[proc_box]="#179299"
+        theme[div_line]="#e6d5db"
+        theme[temp_start]="#40a02b"
+        theme[temp_mid]="#df8e1d"
+        theme[temp_end]="#d20f39"
+        theme[cpu_start]="#40a02b"
+        theme[cpu_mid]="#df8e1d"
+        theme[cpu_end]="#d20f39"
+        theme[free_start]="#40a02b"
+        theme[free_mid]="#df8e1d"
+        theme[free_end]="#d20f39"
+        theme[cached_start]="#179299"
+        theme[cached_mid]="#1e66f5"
+        theme[cached_end]="#ea76cb"
+        theme[available_start]="#179299"
+        theme[available_mid]="#1e66f5"
+        theme[available_end]="#ea76cb"
+        theme[used_start]="#40a02b"
+        theme[used_mid]="#df8e1d"
+        theme[used_end]="#d20f39"
+        theme[download_start]="#179299"
+        theme[download_mid]="#1e66f5"
+        theme[download_end]="#ea76cb"
+        theme[upload_start]="#1e66f5"
+        theme[upload_mid]="#ea76cb"
+        theme[upload_end]="#d20f39"
+        theme[process_start]="#40a02b"
+        theme[process_mid]="#179299"
+        theme[process_end]="#1e66f5"
+      '';
+
+      "Mizuki Dark" = ''
+        # Kawa Dark / Mizuki dark palette
+        theme[main_bg]="#191017"
+        theme[main_fg]="#fafafa"
+        theme[title]="#f5c2e7"
+        theme[hi_fg]="#89b4fa"
+        theme[selected_bg]="#2c1f2d"
+        theme[selected_fg]="#fafafa"
+        theme[inactive_fg]="#a9a9b1"
+        theme[graph_text]="#bac2de"
+        theme[meter_bg]="#2c1f2d"
+        theme[proc_misc]="#f5c2e7"
+        theme[cpu_box]="#89b4fa"
+        theme[mem_box]="#a6e3a1"
+        theme[net_box]="#f38ba8"
+        theme[proc_box]="#94e2d5"
+        theme[div_line]="#4a354c"
+        theme[temp_start]="#a6e3a1"
+        theme[temp_mid]="#f9e2af"
+        theme[temp_end]="#f38ba8"
+        theme[cpu_start]="#a6e3a1"
+        theme[cpu_mid]="#f9e2af"
+        theme[cpu_end]="#f38ba8"
+        theme[free_start]="#a6e3a1"
+        theme[free_mid]="#f9e2af"
+        theme[free_end]="#f38ba8"
+        theme[cached_start]="#94e2d5"
+        theme[cached_mid]="#89b4fa"
+        theme[cached_end]="#f5c2e7"
+        theme[available_start]="#94e2d5"
+        theme[available_mid]="#89b4fa"
+        theme[available_end]="#f5c2e7"
+        theme[used_start]="#a6e3a1"
+        theme[used_mid]="#f9e2af"
+        theme[used_end]="#f38ba8"
+        theme[download_start]="#94e2d5"
+        theme[download_mid]="#89b4fa"
+        theme[download_end]="#f5c2e7"
+        theme[upload_start]="#89b4fa"
+        theme[upload_mid]="#f5c2e7"
+        theme[upload_end]="#f38ba8"
+        theme[process_start]="#a6e3a1"
+        theme[process_mid]="#94e2d5"
+        theme[process_end]="#89b4fa"
+      '';
+    };
+  };
+}

modules/home/devtool/vscode.nix

@@ -21,8 +21,10 @@ in
   programs.vscode = {
     enable = true;
     mutableExtensionsDir = true;
-    userSettings = {
-      "extensions.autoUpdate" = true;
+    profiles.default = {
+      userSettings = {
+        "extensions.autoUpdate" = true;
+      };
     };
     package = (pkgs.vscode.override { isInsiders = true; }).overrideAttrs (oldAttrs: {
       version = "latest";

modules/home/firefox-devedition.nix

@@ -0,0 +1,32 @@
+{ pkgs, ... }:
+{
+  programs.firefox = {
+    enable = true;
+    package = pkgs.firefox-devedition;
+
+    policies = {
+      DisableAppUpdate = true;
+
+      ExtensionSettings = {
+        "figma-windows-ua-spoofer@imnyang.local" = {
+          installation_mode = "force_installed";
+          install_url = "https://git.mizuki.guru/imnyang/thisiswindowsfigma/releases/download/v1.0.0/d168a70cb6a24fe4a478-1.0.0.xpi";
+        };
+
+        "thisiswindowschromiumnetflix@imnya.ng" = {
+          installation_mode = "force_installed";
+          install_url = "https://git.mizuki.guru/imnyang/thisiswindowschromiumnetflix/releases/download/v2026.07.27/b30e361a21474a79be8d-2026.7.27.xpi";
+        };
+      };
+    };
+  };
+
+  xdg.mimeApps.defaultApplications = {
+    "text/html" = [ "firefox-devedition.desktop" ];
+
+    "x-scheme-handler/http" = [ "firefox-devedition.desktop" ];
+    "x-scheme-handler/https" = [ "firefox-devedition.desktop" ];
+    "x-scheme-handler/about" = [ "firefox-devedition.desktop" ];
+    "x-scheme-handler/unknown" = [ "firefox-devedition.desktop" ];
+  };
+}

modules/home/packages.nix

@@ -51,7 +51,7 @@ with pkgs;
 
   gnome-disk-utility
 
-  antigravity
+  antigravity-ide
   postman
 
   burpsuite
@@ -98,8 +98,6 @@ with pkgs;
 
   code-cursor
 
-  microsoft-edge
-
   galaxy-buds-client
 
   # another

modules/home/ssh.nix

@@ -1,24 +1,23 @@
 { ... }: {
   programs.ssh = {
     enable = true;
-    matchBlocks = {
+    enableDefaultConfig = false;
+    settings = {
       "*" = {
-        forwardAgent = false;
-        identityAgent = "~/.1password/agent.sock";
-        setEnv = {
+        ForwardAgent = false;
+        IdentityAgent = "~/.1password/agent.sock";
+        SetEnv = {
           TERM = "xterm-256color";
         };
-        extraOptions = {
-          ServerAliveInterval = "0";
-          ServerAliveCountMax = "3";
-          Compression = "no";
-          AddKeysToAgent = "no";
-          HashKnownHosts = "no";
-          UserKnownHostsFile = "~/.ssh/known_hosts";
-          ControlMaster = "no";
-          ControlPath = "~/.ssh/master-%r@%n:%p";
-          ControlPersist = "no";
-        };
+        ServerAliveInterval = 0;
+        ServerAliveCountMax = 3;
+        Compression = false;
+        AddKeysToAgent = "no";
+        HashKnownHosts = false;
+        UserKnownHostsFile = "~/.ssh/known_hosts";
+        ControlMaster = "no";
+        ControlPath = "~/.ssh/master-%r@%n:%p";
+        ControlPersist = "no";
       };
     };
   };

modules/mizukios/features/_1password.nix

@@ -0,0 +1,17 @@
+{ config, pkgs, ... }:
+{
+  programs._1password.enable = true;
+  programs._1password-gui = {
+    enable = true;
+    polkitPolicyOwners = [ "imnyang" ];
+  };
+
+  environment.etc = {
+    "1password/custom_allowed_browsers" = {
+      text = ''
+        firefox-devedition
+      '';
+      mode = "0755";
+    };
+  };
+}

modules/mizukios/features/packages.nix

@@ -8,23 +8,6 @@ let
   nrr = import ./packages/nrr.nix { inherit pkgs; };
 in
 {
-  programs._1password.enable = true;
-  programs._1password-gui = {
-    enable = true;
-    polkitPolicyOwners = [ "imnyang" ];
-  };
-
-  environment.etc = {
-    "1password/custom_allowed_browsers" = {
-      text = ''
-        microsoft-edge
-        firefox-devedition
-      '';
-      mode = "0755";
-    };
-  };
-
-  # 시스템 전역 패키지 (데스크탑/개발용)
   environment.systemPackages = with pkgs; [
     nr
     nrr

modules/mizukios/features/packages/nrr.nix

@@ -19,6 +19,7 @@ pkgs.writeShellApplication {
 
     declare -A HOST_MAP
     HOST_MAP["hikari"]="10.11.8.100"
+    HOST_MAP["amia"]="10.11.8.104"
     HOST_MAP["hako"]="10.11.8.102"
     HOST_MAP["kazusa"]="82.21.82.30"
     HOST_MAP["natsu"]="natsu.icn.mizuki.guru"