refector

hosts/machine/mafuyu/configuration.nix

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

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

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