From dcfe5b143580a64e88f45932e7232af0fb2493d6 Mon Sep 17 00:00:00 2001
From: ponymushama <ponymushama@gmail.com>
Date: Sun, 21 Jul 2024 15:53:47 +0800
Subject: [PATCH] update ama_nix config

---
 flake.nix                       | 12 ++++++------
 profiles/work/configuration.nix |  2 +-
 profiles/work/home.nix          |  2 +-
 system/wm/fonts.nix             |  2 ++
 user/shell/cli-collection.nix   |  3 +++
 user/shell/sh.nix               |  1 +
 user/wm/hyprland/hyprland.nix   |  2 +-
 user/wm/input/nihongo.nix       |  1 +
 8 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/flake.nix b/flake.nix
index 494ab68..989107a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,9 +6,9 @@
       # ---- SYSTEM SETTINGS ---- #
       systemSettings = {
         system = "x86_64-linux"; # system arch
-        hostname = "snowfire"; # hostname
+        hostname = "ama_nix"; # hostname
         profile = "personal"; # select a profile defined from my profiles directory
-        timezone = "America/Chicago"; # select timezone
+        timezone = "Asia/Shanghai"; # select timezone
         locale = "en_US.UTF-8"; # select locale
         bootMode = "uefi"; # uefi or bios
         bootMountPath = "/boot"; # mount path for efi boot partition; only used for uefi boot mode
@@ -18,15 +18,15 @@
 
       # ----- USER SETTINGS ----- #
       userSettings = rec {
-        username = "emmet"; # username
-        name = "Emmet"; # name/identifier
-        email = "emmet@librephoenix.com"; # email (used for certain configurations)
+        username = "ama"; # username
+        name = "ama"; # name/identifier
+        email = "ponymushama@gmail.com"; # email (used for certain configurations)
         dotfilesDir = "~/.dotfiles"; # absolute path of the local repo
         theme = "io"; # selcted theme from my themes directory (./themes/)
         wm = "hyprland"; # Selected window manager or desktop environment; must select one in both ./user/wm/ and ./system/wm/
         # window manager type (hyprland or x11) translator
         wmType = if (wm == "hyprland") then "wayland" else "x11";
-        browser = "qutebrowser"; # Default browser; must select one from ./user/app/browser/
+        browser = "librewolf"; # Default browser; must select one from ./user/app/browser/
         defaultRoamDir = "Personal.p"; # Default org roam directory relative to ~/Org
         term = "alacritty"; # Default terminal command;
         font = "Intel One Mono"; # Selected font
diff --git a/profiles/work/configuration.nix b/profiles/work/configuration.nix
index d6b61eb..243c470 100644
--- a/profiles/work/configuration.nix
+++ b/profiles/work/configuration.nix
@@ -14,7 +14,7 @@
       ../../system/hardware/printing.nix
       ../../system/hardware/bluetooth.nix
       (./. + "../../../system/wm"+("/"+userSettings.wm)+".nix") # My window manager
-      #../../system/app/flatpak.nix
+      ../../system/app/flatpak.nix
       ../../system/app/virtualization.nix
       ( import ../../system/app/docker.nix {storageDriver = null; inherit pkgs userSettings lib;} )
       ../../system/security/doas.nix
diff --git a/profiles/work/home.nix b/profiles/work/home.nix
index 9693c92..c5c0b9d 100644
--- a/profiles/work/home.nix
+++ b/profiles/work/home.nix
@@ -18,7 +18,7 @@
               ../../user/app/keepass/keepass.nix # My password manager
               (./. + "../../../user/app/browser"+("/"+userSettings.browser)+".nix") # My default browser selected from flake
               ../../user/app/virtualization/virtualization.nix # Virtual machines
-              #../../user/app/flatpak/flatpak.nix # Flatpaks
+              ../../user/app/flatpak/flatpak.nix # Flatpaks
               ../../user/style/stylix.nix # Styling and themes for my apps
               ../../user/lang/cc/cc.nix # C and C++ tools
               ../../user/lang/godot/godot.nix # Game development
diff --git a/system/wm/fonts.nix b/system/wm/fonts.nix
index ca862c8..cf9d441 100644
--- a/system/wm/fonts.nix
+++ b/system/wm/fonts.nix
@@ -5,6 +5,8 @@
   fonts.packages = with pkgs; [
     # Fonts
     nerdfonts
+    lxgw-wenkai
+    sarasa-gothic
     # powerline # FIXME broken by python 311 -> 312 nixpkgs update
   ];
 
diff --git a/user/shell/cli-collection.nix b/user/shell/cli-collection.nix
index f753928..23325c9 100644
--- a/user/shell/cli-collection.nix
+++ b/user/shell/cli-collection.nix
@@ -19,6 +19,9 @@
     hwinfo
     pciutils
     numbat
+    lazygit
+    zoxide
+    fzf
     (pkgs.callPackage ../pkgs/pokemon-colorscripts.nix { })
     (pkgs.writeShellScriptBin "airplane-mode" ''
       #!/bin/sh
diff --git a/user/shell/sh.nix b/user/shell/sh.nix
index ea6a861..a9819b7 100644
--- a/user/shell/sh.nix
+++ b/user/shell/sh.nix
@@ -44,4 +44,5 @@ in
   programs.direnv.enable = true;
   programs.direnv.enableZshIntegration = true;
   programs.direnv.nix-direnv.enable = true;
+  programs.fzf.enableZshIntegration = true;
 }
diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix
index 3211fe5..232a5a2 100644
--- a/user/wm/hyprland/hyprland.nix
+++ b/user/wm/hyprland/hyprland.nix
@@ -848,7 +848,7 @@ in
         clock = {
           "interval" = 1;
           "format" = "{:%a %Y-%m-%d %I:%M:%S %p}";
-          "timezone" = "America/Chicago";
+          "timezone" = "Asia/Shanghai";
           "tooltip-format" = ''
             <big>{:%Y %B}</big>
             <tt><small>{calendar}</small></tt>'';
diff --git a/user/wm/input/nihongo.nix b/user/wm/input/nihongo.nix
index 9c6c017..e077815 100644
--- a/user/wm/input/nihongo.nix
+++ b/user/wm/input/nihongo.nix
@@ -6,6 +6,7 @@
     fcitx5.addons = with pkgs; [
       fcitx5-mozc
       fcitx5-gtk
+      fcitx5-rime
     ];
   };
   home.file.".config/fcitx5/config".text = ''