From 7b715aa4e9e2d6123632cd3fb3b3e4a0c6a78e25 Mon Sep 17 00:00:00 2001 From: rydesun Date: Fri, 25 Feb 2022 21:17:44 +0800 Subject: [PATCH] Update env --- .config/environment.d/env.conf | 1 + .config/systemd/user/copyq.service | 1 - .config/systemd/user/fcitx.service | 1 - .config/systemd/user/kdeconnect.service | 1 - .config/systemd/user/nm-applet.service | 1 - .config/systemd/user/picom.service | 1 - .config/systemd/user/policykit-agent.service | 1 - .config/systemd/user/qv2ray.service | 1 - .config/systemd/user/redshift-gtk.service | 1 - .config/systemd/user/udiskie.service | 1 - .config/systemd/user/xsettingsd.service | 1 - .pam_environment | 59 ++++++++------------ 12 files changed, 25 insertions(+), 45 deletions(-) create mode 100644 .config/environment.d/env.conf diff --git a/.config/environment.d/env.conf b/.config/environment.d/env.conf new file mode 100644 index 0000000..f638dd1 --- /dev/null +++ b/.config/environment.d/env.conf @@ -0,0 +1 @@ +LANG=zh_CN.UTF-8 diff --git a/.config/systemd/user/copyq.service b/.config/systemd/user/copyq.service index 9b8a8b0..645887b 100644 --- a/.config/systemd/user/copyq.service +++ b/.config/systemd/user/copyq.service @@ -3,7 +3,6 @@ Description=Clipboard manager with searchable and editable history [Service] Type=idle -Environment="LANG=zh_CN.UTF-8" ExecStart=/usr/bin/copyq [Install] diff --git a/.config/systemd/user/fcitx.service b/.config/systemd/user/fcitx.service index 9a201fe..1280090 100644 --- a/.config/systemd/user/fcitx.service +++ b/.config/systemd/user/fcitx.service @@ -3,7 +3,6 @@ Description=Input method framework [Service] Type=forking -Environment="LANG=zh_CN.UTF-8" ExecStart=/usr/bin/fcitx5 -d [Install] diff --git a/.config/systemd/user/kdeconnect.service b/.config/systemd/user/kdeconnect.service index d153160..b509b4b 100644 --- a/.config/systemd/user/kdeconnect.service +++ b/.config/systemd/user/kdeconnect.service @@ -3,7 +3,6 @@ Description=Communication Daemon between desktop and smartphone [Service] Type=idle -Environment="LANG=zh_CN.UTF-8" ExecStartPre=/usr/bin/sleep 5 ExecStart=/usr/bin/kdeconnect-indicator diff --git a/.config/systemd/user/nm-applet.service b/.config/systemd/user/nm-applet.service index 6fa923b..72fa39e 100644 --- a/.config/systemd/user/nm-applet.service +++ b/.config/systemd/user/nm-applet.service @@ -3,7 +3,6 @@ Description=Applet for managing network connections [Service] Type=idle -Environment="LANG=zh_CN.UTF-8" ExecStart=/usr/bin/nm-applet [Install] diff --git a/.config/systemd/user/picom.service b/.config/systemd/user/picom.service index a4d8cf4..c20b157 100644 --- a/.config/systemd/user/picom.service +++ b/.config/systemd/user/picom.service @@ -3,7 +3,6 @@ Description=X compositor [Service] Type=idle -Environment="LANG=zh_CN.UTF-8" ExecStart=/usr/bin/picom [Install] diff --git a/.config/systemd/user/policykit-agent.service b/.config/systemd/user/policykit-agent.service index 3dd074d..9c0e480 100644 --- a/.config/systemd/user/policykit-agent.service +++ b/.config/systemd/user/policykit-agent.service @@ -3,7 +3,6 @@ Description=LXQt policykit authentication agent [Service] Type=idle -Environment="LANG=zh_CN.UTF-8" ExecStart=/usr/bin/lxqt-policykit-agent [Install] diff --git a/.config/systemd/user/qv2ray.service b/.config/systemd/user/qv2ray.service index cff4d67..9294cda 100644 --- a/.config/systemd/user/qv2ray.service +++ b/.config/systemd/user/qv2ray.service @@ -3,7 +3,6 @@ Description=Cross-platform V2ray Client written in Qt [Service] Type=idle -Environment="LANG=zh_CN.UTF-8" ExecStart=/usr/bin/qv2ray [Install] diff --git a/.config/systemd/user/redshift-gtk.service b/.config/systemd/user/redshift-gtk.service index dbef57b..1bb65ab 100644 --- a/.config/systemd/user/redshift-gtk.service +++ b/.config/systemd/user/redshift-gtk.service @@ -3,7 +3,6 @@ Description=Redshift display colour temperature adjustment (GUI) [Service] Type=idle -Environment="LANG=zh_CN.UTF-8" ExecStart=/usr/bin/redshift-gtk [Install] diff --git a/.config/systemd/user/udiskie.service b/.config/systemd/user/udiskie.service index 767231c..060ee45 100644 --- a/.config/systemd/user/udiskie.service +++ b/.config/systemd/user/udiskie.service @@ -3,7 +3,6 @@ Description=Removable disk automounter using udisks [Service] Type=idle -Environment="LANG=zh_CN.UTF-8" ExecStart=/usr/bin/udiskie --smart-tray [Install] diff --git a/.config/systemd/user/xsettingsd.service b/.config/systemd/user/xsettingsd.service index 722efb3..db95d11 100644 --- a/.config/systemd/user/xsettingsd.service +++ b/.config/systemd/user/xsettingsd.service @@ -3,7 +3,6 @@ Description=Provides settings to X11 applications via the XSETTINGS specificatio [Service] Type=idle -Environment="LANG=zh_CN.UTF-8" ExecStart=/usr/bin/xsettingsd [Install] diff --git a/.pam_environment b/.pam_environment index d613295..c659e8a 100644 --- a/.pam_environment +++ b/.pam_environment @@ -1,73 +1,62 @@ -# default +PATH DEFAULT=@{HOME}/.bin EDITOR DEFAULT=nvim BROWSER DEFAULT=firefox MANPAGER DEFAULT="nvim +Man! --cmd 'let $NVIM_AS_PAGER=1'" -# xdg base directory -XDG_CONFIG_HOME DEFAULT=@{HOME}/.config -XDG_CACHE_HOME DEFAULT=@{HOME}/.cache -XDG_DATA_HOME DEFAULT=@{HOME}/.data - +# QT QT_QPA_PLATFORMTHEME DEFAULT=qt5ct QT_AUTO_SCREEN_SCALE_FACTOR DEFAULT=0 -GTK2_RC_FILES DEFAULT=${XDG_CONFIG_HOME}/gtk-2.0/gtkrc -# fcitx +# fcitx5 GTK_IM_MODULE DEFAULT=fcitx QT_IM_MODULE DEFAULT=fcitx -XMODIFIERS DEFAULT=@im=fcitx +XMODIFIERS DEFAULT=\@im=fcitx INPUT_METHOD DEFAULT=fcitx SDL_IM_MODULE DEFAULT=fcitx GLFW_IM_MODULE DEFAULT=ibus +# XDG base directory +XDG_CONFIG_HOME DEFAULT=@{HOME}/.config +XDG_CACHE_HOME DEFAULT=@{HOME}/.cache +XDG_DATA_HOME DEFAULT=@{HOME}/.data +#gpg +GNUPGHOME DEFAULT=${XDG_DATA_HOME}/gnupg +# GTK2 +GTK2_RC_FILES DEFAULT=${XDG_CONFIG_HOME}/gtk-2.0/gtkrc # readline INPUTRC DEFAULT=${XDG_CONFIG_HOME}/readline/inputrc - # xorg-xauth XAUTHORITY DEFAULT=${XDG_RUNTIME_DIR}/Xauthority - -# xinit +# X11 XINITRC DEFAULT=${XDG_CONFIG_HOME}/X11/session XSERVERRC DEFAULT=${XDG_CONFIG_HOME}/X11/serverrc - # less LESSKEY DEFAULT=${XDG_CONFIG_HOME}/less/lesskey LESSHISTFILE DEFAULT=${XDG_DATA_HOME}/less/history - # zsh ZDOTDIR DEFAULT=${XDG_CONFIG_HOME}/zsh HISTFILE DEFAULT=${XDG_DATA_HOME}/zsh/history - # openssl RANDFILE DEFAULT=${XDG_DATA_HOME}/openssl/randfile - # rust CARGO_HOME DEFAULT=${XDG_DATA_HOME}/cargo RUSTUP_HOME DEFAULT=${XDG_DATA_HOME}/rustup - # golang GO111MODULE DEFAULT=on GOPROXY DEFAULT=https://goproxy.cn,direct GOCACHE DEFAULT=${XDG_CACHE_HOME}/go GOMODCACHE DEFAULT=${XDG_DATA_HOME}/go GOPATH DEFAULT=${XDG_DATA_HOME}/go -GOBIN DEFAULT=@{HOME}/bin/go - -# python -PYTHONSTARTUP DEFAULT=${XDG_CONFIG_HOME}/python/repl_startup.py -PYTHONPYCACHEPREFIX DEFAULT=@{HOME}/.cache/python -PYTHONUSERBASE DEFAULT=@{HOME}/.data/python -IPYTHONDIR DEFAULT=${XDG_DATA_HOME}/ipython -JUPYTER_CONFIG_DIR DEFAULT=${XDG_CONFIG_HOME}/jupyter - -# node -NODE_REPL_HISTORY DEFAULT=${XDG_DATA_HOME}/node_repl_history - -# npm -NPM_CONFIG_USERCONFIG DEFAULT=${XDG_CONFIG_HOME}/npm/npmrc - +GOBIN DEFAULT=@{HOME}/.bin/go # nvm NVM_DIR DEFAULT=${XDG_DATA_HOME}/nvm - -# PATH -PATH DEFAULT=@{HOME}/bin:${GOBIN}:/usr/local/sbin:/usr/local/bin:/usr/bin +# node +NODE_REPL_HISTORY DEFAULT=${XDG_DATA_HOME}/node_repl_history +# npm +NPM_CONFIG_USERCONFIG DEFAULT=${XDG_CONFIG_HOME}/npm/npmrc +# python +PYTHONSTARTUP DEFAULT=${XDG_CONFIG_HOME}/python/repl_startup.py +PYTHONPYCACHEPREFIX DEFAULT=${XDG_CACHE_HOME}/python +PYTHONUSERBASE DEFAULT=${XDG_DATA_HOME}/python +IPYTHONDIR DEFAULT=${XDG_DATA_HOME}/ipython +JUPYTER_CONFIG_DIR DEFAULT=${XDG_CONFIG_HOME}/jupyter