Compare commits

..
Author SHA1 Message Date
Olaf acdb913edb emacs startup error in projectile 2026-09-16 16:17:02 +02:00
Olaf 41a9a18e0a alacrity term definition 2026-09-16 16:16:48 +02:00
Olaf a0b974e71a texlive deprication 2026-09-16 16:16:36 +02:00
3 changed files with 22 additions and 14 deletions
+1 -1
View File
@@ -49,7 +49,7 @@
:bind-keymap ("C-c p" . projectile-command-map) :bind-keymap ("C-c p" . projectile-command-map)
:defer 5 :defer 5
:config :config
(projectile-global-mode)) (projectile-mode +1))
+13 -8
View File
@@ -62,7 +62,7 @@ in
"Affinity Publisher 2" = 1606941598; "Affinity Publisher 2" = 1606941598;
# "DaisyDisk" = 409907375; # (4.32) # Don't use this, we need the official version that is not sandboxed # "DaisyDisk" = 409907375; # (4.32) # Don't use this, we need the official version that is not sandboxed
"Fantastical - Calendar" = 975937182; "Fantastical - Calendar" = 975937182;
"Fedistar" = 6445863996; # (1.13.1) "Fedistar" = 6445863996; # (1.13.1)
"Home Assistant" = 1099568401; # (2025.7.1) "Home Assistant" = 1099568401; # (2025.7.1)
"Ice Cubes for Mastodon" = 6444915884; # (1.11.3) "Ice Cubes for Mastodon" = 6444915884; # (1.11.3)
"LibreOffice" = 1630474372; "LibreOffice" = 1630474372;
@@ -118,6 +118,10 @@ in
style = "Block"; style = "Block";
}; };
env = {
TERM = "xterm-256color";
};
window = { window = {
opacity = 1.0; opacity = 1.0;
padding = { padding = {
@@ -231,19 +235,19 @@ in
}; };
initContent = initContent =
let 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 '' zshConfigEarlyInit = lib.mkOrder 500 ''
if [[ -f /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh ]]; then 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-daemon.sh
. /nix/var/nix/profiles/default/etc/profile.d/nix.sh . /nix/var/nix/profiles/default/etc/profile.d/nix.sh
fi 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 # GPGAgent for SSH
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
@@ -285,6 +289,7 @@ in
''; '';
in in
lib.mkMerge [ lib.mkMerge [
zshConfigBefore
zshConfigEarlyInit zshConfigEarlyInit
zshConfigLastInit zshConfigLastInit
]; ];
+8 -5
View File
@@ -35,6 +35,7 @@ with pkgs;
killall killall
minicom minicom
mtr mtr
ncurses
ncdu ncdu
nodejs nodejs
@@ -96,7 +97,9 @@ with pkgs;
uv uv
(python3.withPackages ( (python3.withPackages (
python-pkgs: with python-pkgs; [ python-pkgs:
with python-pkgs;
[
bidict bidict
blinker blinker
certifi certifi
@@ -150,8 +153,8 @@ with pkgs;
xml2rfc xml2rfc
zotero zotero
(texlive.combine { (texliveSmall.withPackages (
inherit (texlive) texlivePackages: with texlivePackages; [
apa6 apa6
apa7 apa7
apacite apacite
@@ -200,8 +203,8 @@ with pkgs;
xecjk xecjk
xifthen xifthen
xurl xurl
; ]
}) ))
dockutil dockutil
] ]