Compatibility, bringing Sumireko into the fold. Deprecate katexprs.

config/users/kat/base/packages.nix

@@ -8,7 +8,7 @@
     sd
     duc-cli
     bat
-    exa-noman
+    exa
     socat
     rsync
     wget

config/users/kat/base/shell.nix

@@ -27,7 +27,7 @@ in
     yes = "me instead";
   };
   xdg.dataFile = { "z/.keep".text = ""; };
-  home.packages = with pkgs; [ fzf fd zsh-completions akiflags ];
+  home.packages = with pkgs; [ fzf fd zsh-completions ];
   programs.zsh = {
     enable = true;
     enableSyntaxHighlighting = true;
@@ -61,7 +61,10 @@ in
           HISTFILE=/persist/home/.zsh_history
         '' else ''
         ''}
+	${if pkgs.stdenv.system != "aarch64-darwin" then ''
         eval $(dircolors)
+	'' else ''
+	''}
         PROMPT_EOL_MARK='''
         ZSH_TAB_TITLE_ADDITIONAL_TERMS='foot'
         ZSH_TAB_TITLE_ENABLE_FULL_COMMAND=true
@@ -124,6 +127,9 @@ in
       src = "${pkgs.zsh-fzf-tab}/share/fzf-tab";
     });
   };
+  home.sessionVariables = {
+    XDG_DATA_HOME = "${config.xdg.dataHome}";
+  };
   programs.fzf = {
     enable = true;
     enableZshIntegration = true;

config/users/kat/base/vim/init.vim

@@ -4,7 +4,7 @@ set list listchars=tab:»\ ,extends:›,precedes:‹,nbsp:·,trail:✖
 " Enable mouse
 set mouse=a
 
-set viminfo='100000,<100000,s1000,h,n$XDG_DATA_HOME/vim/viminfo'
+set viminfo='100000,<100000,s1000,h,n~/.local/share/vim/viminfo'
 set ts=2
 set sw=2
 

config/users/kat/base/vim/nvim.nix

@@ -1,12 +1,11 @@
 { config, lib, pkgs, nixos, ... }: with lib;
 
 let initvim = pkgs.callPackage
-  ({ stdenv, elinks, nodejs }: stdenv.mkDerivation {
+  ({ stdenv, nodejs }: stdenv.mkDerivation {
     name = "init.vim";
     src = ./init.vim;
-    inherit nodejs elinks;
+    inherit nodejs;
     buildInputs = [
-      elinks
       nodejs
     ];
     phases = [ "buildPhase" ];

config/users/kat/base/xdg.nix

@@ -1,18 +0,0 @@
-{ config, lib, ... }:
-
-{
-  xdg = {
-    enable = true;
-    userDirs = {
-      enable = true;
-      pictures = "$HOME/media";
-      videos = "$HOME/media/videos";
-      documents = "$HOME/docs";
-      download = "$HOME/downloads";
-      desktop = "$HOME/tmp";
-      templates = "$HOME/tmp";
-      publicShare = "$HOME/shared";
-      music = "$HOME/media-share/music";
-    };
-  };
-}