flake.nix

@@ -123,7 +123,6 @@
           paring.overlays.default
           imnyang.overlays.default
         ];
-        installer = mkHost ./hosts/installer overlays;
 
         # Server
         hikari = mkHost ./hosts/server/hikari/default overlays;

hosts/installer/default.nix

@@ -1,37 +0,0 @@
-{
-  inputs,
-  overlays,
-}:
-let
-  inherit (inputs) nixpkgs;
-in
-nixpkgs.lib.nixosSystem {
-  system = "x86_64-linux";
-
-  modules = [
-    "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix"
-
-    "${inputs.self}/modules/mizukios/base"
-
-    ({ pkgs, ... }: {
-      environment.systemPackages = with pkgs; [
-        fastfetch
-        git
-        neovim
-
-        ghostty
-        cryptsetup
-        lvm2
-        sbctl
-      ];
-
-      security.sudo.enable = false;
-
-      environment.etc.flake.source = "${inputs.self}";
-    })
-  ];
-
-  specialArgs = {
-    inherit inputs overlays;
-  };
-}

hosts/machine/ena/configuration.nix

@@ -8,22 +8,22 @@
   imports = [
     ./hardware-configuration.nix
 
-    "${inputs.self}/modules/mizukios/base"
+    "${inputs.self}/modules/nixos/base"
-    "${inputs.self}/modules/mizukios/features/system/boot.nix"
+    "${inputs.self}/modules/nixos/features/system/boot.nix"
-    "${inputs.self}/modules/mizukios/features/fonts.nix"
+    "${inputs.self}/modules/nixos/features/fonts.nix"
-    "${inputs.self}/modules/mizukios/features/plasma.nix"
+    "${inputs.self}/modules/nixos/features/plasma.nix"
-    "${inputs.self}/modules/mizukios/features/system/sound.nix"
+    "${inputs.self}/modules/nixos/features/system/sound.nix"
-    "${inputs.self}/modules/mizukios/features/packages.nix"
+    "${inputs.self}/modules/nixos/features/packages.nix"
-    "${inputs.self}/modules/mizukios/features/catppuccin.nix"
+    "${inputs.self}/modules/nixos/features/catppuccin.nix"
-    "${inputs.self}/modules/mizukios/features/figma-agent.nix"
+    "${inputs.self}/modules/nixos/features/figma-agent.nix"
-    "${inputs.self}/modules/mizukios/features/system/sbctl.nix"
+    "${inputs.self}/modules/nixos/features/system/sbctl.nix"
-    "${inputs.self}/modules/mizukios/features/system/grub-standalone.nix"
+    "${inputs.self}/modules/nixos/features/system/grub-standalone.nix"
-    "${inputs.self}/modules/mizukios/features/system/virtualisation.nix"
+    "${inputs.self}/modules/nixos/features/system/virtualisation.nix"
-    "${inputs.self}/modules/mizukios/features/management/cockpit.nix"
+    "${inputs.self}/modules/nixos/features/management/cockpit.nix"
-    "${inputs.self}/modules/mizukios/features/system/bluetooth.nix"
+    "${inputs.self}/modules/nixos/features/system/bluetooth.nix"
-    "${inputs.self}/modules/mizukios/features/system/graphics.nix"
+    "${inputs.self}/modules/nixos/features/system/graphics.nix"
-    "${inputs.self}/modules/mizukios/features/steam.nix"
+    "${inputs.self}/modules/nixos/features/steam.nix"
-    "${inputs.self}/modules/mizukios/features/remote/ssh.nix"
+    "${inputs.self}/modules/nixos/features/remote/ssh.nix"
   ];
 
   networking = {

hosts/machine/ena/home/config/shell.nix

@@ -15,6 +15,7 @@
 
       cat = "bat --plain";
 
+      # NixOS 관련
       rebuild = "nr";
       update = "nix flake update";
       clean = "sudo nix-collect-garbage -d";

hosts/machine/kanade/home/packages.nix

@@ -1,6 +1,6 @@
 { pkgs, inputs, ... }:
 let
-  dr = import ../../../../modules/mizukios/features/packages/dr.nix { inherit pkgs; };
+  dr = import ../../../../modules/nixos/features/packages/dr.nix { inherit pkgs; };
 in
 with pkgs;
 [

hosts/machine/mafuyu/configuration.nix

@@ -3,16 +3,16 @@
   imports = [
     ./hardware-configuration.nix
 
-    "${inputs.self}/modules/mizukios/base"
+    "${inputs.self}/modules/nixos/base"
-    "${inputs.self}/modules/mizukios/features/system/boot.nix"
+    "${inputs.self}/modules/nixos/features/system/boot.nix"
-    "${inputs.self}/modules/mizukios/features/fonts.nix"
+    "${inputs.self}/modules/nixos/features/fonts.nix"
-    "${inputs.self}/modules/mizukios/features/packages.nix"
+    "${inputs.self}/modules/nixos/features/packages.nix"
-    "${inputs.self}/modules/mizukios/features/plasma.nix"
+    "${inputs.self}/modules/nixos/features/plasma.nix"
-    "${inputs.self}/modules/mizukios/features/system/sound.nix"
+    "${inputs.self}/modules/nixos/features/sound.nix"
-    "${inputs.self}/modules/mizukios/features/catppuccin.nix"
+    "${inputs.self}/modules/nixos/features/catppuccin.nix"
-    "${inputs.self}/modules/mizukios/features/remote/ssh.nix"
+    "${inputs.self}/modules/nixos/features/ssh.nix"
-    "${inputs.self}/modules/mizukios/features/steam.nix"
+    "${inputs.self}/modules/nixos/features/steam.nix"
-    "${inputs.self}/modules/mizukios/features/remote/sunshine.nix"
+    "${inputs.self}/modules/nixos/features/sunshine.nix"
   ];
 
   networking = {

hosts/machine/mafuyu/hardware-configuration.nix

@@ -59,8 +59,6 @@
   };
   services.xserver.videoDrivers = [ "nvidia" ];
 
-  networking.interfaces.enp3s0.wakeOnLan.enable = true;
-
   hardware.graphics = {
     enable = true;
     enable32Bit = true;

hosts/machine/mizuki/configuration.nix

@@ -3,21 +3,21 @@
   imports = [
     ./hardware-configuration.nix
 
-    "${inputs.self}/modules/mizukios/base"
+    "${inputs.self}/modules/nixos/base"
-    "${inputs.self}/modules/mizukios/features/system/boot.nix"
+    "${inputs.self}/modules/nixos/features/system/boot.nix"
-    "${inputs.self}/modules/mizukios/features/fonts.nix"
+    "${inputs.self}/modules/nixos/features/fonts.nix"
-    "${inputs.self}/modules/mizukios/features/packages.nix"
+    "${inputs.self}/modules/nixos/features/packages.nix"
-    "${inputs.self}/modules/mizukios/features/plasma.nix"
+    "${inputs.self}/modules/nixos/features/plasma.nix"
-    "${inputs.self}/modules/mizukios/features/system/sound.nix"
+    "${inputs.self}/modules/nixos/features/system/sound.nix"
-    "${inputs.self}/modules/mizukios/features/catppuccin.nix"
+    "${inputs.self}/modules/nixos/features/catppuccin.nix"
-    "${inputs.self}/modules/mizukios/features/figma-agent.nix"
+    "${inputs.self}/modules/nixos/features/figma-agent.nix"
-    "${inputs.self}/modules/mizukios/features/management/cockpit.nix"
+    "${inputs.self}/modules/nixos/features/management/cockpit.nix"
-    "${inputs.self}/modules/mizukios/features/system/bluetooth.nix"
+    "${inputs.self}/modules/nixos/features/system/bluetooth.nix"
-    "${inputs.self}/modules/mizukios/features/system/graphics.nix"
+    "${inputs.self}/modules/nixos/features/system/graphics.nix"
-    "${inputs.self}/modules/mizukios/features/remote/ssh.nix"
+    "${inputs.self}/modules/nixos/features/remote/ssh.nix"
-    "${inputs.self}/modules/mizukios/features/system/virtualisation.nix"
+    "${inputs.self}/modules/nixos/features/system/virtualisation.nix"
-    "${inputs.self}/modules/mizukios/features/steam.nix"
+    "${inputs.self}/modules/nixos/features/steam.nix"
-    "${inputs.self}/modules/mizukios/features/remote/sunshine.nix"
+    "${inputs.self}/modules/nixos/features/remote/sunshine.nix"
   ];
 
   networking = {

hosts/machine/mizuki/home/default.nix

@@ -51,7 +51,6 @@
     "${inputs.self}/modules/home/devtool/ghostty.nix"
     "${inputs.self}/modules/home/devtool/zed.nix"
     "${inputs.self}/modules/home/vicinae.nix"
-    "${inputs.self}/modules/home/fastfetch.nix"
     ./config/shell.nix
     ./config/plasma.nix
     "${inputs.self}/modules/home/discord/linux.nix"

hosts/machine/ribbon/configuration.nix

@@ -1,8 +1,8 @@
 { pkgs, inputs, ... }:
 {
   imports = [
-    "${inputs.self}/modules/mizukios/base"
+    "${inputs.self}/modules/nixos/base"
-    "${inputs.self}/modules/mizukios/features/ssh.nix"
+    "${inputs.self}/modules/nixos/features/ssh.nix"
   ];
 
   wsl.enable = true;

hosts/machine/ribbon/home/packages.nix

@@ -1,7 +1,7 @@
 { pkgs, inputs }:
 let
-  nr = import "${inputs.self}/modules/mizukios/features/packages/nr.nix" { inherit pkgs; };
+  nr = import "${inputs.self}/modules/nixos/features/packages/nr.nix" { inherit pkgs; };
-  nrr = import "${inputs.self}/modules/mizukios/features/packages/nrr.nix" { inherit pkgs; };
+  nrr = import "${inputs.self}/modules/nixos/features/packages/nrr.nix" { inherit pkgs; };
 in
 with pkgs;
 [

hosts/server/hikari/default/configuration.nix

@@ -2,11 +2,11 @@
 {
   imports = [
     ./hardware-configuration.nix
-    "${inputs.self}/modules/mizukios/base"
+    "${inputs.self}/modules/nixos/base"
-    "${inputs.self}/modules/mizukios/features/management/cockpit.nix"
+    "${inputs.self}/modules/nixos/features/management/cockpit.nix"
-    "${inputs.self}/modules/mizukios/features/system/boot.nix"
+    "${inputs.self}/modules/nixos/features/system/boot.nix"
-    "${inputs.self}/modules/mizukios/features/remote/ssh.nix"
+    "${inputs.self}/modules/nixos/features/remote/ssh.nix"
-    "${inputs.self}/modules/mizukios/features/management/podman.nix"
+    "${inputs.self}/modules/nixos/features/management/podman.nix"
 
     ./services/rustfs.nix
     ./services/nextcloud.nix

hosts/server/hikari/default/home.nix

@@ -4,8 +4,8 @@
   ...
 }:
 let
-  nr = import "${inputs.self}/modules/mizukios/features/packages/nr.nix" { inherit pkgs; };
+  nr = import "${inputs.self}/modules/nixos/features/packages/nr.nix" { inherit pkgs; };
-  nrr = import "${inputs.self}/modules/mizukios/features/packages/nrr.nix" { inherit pkgs; };
+  nrr = import "${inputs.self}/modules/nixos/features/packages/nrr.nix" { inherit pkgs; };
 in
 {
   home.stateVersion = "26.05";

hosts/server/hikari/hako/configuration.nix

@@ -2,10 +2,10 @@
 {
   imports = [
     ./hardware-configuration.nix
-    "${inputs.self}/modules/mizukios/base"
+    "${inputs.self}/modules/nixos/base"
-    "${inputs.self}/modules/mizukios/features/system/boot.nix"
+    "${inputs.self}/modules/nixos/features/system/boot.nix"
-    "${inputs.self}/modules/mizukios/features/remote/ssh.nix"
+    "${inputs.self}/modules/nixos/features/remote/ssh.nix"
-    "${inputs.self}/modules/mizukios/features/management/docker.nix"
+    "${inputs.self}/modules/nixos/features/management/docker.nix"
   ];
 
   # 1. 크론 설정

hosts/server/hikari/hako/home.nix

@@ -4,8 +4,8 @@
   ...
 }:
 let
-  nr = import "${inputs.self}/modules/mizukios/features/packages/nr.nix" { inherit pkgs; };
+  nr = import "${inputs.self}/modules/nixos/features/packages/nr.nix" { inherit pkgs; };
-  nrr = import "${inputs.self}/modules/mizukios/features/packages/nrr.nix" { inherit pkgs; };
+  nrr = import "${inputs.self}/modules/nixos/features/packages/nrr.nix" { inherit pkgs; };
 in
 {
   home.stateVersion = "26.05";

hosts/server/kazusa/configuration.nix

@@ -6,10 +6,10 @@
 }:
 {
   imports = [
-    "${inputs.self}/modules/mizukios/base"
+    "${inputs.self}/modules/nixos/base"
-    "${inputs.self}/modules/mizukios/features/system/boot.nix"
+    "${inputs.self}/modules/nixos/features/system/boot.nix"
-    "${inputs.self}/modules/mizukios/features/remote/ssh.nix"
+    "${inputs.self}/modules/nixos/features/remote/ssh.nix"
-    "${inputs.self}/modules/mizukios/features/management/docker.nix"
+    "${inputs.self}/modules/nixos/features/management/docker.nix"
     ./services/mailserver.nix
     ./services/caddy.nix
   ];

hosts/server/kazusa/home/default.nix

@@ -5,8 +5,8 @@
   ...
 }:
 let
-  nr = import "${inputs.self}/modules/mizukios/features/packages/nr.nix" { inherit pkgs; };
+  nr = import "${inputs.self}/modules/nixos/features/packages/nr.nix" { inherit pkgs; };
-  nrr = import "${inputs.self}/modules/mizukios/features/packages/nrr.nix" { inherit pkgs; };
+  nrr = import "${inputs.self}/modules/nixos/features/packages/nrr.nix" { inherit pkgs; };
 in
 {
   home.stateVersion = "26.05";

hosts/server/natsu/configuration.nix

@@ -2,10 +2,10 @@
 {
   imports = [
     ./hardware-configuration.nix
-    "${inputs.self}/modules/mizukios/base"
+    "${inputs.self}/modules/nixos/base"
-    "${inputs.self}/modules/mizukios/features/system/boot.nix"
+    "${inputs.self}/modules/nixos/features/system/boot.nix"
-    "${inputs.self}/modules/mizukios/features/remote/ssh.nix"
+    "${inputs.self}/modules/nixos/features/remote/ssh.nix"
-    "${inputs.self}/modules/mizukios/features/management/docker.nix"
+    "${inputs.self}/modules/nixos/features/management/docker.nix"
   ];
 
   virtualisation.docker.daemon.settings = {

hosts/server/natsu/home.nix

@@ -5,8 +5,8 @@
   ...
 }:
 let
-  nr = import "${inputs.self}/modules/mizukios/features/packages/nr.nix" { inherit pkgs; };
+  nr = import "${inputs.self}/modules/nixos/features/packages/nr.nix" { inherit pkgs; };
-  nrr = import "${inputs.self}/modules/mizukios/features/packages/nrr.nix" { inherit pkgs; };
+  nrr = import "${inputs.self}/modules/nixos/features/packages/nrr.nix" { inherit pkgs; };
 in
 {
   home.stateVersion = "26.05";

hosts/server/natsu/services/caddy.nix

@@ -116,7 +116,7 @@ in
     '';
 
     virtualHosts."plutos.dazzle.st".extraConfig = ''
-      reverse_proxy localhost:13000
+      reverse_proxy epc.hikari.mizuki.arpa:3000
     '';
 
     virtualHosts."event.dazzle.st".extraConfig = ''

modules/home/fastfetch.nix

@@ -1,51 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-}:
-let
-  mizukios-logo = pkgs.callPackage ../mizukios/base/mizukios/assets/mizukios-logo.nix { };
-in
-{
-  config = lib.mkIf pkgs.stdenv.isLinux {
-    programs.fastfetch = {
-      enable = true;
-
-      settings = {
-        logo.source = "${mizukios-logo}/share/pixmaps/mizukios-mini.png";
-
-        modules = [
-          "title"
-          "separator"
-          "os"
-          "host"
-          "kernel"
-          "uptime"
-          "packages"
-          "shell"
-          "display"
-          "de"
-          "wm"
-          "wmtheme"
-          "theme"
-          "icons"
-          "font"
-          "cursor"
-          "terminal"
-          "terminalfont"
-          "cpu"
-          "gpu"
-          "memory"
-          "swap"
-          "disk"
-          "localip"
-          "battery"
-          "poweradapter"
-          "locale"
-          "break"
-          "colors"
-        ];
-      };
-    };
-  };
-}

modules/mizukios/base/mizukios/assets/mizukios-logo.nix

@@ -1,33 +0,0 @@
-{
-  stdenvNoCC,
-  fetchurl,
-  imagemagick,
-}:
-stdenvNoCC.mkDerivation {
-  pname = "mizukios-logo";
-  version = "1.0";
-  src = fetchurl {
-    url = "https://miyo.moe/pub/img/%E1%84%86%E1%85%B5%E1%84%8C%E1%85%B3%E1%84%8F%E1%85%B5.png";
-    hash = "sha256-ZHQkYO4HvBjccXtQGTRcNcl7f1noibOTP6Cq71OKFP4=";
-  };
-
-  nativeBuildInputs = [
-    imagemagick
-  ];
-
-  dontUnpack = true;
-
-  # unpackPhase = ":";
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/share/pixmaps
-    mkdir -p $out/share/icons/hicolor/scalable/apps
-    cp $src $out/share/pixmaps/mizukios.png
-    cp $src $out/share/icons/hicolor/scalable/apps/mizukios.png
-
-    magick $src \
-      -resize "512x512" \
-      $out/share/pixmaps/mizukios-mini.png
-  '';
-}

modules/mizukios/base/mizukios/default.nix

@@ -1,16 +0,0 @@
-{ pkgs, ... }:
-let
-  mizukios-logo = pkgs.callPackage ./assets/mizukios-logo.nix { };
-in
-{
-  system.nixos = {
-    distroName = "MizukiOS";
-    distroId = "mizukios";
-
-    extraOSReleaseArgs = {
-      LOGO = "mizukios";
-    };
-  };
-
-  environment.systemPackages = [ mizukios-logo ];
-}

modules/nixos/base/default.nix

@@ -5,6 +5,5 @@
     ./user.nix
     ./i18n.nix
     ./packages.nix
-    ./mizukios
   ];
 }

modules/nixos/base/i18n.nix

@@ -1,7 +1,9 @@
 { pkgs, ... }:
 {
+  # 시간대 설정
   time.timeZone = "Asia/Seoul";
 
+  # 로케일 설정 (영어 기본 + 한국 로케일)
   i18n = {
     defaultLocale = "en_US.UTF-8";
     extraLocaleSettings = {