homes/common.nix

@@ -3,20 +3,20 @@ let
   conda_init = shell: ''
     # >>> conda initialize >>>
     # !! Contents within this block are managed by 'conda init' !!
-    __conda_setup="$(${config.xdg.dataHome}/miniconda3/bin/conda shell.${shell} 'hook' 2> /dev/null)"
+    __conda_setup="$($HOME/miniconda3/bin/conda shell.${shell} 'hook' 2> /dev/null)"
     if [ $? -eq 0 ]; then
         eval "$__conda_setup"
     else
-        if [ -f "${config.xdg.dataHome}/miniconda3/etc/profile.d/conda.sh" ]; then
+        if [ -f "$HOME/miniconda3/etc/profile.d/conda.sh" ]; then
-            . "${config.xdg.dataHome}/miniconda3/etc/profile.d/conda.sh"
+            . "$HOME/miniconda3/etc/profile.d/conda.sh"
         else
-            export PATH="${config.xdg.dataHome}/miniconda3/bin:$PATH"
+            export PATH="$HOME/miniconda3/bin:$PATH"
         fi
     fi
     unset __conda_setup
 
-    if [ -f "${config.xdg.dataHome}/miniconda3/etc/profile.d/mamba.sh" ]; then
+    if [ -f "$HOME/miniconda3/etc/profile.d/mamba.sh" ]; then
-      . "${config.xdg.dataHome}/miniconda3/etc/profile.d/mamba.sh"
+      . "$HOME/miniconda3/etc/profile.d/mamba.sh"
     fi
     # <<< conda initialize <<<
 
@@ -30,7 +30,10 @@ let
 in {
   home = {
     stateVersion = "23.11";
-    file = { ".p10k.zsh".source = ./../dotfiles/p10k.zsh; };
+    file = {
+      ".p10k.zsh".source = ./../dotfiles/p10k.zsh;
+      ".local/share/julia/config/startup.jl".source = ./../dotfiles/startup.jl;
+    };
     packages = with pkgs; [
       act
       cowsay
@@ -55,18 +58,19 @@ in {
       python3
       quarto
       shellcheck
-      tex-fmt
       zulu17
       (texlive.combine { inherit (texlive) scheme-basic latex-bin latexmk; })
     ];
     sessionVariables = {
       PAGER = "most";
-      NXF_HOME = "${config.xdg.dataHome}/nextflow";
+      NXF_HOME = "\${XDG_DATA_HOME:-$HOME/.local/share}/nextflow";
-      NXF_CACHE = "${config.xdg.cacheHome}/nextflow";
+      NXF_CACHE = "\${XDG_CACHE_HOME:-$HOME/.cache}/nextflow";
       NXF_CONDA_CACHEDIR = "$NXF_CACHE/conda";
       NXF_SINGULARITY_CACHEDIR = "$NXF_CACHE/singularity";
-      JULIA_DEPOT_PATH = "${config.xdg.dataHome}/julia:";
+      JULIA_DEPOT_PATH = "\${XDG_DATA_HOME:-$HOME/.local/share}/julia:";
       JULIA_PKG_USE_CLI_GIT = "true";
+      # GPG_TTY = "$(tty)";
+      # SSH_AUTH_SOCK = "$(gpgconf --list-dirs agent-ssh-socket)";
     };
     shellAliases = {
       cat = "bat";
@@ -196,7 +200,4 @@ in {
       '';
     };
   };
-  xdg = {
-    dataFile = { "julia/config/startup.jl".source = ./../dotfiles/startup.jl; };
-  };
 }

homes/desktop.nix

@@ -1,13 +1,15 @@
 { config, lib, pkgs, pkgs-unstable, firefox-addons, buildFirefoxXpiAddon, ... }:
 let
+  packages = import ./../pkgs.nix {
+    inherit pkgs;
+    inherit pkgs-unstable;
+  };
   firefox-config = import ./../programs/firefox.nix;
   zed-config = import ./../programs/zed.nix;
 in {
   home = {
     packages = with pkgs; [
-      dejavu_fonts
       kdePackages.qtdeclarative
-      roboto-slab
       sqlitebrowser
       woodpecker-cli
       (pkgs.nerdfonts.override {
@@ -31,8 +33,8 @@ in {
       enableBashIntegration = true;
       enableSshSupport = true;
       enableZshIntegration = true;
-      defaultCacheTtl = 604800;
+      defaultCacheTtl = 10800;
-      maxCacheTtl = 604800;
+      maxCacheTtl = 21600;
       verbose = true;
     };
     syncthing = { enable = true; };

homes/linux-desktop.nix

@@ -1,9 +1,4 @@
-{ config, lib, pkgs, pkgs-unstable, ... }:
+{ config, lib, pkgs, pkgs-unstable, ... }: {
-let
-  home-manager-repo = "${config.xdg.configHome}/home-manager";
-  mkOutOfStoreSymlink = config.lib.file.mkOutOfStoreSymlink;
-in {
-
   home = { packages = with pkgs; [ ollama trayscale veracrypt ]; };
   programs = { };
   services = {
@@ -24,22 +19,4 @@ in {
       ];
     };
   };
-  xdg = {
-    configFile = {
-      "konsolerc".source =
-        mkOutOfStoreSymlink "${home-manager-repo}/dotfiles/konsolerc";
-      "yakuakerc".source =
-        mkOutOfStoreSymlink "${home-manager-repo}/dotfiles/yakuakerc";
-    };
-    dataFile = {
-      "konsole/My Default.profile".source =
-        mkOutOfStoreSymlink "${home-manager-repo}/dotfiles/MyDefault.profile";
-      "kio/servicemenus/kate.desktop".source = ./../dotfiles/kate.desktop;
-      "kio/servicemenus/vlc.desktop".source = ./../dotfiles/vlc.desktop;
-      "kio/servicemenus/word-to-pdf.desktop".source =
-        ./../dotfiles/word-to-pdf.desktop;
-      "kio/servicemenus/powerpoint-to-pdf.desktop".source =
-        ./../dotfiles/powerpoint-to-pdf.desktop;
-    };
-  };
 }

homes/linux.nix

@@ -1,6 +1,20 @@
 { config, lib, pkgs, pkgs-unstable, ... }: {
   fonts = { fontconfig = { enable = true; }; };
   home = {
+    file = {
+      "${config.xdg.configHome}/konsolerc".source = ./../dotfiles/konsolerc;
+      "${config.xdg.configHome}/yakuakerc".source = ./../dotfiles/yakuakerc;
+      "${config.xdg.dataHome}/konsole/My Default.profile".source =
+        ./../dotfiles/MyDefault.profile;
+      "${config.xdg.dataHome}/kio/servicemenus/kate.desktop".source =
+        ./../dotfiles/kate.desktop;
+      "${config.xdg.dataHome}/kio/servicemenus/vlc.desktop".source =
+        ./../dotfiles/vlc.desktop;
+      "${config.xdg.dataHome}/kio/servicemenus/word-to-pdf.desktop".source =
+        ./../dotfiles/word-to-pdf.desktop;
+      "${config.xdg.dataHome}/kio/servicemenus/powerpoint-to-pdf.desktop".source =
+        ./../dotfiles/powerpoint-to-pdf.desktop;
+    };
     # A notable exception here: R
     # R is a very painful program to manage.
     # Package compatibility between R versions is abysmal, so I need to keep multiple R versions around.inherit

programs/zed.nix

@@ -39,14 +39,6 @@
           };
         };
       };
-      LaTeX = {
-        formatter = {
-          external = {
-            command = "tex-fmt";
-            arguments = [ "--stdin" ];
-          };
-        };
-      };
       Nix = { formatter = { external = { command = "nixfmt"; }; }; };
     };
     preview_tabs = { enabled = false; };