Compare commits
49 changed files with 77 additions and 216 deletions
|
|
@ -123,7 +123,6 @@
|
||||||
paring.overlays.default
|
paring.overlays.default
|
||||||
imnyang.overlays.default
|
imnyang.overlays.default
|
||||||
];
|
];
|
||||||
installer = mkHost ./hosts/installer overlays;
|
|
||||||
|
|
||||||
# Server
|
# Server
|
||||||
hikari = mkHost ./hosts/server/hikari/default overlays;
|
hikari = mkHost ./hosts/server/hikari/default overlays;
|
||||||
|
|
|
||||||
|
|
@ -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;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -8,22 +8,22 @@
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./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 = {
|
networking = {
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@
|
||||||
|
|
||||||
cat = "bat --plain";
|
cat = "bat --plain";
|
||||||
|
|
||||||
|
# NixOS 관련
|
||||||
rebuild = "nr";
|
rebuild = "nr";
|
||||||
update = "nix flake update";
|
update = "nix flake update";
|
||||||
clean = "sudo nix-collect-garbage -d";
|
clean = "sudo nix-collect-garbage -d";
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{ pkgs, inputs, ... }:
|
{ pkgs, inputs, ... }:
|
||||||
let
|
let
|
||||||
dr = import ../../../../modules/mizukios/features/packages/dr.nix { inherit pkgs; };
|
dr = import ../../../../modules/nixos/features/packages/dr.nix { inherit pkgs; };
|
||||||
in
|
in
|
||||||
with pkgs;
|
with pkgs;
|
||||||
[
|
[
|
||||||
|
|
|
||||||
|
|
@ -3,16 +3,16 @@
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./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 = {
|
networking = {
|
||||||
|
|
|
||||||
|
|
@ -59,8 +59,6 @@
|
||||||
};
|
};
|
||||||
services.xserver.videoDrivers = [ "nvidia" ];
|
services.xserver.videoDrivers = [ "nvidia" ];
|
||||||
|
|
||||||
networking.interfaces.enp3s0.wakeOnLan.enable = true;
|
|
||||||
|
|
||||||
hardware.graphics = {
|
hardware.graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enable32Bit = true;
|
enable32Bit = true;
|
||||||
|
|
|
||||||
|
|
@ -3,21 +3,21 @@
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./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 = {
|
networking = {
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,6 @@
|
||||||
"${inputs.self}/modules/home/devtool/ghostty.nix"
|
"${inputs.self}/modules/home/devtool/ghostty.nix"
|
||||||
"${inputs.self}/modules/home/devtool/zed.nix"
|
"${inputs.self}/modules/home/devtool/zed.nix"
|
||||||
"${inputs.self}/modules/home/vicinae.nix"
|
"${inputs.self}/modules/home/vicinae.nix"
|
||||||
"${inputs.self}/modules/home/fastfetch.nix"
|
|
||||||
./config/shell.nix
|
./config/shell.nix
|
||||||
./config/plasma.nix
|
./config/plasma.nix
|
||||||
"${inputs.self}/modules/home/discord/linux.nix"
|
"${inputs.self}/modules/home/discord/linux.nix"
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
{ pkgs, inputs, ... }:
|
{ pkgs, inputs, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
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;
|
wsl.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
{ pkgs, inputs }:
|
{ pkgs, inputs }:
|
||||||
let
|
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
|
in
|
||||||
with pkgs;
|
with pkgs;
|
||||||
[
|
[
|
||||||
nr
|
nr
|
||||||
nrr
|
nrr
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./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/rustfs.nix
|
||||||
./services/nextcloud.nix
|
./services/nextcloud.nix
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
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
|
in
|
||||||
{
|
{
|
||||||
home.stateVersion = "26.05";
|
home.stateVersion = "26.05";
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,10 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./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. 크론 설정
|
# 1. 크론 설정
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
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
|
in
|
||||||
{
|
{
|
||||||
home.stateVersion = "26.05";
|
home.stateVersion = "26.05";
|
||||||
|
|
|
||||||
|
|
@ -6,10 +6,10 @@
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
imports = [
|
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/mailserver.nix
|
||||||
./services/caddy.nix
|
./services/caddy.nix
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,8 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
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
|
in
|
||||||
{
|
{
|
||||||
home.stateVersion = "26.05";
|
home.stateVersion = "26.05";
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,10 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./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 = {
|
virtualisation.docker.daemon.settings = {
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,8 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
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
|
in
|
||||||
{
|
{
|
||||||
home.stateVersion = "26.05";
|
home.stateVersion = "26.05";
|
||||||
|
|
|
||||||
|
|
@ -116,7 +116,7 @@ in
|
||||||
'';
|
'';
|
||||||
|
|
||||||
virtualHosts."plutos.dazzle.st".extraConfig = ''
|
virtualHosts."plutos.dazzle.st".extraConfig = ''
|
||||||
reverse_proxy localhost:13000
|
reverse_proxy epc.hikari.mizuki.arpa:3000
|
||||||
'';
|
'';
|
||||||
|
|
||||||
virtualHosts."event.dazzle.st".extraConfig = ''
|
virtualHosts."event.dazzle.st".extraConfig = ''
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue