imnyang/nix-flakes
Watch
1
0
Fork
You've already forked nix-flakes
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactoring

Browse source
This commit is contained in:
암냥 2026-07-05 13:36:31 +09:00
commit 3adc5e9f73
No known key found for this signature in database
40 changed files with 73 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

32
hosts/machine/ena/configuration.nix
View file

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

2
hosts/machine/kanade/home/packages.nix
View file

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

20
hosts/machine/mafuyu/configuration.nix
View file

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

30
hosts/machine/mizuki/configuration.nix
View file

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

4
hosts/machine/ribbon/configuration.nix
View file

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

4
hosts/machine/ribbon/home/packages.nix
View file

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

10
hosts/server/hikari/default/configuration.nix
View file

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

4
hosts/server/hikari/default/home.nix
View file

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

8
hosts/server/hikari/hako/configuration.nix
View file

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

4
hosts/server/hikari/hako/home.nix
View file

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

8
hosts/server/kazusa/configuration.nix
View file

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

4
hosts/server/kazusa/home/default.nix
View file

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

8
hosts/server/natsu/configuration.nix
View file

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

4
hosts/server/natsu/home.nix
View file

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

9
modules/mizukios/base/default.nix Normal file
View file

@ -0,0 +1,9 @@
{ ... }:
{
imports = [
./nix.nix
./user.nix
./i18n.nix
./packages.nix
];
}

62
modules/mizukios/base/i18n.nix Normal file
View file

@ -0,0 +1,62 @@
{ pkgs, ... }:
{
# 시간대 설정
time.timeZone = "Asia/Seoul";
# 로케일 설정 (영어 기본 + 한국 로케일)
i18n = {
defaultLocale = "en_US.UTF-8";
extraLocaleSettings = {
LC_ADDRESS = "en_US.UTF-8";
LC_IDENTIFICATION = "en_US.UTF-8";
LC_MEASUREMENT = "en_US.UTF-8";
LC_MONETARY = "en_US.UTF-8";
LC_NAME = "en_US.UTF-8";
LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "en_US.UTF-8";
LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
};
};
i18n.inputMethod = {
enable = true;
type = "fcitx5";
fcitx5 = {
settings.globalOptions = {
"Hotkey/TriggerKeys" = {
"0" = "Hangul";
};
"Hotkey/ActivateKeys" = {
"0" = "Hangul_Hanja";
};
"Hotkey/DeactivateKeys" = {
"0" = "Hangul_Romaja";
};
"Hotkey/EnumerateGroupForwardKeys" = {
"0" = "Super+space";
};
"Hotkey/PrevPage" = {
"0" = "Up";
};
"Hotkey/NextPage" = {
"0" = "Down";
};
"Hotkey" = {
"AltTriggerKeys" = "";
"EnumerateForwardKeys" = "";
"EnumerateBackwardKeys" = "";
};
};
};
fcitx5.addons = with pkgs; [
fcitx5-hangul
];
};
environment.sessionVariables = {
GTK_IM_MODULE = "fcitx";
QT_IM_MODULE = "fcitx";
XMODIFIERS = "@im=fcitx";
};
}

47
modules/mizukios/base/nix.nix Normal file
View file

@ -0,0 +1,47 @@
{ overlays, ... }:
{
# Apply overlays
nixpkgs.overlays = overlays;
nixpkgs.config.allowUnfree = true;
# Nix 설정
nix.settings = {
sandbox = false;
experimental-features = [
"nix-command"
"flakes"
];
auto-optimise-store = true;
};
nix.settings.trusted-users = [
"root"
"imnyang"
];
nix.settings = {
substituters = [
"https://cache.mizuki.guru/public"
"https://cache.mizuki.guru/imnyang"
"https://nix.mizuki.my/public"
"https://vicinae.cachix.org"
];
trusted-public-keys = [
"public:IgipakDD/clr0XbuaIejPYMT5UkTVGKVTxtWXcsbiAg="
"imnyang:x8Oex2DLzZUBxS/3VvkVptT3DiugjsCbQ23VjsxMT5c="
"public:SnHrtrxbCPcZujbJdgsKFeObTfRKQl5KhrI+LljtZUE="
"vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc="
];
};
nix.gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 7d";
};
nixpkgs.config.permittedInsecurePackages = [
"openssl-1.1.1w"
"pnpm-10.29.2"
];
}

31
modules/mizukios/base/packages.nix Normal file
View file

@ -0,0 +1,31 @@
{ pkgs, ... }:
{
programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [
glib
stdenv.cc.cc
zlib
];
# Unfree 패키지 허용
nixpkgs.config.allowUnfree = true;
programs.direnv.enable = true;
# 기본 시스템 패키지
environment.systemPackages = with pkgs; [
eza
btop
vim
wget
curl
git
tree
unzip
zip
file
attic-client
direnv
devenv
];
}

34
modules/mizukios/base/user.nix Normal file
View file

@ -0,0 +1,34 @@
{ pkgs, inputs, ... }:
{
users.users.imnyang = {
isNormalUser = true;
linger = true;
description = "@imnya.ng";
extraGroups = [
"imnyang"
"networkmanager"
"wheel"
"docker"
"libvirtd"
"podman"
];
shell = pkgs.fish;
};
security.sudo.extraRules = [
{
users = [ "imnyang" ];
commands = [
{
command = "ALL";
options = [ "NOPASSWD" ];
}
];
}
];
system.activationScripts.createIcon = "ln -sfn ${inputs.self}/assets/avatar.webp /var/lib/AccountsService/icons/imnyang";
programs.fish.enable = true;
}

18
modules/mizukios/features/catppuccin.nix Normal file
View file

@ -0,0 +1,18 @@
{ pkgs, ... }:
{
catppuccin.enable = true;
catppuccin.flavor = "latte";
catppuccin.autoEnable = false;
catppuccin = {
cache.enable = true;
cursors.enable = false;
fcitx5.enable = true;
forgejo.enable = false;
limine.enable = false;
gitea.enable = false;
grub.enable = true;
plymouth.enable = false;
sddm.enable = false;
tty.enable = true;
};
}

Some files were not shown because too many files have changed in this diff Show more