refector

hosts/machine/ena/configuration.nix

@@ -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;

hosts/machine/ena/home/config/shell.nix

@@ -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 = " ⚠️";
     };
   };
 }