diff --git a/flake.nix b/flake.nix index d034a0b..24d83cb 100644 --- a/flake.nix +++ b/flake.nix @@ -123,6 +123,7 @@ 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 new file mode 100644 index 0000000..e996624 --- /dev/null +++ b/hosts/installer/default.nix @@ -0,0 +1,37 @@ +{ + 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/home/config/shell.nix b/hosts/machine/ena/home/config/shell.nix index 12bd876..511bdbf 100644 --- a/hosts/machine/ena/home/config/shell.nix +++ b/hosts/machine/ena/home/config/shell.nix @@ -15,7 +15,6 @@ cat = "bat --plain"; - # NixOS 관련 rebuild = "nr"; update = "nix flake update"; clean = "sudo nix-collect-garbage -d"; diff --git a/hosts/machine/mafuyu/configuration.nix b/hosts/machine/mafuyu/configuration.nix index c883bc2..f6a94d6 100644 --- a/hosts/machine/mafuyu/configuration.nix +++ b/hosts/machine/mafuyu/configuration.nix @@ -8,11 +8,11 @@ "${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/sound.nix" + "${inputs.self}/modules/mizukios/features/system/sound.nix" "${inputs.self}/modules/mizukios/features/catppuccin.nix" - "${inputs.self}/modules/mizukios/features/ssh.nix" + "${inputs.self}/modules/mizukios/features/remote/ssh.nix" "${inputs.self}/modules/mizukios/features/steam.nix" - "${inputs.self}/modules/mizukios/features/sunshine.nix" + "${inputs.self}/modules/mizukios/features/remote/sunshine.nix" ]; networking = { diff --git a/hosts/machine/mafuyu/hardware-configuration.nix b/hosts/machine/mafuyu/hardware-configuration.nix index 19107f8..fdd750d 100644 --- a/hosts/machine/mafuyu/hardware-configuration.nix +++ b/hosts/machine/mafuyu/hardware-configuration.nix @@ -59,6 +59,8 @@ }; services.xserver.videoDrivers = [ "nvidia" ]; + networking.interfaces.enp3s0.wakeOnLan.enable = true; + hardware.graphics = { enable = true; enable32Bit = true; diff --git a/hosts/machine/mizuki/home/default.nix b/hosts/machine/mizuki/home/default.nix index cb34717..175c2a7 100644 --- a/hosts/machine/mizuki/home/default.nix +++ b/hosts/machine/mizuki/home/default.nix @@ -51,6 +51,7 @@ "${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/server/natsu/services/caddy.nix b/hosts/server/natsu/services/caddy.nix index fb835f3..a54246c 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 epc.hikari.mizuki.arpa:3000 + reverse_proxy localhost:13000 ''; virtualHosts."event.dazzle.st".extraConfig = '' diff --git a/modules/home/fastfetch.nix b/modules/home/fastfetch.nix new file mode 100644 index 0000000..a6de741 --- /dev/null +++ b/modules/home/fastfetch.nix @@ -0,0 +1,51 @@ +{ + 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/default.nix b/modules/mizukios/base/default.nix index 7a5b322..a5922c2 100644 --- a/modules/mizukios/base/default.nix +++ b/modules/mizukios/base/default.nix @@ -5,5 +5,6 @@ ./user.nix ./i18n.nix ./packages.nix + ./mizukios ]; } diff --git a/modules/mizukios/base/i18n.nix b/modules/mizukios/base/i18n.nix index af3c6b7..4936343 100644 --- a/modules/mizukios/base/i18n.nix +++ b/modules/mizukios/base/i18n.nix @@ -1,9 +1,7 @@ { pkgs, ... }: { - # 시간대 설정 time.timeZone = "Asia/Seoul"; - # 로케일 설정 (영어 기본 + 한국 로케일) i18n = { defaultLocale = "en_US.UTF-8"; extraLocaleSettings = { diff --git a/modules/mizukios/base/mizukios/assets/mizukios-logo.nix b/modules/mizukios/base/mizukios/assets/mizukios-logo.nix new file mode 100644 index 0000000..214b348 --- /dev/null +++ b/modules/mizukios/base/mizukios/assets/mizukios-logo.nix @@ -0,0 +1,33 @@ +{ + 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 new file mode 100644 index 0000000..2eccfed --- /dev/null +++ b/modules/mizukios/base/mizukios/default.nix @@ -0,0 +1,16 @@ +{ pkgs, ... }: +let + mizukios-logo = pkgs.callPackage ./assets/mizukios-logo.nix { }; +in +{ + system.nixos = { + distroName = "MizukiOS"; + distroId = "mizukios"; + + extraOSReleaseArgs = { + LOGO = "mizukios"; + }; + }; + + environment.systemPackages = [ mizukios-logo ]; +}