Merge branch 'main' of ssh://mizuki.guru/imnyang/nix-flakes
# Conflicts: # flake.lock # hosts/machine/mafuyu/home/packages.nix # modules/home/packages.nix
This commit is contained in:
commit
eb439fe825
30 changed files with 531 additions and 201 deletions
|
|
@ -25,6 +25,7 @@
|
|||
"${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/mizukios/features/_1password.nix"
|
||||
];
|
||||
|
||||
catppuccin.flavor = lib.mkForce "mocha";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
|
|
@ -25,7 +26,9 @@
|
|||
"${inputs.self}/modules/home/devtool/neovim.nix"
|
||||
"${inputs.self}/modules/home/spicetify.nix"
|
||||
"${inputs.self}/modules/home/devtool/ghostty.nix"
|
||||
"${inputs.self}/modules/home/devtool/btop.nix"
|
||||
"${inputs.self}/modules/home/devtool/zed.nix"
|
||||
"${inputs.self}/modules/home/firefox-devedition.nix"
|
||||
"${inputs.self}/modules/home/discord/linux.nix"
|
||||
"${inputs.self}/modules/home/devtool/vscode.nix"
|
||||
"${inputs.self}/modules/home/devtool/ciscopackettracer.nix"
|
||||
|
|
@ -35,4 +38,6 @@
|
|||
./config/shell.nix
|
||||
./config/plasma.nix
|
||||
];
|
||||
|
||||
programs.btop.settings.color_theme = lib.mkForce "Mizuki Dark";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
imports = [
|
||||
"${inputs.self}/modules/home/devtool/neovim.nix"
|
||||
"${inputs.self}/modules/home/devtool/ghostty.nix"
|
||||
"${inputs.self}/modules/home/devtool/btop.nix"
|
||||
"${inputs.self}/modules/home/devtool/zed.nix"
|
||||
./config/git.nix
|
||||
./config/shell.nix
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
"1password"
|
||||
"cloudflare-warp"
|
||||
"protonvpn"
|
||||
"microsoft-edge@canary"
|
||||
|
||||
# Communication
|
||||
"discord"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
|
||||
persistent-apps = [
|
||||
"/System/Applications/Apps.app"
|
||||
"/Applications/Microsoft Edge Canary.app"
|
||||
"/Applications/Discord.app"
|
||||
"/Applications/KakaoTalk.app"
|
||||
"/Applications/Signal.app"
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
"${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/mizukios/features/_1password.nix"
|
||||
];
|
||||
|
||||
networking = {
|
||||
|
|
|
|||
|
|
@ -35,7 +35,9 @@
|
|||
imports = [
|
||||
"${inputs.self}/modules/home/devtool/neovim.nix"
|
||||
"${inputs.self}/modules/home/devtool/ghostty.nix"
|
||||
"${inputs.self}/modules/home/devtool/btop.nix"
|
||||
"${inputs.self}/modules/home/devtool/zed.nix"
|
||||
"${inputs.self}/modules/home/firefox-devedition.nix"
|
||||
"${inputs.self}/modules/home/discord/linux.nix"
|
||||
./config/shell.nix
|
||||
./config/plasma.nix
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
"${inputs.self}/modules/mizukios/features/steam.nix"
|
||||
"${inputs.self}/modules/mizukios/features/remote/sunshine.nix"
|
||||
"${inputs.self}/modules/mizukios/features/waydroid.nix"
|
||||
"${inputs.self}/modules/mizukios/features/_1password.nix"
|
||||
];
|
||||
|
||||
networking = {
|
||||
|
|
|
|||
|
|
@ -25,7 +25,9 @@
|
|||
"${inputs.self}/modules/home/devtool/neovim.nix"
|
||||
"${inputs.self}/modules/home/spicetify.nix"
|
||||
"${inputs.self}/modules/home/devtool/ghostty.nix"
|
||||
"${inputs.self}/modules/home/devtool/btop.nix"
|
||||
"${inputs.self}/modules/home/devtool/zed.nix"
|
||||
"${inputs.self}/modules/home/firefox-devedition.nix"
|
||||
"${inputs.self}/modules/home/vicinae.nix"
|
||||
"${inputs.self}/modules/home/fastfetch.nix"
|
||||
./config/shell.nix
|
||||
|
|
|
|||
|
|
@ -15,6 +15,9 @@ with pkgs;
|
|||
davinci-resolve
|
||||
kdePackages.kdenlive
|
||||
|
||||
android-tools
|
||||
android-cli
|
||||
|
||||
# waterfox-bin
|
||||
# inputs.waterfox.packages.${pkgs.system}.waterfox
|
||||
]
|
||||
|
|
|
|||
68
hosts/server/hikari/amia/configuration.nix
Normal file
68
hosts/server/hikari/amia/configuration.nix
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
{ pkgs, inputs, ... }:
|
||||
let
|
||||
amiaBot = pkgs.rustPlatform.buildRustPackage {
|
||||
pname = "amia";
|
||||
version = "0.1.0";
|
||||
src = inputs.amiaBot;
|
||||
cargoLock.lockFile = "${inputs.amiaBot}/Cargo.lock";
|
||||
};
|
||||
in
|
||||
{
|
||||
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"
|
||||
];
|
||||
|
||||
services.qemuGuest.enable = true;
|
||||
|
||||
users.users.imnyang.openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOHP3Z+AYrRh9f8TYyqChKfeyNm3lOe0F75AwRHTTaxD imnyang@kazusa"
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
eza
|
||||
neovim
|
||||
nil
|
||||
nixd
|
||||
bind
|
||||
dig
|
||||
];
|
||||
|
||||
programs.git.config = {
|
||||
safe.directory = "*";
|
||||
};
|
||||
|
||||
nix.settings.require-sigs = false;
|
||||
|
||||
networking.firewall.enable = false;
|
||||
|
||||
systemd.services.amia = {
|
||||
description = "Discord Profile Widget Bot";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
unitConfig.ConditionPathExists = "/home/imnyang/amia/config.toml";
|
||||
path = [
|
||||
pkgs.bind.dnsutils
|
||||
];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
User = "imnyang";
|
||||
WorkingDirectory = "/home/imnyang/amia";
|
||||
UMask = "0077";
|
||||
ExecStart = "${amiaBot}/bin/amia";
|
||||
Restart = "on-failure";
|
||||
RestartSec = "5s";
|
||||
NoNewPrivileges = true;
|
||||
PrivateTmp = true;
|
||||
ProtectSystem = "strict";
|
||||
ProtectHome = false;
|
||||
};
|
||||
};
|
||||
|
||||
networking.hostName = "amia";
|
||||
system.stateVersion = "26.05";
|
||||
}
|
||||
25
hosts/server/hikari/amia/default.nix
Normal file
25
hosts/server/hikari/amia/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{
|
||||
inputs,
|
||||
overlays,
|
||||
}:
|
||||
let
|
||||
inherit (inputs) nixpkgs home-manager;
|
||||
in
|
||||
nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
./configuration.nix
|
||||
./hardware-configuration.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||
home-manager.users.imnyang = import ./home.nix;
|
||||
}
|
||||
];
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
inherit overlays;
|
||||
};
|
||||
}
|
||||
30
hosts/server/hikari/amia/hardware-configuration.nix
Normal file
30
hosts/server/hikari/amia/hardware-configuration.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/profiles/qemu-guest.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/a31f97e6-5de2-470d-8718-a1eadd7827a8";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/5B6A-1CAB";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
}
|
||||
66
hosts/server/hikari/amia/home.nix
Normal file
66
hosts/server/hikari/amia/home.nix
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
{
|
||||
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; };
|
||||
in
|
||||
{
|
||||
home.stateVersion = "26.05";
|
||||
home.username = "imnyang";
|
||||
home.homeDirectory = "/home/imnyang";
|
||||
|
||||
home.packages = [
|
||||
nr
|
||||
nrr
|
||||
];
|
||||
|
||||
home.sessionVariables = {
|
||||
EDITOR = "nano";
|
||||
VISUAL = "nano";
|
||||
};
|
||||
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
|
||||
shellAliases = {
|
||||
".." = "cd ..";
|
||||
"..." = "cd ../..";
|
||||
|
||||
ls = "eza";
|
||||
ll = "eza -l";
|
||||
la = "eza -a";
|
||||
lla = "eza -la";
|
||||
|
||||
rebuild = "sudo nixos-rebuild switch --flake .#hako";
|
||||
update = "nix flake update";
|
||||
clean = "sudo nix-collect-garbage -d";
|
||||
};
|
||||
|
||||
interactiveShellInit = ''
|
||||
set -g fish_greeting ""
|
||||
set -g fish_color_command blue
|
||||
set -g fish_color_error red
|
||||
set -g fish_color_param cyan
|
||||
'';
|
||||
|
||||
functions = {
|
||||
fish_prompt = ''
|
||||
set_color purple
|
||||
echo -n (whoami)
|
||||
set_color normal
|
||||
echo -n "@"
|
||||
set_color green
|
||||
echo -n (hostname)
|
||||
set_color normal
|
||||
echo -n ":"
|
||||
set_color blue
|
||||
echo -n (prompt_pwd)
|
||||
set_color normal
|
||||
echo -n " > "
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -14,7 +14,6 @@
|
|||
./services/caddy.nix
|
||||
];
|
||||
|
||||
# Override shared boot.nix for Legacy BIOS
|
||||
boot.loader.grub.enableCryptodisk = lib.mkForce false;
|
||||
|
||||
services.netbird.enable = true;
|
||||
|
|
|
|||
|
|
@ -13,22 +13,17 @@
|
|||
ipv6 = true;
|
||||
};
|
||||
|
||||
# 2. 크론 설정
|
||||
services.cron = {
|
||||
enable = true;
|
||||
systemCronJobs = [
|
||||
"1 0 * * * imnyang * * * * * printf '\n%s : ' '$(date)' >> /home/imnyang/codelounge.log && /home/imnyang/codelounge.sh >> /home/imnyang/codelounge.log"
|
||||
];
|
||||
};
|
||||
services.netbird.enable = true;
|
||||
|
||||
# 3. 사용자 SSH 키 등록
|
||||
users.users.imnyang.openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOHP3Z+AYrRh9f8TYyqChKfeyNm3lOe0F75AwRHTTaxD imnyang@kazusa"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIrpjEYOBx7LTGb7QsPrmPBboqyTUNm/e+4+yqWruljv imnyang@natsu"
|
||||
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDNH9+KCZmlrkRsscGsDHLQJNUXW1km0aIr4gAnG8jpbI+LCgtdILd/aDOzNVM2MVJSRnn+USnf++QAFQxPNwkuG+PhJ+ZOwQnJpr27LFYDvtWh/c0IsBapmzPLkacmAc8D+CpBCLiK51OrlGtuV0etjfAj08BfTSGq2U9O7ksZohl/JHkRyIEZxRUnGqSA1oAkayByMUor9p2e1kSUCjO+S1u8CNphU+XBx+Fll49Y+rGjFYm3vEdznoDpz/Ho5lgndoOasGQqNGA+LWsp5Ap3e8xMsRIQy53HSwhY0kaWmaQYdovGBF5Eq7bgu5gdDXgq261gcArqteBCCgnrh8Fp jongyeol@furry"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOFmyMQERIYmVzuKRohPpJlIgA0d/WCL3hVPfiNxqN5A crackthrough@heart"
|
||||
# "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDNH9+KCZmlrkRsscGsDHLQJNUXW1km0aIr4gAnG8jpbI+LCgtdILd/aDOzNVM2MVJSRnn+USnf++QAFQxPNwkuG+PhJ+ZOwQnJpr27LFYDvtWh/c0IsBapmzPLkacmAc8D+CpBCLiK51OrlGtuV0etjfAj08BfTSGq2U9O7ksZohl/JHkRyIEZxRUnGqSA1oAkayByMUor9p2e1kSUCjO+S1u8CNphU+XBx+Fll49Y+rGjFYm3vEdznoDpz/Ho5lgndoOasGQqNGA+LWsp5Ap3e8xMsRIQy53HSwhY0kaWmaQYdovGBF5Eq7bgu5gdDXgq261gcArqteBCCgnrh8Fp jongyeol@furry"
|
||||
# "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOFmyMQERIYmVzuKRohPpJlIgA0d/WCL3hVPfiNxqN5A crackthrough@heart"
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
|
@ -76,22 +71,14 @@
|
|||
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
22 # default ssh port
|
||||
3022 # alternative ssh port
|
||||
|
||||
80
|
||||
443
|
||||
12345
|
||||
|
||||
57017
|
||||
35353
|
||||
];
|
||||
|
||||
|
||||
services.openssh = {
|
||||
ports = [
|
||||
22
|
||||
3022
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
networking.hostName = "natsu";
|
||||
system.stateVersion = "26.05";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,9 @@ nixpkgs.lib.nixosSystem {
|
|||
# ./services/attic.nix
|
||||
./services/caddy.nix
|
||||
./services/forgejo-runner.nix
|
||||
./services/limbo.nix
|
||||
./services/stream.nix
|
||||
./services/velocity.nix
|
||||
# ./services/harmonia.nix
|
||||
./configuration.nix
|
||||
./hardware-configuration.nix
|
||||
|
|
|
|||
|
|
@ -228,7 +228,7 @@ in
|
|||
"github.com/RussellLuo/caddy-ext/ratelimit@v0.3.0"
|
||||
"github.com/neodyme-labs/user_agent_parse@v0.0.1"
|
||||
];
|
||||
hash = "sha256-YqOyHxPIKreCSkXfJUWTEFi+xOlIIiDqy3bYt7/A6Rg=";
|
||||
hash = "sha256-z9/LF2gws+H0pKL6F62QfklD0W8DKWCccnXLOOs3+jY=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
20
hosts/server/natsu/services/limbo.nix
Normal file
20
hosts/server/natsu/services/limbo.nix
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
{ ... }:
|
||||
|
||||
{
|
||||
systemd.services.limbo = {
|
||||
description = "Minecraft Limbo Server";
|
||||
after = [ "network-online.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
User = "imnyang";
|
||||
Group = "users";
|
||||
WorkingDirectory = "/home/imnyang/minecraft/limbo";
|
||||
ExecStart = "/home/imnyang/minecraft/limbo/pico_limbo --config /home/imnyang/minecraft/limbo/server.toml";
|
||||
Restart = "always";
|
||||
RestartSec = 5;
|
||||
};
|
||||
};
|
||||
}
|
||||
28
hosts/server/natsu/services/velocity.nix
Normal file
28
hosts/server/natsu/services/velocity.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
systemd.services.velocity = {
|
||||
description = "Minecraft Velocity Proxy";
|
||||
after = [
|
||||
"network-online.target"
|
||||
];
|
||||
wants = [ "network-online.target" ];
|
||||
# requires = [ "limbo.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
User = "imnyang";
|
||||
Group = "users";
|
||||
WorkingDirectory = "/home/imnyang/minecraft/proxy";
|
||||
ExecStart = "${pkgs.corretto25}/bin/java -jar /home/imnyang/minecraft/proxy/velocity.jar";
|
||||
Restart = "always";
|
||||
RestartSec = 5;
|
||||
SuccessExitStatus = [ 0 143 ];
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
25565
|
||||
];
|
||||
}
|
||||
Loading…
Reference in a new issue