From d02c860acba52674a332b53c4d73b9092555b9f7 Mon Sep 17 00:00:00 2001
From: caandt <caandt@twoha.cc>
Date: Fri, 4 Oct 2024 19:25:55 -0500
Subject: [PATCH] reorganize

---
 configuration.nix | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 77d99f8..ffdf090 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -17,6 +17,7 @@
   };
 
   environment.pathsToLink = [ "/libexec" ];
+  environment.localBinInPath = true;
 
   boot.tmp.useTmpfs = true;
 
@@ -30,6 +31,20 @@
     "en_US.UTF-8/UTF-8"
     "ja_JP.UTF-8/UTF-8"
   ];
+  i18n.inputMethod = {
+    enabled = "fcitx5";
+    fcitx5.addons = with pkgs; [
+      fcitx5-mozc
+      fcitx5-gtk
+    ];
+  };
+  fonts.packages = with pkgs; [
+    noto-fonts
+    noto-fonts-cjk
+    source-han-sans
+    source-han-serif
+    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
+  ];
 
   services.xserver = {
     enable = true;
@@ -81,46 +96,34 @@
     promptInit = ''PS1="[\u \W] \[\e[32;1m\]\$\[\e[0m\] "'';
   };
   environment.etc.bashrc.text = lib.mkAfter ''[ -f ~/.config/bash/bashrc ] && . ~/.config/bash/bashrc'';
-  environment.localBinInPath = true;
 
   users.users.ahnwuoa = {
     isNormalUser = true;
     extraGroups = [ "wheel" ];
   };
+
+  xdg.terminal-exec = {
+    enable = true;
+    settings.default = [ "Alacritty.desktop" ];
+  };
   programs.partition-manager = {
     enable = true;
     package = pkgs.libsForQt5.partitionmanager;
   };
   services.udisks2.enable = true;
+
   virtualisation.libvirtd.enable = true;
   programs.virt-manager.enable = true;
+  programs.nix-ld.enable = true;
+  hardware.graphics.enable32Bit = true;
+
   security.doas = {
     enable = true;
     extraRules = [
       { groups = [ "wheel" ]; persist = true; }
     ];
   };
-  fonts.packages = with pkgs; [
-    noto-fonts
-    noto-fonts-cjk
-    source-han-sans
-    source-han-serif
-    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
-  ];
-  i18n.inputMethod = {
-    enabled = "fcitx5";
-    fcitx5.addons = with pkgs; [
-      fcitx5-mozc
-      fcitx5-gtk
-    ];
-  };
   security.polkit.enable = true;
-  hardware.graphics.enable32Bit = true;
-  programs.nix-ld.enable = true;
-  xdg.terminal-exec = {
-    enable = true;
-    settings.default = [ "Alacritty.desktop" ];
-  };
 
   system.stateVersion = "24.05";
 }