diff --git a/flake.nix b/flake.nix index 24d83cb..d034a0b 100644 --- a/flake.nix +++ b/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; diff --git a/hosts/installer/default.nix b/hosts/installer/default.nix deleted file mode 100644 index e996624..0000000 --- a/hosts/installer/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/hosts/machine/ena/configuration.nix b/hosts/machine/ena/configuration.nix index c26d155..1d060cf 100644 --- a/hosts/machine/ena/configuration.nix +++ b/hosts/machine/ena/configuration.nix @@ -8,22 +8,22 @@ imports = [ ./hardware-configuration.nix - "${inputs.self}/modules/mizukios/base" - "${inputs.self}/modules/mizukios/features/system/boot.nix" - "${inputs.self}/modules/mizukios/features/fonts.nix" - "${inputs.self}/modules/mizukios/features/plasma.nix" - "${inputs.self}/modules/mizukios/features/system/sound.nix" - "${inputs.self}/modules/mizukios/features/packages.nix" - "${inputs.self}/modules/mizukios/features/catppuccin.nix" - "${inputs.self}/modules/mizukios/features/figma-agent.nix" - "${inputs.self}/modules/mizukios/features/system/sbctl.nix" - "${inputs.self}/modules/mizukios/features/system/grub-standalone.nix" - "${inputs.self}/modules/mizukios/features/system/virtualisation.nix" - "${inputs.self}/modules/mizukios/features/management/cockpit.nix" - "${inputs.self}/modules/mizukios/features/system/bluetooth.nix" - "${inputs.self}/modules/mizukios/features/system/graphics.nix" - "${inputs.self}/modules/mizukios/features/steam.nix" - "${inputs.self}/modules/mizukios/features/remote/ssh.nix" + "${inputs.self}/modules/nixos/base" + "${inputs.self}/modules/nixos/features/system/boot.nix" + "${inputs.self}/modules/nixos/features/fonts.nix" + "${inputs.self}/modules/nixos/features/plasma.nix" + "${inputs.self}/modules/nixos/features/system/sound.nix" + "${inputs.self}/modules/nixos/features/packages.nix" + "${inputs.self}/modules/nixos/features/catppuccin.nix" + "${inputs.self}/modules/nixos/features/figma-agent.nix" + "${inputs.self}/modules/nixos/features/system/sbctl.nix" + "${inputs.self}/modules/nixos/features/system/grub-standalone.nix" + "${inputs.self}/modules/nixos/features/system/virtualisation.nix" + "${inputs.self}/modules/nixos/features/management/cockpit.nix" + "${inputs.self}/modules/nixos/features/system/bluetooth.nix" + "${inputs.self}/modules/nixos/features/system/graphics.nix" + "${inputs.self}/modules/nixos/features/steam.nix" + "${inputs.self}/modules/nixos/features/remote/ssh.nix" ]; networking = { diff --git a/hosts/machine/ena/home/config/shell.nix b/hosts/machine/ena/home/config/shell.nix index 511bdbf..12bd876 100644 --- a/hosts/machine/ena/home/config/shell.nix +++ b/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"; diff --git a/hosts/machine/kanade/home/packages.nix b/hosts/machine/kanade/home/packages.nix index 6cbbb1b..485dd82 100644 --- a/hosts/machine/kanade/home/packages.nix +++ b/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; [ diff --git a/hosts/machine/mafuyu/configuration.nix b/hosts/machine/mafuyu/configuration.nix index f6a94d6..bdb3218 100644 --- a/hosts/machine/mafuyu/configuration.nix +++ b/hosts/machine/mafuyu/configuration.nix @@ -3,16 +3,16 @@ imports = [ ./hardware-configuration.nix - "${inputs.self}/modules/mizukios/base" - "${inputs.self}/modules/mizukios/features/system/boot.nix" - "${inputs.self}/modules/mizukios/features/fonts.nix" - "${inputs.self}/modules/mizukios/features/packages.nix" - "${inputs.self}/modules/mizukios/features/plasma.nix" - "${inputs.self}/modules/mizukios/features/system/sound.nix" - "${inputs.self}/modules/mizukios/features/catppuccin.nix" - "${inputs.self}/modules/mizukios/features/remote/ssh.nix" - "${inputs.self}/modules/mizukios/features/steam.nix" - "${inputs.self}/modules/mizukios/features/remote/sunshine.nix" + "${inputs.self}/modules/nixos/base" + "${inputs.self}/modules/nixos/features/system/boot.nix" + "${inputs.self}/modules/nixos/features/fonts.nix" + "${inputs.self}/modules/nixos/features/packages.nix" + "${inputs.self}/modules/nixos/features/plasma.nix" + "${inputs.self}/modules/nixos/features/sound.nix" + "${inputs.self}/modules/nixos/features/catppuccin.nix" + "${inputs.self}/modules/nixos/features/ssh.nix" + "${inputs.self}/modules/nixos/features/steam.nix" + "${inputs.self}/modules/nixos/features/sunshine.nix" ]; networking = { diff --git a/hosts/machine/mafuyu/hardware-configuration.nix b/hosts/machine/mafuyu/hardware-configuration.nix index fdd750d..19107f8 100644 --- a/hosts/machine/mafuyu/hardware-configuration.nix +++ b/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; diff --git a/hosts/machine/mizuki/configuration.nix b/hosts/machine/mizuki/configuration.nix index 004902a..8dba4dd 100644 --- a/hosts/machine/mizuki/configuration.nix +++ b/hosts/machine/mizuki/configuration.nix @@ -3,21 +3,21 @@ imports = [ ./hardware-configuration.nix - "${inputs.self}/modules/mizukios/base" - "${inputs.self}/modules/mizukios/features/system/boot.nix" - "${inputs.self}/modules/mizukios/features/fonts.nix" - "${inputs.self}/modules/mizukios/features/packages.nix" - "${inputs.self}/modules/mizukios/features/plasma.nix" - "${inputs.self}/modules/mizukios/features/system/sound.nix" - "${inputs.self}/modules/mizukios/features/catppuccin.nix" - "${inputs.self}/modules/mizukios/features/figma-agent.nix" - "${inputs.self}/modules/mizukios/features/management/cockpit.nix" - "${inputs.self}/modules/mizukios/features/system/bluetooth.nix" - "${inputs.self}/modules/mizukios/features/system/graphics.nix" - "${inputs.self}/modules/mizukios/features/remote/ssh.nix" - "${inputs.self}/modules/mizukios/features/system/virtualisation.nix" - "${inputs.self}/modules/mizukios/features/steam.nix" - "${inputs.self}/modules/mizukios/features/remote/sunshine.nix" + "${inputs.self}/modules/nixos/base" + "${inputs.self}/modules/nixos/features/system/boot.nix" + "${inputs.self}/modules/nixos/features/fonts.nix" + "${inputs.self}/modules/nixos/features/packages.nix" + "${inputs.self}/modules/nixos/features/plasma.nix" + "${inputs.self}/modules/nixos/features/system/sound.nix" + "${inputs.self}/modules/nixos/features/catppuccin.nix" + "${inputs.self}/modules/nixos/features/figma-agent.nix" + "${inputs.self}/modules/nixos/features/management/cockpit.nix" + "${inputs.self}/modules/nixos/features/system/bluetooth.nix" + "${inputs.self}/modules/nixos/features/system/graphics.nix" + "${inputs.self}/modules/nixos/features/remote/ssh.nix" + "${inputs.self}/modules/nixos/features/system/virtualisation.nix" + "${inputs.self}/modules/nixos/features/steam.nix" + "${inputs.self}/modules/nixos/features/remote/sunshine.nix" ]; networking = { diff --git a/hosts/machine/mizuki/home/default.nix b/hosts/machine/mizuki/home/default.nix index 175c2a7..cb34717 100644 --- a/hosts/machine/mizuki/home/default.nix +++ b/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" diff --git a/hosts/machine/ribbon/configuration.nix b/hosts/machine/ribbon/configuration.nix index ec8907a..6e9de34 100644 --- a/hosts/machine/ribbon/configuration.nix +++ b/hosts/machine/ribbon/configuration.nix @@ -1,8 +1,8 @@ { pkgs, inputs, ... }: { imports = [ - "${inputs.self}/modules/mizukios/base" - "${inputs.self}/modules/mizukios/features/ssh.nix" + "${inputs.self}/modules/nixos/base" + "${inputs.self}/modules/nixos/features/ssh.nix" ]; wsl.enable = true; diff --git a/hosts/machine/ribbon/home/packages.nix b/hosts/machine/ribbon/home/packages.nix index 58af817..af9f70e 100644 --- a/hosts/machine/ribbon/home/packages.nix +++ b/hosts/machine/ribbon/home/packages.nix @@ -1,10 +1,10 @@ { pkgs, inputs }: let - nr = import "${inputs.self}/modules/mizukios/features/packages/nr.nix" { inherit pkgs; }; - nrr = import "${inputs.self}/modules/mizukios/features/packages/nrr.nix" { inherit pkgs; }; + nr = import "${inputs.self}/modules/nixos/features/packages/nr.nix" { inherit pkgs; }; + nrr = import "${inputs.self}/modules/nixos/features/packages/nrr.nix" { inherit pkgs; }; in with pkgs; [ - nr - nrr + nr + nrr ] diff --git a/hosts/server/hikari/default/configuration.nix b/hosts/server/hikari/default/configuration.nix index 0f4e0cb..58bcefe 100644 --- a/hosts/server/hikari/default/configuration.nix +++ b/hosts/server/hikari/default/configuration.nix @@ -2,11 +2,11 @@ { imports = [ ./hardware-configuration.nix - "${inputs.self}/modules/mizukios/base" - "${inputs.self}/modules/mizukios/features/management/cockpit.nix" - "${inputs.self}/modules/mizukios/features/system/boot.nix" - "${inputs.self}/modules/mizukios/features/remote/ssh.nix" - "${inputs.self}/modules/mizukios/features/management/podman.nix" + "${inputs.self}/modules/nixos/base" + "${inputs.self}/modules/nixos/features/management/cockpit.nix" + "${inputs.self}/modules/nixos/features/system/boot.nix" + "${inputs.self}/modules/nixos/features/remote/ssh.nix" + "${inputs.self}/modules/nixos/features/management/podman.nix" ./services/rustfs.nix ./services/nextcloud.nix diff --git a/hosts/server/hikari/default/home.nix b/hosts/server/hikari/default/home.nix index bcf93b9..7d9d39d 100644 --- a/hosts/server/hikari/default/home.nix +++ b/hosts/server/hikari/default/home.nix @@ -4,8 +4,8 @@ ... }: let - nr = import "${inputs.self}/modules/mizukios/features/packages/nr.nix" { inherit pkgs; }; - nrr = import "${inputs.self}/modules/mizukios/features/packages/nrr.nix" { inherit pkgs; }; + nr = import "${inputs.self}/modules/nixos/features/packages/nr.nix" { inherit pkgs; }; + nrr = import "${inputs.self}/modules/nixos/features/packages/nrr.nix" { inherit pkgs; }; in { home.stateVersion = "26.05"; diff --git a/hosts/server/hikari/hako/configuration.nix b/hosts/server/hikari/hako/configuration.nix index 9c0b43c..8978761 100644 --- a/hosts/server/hikari/hako/configuration.nix +++ b/hosts/server/hikari/hako/configuration.nix @@ -2,10 +2,10 @@ { imports = [ ./hardware-configuration.nix - "${inputs.self}/modules/mizukios/base" - "${inputs.self}/modules/mizukios/features/system/boot.nix" - "${inputs.self}/modules/mizukios/features/remote/ssh.nix" - "${inputs.self}/modules/mizukios/features/management/docker.nix" + "${inputs.self}/modules/nixos/base" + "${inputs.self}/modules/nixos/features/system/boot.nix" + "${inputs.self}/modules/nixos/features/remote/ssh.nix" + "${inputs.self}/modules/nixos/features/management/docker.nix" ]; # 1. 크론 설정 diff --git a/hosts/server/hikari/hako/home.nix b/hosts/server/hikari/hako/home.nix index bcf93b9..7d9d39d 100644 --- a/hosts/server/hikari/hako/home.nix +++ b/hosts/server/hikari/hako/home.nix @@ -4,8 +4,8 @@ ... }: let - nr = import "${inputs.self}/modules/mizukios/features/packages/nr.nix" { inherit pkgs; }; - nrr = import "${inputs.self}/modules/mizukios/features/packages/nrr.nix" { inherit pkgs; }; + nr = import "${inputs.self}/modules/nixos/features/packages/nr.nix" { inherit pkgs; }; + nrr = import "${inputs.self}/modules/nixos/features/packages/nrr.nix" { inherit pkgs; }; in { home.stateVersion = "26.05"; diff --git a/hosts/server/kazusa/configuration.nix b/hosts/server/kazusa/configuration.nix index 8eac76c..a2d453b 100644 --- a/hosts/server/kazusa/configuration.nix +++ b/hosts/server/kazusa/configuration.nix @@ -6,10 +6,10 @@ }: { imports = [ - "${inputs.self}/modules/mizukios/base" - "${inputs.self}/modules/mizukios/features/system/boot.nix" - "${inputs.self}/modules/mizukios/features/remote/ssh.nix" - "${inputs.self}/modules/mizukios/features/management/docker.nix" + "${inputs.self}/modules/nixos/base" + "${inputs.self}/modules/nixos/features/system/boot.nix" + "${inputs.self}/modules/nixos/features/remote/ssh.nix" + "${inputs.self}/modules/nixos/features/management/docker.nix" ./services/mailserver.nix ./services/caddy.nix ]; diff --git a/hosts/server/kazusa/home/default.nix b/hosts/server/kazusa/home/default.nix index 6d40cfe..a86b950 100644 --- a/hosts/server/kazusa/home/default.nix +++ b/hosts/server/kazusa/home/default.nix @@ -5,8 +5,8 @@ ... }: let - nr = import "${inputs.self}/modules/mizukios/features/packages/nr.nix" { inherit pkgs; }; - nrr = import "${inputs.self}/modules/mizukios/features/packages/nrr.nix" { inherit pkgs; }; + nr = import "${inputs.self}/modules/nixos/features/packages/nr.nix" { inherit pkgs; }; + nrr = import "${inputs.self}/modules/nixos/features/packages/nrr.nix" { inherit pkgs; }; in { home.stateVersion = "26.05"; diff --git a/hosts/server/natsu/configuration.nix b/hosts/server/natsu/configuration.nix index 6e5f76b..72e5a93 100644 --- a/hosts/server/natsu/configuration.nix +++ b/hosts/server/natsu/configuration.nix @@ -2,10 +2,10 @@ { imports = [ ./hardware-configuration.nix - "${inputs.self}/modules/mizukios/base" - "${inputs.self}/modules/mizukios/features/system/boot.nix" - "${inputs.self}/modules/mizukios/features/remote/ssh.nix" - "${inputs.self}/modules/mizukios/features/management/docker.nix" + "${inputs.self}/modules/nixos/base" + "${inputs.self}/modules/nixos/features/system/boot.nix" + "${inputs.self}/modules/nixos/features/remote/ssh.nix" + "${inputs.self}/modules/nixos/features/management/docker.nix" ]; virtualisation.docker.daemon.settings = { diff --git a/hosts/server/natsu/home.nix b/hosts/server/natsu/home.nix index d64619a..f371120 100644 --- a/hosts/server/natsu/home.nix +++ b/hosts/server/natsu/home.nix @@ -5,8 +5,8 @@ ... }: let - nr = import "${inputs.self}/modules/mizukios/features/packages/nr.nix" { inherit pkgs; }; - nrr = import "${inputs.self}/modules/mizukios/features/packages/nrr.nix" { inherit pkgs; }; + nr = import "${inputs.self}/modules/nixos/features/packages/nr.nix" { inherit pkgs; }; + nrr = import "${inputs.self}/modules/nixos/features/packages/nrr.nix" { inherit pkgs; }; in { home.stateVersion = "26.05"; diff --git a/hosts/server/natsu/services/caddy.nix b/hosts/server/natsu/services/caddy.nix index a54246c..fb835f3 100644 --- a/hosts/server/natsu/services/caddy.nix +++ b/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 = '' diff --git a/modules/home/fastfetch.nix b/modules/home/fastfetch.nix deleted file mode 100644 index a6de741..0000000 --- a/modules/home/fastfetch.nix +++ /dev/null @@ -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" - ]; - }; - }; - }; -} diff --git a/modules/mizukios/base/mizukios/assets/mizukios-logo.nix b/modules/mizukios/base/mizukios/assets/mizukios-logo.nix deleted file mode 100644 index 214b348..0000000 --- a/modules/mizukios/base/mizukios/assets/mizukios-logo.nix +++ /dev/null @@ -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 - ''; -} diff --git a/modules/mizukios/base/mizukios/default.nix b/modules/mizukios/base/mizukios/default.nix deleted file mode 100644 index 2eccfed..0000000 --- a/modules/mizukios/base/mizukios/default.nix +++ /dev/null @@ -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 ]; -} diff --git a/modules/mizukios/base/default.nix b/modules/nixos/base/default.nix similarity index 86% rename from modules/mizukios/base/default.nix rename to modules/nixos/base/default.nix index a5922c2..7a5b322 100644 --- a/modules/mizukios/base/default.nix +++ b/modules/nixos/base/default.nix @@ -5,6 +5,5 @@ ./user.nix ./i18n.nix ./packages.nix - ./mizukios ]; } diff --git a/modules/mizukios/base/i18n.nix b/modules/nixos/base/i18n.nix similarity index 94% rename from modules/mizukios/base/i18n.nix rename to modules/nixos/base/i18n.nix index 4936343..af3c6b7 100644 --- a/modules/mizukios/base/i18n.nix +++ b/modules/nixos/base/i18n.nix @@ -1,7 +1,9 @@ { pkgs, ... }: { + # 시간대 설정 time.timeZone = "Asia/Seoul"; + # 로케일 설정 (영어 기본 + 한국 로케일) i18n = { defaultLocale = "en_US.UTF-8"; extraLocaleSettings = { diff --git a/modules/mizukios/base/nix.nix b/modules/nixos/base/nix.nix similarity index 100% rename from modules/mizukios/base/nix.nix rename to modules/nixos/base/nix.nix diff --git a/modules/mizukios/base/packages.nix b/modules/nixos/base/packages.nix similarity index 100% rename from modules/mizukios/base/packages.nix rename to modules/nixos/base/packages.nix diff --git a/modules/mizukios/base/user.nix b/modules/nixos/base/user.nix similarity index 100% rename from modules/mizukios/base/user.nix rename to modules/nixos/base/user.nix diff --git a/modules/mizukios/features/catppuccin.nix b/modules/nixos/features/catppuccin.nix similarity index 100% rename from modules/mizukios/features/catppuccin.nix rename to modules/nixos/features/catppuccin.nix diff --git a/modules/mizukios/features/figma-agent.nix b/modules/nixos/features/figma-agent.nix similarity index 100% rename from modules/mizukios/features/figma-agent.nix rename to modules/nixos/features/figma-agent.nix diff --git a/modules/mizukios/features/fonts.nix b/modules/nixos/features/fonts.nix similarity index 100% rename from modules/mizukios/features/fonts.nix rename to modules/nixos/features/fonts.nix diff --git a/modules/mizukios/features/management/cockpit.nix b/modules/nixos/features/management/cockpit.nix similarity index 100% rename from modules/mizukios/features/management/cockpit.nix rename to modules/nixos/features/management/cockpit.nix diff --git a/modules/mizukios/features/management/docker.nix b/modules/nixos/features/management/docker.nix similarity index 100% rename from modules/mizukios/features/management/docker.nix rename to modules/nixos/features/management/docker.nix diff --git a/modules/mizukios/features/management/podman.nix b/modules/nixos/features/management/podman.nix similarity index 100% rename from modules/mizukios/features/management/podman.nix rename to modules/nixos/features/management/podman.nix diff --git a/modules/mizukios/features/packages.nix b/modules/nixos/features/packages.nix similarity index 100% rename from modules/mizukios/features/packages.nix rename to modules/nixos/features/packages.nix diff --git a/modules/mizukios/features/packages/dr.nix b/modules/nixos/features/packages/dr.nix similarity index 100% rename from modules/mizukios/features/packages/dr.nix rename to modules/nixos/features/packages/dr.nix diff --git a/modules/mizukios/features/packages/nr.nix b/modules/nixos/features/packages/nr.nix similarity index 100% rename from modules/mizukios/features/packages/nr.nix rename to modules/nixos/features/packages/nr.nix diff --git a/modules/mizukios/features/packages/nrr.nix b/modules/nixos/features/packages/nrr.nix similarity index 100% rename from modules/mizukios/features/packages/nrr.nix rename to modules/nixos/features/packages/nrr.nix diff --git a/modules/mizukios/features/plasma.nix b/modules/nixos/features/plasma.nix similarity index 100% rename from modules/mizukios/features/plasma.nix rename to modules/nixos/features/plasma.nix diff --git a/modules/mizukios/features/remote/ssh.nix b/modules/nixos/features/remote/ssh.nix similarity index 100% rename from modules/mizukios/features/remote/ssh.nix rename to modules/nixos/features/remote/ssh.nix diff --git a/modules/mizukios/features/remote/sunshine.nix b/modules/nixos/features/remote/sunshine.nix similarity index 100% rename from modules/mizukios/features/remote/sunshine.nix rename to modules/nixos/features/remote/sunshine.nix diff --git a/modules/mizukios/features/steam.nix b/modules/nixos/features/steam.nix similarity index 100% rename from modules/mizukios/features/steam.nix rename to modules/nixos/features/steam.nix diff --git a/modules/mizukios/features/system/bluetooth.nix b/modules/nixos/features/system/bluetooth.nix similarity index 100% rename from modules/mizukios/features/system/bluetooth.nix rename to modules/nixos/features/system/bluetooth.nix diff --git a/modules/mizukios/features/system/boot.nix b/modules/nixos/features/system/boot.nix similarity index 100% rename from modules/mizukios/features/system/boot.nix rename to modules/nixos/features/system/boot.nix diff --git a/modules/mizukios/features/system/graphics.nix b/modules/nixos/features/system/graphics.nix similarity index 100% rename from modules/mizukios/features/system/graphics.nix rename to modules/nixos/features/system/graphics.nix diff --git a/modules/mizukios/features/system/grub-standalone.nix b/modules/nixos/features/system/grub-standalone.nix similarity index 100% rename from modules/mizukios/features/system/grub-standalone.nix rename to modules/nixos/features/system/grub-standalone.nix diff --git a/modules/mizukios/features/system/sbctl.nix b/modules/nixos/features/system/sbctl.nix similarity index 100% rename from modules/mizukios/features/system/sbctl.nix rename to modules/nixos/features/system/sbctl.nix diff --git a/modules/mizukios/features/system/sound.nix b/modules/nixos/features/system/sound.nix similarity index 100% rename from modules/mizukios/features/system/sound.nix rename to modules/nixos/features/system/sound.nix diff --git a/modules/mizukios/features/system/virtualisation.nix b/modules/nixos/features/system/virtualisation.nix similarity index 100% rename from modules/mizukios/features/system/virtualisation.nix rename to modules/nixos/features/system/virtualisation.nix