ruff: remove docstring-code-format from config, error in current version

Change jupyterlab/default.nix to just return a package set which is
then integrated with other python packages in default.nix

home/prog/default.nix

@@ -3,6 +3,8 @@
     "ruff/pyproject.toml".source = ./ruff.toml;
     "pypoetry/config.toml".source = ./pypoetry.toml;
     "ipython/profile_default/ipython_config.json".source = ./ipython_config.json;
+    "jupyter/jupyter_server_config.py".source = ./jupyter_server_config.py;
+    "jupyter/jupyter_nbconvert_config.py".source = ./jupyter_nbconvert_config.py;
   };
   home.packages = with pkgs; [
     # Nix
@@ -23,7 +25,10 @@
 
     # Python
     (python3.withPackages
-      (ps: with ps; [python-lsp-server mypy isort]))
+      (ps:
+        with ps;
+          [python-lsp-server mypy isort]
+          ++ (ps.callPackage ./jupyter/default.nix {})))
     ruff
 
     # JavaScript / TypeScript

home/prog/jupyter/default.nix

@@ -1,16 +1,8 @@
-{pkgs, ...}: {
-  xdg.configFile = {
-    "jupyter/jupyter_server_config.py".source = ./jupyter_server_config.py;
-    "jupyter/jupyter_nbconvert_config.py".source =
-      ./jupyter_nbconvert_config.py;
-  };
-  home.packages = with pkgs; [
-    (python3.withPackages
-      (ps:
-        with ps; [
+{python, ...}:
+with python.pkgs; [
   jupyterlab
   jupyterlab-git
+  nbdime
+  nbconvert
   (callPackage ./catppuccin_jupyterlab/default.nix {})
-        ]))
-  ];
-}
+]

home/prog/ruff.toml

@@ -33,5 +33,5 @@ ignore = [
 ]
 unfixable = ["W", "B", "PD", "NPY", "RUF", "E101", "E501", "C901", "I001", "I002"]
 
-[format]
-docstring-code-format = true
+# [format]
+# docstring-code-format = true

home/waybar/default.nix

@@ -42,7 +42,7 @@
           "(.*) - GNU Emacs at (.*)" = "  $1 [$2]";
           "(Alacritty.*)" = "  $1";
           "(.*) - mpv" = "󰦟  $1";
-          "swayimg: (.*)" = "󰋩  $1"
+          "swayimg: (.*)" = "󰋩  $1";
           "(btm)" = "  Resource Usage [$1]";
           "(cava)" = "󰝚  Music Visualiser [$1]";
           "(.*) - Thunar" = "󰝰  $1";

system/bookmarks/default.org

@@ -26,15 +26,17 @@
 ** Server :server:
 - [[https://xenia.me.uk][Home Page]]
 - [[https://git.xenia.me.uk][Forgejo]]
+- [[https://blog.xenia.me.uk][Blog]]
 ** Documentation :documentation:
 - [[https://nixos-and-flakes.thiscute.world/][NixOS and Flakes]]
 - [[https://nix-community.github.io/home-manager/options.xhtml][Home Manager Configuration Options]]
 - [[https://mipmip.github.io/home-manager-option-search/][Home Manager Option Search]]
 - [[https://mozilla.github.io/policy-templates/][Mozilla Policy Templates]]
-- [[https://chromeenterprise.google/policies/][Chrome Enterprise Policy List]]
 ** Awesome Repos :awesome:git:
 - [[https://github.com/emacs-tw/awesome-emacs][Awesome Emacs]]
 - [[https://github.com/hyprland-community/awesome-hyprland][Awesome Hyprland]]
+** Miscellaneous :misc:
+- [[https://www.colorhexa.com/][Colour Encyclopedia]]
 * Work :work:
 - [[https://nucleus.ukaea.uk/][Nucleus]]
 - [[https://marval.service.ukaea.uk/MSMSelfService/Index.aspx][Marval Helpdesk]]
@@ -61,5 +63,6 @@
 - [[https://wiki.jetdata.eu/open/index.php?title=KT3_Journals][KT3]]
 ** Office :microsoft:office:
 - [[https://outlook.office.com][Outlook]]
+- [[https://outlook.office.com/calendar/view/workweek][Outlook Calendar]]
 - [[https://teams.cloud.microsoft][Microsoft Teams]]
 - [[https://teams.microsoft.com][Microsoft Teams (Old)]]