commit f71f7ee708a56722fd48454963de4f7cbca4af3f parent 8a5aee31b2fd0bc76896c2df651d3f9f28a2c36d Author: Toni Brown <me@tb148.net> Date: Fri, 1 May 2026 21:18:07 +0800 refactor home config Diffstat:
22 files changed, 89 insertions(+), 71 deletions(-)
diff --git a/home/default.nix b/home/default.nix @@ -1,54 +1,10 @@ -{pkgs, ...}: { +{...}: { imports = [ - ./alacritty/. - ./catppuccin/. - ./directory/. - ./direnv/. - ./fcitx5/. - ./firefox/. - ./gpg/. - ./jujutsu/. - ./nushell/. - ./protonmail-bridge/. - ./thunderbird/. - ./zed-editor/. + ./misc/. + ./program/. + ./service/. ]; - home.packages = with pkgs; [ - ffmpeg - fontforge-gtk - inkscape - jetbrains.idea - krita - libreoffice-qt-fresh - (python314.withPackages (python-pkgs: - with python-pkgs; [ - ipython - virtualenv - ])) - onlyoffice-desktopeditors - osu-lazer-bin - ponysay - qalculate-qt - sequoia-sq - ungoogled-chromium - unrar - vlc - ]; - - programs.bat.enable = true; - programs.carapace.enable = true; - programs.fastfetch.enable = true; - programs.fd.enable = true; - programs.helix.enable = true; - programs.hyfetch.enable = true; - programs.nix-index.enable = true; - programs.opencode.enable = true; - programs.pay-respects.enable = true; - programs.starship.enable = true; - programs.uv.enable = true; - programs.zoxide.enable = true; - # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage # when a new Home Manager release introduces backwards diff --git a/home/gpg/default.nix b/home/gpg/default.nix @@ -1,23 +0,0 @@ -{pkgs, ...}: { - programs.gpg.enable = true; - programs.gpg.package = with pkgs; - symlinkJoin { - name = "gnupg-from-sequoia"; - paths = [ - gnupg - sequoia-chameleon-gnupg - ]; - postBuild = '' - mv $out/bin/gpg $out/bin/gpg-g10code - mv $out/bin/gpgv $out/bin/gpgv-g10code - cp -P $out/bin/gpg-sq $out/bin/gpg - cp -P $out/bin/gpgv-sq $out/bin/gpgv - ''; - }; - services.gpg-agent = { - enable = true; - enableSshSupport = true; - pinentry.package = pkgs.pinentry-qt; - sshKeys = ["F2F9CB00ABA433C59C7AF87A67A8D5F74D235760"]; - }; -} diff --git a/home/catppuccin/default.nix b/home/misc/catppuccin/default.nix diff --git a/home/misc/default.nix b/home/misc/default.nix @@ -0,0 +1,7 @@ +{...}: { + imports = [ + ./catppuccin/. + ./directory/. + ./ime/. + ]; +} diff --git a/home/directory/avatar.png b/home/misc/directory/avatar.png Binary files differ. diff --git a/home/directory/default.nix b/home/misc/directory/default.nix diff --git a/home/directory/wallpaper.png b/home/misc/directory/wallpaper.png Binary files differ. diff --git a/home/directory/猫娘.png b/home/misc/directory/猫娘.png Binary files differ. diff --git a/home/fcitx5/default.nix b/home/misc/ime/default.nix diff --git a/home/fcitx5/rime.yaml b/home/misc/ime/rime.yaml diff --git a/home/alacritty/default.nix b/home/program/alacritty/default.nix diff --git a/home/program/default.nix b/home/program/default.nix @@ -0,0 +1,47 @@ +{pkgs, ...}: { + imports = [ + ./alacritty/. + ./direnv/. + ./firefox/. + ./gpg/. + ./jujutsu/. + ./nushell/. + ./thunderbird/. + ./zed-editor/. + ]; + + home.packages = with pkgs; [ + ffmpeg + fontforge-gtk + inkscape + jetbrains.idea + krita + libreoffice-qt-fresh + (python314.withPackages (python-pkgs: + with python-pkgs; [ + ipython + virtualenv + ])) + onlyoffice-desktopeditors + osu-lazer-bin + ponysay + qalculate-qt + sequoia-sq + ungoogled-chromium + unrar + vlc + ]; + + programs.bat.enable = true; + programs.carapace.enable = true; + programs.fastfetch.enable = true; + programs.fd.enable = true; + programs.helix.enable = true; + programs.hyfetch.enable = true; + programs.nix-index.enable = true; + programs.opencode.enable = true; + programs.pay-respects.enable = true; + programs.starship.enable = true; + programs.uv.enable = true; + programs.zoxide.enable = true; +} diff --git a/home/direnv/default.nix b/home/program/direnv/default.nix diff --git a/home/firefox/default.nix b/home/program/firefox/default.nix diff --git a/home/program/gpg/default.nix b/home/program/gpg/default.nix @@ -0,0 +1,17 @@ +{pkgs, ...}: { + programs.gpg.enable = true; + programs.gpg.package = with pkgs; + symlinkJoin { + name = "gnupg-from-sequoia"; + paths = [ + gnupg + sequoia-chameleon-gnupg + ]; + postBuild = '' + mv $out/bin/gpg $out/bin/gpg-g10code + mv $out/bin/gpgv $out/bin/gpgv-g10code + cp -P $out/bin/gpg-sq $out/bin/gpg + cp -P $out/bin/gpgv-sq $out/bin/gpgv + ''; + }; +} diff --git a/home/jujutsu/default.nix b/home/program/jujutsu/default.nix diff --git a/home/nushell/default.nix b/home/program/nushell/default.nix diff --git a/home/thunderbird/default.nix b/home/program/thunderbird/default.nix diff --git a/home/zed-editor/default.nix b/home/program/zed-editor/default.nix diff --git a/home/service/default.nix b/home/service/default.nix @@ -0,0 +1,6 @@ +{...}: { + imports = [ + ./gpg-agent/. + ./protonmail-bridge/. + ]; +} diff --git a/home/service/gpg-agent/default.nix b/home/service/gpg-agent/default.nix @@ -0,0 +1,8 @@ +{pkgs, ...}: { + services.gpg-agent = { + enable = true; + enableSshSupport = true; + pinentry.package = pkgs.pinentry-qt; + sshKeys = ["F2F9CB00ABA433C59C7AF87A67A8D5F74D235760"]; + }; +} diff --git a/home/protonmail-bridge/default.nix b/home/service/protonmail-bridge/default.nix
