WIP

This is mostly so that I can add the XDG-compliant configuration.

flake.lock

@@ -136,11 +136,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706955260,
+        "lastModified": 1707175763,
-        "narHash": "sha256-W3y0j77IDVbmbajudHoUr46RpswujUCl+D5Vru53UsI=",
+        "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "880d9bc2110f7cae59698f715b8ca42cdc53670c",
+        "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80",
         "type": "github"
       },
       "original": {
@@ -152,11 +152,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1706732774,
+        "lastModified": 1707092692,
-        "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=",
+        "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d",
+        "rev": "faf912b086576fd1a15fca610166c98d47bc667e",
         "type": "github"
       },
       "original": {
@@ -168,11 +168,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1706978646,
+        "lastModified": 1707234300,
-        "narHash": "sha256-XEFktO8Ba41zKawf1Uf6FKIR1x0ShuoSddYXU4PQbx8=",
+        "narHash": "sha256-D+LdA8g0Tq+KE9EmJMmn8EGRO5jZ2nLe/W0Fr5EIsdg=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "66d6b7b355f3b10ea4140f8b85b2e274c24d442a",
+        "rev": "59fceae769455455ef44c1dfb63bbae1ecddc41d",
         "type": "github"
       },
       "original": {

modules/home/default.nix

@@ -39,6 +39,7 @@
     ./tmux
     ./udiskie
     ./vim
+    ./wget
     ./wm
     ./x
     ./xdg

modules/home/nix/default.nix

@@ -48,7 +48,11 @@ in
       nix = {
         package = lib.mkDefault pkgs.nix; # NixOS module sets it unconditionally
 
+        # FIXME: waiting on https://github.com/nix-community/home-manager/pull/3876
         settings = {
+          # I like XDG-compliance
+          use-xdg-base-directories = true;
+
           experimental-features = [ "nix-command" "flakes" ];
         };
       };

modules/home/wget/default.nix

@@ -0,0 +1,26 @@
+{ config, pkgs, lib, ... }:
+let
+  cfg = config.my.home.wget;
+in
+{
+  options.my.home.wget = with lib; {
+    enable = my.mkDisableOption "wget configuration";
+
+    package = mkPackageOption pkgs "wget" { };
+  };
+
+  config = lib.mkIf cfg.enable {
+    home.packages = [
+      cfg.package
+    ];
+
+
+    home.sessionVariables = lib.mkIf cfg.enable {
+      WGETRC = "${config.xdg.configHome}/wgetrc";
+    };
+
+    xdg.configFile."wgetrc".text = ''
+      hsts-file = ${config.xdg.dataHome}/wget-hsts
+    '';
+  };
+}

modules/home/xdg/default.nix

@@ -48,8 +48,11 @@ in
     LESSHISTFILE = "${dataHome}/less/history";
     LESSKEY = "${configHome}/less/lesskey";
     PSQL_HISTORY = "${dataHome}/psql_history";
-    REPO_CONFIG_DIR = "${configHome}/repo";
+    PYTHONPYCACHEPREFIX = "${cacheHome}/python/";
+    PYTHONUSERBASE = "${dataHome}/python/";
+    PYTHON_HISTORY = "${stateHome}/python/history";
     REDISCLI_HISTFILE = "${dataHome}/redis/rediscli_history";
+    REPO_CONFIG_DIR = "${configHome}/repo";
     XCOMPOSECACHE = "${dataHome}/X11/xcompose";
   };
 }

modules/nixos/system/nix/default.nix

@@ -54,7 +54,12 @@ in
       nix = {
         package = pkgs.nix;
 
+        # FIXME: waiting on https://github.com/NixOS/nixpkgs/pull/146515
+        # FIXME: look at https://github.com/SuperSandro2000/nixos-modules/blob/master/modules/nix.nix
         settings = {
+          # I like XDG-compliance
+          use-xdg-base-directories = true;
+
           experimental-features = [ "nix-command" "flakes" ];
         };
       };

overlays/gruvbox-nvim-better-diff/generated.nix

@@ -1,24 +1,10 @@
-{ vimUtils, fetchFromGitHub }:
+{ ... }:
 
-_final: _prev: {
+_final: prev: {
-  gruvbox-nvim = vimUtils.buildVimPlugin {
+  gruvbox-nvim = prev.gruvbox-nvim.overrideAttrs (oa: {
-    pname = "gruvbox.nvim";
+    patches = (oa.patches or [ ]) ++ [
-    version = "2023-10-07";
-
-    src = fetchFromGitHub {
-      owner = "ellisonleao";
-      repo = "gruvbox.nvim";
-      rev = "477c62493c82684ed510c4f70eaf83802e398898";
-      sha256 = "0250c24c6n6yri48l288irdawhqs16qna3y74rdkgjd2jvh66vdm";
-    };
-
-    patches = [
       # Inspired by https://github.com/ellisonleao/gruvbox.nvim/pull/291
       ./colours.patch
     ];
-
+  });
-    meta = {
-      homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
-    };
-  };
 }

overlays/gruvbox-nvim-treesitter-fix/default.nix

@@ -0,0 +1,4 @@
+self: prev:
+{
+  vimPlugins = prev.vimPlugins.extend (self.callPackage ./generated.nix { });
+}

overlays/gruvbox-nvim-treesitter-fix/generated.nix

@@ -0,0 +1,14 @@
+{ fetchFromGitHub }:
+
+_final: prev: {
+  gruvbox-nvim = prev.gruvbox-nvim.overrideAttrs (_: {
+    version = "2024-01-29";
+
+    src = fetchFromGitHub {
+      owner = "ellisonleao";
+      repo = "gruvbox.nvim";
+      rev = "6e4027ae957cddf7b193adfaec4a8f9e03b4555f";
+      sha256 = "sha256-jWnrRy/PT7D0UcPGL+XTbKHWvS0ixvbyqPtTzG9HY84=";
+    };
+  });
+}

overlays/tandoor-recipes-failing-test/default.nix

@@ -1,9 +0,0 @@
-_self: super:
-{
-  tandoor-recipes = super.tandoor-recipes.overridePythonAttrs (oa: {
-    disabledTests = (oa.disabledTests or [ ]) ++ [
-      "test_search_count"
-      "test_url_import_regex_replace"
-    ];
-  });
-}