refector
This commit is contained in:
parent
42f15beccf
commit
ed42006971
21 changed files with 271 additions and 366 deletions
|
|
@ -9,13 +9,8 @@
|
|||
imports = [
|
||||
./hardware-configuration.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/machine.nix"
|
||||
"${inputs.self}/modules/mizukios/desktop.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"
|
||||
|
|
@ -24,7 +19,6 @@
|
|||
"${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"
|
||||
"${inputs.self}/modules/mizukios/features/_1password.nix"
|
||||
];
|
||||
|
||||
|
|
@ -32,8 +26,6 @@
|
|||
|
||||
networking = {
|
||||
hostName = "ena";
|
||||
networkmanager.enable = true;
|
||||
firewall.enable = false;
|
||||
};
|
||||
|
||||
services.printing.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,58 +1,22 @@
|
|||
{ inputs, ... }:
|
||||
{
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
imports = [
|
||||
"${inputs.self}/modules/home/fish.nix"
|
||||
"${inputs.self}/modules/home/starship.nix"
|
||||
];
|
||||
|
||||
shellAliases = {
|
||||
# 디렉토리 네비게이션
|
||||
".." = "cd ..";
|
||||
"..." = "cd ../..";
|
||||
|
||||
# ls 별칭
|
||||
ls = "eza --icons=always";
|
||||
ll = "eza --icons=always -l";
|
||||
la = "eza --icons=always -a";
|
||||
lla = "eza --icons=always -la";
|
||||
|
||||
cat = "bat --plain";
|
||||
|
||||
rebuild = "nr";
|
||||
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
|
||||
'';
|
||||
programs.fish.shellAliases = {
|
||||
cat = "bat --plain";
|
||||
rebuild = "nr";
|
||||
update = "nix flake update";
|
||||
clean = "sudo nix-collect-garbage -d";
|
||||
};
|
||||
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
settings = {
|
||||
format = "🎨 $directory:$character";
|
||||
add_newline = false;
|
||||
# username = {
|
||||
# style_user = "purple";
|
||||
# style_root = "purple";
|
||||
# format = "[$user]($style)";
|
||||
# show_always = true;
|
||||
# };
|
||||
# hostname = {
|
||||
# style = "green";
|
||||
# format = "[$hostname]($style)";
|
||||
# ssh_only = false;
|
||||
# };
|
||||
directory = {
|
||||
style = "fg:#fbb6c4";
|
||||
format = "[$path]($style)";
|
||||
truncation_length = 3;
|
||||
};
|
||||
character = {
|
||||
success_symbol = " 💜";
|
||||
error_symbol = " ⚠️";
|
||||
};
|
||||
programs.starship.settings = {
|
||||
format = "🎨 $directory:$character";
|
||||
character = {
|
||||
success_symbol = " 💜";
|
||||
error_symbol = " ⚠️";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,60 +1,31 @@
|
|||
{ inputs, lib, ... }:
|
||||
{
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
imports = [
|
||||
"${inputs.self}/modules/home/fish.nix"
|
||||
"${inputs.self}/modules/home/starship.nix"
|
||||
];
|
||||
|
||||
shellAliases = {
|
||||
".." = "cd ..";
|
||||
"..." = "cd ../..";
|
||||
|
||||
ls = "eza --icons=always";
|
||||
ll = "eza --icons=always -l";
|
||||
la = "eza --icons=always -a";
|
||||
lla = "eza --icons=always -la";
|
||||
|
||||
# nix-darwin 관련
|
||||
rebuild = "sudo darwin-rebuild switch --flake .#kanade";
|
||||
update = "nix flake update";
|
||||
clean = "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
|
||||
|
||||
set -gx ANDROID_HOME "$HOME/Library/Android/sdk"
|
||||
if test -d "$ANDROID_HOME/ndk"
|
||||
set -l ndk_versions "$ANDROID_HOME"/ndk/*
|
||||
if test (count $ndk_versions) -gt 0
|
||||
set -gx NDK_HOME $ndk_versions[-1]
|
||||
end
|
||||
end
|
||||
|
||||
set -gx SSH_AUTH_SOCK /Users/imnyang/.ssh/proton-pass-agent.sock
|
||||
'';
|
||||
programs.fish.shellAliases = {
|
||||
rebuild = "sudo darwin-rebuild switch --flake .#kanade";
|
||||
update = "nix flake update";
|
||||
clean = "nix-collect-garbage -d";
|
||||
};
|
||||
|
||||
programs.fish.interactiveShellInit = lib.mkAfter ''
|
||||
set -gx ANDROID_HOME "$HOME/Library/Android/sdk"
|
||||
if test -d "$ANDROID_HOME/ndk"
|
||||
set -l ndk_versions "$ANDROID_HOME"/ndk/*
|
||||
if test (count $ndk_versions) -gt 0
|
||||
set -gx NDK_HOME $ndk_versions[-1]
|
||||
end
|
||||
end
|
||||
|
||||
set -gx SSH_AUTH_SOCK /Users/imnyang/.ssh/proton-pass-agent.sock
|
||||
'';
|
||||
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
settings = {
|
||||
format = "🎼 $directory:$character";
|
||||
add_newline = false;
|
||||
# username = {
|
||||
# style_user = "purple";
|
||||
# style_root = "purple";
|
||||
# format = "[$user]($style)";
|
||||
# show_always = true;
|
||||
# };
|
||||
# hostname = {
|
||||
# style = "green";
|
||||
# format = "[$hostname]($style)";
|
||||
# ssh_only = false;
|
||||
# };
|
||||
directory = {
|
||||
style = "fg:#fbb6c4";
|
||||
format = "[$path]($style)";
|
||||
truncation_length = 3;
|
||||
};
|
||||
character = {
|
||||
success_symbol = " 💕";
|
||||
error_symbol = " ⚠️";
|
||||
|
|
|
|||
|
|
@ -3,23 +3,16 @@
|
|||
imports = [
|
||||
./hardware-configuration.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/machine.nix"
|
||||
"${inputs.self}/modules/mizukios/desktop.nix"
|
||||
"${inputs.self}/modules/mizukios/features/steam.nix"
|
||||
"${inputs.self}/modules/mizukios/features/remote/sunshine.nix"
|
||||
"${inputs.self}/modules/mizukios/features/remote/authorized-keys.nix"
|
||||
"${inputs.self}/modules/mizukios/features/_1password.nix"
|
||||
];
|
||||
|
||||
networking = {
|
||||
hostName = "mafuyu";
|
||||
networkmanager.enable = true;
|
||||
firewall.enable = false;
|
||||
};
|
||||
|
||||
services.caddy = {
|
||||
|
|
@ -83,10 +76,6 @@
|
|||
autoLogin.user = "imnyang";
|
||||
};
|
||||
|
||||
users.users.imnyang.openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOHP3Z+AYrRh9f8TYyqChKfeyNm3lOe0F75AwRHTTaxD imnyang@mizuki"
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
gtk3
|
||||
gtk4
|
||||
|
|
|
|||
|
|
@ -1,54 +1,21 @@
|
|||
{ inputs, ... }:
|
||||
{
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
imports = [
|
||||
"${inputs.self}/modules/home/fish.nix"
|
||||
"${inputs.self}/modules/home/starship.nix"
|
||||
];
|
||||
|
||||
shellAliases = {
|
||||
".." = "cd ..";
|
||||
"..." = "cd ../..";
|
||||
|
||||
ls = "eza --icons=always";
|
||||
ll = "eza --icons=always -l";
|
||||
la = "eza --icons=always -a";
|
||||
lla = "eza --icons=always -la";
|
||||
|
||||
rebuild = "nr";
|
||||
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
|
||||
'';
|
||||
programs.fish.shellAliases = {
|
||||
rebuild = "nr";
|
||||
update = "nix flake update";
|
||||
clean = "sudo nix-collect-garbage -d";
|
||||
};
|
||||
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
settings = {
|
||||
format = "❄️ $directory:$character";
|
||||
add_newline = false;
|
||||
# username = {
|
||||
# style_user = "purple";
|
||||
# style_root = "purple";
|
||||
# format = "[$user]($style)";
|
||||
# show_always = true;
|
||||
# };
|
||||
# hostname = {
|
||||
# style = "green";
|
||||
# format = "[$hostname]($style)";
|
||||
# ssh_only = false;
|
||||
# };
|
||||
directory = {
|
||||
style = "fg:#fbb6c4";
|
||||
format = "[$path]($style)";
|
||||
truncation_length = 3;
|
||||
};
|
||||
character = {
|
||||
success_symbol = " 💕";
|
||||
error_symbol = " ⚠️";
|
||||
};
|
||||
programs.starship.settings = {
|
||||
format = "❄️ $directory:$character";
|
||||
character = {
|
||||
success_symbol = " 💕";
|
||||
error_symbol = " ⚠️";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,19 +3,13 @@
|
|||
imports = [
|
||||
./hardware-configuration.nix
|
||||
|
||||
"${inputs.self}/modules/mizukios/base"
|
||||
"${inputs.self}/modules/mizukios/features/system/boot.nix"
|
||||
"${inputs.self}/modules/mizukios/machine.nix"
|
||||
"${inputs.self}/modules/mizukios/desktop.nix"
|
||||
"${inputs.self}/modules/mizukios/features/system/sbctl.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"
|
||||
|
|
@ -25,8 +19,6 @@
|
|||
|
||||
networking = {
|
||||
hostName = "mizuki";
|
||||
networkmanager.enable = true;
|
||||
firewall.enable = false;
|
||||
interfaces = {
|
||||
enp3s0 = {
|
||||
wakeOnLan.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,54 +1,21 @@
|
|||
{ inputs, ... }:
|
||||
{
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
imports = [
|
||||
"${inputs.self}/modules/home/fish.nix"
|
||||
"${inputs.self}/modules/home/starship.nix"
|
||||
];
|
||||
|
||||
shellAliases = {
|
||||
".." = "cd ..";
|
||||
"..." = "cd ../..";
|
||||
|
||||
ls = "eza --icons=always";
|
||||
ll = "eza --icons=always -l";
|
||||
la = "eza --icons=always -a";
|
||||
lla = "eza --icons=always -la";
|
||||
|
||||
rebuild = "nr";
|
||||
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
|
||||
'';
|
||||
programs.fish.shellAliases = {
|
||||
rebuild = "nr";
|
||||
update = "nix flake update";
|
||||
clean = "sudo nix-collect-garbage -d";
|
||||
};
|
||||
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
settings = {
|
||||
format = "🎀 $directory:$character";
|
||||
add_newline = false;
|
||||
# username = {
|
||||
# style_user = "purple";
|
||||
# style_root = "purple";
|
||||
# format = "[$user]($style)";
|
||||
# show_always = true;
|
||||
# };
|
||||
# hostname = {
|
||||
# style = "green";
|
||||
# format = "[$hostname]($style)";
|
||||
# ssh_only = false;
|
||||
# };
|
||||
directory = {
|
||||
style = "fg:#fbb6c4";
|
||||
format = "[$path]($style)";
|
||||
truncation_length = 3;
|
||||
};
|
||||
character = {
|
||||
success_symbol = " 💕";
|
||||
error_symbol = " ⚠️";
|
||||
};
|
||||
programs.starship.settings = {
|
||||
format = "🎀 $directory:$character";
|
||||
character = {
|
||||
success_symbol = " 💕";
|
||||
error_symbol = " ⚠️";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ pkgs, inputs, ... }:
|
||||
{
|
||||
imports = [
|
||||
"${inputs.self}/modules/mizukios/base"
|
||||
"${inputs.self}/modules/mizukios/features/remote/ssh.nix"
|
||||
"${inputs.self}/modules/mizukios/machine.nix"
|
||||
"${inputs.self}/modules/mizukios/features/remote/authorized-keys.nix"
|
||||
];
|
||||
|
||||
wsl.enable = true;
|
||||
|
|
@ -10,12 +10,7 @@
|
|||
|
||||
networking = {
|
||||
hostName = "ribbon";
|
||||
firewall.enable = false;
|
||||
};
|
||||
|
||||
users.users.imnyang.openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOHP3Z+AYrRh9f8TYyqChKfeyNm3lOe0F75AwRHTTaxD imnyang@mizuki"
|
||||
];
|
||||
|
||||
system.stateVersion = "25.11";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,34 +1,14 @@
|
|||
{ inputs, ... }:
|
||||
{
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
imports = [ "${inputs.self}/modules/home/fish.nix" ];
|
||||
|
||||
shellAliases = {
|
||||
# 디렉토리 네비게이션
|
||||
".." = "cd ..";
|
||||
"..." = "cd ../..";
|
||||
|
||||
# ls 별칭
|
||||
ls = "eza --icons=always";
|
||||
ll = "eza --icons=always -l";
|
||||
la = "eza --icons=always -a";
|
||||
lla = "eza --icons=always -la";
|
||||
|
||||
# NixOS 관련
|
||||
rebuild = "nr";
|
||||
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
|
||||
'';
|
||||
programs.fish.shellAliases = {
|
||||
rebuild = "nr";
|
||||
update = "nix flake update";
|
||||
clean = "sudo nix-collect-garbage -d";
|
||||
};
|
||||
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
settings = {
|
||||
format = "$username@$hostname:$directory$character";
|
||||
add_newline = false;
|
||||
|
|
|
|||
Loading…
Reference in a new issue