Compare commits
2 commits
9313d89b15
...
be184a26ff
| Author | SHA1 | Date | |
|---|---|---|---|
|
be184a26ff |
|||
|
3adc5e9f73 |
49 changed files with 216 additions and 77 deletions
|
|
@ -123,6 +123,7 @@
|
|||
paring.overlays.default
|
||||
imnyang.overlays.default
|
||||
];
|
||||
installer = mkHost ./hosts/installer overlays;
|
||||
|
||||
# Server
|
||||
hikari = mkHost ./hosts/server/hikari/default overlays;
|
||||
|
|
|
|||
37
hosts/installer/default.nix
Normal file
37
hosts/installer/default.nix
Normal file
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
@ -8,22 +8,22 @@
|
|||
imports = [
|
||||
./hardware-configuration.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"
|
||||
"${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"
|
||||
];
|
||||
|
||||
networking = {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@
|
|||
|
||||
cat = "bat --plain";
|
||||
|
||||
# NixOS 관련
|
||||
rebuild = "nr";
|
||||
update = "nix flake update";
|
||||
clean = "sudo nix-collect-garbage -d";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ pkgs, inputs, ... }:
|
||||
let
|
||||
dr = import ../../../../modules/nixos/features/packages/dr.nix { inherit pkgs; };
|
||||
dr = import ../../../../modules/mizukios/features/packages/dr.nix { inherit pkgs; };
|
||||
in
|
||||
with pkgs;
|
||||
[
|
||||
|
|
|
|||
|
|
@ -3,16 +3,16 @@
|
|||
imports = [
|
||||
./hardware-configuration.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"
|
||||
"${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"
|
||||
];
|
||||
|
||||
networking = {
|
||||
|
|
|
|||
|
|
@ -59,6 +59,8 @@
|
|||
};
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
|
||||
networking.interfaces.enp3s0.wakeOnLan.enable = true;
|
||||
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
enable32Bit = true;
|
||||
|
|
|
|||
|
|
@ -3,21 +3,21 @@
|
|||
imports = [
|
||||
./hardware-configuration.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"
|
||||
"${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"
|
||||
];
|
||||
|
||||
networking = {
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ pkgs, inputs, ... }:
|
||||
{
|
||||
imports = [
|
||||
"${inputs.self}/modules/nixos/base"
|
||||
"${inputs.self}/modules/nixos/features/ssh.nix"
|
||||
"${inputs.self}/modules/mizukios/base"
|
||||
"${inputs.self}/modules/mizukios/features/ssh.nix"
|
||||
];
|
||||
|
||||
wsl.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ pkgs, inputs }:
|
||||
let
|
||||
nr = import "${inputs.self}/modules/nixos/features/packages/nr.nix" { inherit pkgs; };
|
||||
nrr = import "${inputs.self}/modules/nixos/features/packages/nrr.nix" { inherit pkgs; };
|
||||
nr = import "${inputs.self}/modules/mizukios/features/packages/nr.nix" { inherit pkgs; };
|
||||
nrr = import "${inputs.self}/modules/mizukios/features/packages/nrr.nix" { inherit pkgs; };
|
||||
in
|
||||
with pkgs;
|
||||
[
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
{
|
||||
imports = [
|
||||
./hardware-configuration.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"
|
||||
"${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"
|
||||
|
||||
./services/rustfs.nix
|
||||
./services/nextcloud.nix
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
nr = import "${inputs.self}/modules/nixos/features/packages/nr.nix" { inherit pkgs; };
|
||||
nrr = import "${inputs.self}/modules/nixos/features/packages/nrr.nix" { inherit pkgs; };
|
||||
nr = import "${inputs.self}/modules/mizukios/features/packages/nr.nix" { inherit pkgs; };
|
||||
nrr = import "${inputs.self}/modules/mizukios/features/packages/nrr.nix" { inherit pkgs; };
|
||||
in
|
||||
{
|
||||
home.stateVersion = "26.05";
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
{
|
||||
imports = [
|
||||
./hardware-configuration.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"
|
||||
"${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"
|
||||
];
|
||||
|
||||
# 1. 크론 설정
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
nr = import "${inputs.self}/modules/nixos/features/packages/nr.nix" { inherit pkgs; };
|
||||
nrr = import "${inputs.self}/modules/nixos/features/packages/nrr.nix" { inherit pkgs; };
|
||||
nr = import "${inputs.self}/modules/mizukios/features/packages/nr.nix" { inherit pkgs; };
|
||||
nrr = import "${inputs.self}/modules/mizukios/features/packages/nrr.nix" { inherit pkgs; };
|
||||
in
|
||||
{
|
||||
home.stateVersion = "26.05";
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@
|
|||
}:
|
||||
{
|
||||
imports = [
|
||||
"${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"
|
||||
"${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"
|
||||
./services/mailserver.nix
|
||||
./services/caddy.nix
|
||||
];
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
nr = import "${inputs.self}/modules/nixos/features/packages/nr.nix" { inherit pkgs; };
|
||||
nrr = import "${inputs.self}/modules/nixos/features/packages/nrr.nix" { inherit pkgs; };
|
||||
nr = import "${inputs.self}/modules/mizukios/features/packages/nr.nix" { inherit pkgs; };
|
||||
nrr = import "${inputs.self}/modules/mizukios/features/packages/nrr.nix" { inherit pkgs; };
|
||||
in
|
||||
{
|
||||
home.stateVersion = "26.05";
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
{
|
||||
imports = [
|
||||
./hardware-configuration.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"
|
||||
"${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"
|
||||
];
|
||||
|
||||
virtualisation.docker.daemon.settings = {
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
nr = import "${inputs.self}/modules/nixos/features/packages/nr.nix" { inherit pkgs; };
|
||||
nrr = import "${inputs.self}/modules/nixos/features/packages/nrr.nix" { inherit pkgs; };
|
||||
nr = import "${inputs.self}/modules/mizukios/features/packages/nr.nix" { inherit pkgs; };
|
||||
nrr = import "${inputs.self}/modules/mizukios/features/packages/nrr.nix" { inherit pkgs; };
|
||||
in
|
||||
{
|
||||
home.stateVersion = "26.05";
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
51
modules/home/fastfetch.nix
Normal file
51
modules/home/fastfetch.nix
Normal file
|
|
@ -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"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -5,5 +5,6 @@
|
|||
./user.nix
|
||||
./i18n.nix
|
||||
./packages.nix
|
||||
./mizukios
|
||||
];
|
||||
}
|
||||
|
|
@ -1,9 +1,7 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
# 시간대 설정
|
||||
time.timeZone = "Asia/Seoul";
|
||||
|
||||
# 로케일 설정 (영어 기본 + 한국 로케일)
|
||||
i18n = {
|
||||
defaultLocale = "en_US.UTF-8";
|
||||
extraLocaleSettings = {
|
||||
33
modules/mizukios/base/mizukios/assets/mizukios-logo.nix
Normal file
33
modules/mizukios/base/mizukios/assets/mizukios-logo.nix
Normal file
|
|
@ -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
|
||||
'';
|
||||
}
|
||||
16
modules/mizukios/base/mizukios/default.nix
Normal file
16
modules/mizukios/base/mizukios/default.nix
Normal file
|
|
@ -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 ];
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue