From 1d5c363220eadd54fc0f582b94db8cd2b3dfab4e Mon Sep 17 00:00:00 2001 From: js0ny Date: Sun, 22 Mar 2026 05:21:48 +0000 Subject: [PATCH] chore: antidots --- nixcfgs/users/js0ny/packages/cli.nix | 5 --- nixcfgs/users/js0ny/packages/gui.nix | 2 -- nixcfgs/users/js0ny/programs/antidots.nix | 35 +++++++++++++++++-- .../js0ny/programs/productivity/zotero.nix | 28 +++++++++++++++ .../users/js0ny/programs/social/wechat.nix | 2 +- nixcfgs/users/js0ny/zephyrus.nix | 4 +-- 6 files changed, 64 insertions(+), 12 deletions(-) create mode 100644 nixcfgs/users/js0ny/programs/productivity/zotero.nix diff --git a/nixcfgs/users/js0ny/packages/cli.nix b/nixcfgs/users/js0ny/packages/cli.nix index f28e1c2..703ce65 100644 --- a/nixcfgs/users/js0ny/packages/cli.nix +++ b/nixcfgs/users/js0ny/packages/cli.nix @@ -90,9 +90,4 @@ programs.nix-index.enable = true; programs.nix-index.symlinkToCacheHome = true; programs.nix-index-database.comma.enable = true; - - home.sessionVariables = { - PASSWORD_STORE_DIR = "${config.xdg.dataHome}/password-store"; - CODEX_HOME = "${config.xdg.configHome}/codex"; - }; } diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix index 0ccd848..ce27afb 100644 --- a/nixcfgs/users/js0ny/packages/gui.nix +++ b/nixcfgs/users/js0ny/packages/gui.nix @@ -100,14 +100,12 @@ in { gimp rustdesk remmina - zotero feishin kicad blender onlyoffice-desktopeditors # wayland-bongocat kdePackages.qttools - antigravity nur.repos.forkprince.helium-nightly obsidian file-roller diff --git a/nixcfgs/users/js0ny/programs/antidots.nix b/nixcfgs/users/js0ny/programs/antidots.nix index 617fe7b..c8b0a5a 100644 --- a/nixcfgs/users/js0ny/programs/antidots.nix +++ b/nixcfgs/users/js0ny/programs/antidots.nix @@ -1,14 +1,45 @@ +# https://wiki.archlinux.org/title/XDG_Base_Directory {config, ...}: let xdg-data = "${config.xdg.dataHome}"; xdg-config = "${config.xdg.configHome}"; xdg-cache = "${config.xdg.cacheHome}"; + xdg-state = "${config.xdg.stateHome}"; + home = "${config.home.homeDirectory}"; + user = "${config.home.username}"; in { home.sessionVariables = { + _JAVA_OPTIONS = + "-Djava.util.prefs.userRoot='${xdg-config}/java'" # ~/.java/fonts + + "-Djavafx.cachedir='${xdg-cache}/openjfx'"; # ~/.openjfx CARGO_HOME = "${xdg-data}/cargo"; - XCOMPOSECACHE = "${xdg-cache}/X11/xcompose"; + # Sometimes required under Wayland + XCOMPOSEFILE = "${xdg-config}/X11/XCompose"; + XCOMPOSECACHE = "${xdg-cache}/X11/XCompose"; DOCKER_CONFIG = "${xdg-config}/docker"; GNUPGHOME = "${xdg-data}/gnupg"; GRADLE_USER_HOME = "${xdg-data}/gradle"; - _JAVA_OPTIONS = "-Djava.util.prefs.userRoot='${xdg-data}/java'"; + PASSWORD_STORE_DIR = "${xdg-data}/password-store"; + CODEX_HOME = "${xdg-config}/codex"; + KIVY_HOME = "${xdg-data}/kivy"; # python-kivy ~/.kivy + LEIN_HOME = "${xdg-data}/lein"; # leiningen ~/.lein ~/.m2 + NPM_CONFIG_USERCONFIG = "${xdg-config}/npm/npmrc"; + NUGET_PACKAGES = "${xdg-data}/nuget/packages"; + OLLAMA_MODELS = "${xdg-data}/ollama/models"; # Only for models aka ~/.ollama/models + RUSTUP_HOME = "${xdg-data}/rustup"; + W3M_DIR = "${xdg-state}/w3m"; + WAKATIME_HOME = "${xdg-config}/wakatime"; # ~/.wakatime + WGETRC = "${xdg-config}/wget/wgetrc"; }; + xdg.configFile."npm/npmrc".text = '' + prefix=${xdg-data}/npm + cache=${xdg-cache}/npm + init-module=${xdg-config}/npm/config/npm-init.js + logs-dir=${xdg-state}/npm/logs + ''; + xdg.configFile."wget/wgetrc".text = '' + hsts-file = ${xdg-state}/wget/wget-hsts + ''; + systemd.user.tmpfiles.rules = [ + "d ${xdg-config}/wakatime 0700 ${user} users -" + ]; } diff --git a/nixcfgs/users/js0ny/programs/productivity/zotero.nix b/nixcfgs/users/js0ny/programs/productivity/zotero.nix new file mode 100644 index 0000000..d10a62c --- /dev/null +++ b/nixcfgs/users/js0ny/programs/productivity/zotero.nix @@ -0,0 +1,28 @@ +{ + config, + pkgs, + ... +}: let + profile = "js0ny"; +in { + home.packages = with pkgs; [zotero]; + home.file = { + ".zotero/profiles.ini".text = '' + [General] + StartWithLastProfile=1 + Version=2 + + [Profile0] + Default=1 + IsRelative=1 + Name=${profile} + Path=${profile} + ''; + # Antidots + ".zotero/${profile}/user.js".text = '' + user_pref("extensions.zotero.dataDir", "${config.home.homeDirectory}/.local/share/Zotero"); + user_pref("extensions.zotero.export.quickCopy.setting", "bibliography=http://www.zotero.org/styles/ieee"); + user_pref("intl.locale.requested", "zh-CN"); + ''; + }; +} diff --git a/nixcfgs/users/js0ny/programs/social/wechat.nix b/nixcfgs/users/js0ny/programs/social/wechat.nix index 71bd35c..0668338 100644 --- a/nixcfgs/users/js0ny/programs/social/wechat.nix +++ b/nixcfgs/users/js0ny/programs/social/wechat.nix @@ -4,7 +4,7 @@ ... }: { systemd.user.tmpfiles.rules = [ - "d ${config.home.homeDirectory}/.sandbox/.per-app/wechat 0755 ${config.home.username} users -" + "d ${config.home.homeDirectory}/.sandbox/.per-app/wechat 0700 ${config.home.username} users -" ]; home.packages = with pkgs; [ wechat-uos-sandboxed diff --git a/nixcfgs/users/js0ny/zephyrus.nix b/nixcfgs/users/js0ny/zephyrus.nix index 8c81500..86b7e4e 100644 --- a/nixcfgs/users/js0ny/zephyrus.nix +++ b/nixcfgs/users/js0ny/zephyrus.nix @@ -10,8 +10,6 @@ in { # General config ./default.nix - ./programs/sandboxed.nix - # Use Gnome-keyring for GUI setup ../../modules/home/gnome-keyrings.nix @@ -26,6 +24,7 @@ in { ./packages/gaming.nix ./programs/antidots.nix + ./programs/sandboxed.nix # Shell ./programs/shell/bash.nix @@ -71,6 +70,7 @@ in { ./programs/productivity/sioyek ./programs/productivity/thunderbird.nix ./programs/productivity/zoom-us.nix + ./programs/productivity/zotero.nix # Social ./programs/social/discord.nix