Compare commits
3
Commits
f923fb7717
...
acdb913edb
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
acdb913edb | ||
|
|
41a9a18e0a | ||
|
|
a0b974e71a |
@@ -49,7 +49,7 @@
|
||||
:bind-keymap ("C-c p" . projectile-command-map)
|
||||
:defer 5
|
||||
:config
|
||||
(projectile-global-mode))
|
||||
(projectile-mode +1))
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -118,6 +118,10 @@ in
|
||||
style = "Block";
|
||||
};
|
||||
|
||||
env = {
|
||||
TERM = "xterm-256color";
|
||||
};
|
||||
|
||||
window = {
|
||||
opacity = 1.0;
|
||||
padding = {
|
||||
@@ -231,19 +235,19 @@ in
|
||||
};
|
||||
initContent =
|
||||
let
|
||||
zshConfigBefore = lib.mkBefore ''
|
||||
if [[ "$TERM" == "alacritty" ]] && ! infocmp alacritty >/dev/null 2>&1; then
|
||||
export TERM="xterm-256color"
|
||||
fi
|
||||
export TERMINFO_DIRS="$HOME/.nix-profile/share/terminfo:/run/current-system/sw/share/terminfo:/nix/var/nix/profiles/default/share/terminfo:/usr/share/terminfo"
|
||||
'';
|
||||
|
||||
zshConfigEarlyInit = lib.mkOrder 500 ''
|
||||
if [[ -f /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh ]]; then
|
||||
. /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
|
||||
. /nix/var/nix/profiles/default/etc/profile.d/nix.sh
|
||||
fi
|
||||
|
||||
if [[ "$TERM" == "alacritty" ]]; then
|
||||
export TERMINFO_DIRS="$HOME/.nix-profile/share/terminfo:/run/current-system/sw/share/terminfo:/nix/var/nix/profiles/default/share/terminfo:/usr/share/terminfo"
|
||||
if ! infocmp alacritty >/dev/null 2>&1; then
|
||||
export TERM="xterm-256color"
|
||||
fi
|
||||
fi
|
||||
|
||||
# GPGAgent for SSH
|
||||
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
|
||||
|
||||
@@ -285,6 +289,7 @@ in
|
||||
'';
|
||||
in
|
||||
lib.mkMerge [
|
||||
zshConfigBefore
|
||||
zshConfigEarlyInit
|
||||
zshConfigLastInit
|
||||
];
|
||||
|
||||
@@ -35,6 +35,7 @@ with pkgs;
|
||||
killall
|
||||
minicom
|
||||
mtr
|
||||
ncurses
|
||||
ncdu
|
||||
nodejs
|
||||
|
||||
@@ -96,7 +97,9 @@ with pkgs;
|
||||
uv
|
||||
|
||||
(python3.withPackages (
|
||||
python-pkgs: with python-pkgs; [
|
||||
python-pkgs:
|
||||
with python-pkgs;
|
||||
[
|
||||
bidict
|
||||
blinker
|
||||
certifi
|
||||
@@ -150,8 +153,8 @@ with pkgs;
|
||||
xml2rfc
|
||||
zotero
|
||||
|
||||
(texlive.combine {
|
||||
inherit (texlive)
|
||||
(texliveSmall.withPackages (
|
||||
texlivePackages: with texlivePackages; [
|
||||
apa6
|
||||
apa7
|
||||
apacite
|
||||
@@ -200,8 +203,8 @@ with pkgs;
|
||||
xecjk
|
||||
xifthen
|
||||
xurl
|
||||
;
|
||||
})
|
||||
]
|
||||
))
|
||||
|
||||
dockutil
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user