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/darwin.nix

@@ -0,0 +1,14 @@
+{ config, pkgs, ... }: {
+	users.users.kat = {
+		name = "kat";
+		home = "/Users/kat";
+		shell = pkgs.zsh;
+                uid = 501;
+	};
+        users.knownUsers = [
+		"kat"
+	];
+	home-manager.users.kat.programs.zsh.initExtraFirst = ''
+		source /etc/static/zshrc
+	'';
+}

config/users/kat/default.nix

@@ -10,9 +10,16 @@
   serviceImports = wrapImports tree.prev.services;
 in
 dirImports // {
+  darwin = {
+    imports = [
+      dirImports.base
+      tree.prev.darwin
+    ];
+  };
   base = {
     imports = [
       dirImports.base
+      dirImports.linux
       tree.prev.nixos
     ];
   };

config/users/kat/dev/packages.nix

@@ -8,7 +8,6 @@
     tokei
     nixpkgs-fmt
     pandoc
-    apache-directory-studio
     hugo
   ];
 }

config/users/kat/dev/vim/default.nix

@@ -2,12 +2,11 @@
 
 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" ];
@@ -44,10 +43,6 @@ in
       nvim-base16
       nvim-web-devicons
       telescope-nvim
-      (nvim-treesitter.withPlugins (
-        plugins: with plugins; pkgs.tree-sitter.allGrammars
-      ))
-      nvim-ts-rainbow
       coc-yaml
       coc-git
       coc-css

config/users/kat/dev/vim/init.vim

@@ -14,22 +14,6 @@ lua << EOF
     }
   })
 
-require('nvim-treesitter.configs').setup {
-ensure_installed = "all", -- one of "all", "maintained" (parsers with maintainers), or a list of languages
-  ignore_install = { }, -- List of parsers to ignore installing
-  highlight = {
-    enable = true,
-    additional_vim_regex_highlighting = true,
-  },
-  indent = {
-    enable = true,
-  },
-  rainbow = {
-    enable = true,
-    extended_mode = true, -- Also highlight non-bracket delimiters like html tags, boolean or table: lang -> boolean
-    max_file_lines = nil, -- Do not enable for files with more than n lines, int
-  }
-}
     require('neorg').setup {
         -- Tell Neorg what modules to load
         load = {

config/users/kat/linux/xdg.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib,  ... }:
 
 {
   xdg = {