users/foo-dogsquared/dotfiles: update packages for Neovim "distribution"

This setup enables multiple Neovim flavors through wrapper-manager and
can even make multiple NixVim configurations under one home-manager
configuration. Very nice.

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2022-2024 Gabriel Arazas <foodogsquared@foodogsquared.one>
+Copyright (c) 2022-2025 Gabriel Arazas <foodogsquared@foodogsquared.one>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

configs/README.adoc

@@ -18,3 +18,12 @@ Here is the following list of them used in the repo history:
 These "codenames" are also used for their environment-specific module structuring (e.g., `hosts.ni.services.backup.enable` for NixOS, `nixvimConfigs.fiesta.setups.tree-sitter` for NixVim, `users.foo-dogsquared.setups.desktop.enable` for home-manager) with the exception of flake-parts where it is basically a free-for-all.
 
 Lastly, these modules are referred collectively in the commits as `modules`.
+
+
+[#conventions]
+== Conventions
+
+There's a few things you need to remember for these configurations.
+
+- Module arguments that are only suitable to be included in the first build step of the configuration are all under the `firstSetupArgs` namespace.
+- Module arguments that are only found inside of the configuration itself should be under the `configurationArgs` namespace.

configs/flake-parts/home-manager.nix

@@ -1,5 +1,6 @@
 { inputs
 , lib
+, config
 
 , defaultNixConf
 
@@ -25,6 +26,10 @@
 
             # Get all of the NUR.
             inputs.nur.overlays.default
+
+            # We have this since we want to compile those NixVim configuration
+            # ourselves.
+            inputs.nixvim-unstable.overlays.default
           ];
         };
         homeManagerBranch = "home-manager-unstable";
@@ -33,6 +38,16 @@
           inputs.nur.modules.homeManager.default
           inputs.sops-nix.homeManagerModules.sops
           inputs.wrapper-manager-fds.homeModules.wrapper-manager
+
+          {
+            _module.args = {
+              firstSetupArgs = {
+                baseNixvimModules =
+                  config.setups.nixvim.configs.fiesta.modules
+                  ++ config.setups.nixvim.sharedModules;
+              };
+            };
+          }
         ];
         nixvim = {
           instance = "fiesta";

configs/flake-parts/nixos.nix

@@ -18,6 +18,7 @@ in
 
         # This is to make an exception for Archivebox.
         nixpkgs.config.permittedInsecurePackages = [
+          "archiver-3.5.1"
           "python3.12-django-3.1.14"
         ];
 
@@ -42,6 +43,19 @@ in
 
           inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate
           inputs.nixos-hardware.nixosModules.common-cpu-amd-raphael-igpu
+
+          (
+            { config, ... }: let
+              hmCfg = config.home-manager.users;
+            in {
+              # Testing out Nushell for a spinerooski.
+              users.users.foo-dogsquared.shell =
+                if hmCfg.foo-dogsquared.programs.nushell.enable then
+                  hmCfg.foo-dogsquared.programs.nushell.package
+                else
+                  "/run/current-system/sw/bin/bash";
+            }
+          )
         ];
         home-manager = {
           branch = "home-manager-unstable";

configs/home-manager/foo-dogsquared/config/tridactyl/tridactylrc

@@ -48,7 +48,12 @@ bind qW recontain Work
 bind qe recontain Banking
 bind qE recontain Shopping
 bind qC recontain Chat
-bind qq recontain
+bind qq recontain Cooking
+
+" Sorting them nicefully.
+bind qss tabsort --url
+bind qsS tabsort --containers
+bind qst tabsort --title
 
 bind <C-Q> fillcmdline containerclose
 
@@ -58,6 +63,7 @@ bind de containerclose Banking
 bind dE containerclose Shopping
 bind dg containerclose Gaming
 bind dC containerclose Chat
+bind dc containerclose Cooking
 
 " Assuming the Google and Facebook containers extensions are installed.
 bind dF containerclose Facebook
@@ -75,6 +81,7 @@ containercreate Banking green dollar
 containercreate Shopping pink cart
 containercreate Gaming turquoise chill
 containercreate Chat blue chill
+containercreate Cooking orange food
 
 " Most of the MOOC are for personal purposes so it is in "Personal" container.
 autocontain -s coursera\.org Personal
@@ -174,6 +181,11 @@ seturl nytimes\.com/games disable true
 seturl merriam-webster\.com/games disable true
 seturl britannica\.com/games disable true
 
+" My cooking gotos.
+autocontain -s lecremedelacrumb\.com Cooking
+autocontain -s cookingclassy\.com Cooking
+autocontain -s panlasangpinoy\.com Cooking
+
 " Ignore all of the keybindings.
 blacklistadd https://design.penpot.app
 

configs/home-manager/foo-dogsquared/modules/default.nix

@@ -12,6 +12,7 @@
     ./programs/hledger.nix
     ./programs/keys.nix
     ./programs/nixvim
+    ./programs/nushell.nix
     ./programs/custom-homepage.nix
     ./programs/shell.nix
     ./programs/terminal-multiplexer.nix

configs/home-manager/foo-dogsquared/modules/dotfiles.nix

@@ -41,8 +41,19 @@ in
       xdg.configFile.nyxt.source = getDotfiles "nyxt";
     })
 
-    (lib.mkIf (!userCfg.programs.nixvim.enable) {
+    # Comes with a heavy assumption that the Neovim configuration found in this
+    # home-manager environment will not write to the XDG config directory.
+    (lib.mkIf (!config.programs.nixvim.enable) {
       xdg.configFile.nvim.source = getDotfiles "nvim";
+
+      programs.neovim.extraPackages = with pkgs; [
+        luarocks
+        shfmt
+      ];
+    })
+
+    (lib.mkIf userCfg.programs.nushell.enable {
+      home.file."${config.xdg.dataHome}/nushell/vendor/autoload".source = getDotfiles "nu/autoload";
     })
   ]);
 }

configs/home-manager/foo-dogsquared/modules/programs/browsers.nix

@@ -125,7 +125,9 @@ in
             updateswh
             zhongwen
             open-access-helper
-          ]);
+            rsshub-radar
+            ])
+          ++ lib.optionals config.programs.mpv.enable (with pkgs.nur.repos.rycee.firefox-addons; [ ff2mpv ]);
 
           # Much of the settings are affected by the policies set in the
           # package. See more information about them in

configs/home-manager/foo-dogsquared/modules/programs/nixvim/default.nix

@@ -1,37 +1,53 @@
 # Take note, this already assumes we're using on top of an already existing
 # NixVim configuration. See the declarative users configuration for more
 # details.
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, firstSetupArgs, ... }:
 
 let
   userCfg = config.users.foo-dogsquared;
   cfg = userCfg.programs.nixvim;
   hmCfg = config;
+
+  createNixvimFlavor = module:
+    pkgs.nixvim.makeNixvimWithModule {
+      inherit pkgs;
+      module.imports = firstSetupArgs.baseNixvimModules ++ [ module ];
+      extraSpecialArgs.hmConfig = config;
+    };
 in
 {
   options.users.foo-dogsquared.programs.nixvim.enable =
     lib.mkEnableOption "NixVim setup";
 
   config = lib.mkIf cfg.enable {
-    programs.nixvim = { ... }: {
+    # Basically, we're creating Neovim flavors with NixVim so no need for it.
-      imports =
+    #
-        [
+    # Also another reason we're forcibly disabling that it is heavily assumed
-          ./colorschemes.nix
+    # that it is using the Neovim configuration found from the dotfiles repo.
-          ./fuzzy-finding.nix
+    programs.nixvim.enable = lib.mkForce false;
-          ./misc.nix
-          ./note-taking.nix
-        ]
-        ++ lib.optionals userCfg.setups.development.enable [
-          ./dev.nix
-          ./lsp.nix
-          ./dap.nix
-        ];
-      config = {
-        enable = true;
 
-        # Inherit all of the schemes.
+    wrapper-manager.packages.neovim-flavors = {
-        bahaghari.tinted-theming.schemes = hmCfg.bahaghari.tinted-theming.schemes;
+      wrappers.nvim-fiesta.arg0 = let
-      };
+        nvimPkg = createNixvimFlavor {
+          imports =
+            [
+              ./colorschemes.nix
+              ./fuzzy-finding.nix
+              ./misc.nix
+              ./note-taking.nix
+            ]
+            ++ lib.optionals userCfg.setups.development.enable [
+              ./dev.nix
+              ./lsp.nix
+              ./dap.nix
+            ];
+
+          config = {
+            # Inherit all of the schemes.
+            bahaghari.tinted-theming.schemes = hmCfg.bahaghari.tinted-theming.schemes;
+          };
+        };
+      in lib.getExe' nvimPkg "nvim";
     };
   };
 }

configs/home-manager/foo-dogsquared/modules/programs/nushell.nix

@@ -0,0 +1,94 @@
+{ config, lib, pkgs, ... }:
+
+let
+  userCfg = config.users.foo-dogsquared;
+  cfg = userCfg.programs.nushell;
+
+  nushellAutoloadScriptDir = "${config.xdg.dataHome}/nushell/vendor/autoload";
+in
+{
+  options.users.foo-dogsquared.programs.nushell.enable =
+    lib.mkEnableOption "Nushell setup";
+
+  config = lib.mkIf cfg.enable (lib.mkMerge [
+    {
+      programs.nushell = {
+        enable = true;
+        plugins = with pkgs.nushellPlugins; [
+          dbus
+          query
+          skim
+          polars
+          units
+          net
+          formats
+          highlight
+        ];
+        extraConfig = ''
+          $env.config = $env.config | merge deep --strategy=append {
+            show_banner: false
+
+            shell_integration: {
+              osc7: true
+              osc133: true
+              osc633: true
+            }
+          }
+        '';
+        environmentVariables.NU_LIB_DIRS =
+          lib.concatStringsSep ":" [
+            "${config.xdg.cacheHome}/nushell/modules"
+            "${config.xdg.userDirs.extraConfig.XDG_PROJECTS_DIR}/nushell"
+          ];
+      };
+    }
+
+    # Configuring our own completion thingy instead.
+    # Based from https://www.nushell.sh/cookbook/external_completers.html#multiple-completer.
+    (lib.mkIf config.programs.carapace.enable {
+      programs.carapace.enableNushellIntegration = lib.mkForce false;
+
+      programs.nushell.extraConfig = lib.mkMerge [
+        (lib.mkIf config.programs.zoxide.enable ''
+          let zoxide_completer = {|spans|
+              $spans | skip 1 | zoxide query -l ...$in | lines | where {|x| $x != $env.PWD}
+          }
+        '')
+
+        ''
+          let carapace_completer = {|spans: list<string>|
+            carapace $spans.0 nushell ...$spans
+            | from json
+            | if ($in | default [] | where value =~ '^-.*ERR$' | is-empty) { $in } else { null }
+          }
+
+          let external_completers = {|spans|
+            let expanded_alias = scope aliases
+              | where name == $spans.0
+              | get -i 0.expansion
+
+            let spans = if $expanded_alias != null {
+              $spans
+              | skip 1
+              | prepend ($expanded_alias | split row ' ' | take 1)
+            } else {
+              $spans
+            }
+
+            match $spans.0 {
+              ${lib.optionalString config.programs.zoxide.enable ''
+                __zoxide_z | __zoxide_zi => $zoxide_completer
+              ''}
+              _ => $carapace_completer
+            } | do $in $spans
+          }
+
+          $env.config.completions.external = $env.config.completions.external | merge deep --strategy=append {
+            enable: true
+            completer: $external_completers
+          }
+        ''
+      ];
+    })
+  ]);
+}

configs/home-manager/foo-dogsquared/modules/programs/shell.nix

@@ -24,6 +24,9 @@ in
       ];
     };
 
+    # Compile all of the completions.
+    programs.carapace.enable = true;
+
     programs.atuin = {
       enable = true;
       settings = {

configs/home-manager/foo-dogsquared/modules/setups/development.nix

@@ -21,7 +21,8 @@ in {
       ];
 
       users.foo-dogsquared.programs = {
-        shell.enable = lib.mkDefault true;
+        shell.enable = true;
+        nushell.enable = true;
         git = {
           enable = lib.mkDefault true;
           instaweb.enable = true;

configs/home-manager/foo-dogsquared/modules/setups/research.nix

@@ -45,6 +45,7 @@ in
         curl # The general purpose downloader.
         fanficfare # It's for the badly written fanfics.
         gallery-dl # More potential for your image collection.
+        goldendict-ng # A golden dictionary for perfecting your diction.
         internetarchive # All of the potential vintage collection of questionable materials at your fingertips.
         kiwix # Offline reader for your fanon wiki.
         localsend # Local network syncing.

configs/nixos/ni/modules/services/rss-reader/default.nix

@@ -29,5 +29,14 @@ in
     services.nginx.virtualHosts."rss.ni.local" = {
       locations."/".proxyPass = "http://ni.local:${builtins.toString port}";
     };
+
+    # Just make sure you execute this script as `miniflux` helper especially
+    # that it is configured with PostgreSQL.
+    wrapper-manager.packages.miniflux-helper = {
+      wrappers.miniflux-helper = {
+        arg0 = lib.getExe' config.services.miniflux.package "miniflux";
+        env = lib.mapAttrs (_: value: { value = builtins.toString value; }) config.services.miniflux.config;
+      };
+    };
   };
 }

configs/nixvim/fiesta/modules/setups/lsp.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, helpers, ... }:
 
 let
   nixvimConfig = config.nixvimConfigs.fiesta;
@@ -15,6 +15,19 @@ in
     };
 
   config = lib.mkIf cfg.enable {
+    keymaps = [
+      {
+        mode = [ "n" ];
+        key = "<leader>Li";
+        options.desc = "Toggle inlay hints";
+        action = helpers.mkRaw ''
+          function()
+            vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
+          end
+        '';
+      }
+    ];
+
     plugins.lsp = {
       enable = true;
       inlayHints = true;

configs/nixvim/fiesta/modules/setups/treesitter.nix

@@ -18,29 +18,6 @@ in
       nixGrammars = true;
       nixvimInjections = true;
 
-      # We'll just use the common languages out of the bat.
-      grammarPackages = with config.plugins.treesitter.package.builtGrammars; [
-        bash
-        c
-        cpp
-        css
-        dockerfile
-        go
-        graphql
-        html
-        http
-        javascript
-        json
-        json5
-        lua
-        nix
-        rust
-        toml
-        tsx
-        typescript
-        yaml
-      ];
-
       # Enable all of its useful features.
       folding = true;
       settings = {

flake.lock

@@ -45,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728330715,
+        "lastModified": 1735644329,
-        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
+        "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
+        "rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
         "type": "github"
       },
       "original": {
@@ -66,11 +66,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728330715,
+        "lastModified": 1735644329,
-        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
+        "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
+        "rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
         "type": "github"
       },
       "original": {
@@ -86,11 +86,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735048446,
+        "lastModified": 1737038063,
-        "narHash": "sha256-Tc35Y8H+krA6rZeOIczsaGAtobSSBPqR32AfNTeHDRc=",
+        "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "3a4de9fa3a78ba7b7170dda6bd8b4cdab87c0b21",
+        "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2",
         "type": "github"
       },
       "original": {
@@ -107,11 +107,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1735265093,
+        "lastModified": 1737249389,
-        "narHash": "sha256-vTaiIj5g5AkKf2Z9mAMEeNc0y1OClaSmFNeIbQtP/0s=",
+        "narHash": "sha256-VZmUzQi1XEFMOaLoSTZz++eU81Dwoh6jZNzrfKqrC5U=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "4b0e7b77b538ee7a012404c62dad556c1fdf26a2",
+        "rev": "9071d5f50ce03d1f872973516d0e5dd13179cb93",
         "type": "github"
       },
       "original": {
@@ -247,11 +247,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1733312601,
+        "lastModified": 1736143030,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
         "type": "github"
       },
       "original": {
@@ -268,11 +268,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733312601,
+        "lastModified": 1736143030,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
         "type": "github"
       },
       "original": {
@@ -290,11 +290,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733312601,
+        "lastModified": 1736143030,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
         "type": "github"
       },
       "original": {
@@ -310,11 +310,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733312601,
+        "lastModified": 1736143030,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
         "type": "github"
       },
       "original": {
@@ -331,11 +331,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733312601,
+        "lastModified": 1736143030,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
         "type": "github"
       },
       "original": {
@@ -419,24 +419,6 @@
         "type": "github"
       }
     },
-    "flake-utils_4": {
-      "inputs": {
-        "systems": "systems_5"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "git-hooks": {
       "inputs": {
         "flake-compat": "flake-compat_3",
@@ -444,18 +426,14 @@
         "nixpkgs": [
           "neovim-nightly-overlay",
           "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "neovim-nightly-overlay",
-          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1734797603,
+        "lastModified": 1737043064,
-        "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
+        "narHash": "sha256-I/OuxGwXwRi5gnFPsyCvVR+IfFstA+QXEpHu1hvsgD8=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
+        "rev": "94ee657f6032d913fe0ef49adaa743804635b0bb",
         "type": "github"
       },
       "original": {
@@ -471,18 +449,14 @@
         "nixpkgs": [
           "nixvim-stable",
           "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixvim-stable",
-          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1734425854,
+        "lastModified": 1735882644,
-        "narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=",
+        "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d",
+        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
         "type": "github"
       },
       "original": {
@@ -501,18 +475,14 @@
         "nixpkgs": [
           "nixvim-unstable",
           "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixvim-unstable",
-          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1734797603,
+        "lastModified": 1737043064,
-        "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
+        "narHash": "sha256-I/OuxGwXwRi5gnFPsyCvVR+IfFstA+QXEpHu1hvsgD8=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
+        "rev": "94ee657f6032d913fe0ef49adaa743804635b0bb",
         "type": "github"
       },
       "original": {
@@ -597,11 +567,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1735147613,
+        "lastModified": 1737226203,
-        "narHash": "sha256-/hPnbJA2KY088J7N7EX7m8OywIGla1CHX4e0ysDH9kA=",
+        "narHash": "sha256-maMmVQQzdd92LHiI24NyIF3QblnIUJSESDPpnDThtNU=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "7b9b9329b9d9567f0c5cfded453b4e8445525774",
+        "rev": "7cc93eb1c554e72a5aa0c18d244c0fd3ec07d97f",
         "type": "github"
       },
       "original": {
@@ -619,11 +589,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733333617,
+        "lastModified": 1736917206,
-        "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=",
+        "narHash": "sha256-JTBWmyGf8K1Rwb+gviHIUzRJk/sITtT+72HXFkTZUjo=",
         "owner": "hercules-ci",
         "repo": "hercules-ci-effects",
-        "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea",
+        "rev": "afd0a42e8c61ebb56899315ee4084a8b2e4ff425",
         "type": "github"
       },
       "original": {
@@ -660,11 +630,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735053786,
+        "lastModified": 1737221749,
-        "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=",
+        "narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84",
+        "rev": "97d7946b5e107dd03cc82f21165251d4e0159655",
         "type": "github"
       },
       "original": {
@@ -714,11 +684,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1735172062,
+        "lastModified": 1737245364,
-        "narHash": "sha256-Ru+5fwMqXEoc6G1PbuTppAzxtqvj0322cBAWCb0Yhbo=",
+        "narHash": "sha256-tjk7m4o9LUuN4j/3wosaeN5HPHcjHDsLz/qanWpbkX0=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "d05e1d754812bcd89925d845992f377faf6c4944",
+        "rev": "8e015a6dd1a95e7389ffb5b8617a13f167c78a58",
         "type": "github"
       },
       "original": {
@@ -730,11 +700,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1735157560,
+        "lastModified": 1737227330,
-        "narHash": "sha256-ndlWdGm61W3uObi8cowWqnPdJwq2FsH4GHGOQYeNSOM=",
+        "narHash": "sha256-HCdWnhT69peRlyQpM41MGM297Hod+kzTBij8A35rE1s=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "487c48ec8689b865bad04fdb87b61f5ada25da97",
+        "rev": "a5b1b83a2693ffa7a5a0a22b3693d36ea60051be",
         "type": "github"
       },
       "original": {
@@ -751,11 +721,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733570843,
+        "lastModified": 1736370755,
-        "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
+        "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "a35b08d09efda83625bef267eb24347b446c80b8",
+        "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e",
         "type": "github"
       },
       "original": {
@@ -772,11 +742,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733570843,
+        "lastModified": 1736819234,
-        "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
+        "narHash": "sha256-deQVtIH4UJueELJqluAICUtX7OosD9paTP+5FgbiSwI=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "a35b08d09efda83625bef267eb24347b446c80b8",
+        "rev": "bd921223ba7cdac346477d7ea5204d6f4736fcc6",
         "type": "github"
       },
       "original": {
@@ -792,11 +762,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735222882,
+        "lastModified": 1737257306,
-        "narHash": "sha256-kWNi45/mRjQMG+UpaZQ7KyPavYrKfle3WgLn9YeBBVg=",
+        "narHash": "sha256-lEGgpA4kGafc76+Amnz+gh1L/cwUS2pePFlf22WEyh8=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "7e3246f6ad43b44bc1c16d580d7bf6467f971530",
+        "rev": "744d330659e207a1883d2da0141d35e520eb87bd",
         "type": "github"
       },
       "original": {
@@ -807,11 +777,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1734829460,
+        "lastModified": 1736643958,
-        "narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=",
+        "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c",
+        "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
         "type": "github"
       },
       "original": {
@@ -828,11 +798,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734915500,
+        "lastModified": 1737057290,
-        "narHash": "sha256-A7CTIQ8SW0hfbhKlwK+vSsu4pD+Oaelw3v6goX6go+U=",
+        "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "051d1b2dda3b2e81b38d82e2b691e5c2f4d335f4",
+        "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453",
         "type": "github"
       },
       "original": {
@@ -843,11 +813,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1734954597,
+        "lastModified": 1736978406,
-        "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=",
+        "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "def1d472c832d77885f174089b0d34854b007198",
+        "rev": "b678606690027913f3434dea3864e712b862dde5",
         "type": "github"
       },
       "original": {
@@ -858,11 +828,11 @@
     },
     "nixos-stable": {
       "locked": {
-        "lastModified": 1735066050,
+        "lastModified": 1735563628,
-        "narHash": "sha256-vCBl6vYGi0QB11TMqdndLa7/UzxvuJUvKazlEnMTEX4=",
+        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "17fcc7929706c2bd08db2b785edbb23a66b2f681",
+        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
         "type": "github"
       },
       "original": {
@@ -874,11 +844,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1734649271,
+        "lastModified": 1737062831,
-        "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
+        "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
+        "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
         "type": "github"
       },
       "original": {
@@ -890,11 +860,11 @@
     },
     "nixos-unstable-small": {
       "locked": {
-        "lastModified": 1735226532,
+        "lastModified": 1737241062,
-        "narHash": "sha256-4UYXERaJPiiy+JxjKo+IWuHN7kgwmlYdV5x8Ew+YNGQ=",
+        "narHash": "sha256-GM4ZnlsuJWjk+tbespU/DWQsZ2V0u0CS3Hqg0JGMt5M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "03539677da5a6caba6a6b3d2143ec63b116902d3",
+        "rev": "b681ff2c9c9163f24ca705d948bb0cee1b3e09f9",
         "type": "github"
       },
       "original": {
@@ -907,17 +877,16 @@
     "nixos-wsl": {
       "inputs": {
         "flake-compat": "flake-compat_4",
-        "flake-utils": "flake-utils_3",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1733854371,
+        "lastModified": 1736095716,
-        "narHash": "sha256-K9qGHniYBbjqVcEiwXyiofj/IFf78L5F0/FCf+CKyr0=",
+        "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "dee4425dcee3149475ead0cb6a616b8a028c5888",
+        "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0",
         "type": "github"
       },
       "original": {
@@ -928,11 +897,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1734649271,
+        "lastModified": 1737062831,
-        "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
+        "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
+        "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
         "type": "github"
       },
       "original": {
@@ -944,23 +913,23 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1733096140,
+        "lastModified": 1735774519,
-        "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=",
+        "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
       }
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1735141468,
+        "lastModified": 1737165118,
-        "narHash": "sha256-VIAjBr1qGcEbmhLwQJD6TABppPMggzOvqFsqkDoMsAY=",
+        "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4005c3ff7505313cbc21081776ad0ce5dfd7a3ce",
+        "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566",
         "type": "github"
       },
       "original": {
@@ -972,11 +941,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1734988233,
+        "lastModified": 1737110817,
-        "narHash": "sha256-Ucfnxq1rF/GjNP3kTL+uTfgdoE9a3fxDftSfeLIS8mA=",
+        "narHash": "sha256-DSenga8XjPaUV5KUFW/i3rNkN7jm9XmguW+qQ1ZJTR4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "de1864217bfa9b5845f465e771e0ecb48b30e02d",
+        "rev": "041c867bad68dfe34b78b2813028a2e2ea70a23c",
         "type": "github"
       },
       "original": {
@@ -1002,11 +971,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1734784342,
+        "lastModified": 1736598783,
-        "narHash": "sha256-VWbcqVnGflD6KbhHqtllZ1zybXIUpufKrqcn1S08j3E=",
+        "narHash": "sha256-N1k0EdU9zmeZfYvAVTLLLP3/RYnhf/AUe8dEl8ve+fE=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "8d81e9af1b23ebaf7990eb8a86ae0ca5ae37c09c",
+        "rev": "62fdd8e1c5f9be8a794857e6e2d246b0db0f09ae",
         "type": "github"
       },
       "original": {
@@ -1033,11 +1002,11 @@
         "treefmt-nix": "treefmt-nix_3"
       },
       "locked": {
-        "lastModified": 1735254735,
+        "lastModified": 1737200978,
-        "narHash": "sha256-byFeQzjeTLgWkk2xEhTYqYvUsID7H2QAkzuFKIL2Stc=",
+        "narHash": "sha256-QTUx/F8HVjrRIHQxHKrr72aPMj+cDk18WTbvBCCBBdI=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "1671f8618fa347d8a0cd62506df386d58d7608f3",
+        "rev": "cbf960e5659054b2ccf27b67218782e69016bef5",
         "type": "github"
       },
       "original": {
@@ -1053,11 +1022,11 @@
         "treefmt-nix": "treefmt-nix_4"
       },
       "locked": {
-        "lastModified": 1735267453,
+        "lastModified": 1737258869,
-        "narHash": "sha256-Nu+fTD6pgVEzxdo4qJlY/29D29HzXdS3QyRekROpXb8=",
+        "narHash": "sha256-Ue2TumKTw+6VUSKdgHE93gViUTOJDmS2I0HjLbmrHls=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "cb6a6ad413f8c22b7f3df3f0a317de7f138e339b",
+        "rev": "0b2b53ac3bd61384876cf8461d32e698064297ea",
         "type": "github"
       },
       "original": {
@@ -1068,7 +1037,7 @@
     },
     "nuschtosSearch": {
       "inputs": {
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_3",
         "ixx": "ixx",
         "nixpkgs": [
           "nixvim-unstable",
@@ -1076,11 +1045,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733773348,
+        "lastModified": 1735854821,
-        "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=",
+        "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9",
+        "rev": "836908e3bddd837ae0f13e215dd48767aee355f0",
         "type": "github"
       },
       "original": {
@@ -1153,11 +1122,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734546875,
+        "lastModified": 1737107480,
-        "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=",
+        "narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d",
+        "rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6",
         "type": "github"
       },
       "original": {
@@ -1226,21 +1195,6 @@
         "type": "github"
       }
     },
-    "systems_5": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -1249,11 +1203,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735135567,
+        "lastModified": 1737103437,
-        "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=",
+        "narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "9e09d30a644c57257715902efbb3adc56c79cf28",
+        "rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899",
         "type": "github"
       },
       "original": {
@@ -1270,11 +1224,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734704479,
+        "lastModified": 1736154270,
-        "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=",
+        "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f",
+        "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
         "type": "github"
       },
       "original": {
@@ -1291,11 +1245,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734704479,
+        "lastModified": 1737054102,
-        "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=",
+        "narHash": "sha256-saLiCRQ5RtdTnznT/fja7GxcYRAzeY3k8S+IF/2s/2A=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f",
+        "rev": "97871d416166803134ba64597a1006f3f670fbde",
         "type": "github"
       },
       "original": {
@@ -1345,11 +1299,11 @@
     },
     "wrapper-manager-fds": {
       "locked": {
-        "lastModified": 1733054911,
+        "lastModified": 1736675919,
-        "narHash": "sha256-jNmptnLKXY2tF3SnrxxOAEdGTR4NL/ufyUx3gJgtqsk=",
+        "narHash": "sha256-xgiFQE/P7xWp4Rzhx9W+smtdEKzZ8JPuK9Tn6AiYuoU=",
         "owner": "foo-dogsquared",
         "repo": "nix-module-wrapper-manager-fds",
-        "rev": "cf2f046d6927944b0fa7bfbcdd3b01392f00eed9",
+        "rev": "c2625afbffc76ad2a1e6659a84baa69cf4a5f9b1",
         "type": "github"
       },
       "original": {

modules/flake-parts/setups/home-manager.nix

@@ -120,6 +120,7 @@ let
       ];
 
       nixpkgs.config = cfg.sharedNixpkgsConfig;
+      specialArgs = cfg.sharedSpecialArgs;
     };
   };
 in
@@ -132,6 +133,13 @@ in
       '';
     };
 
+    sharedSpecialArgs = options.setups.sharedSpecialArgs // {
+      description = ''
+        Shared set of module arguments as part of `_module.specialArgs` of the
+        configuration.
+      '';
+    };
+
     sharedModules = lib.mkOption {
       type = with lib.types; listOf deferredModule;
       default = [ ];
@@ -165,6 +173,7 @@ in
         (import ./shared/nix-conf.nix { inherit inputs; })
         (import ./shared/config-options.nix { inherit (config) systems; })
         ./shared/nixpkgs-options.nix
+        ./shared/special-args-options.nix
         configType
       ]);
       default = { };

modules/flake-parts/setups/nixvim.nix

@@ -108,6 +108,8 @@ let
       modules = [
         "${partsConfig.setups.configDir}/nixvim/${config.configName}"
       ];
+
+      specialArgs = cfg.sharedSpecialArgs;
     };
   };
 
@@ -169,6 +171,7 @@ in
     configs = lib.mkOption {
       type = with lib.types; attrsOf (submodule [
         (import ./shared/config-options.nix { inherit (config) systems; })
+        ./shared/special-args-options.nix
         configType
       ]);
       default = { };
@@ -186,6 +189,14 @@ in
         environments when NixVim-specific integrations has been enabled.
       '';
     };
+
+    sharedSpecialArgs = options.setups.sharedSpecialArgs // {
+      description = ''
+        Shared set of module arguments as part of `_module.specialArgs` of the
+        configuration.
+      '';
+    };
+
     standaloneConfigModules = modulesOption' "standalone configuration";
 
     sharedNixpkgsConfig = options.setups.sharedNixpkgsConfig // {

modules/home-manager/_private/suites/desktop.nix

@@ -92,6 +92,7 @@ in
       home.packages = with pkgs; [
         ffmpeg-full # Ah yes, everyman's multimedia swiss army knife.
         kdenlive # YOU! Edit this video and live in a den, 'k?
+        davinci-resolve # Michaelangelo once used this, I think.
         gnome-video-effects # A bunch of stock video effects.
       ];
 

modules/home-manager/_private/suites/dev.nix

@@ -121,7 +121,7 @@ in {
         flags = [ "--disable-up-arrow" ];
         settings = {
           search_mode = "fuzzy";
-          filter_mode = "global";
+          filter_mode = "session";
         };
       };
 

modules/nixos/profiles/desktop/audio.nix

@@ -2,7 +2,7 @@
 { lib, ... }:
 
 {
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
   security.rtkit.enable = lib.mkDefault true;
 
   # The main preferred setup of our audio system.

pkgs/base16-builder-go/default.nix

@@ -1,7 +1,4 @@
-{ lib
+{ lib, fetchFromGitHub, buildGoModule }:
-, fetchFromGitHub
-, buildGoModule
-}:
 
 buildGoModule rec {
   pname = "base16-builder-go";

pkgs/blender-blendergis/default.nix

@@ -1,9 +1,4 @@
-{ lib
+{ lib, buildPythonPackage, fetchFromGitHub, imageio, openimageio }:
-, buildPythonPackage
-, fetchFromGitHub
-, imageio
-, openimageio
-}:
 
 buildPythonPackage rec {
   pname = "blender-blendergis";

pkgs/blender-machin3tools/default.nix

@@ -1,7 +1,4 @@
-{ lib
+{ lib, buildPythonPackage, fetchFromGitHub }:
-, buildPythonPackage
-, fetchFromGitHub
-}:
 
 buildPythonPackage rec {
   pname = "blender-machin3tools";

pkgs/ctrld/default.nix

@@ -1,8 +1,4 @@
-{
+{ lib, fetchFromGitHub, buildGoModule, }:
-  lib,
-  fetchFromGitHub,
-  buildGoModule,
-}:
 
 buildGoModule rec {
   pname = "ctrld";

pkgs/default.nix

@@ -23,6 +23,7 @@ in lib.makeScope pkgs.newScope (self: {
   distant = callPackage ./distant.nix { };
   gnome-search-provider-recoll =
     callPackage ./gnome-search-provider-recoll.nix { };
+  #graphite-design-tool = callPackage ./graphite-design-tool { };
   go-avahi-cname = callPackage ./go-avahi-cname { };
   hush-shell = callPackage ./hush-shell.nix { };
   lazyjj = callPackage ./lazyjj { };
@@ -43,6 +44,10 @@ in lib.makeScope pkgs.newScope (self: {
   swh = callPackage ./software-heritage {
     python3Packages = pkgs.python310Packages;
   };
+  #pd-l2ork = callPackage ./pd-l2ork { };
+  #rotp-modnar = callPackage ./rotp-modnar { };
+  #rotp-fusion = callPackage ./rotp-fusion { };
+  #purrdata = callPackage ./purr-data { };
   speki = callPackage ./speki { };
   tic-80 = callPackage ./tic-80 { };
   smile = callPackage ./smile { };

pkgs/distant.nix

@@ -1,10 +1,4 @@
-{ stdenv
+{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }:
-, lib
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, openssl
-}:
 
 rustPlatform.buildRustPackage rec {
   version = "0.20.0";

pkgs/domterm/default.nix

@@ -1,33 +1,14 @@
-{ lib
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, desktop-file-utils, pkg-config
-, stdenv
+, libwebsockets, ncurses, openssl, unixtools, zlib, rustPlatform, perl, qtbase
-, fetchFromGitHub
+, qtwebchannel, qtwebengine, wrapQtAppsHook
-, autoreconfHook
-, desktop-file-utils
-, pkg-config
-, libwebsockets
-, ncurses
-, openssl
-, unixtools
-, zlib
-, rustPlatform
-, perl
-, qtbase
-, qtwebchannel
-, qtwebengine
-, wrapQtAppsHook
 
 , withQtDocking ? false
 
-, withKddockwidgets ? false
+, withKddockwidgets ? false, kddockwidgets
-, kddockwidgets
 
-, withAsciidoctor ? true
+, withAsciidoctor ? true, asciidoctor
-, asciidoctor
 
-, withDocbook ? true
+, withDocbook ? true, docbook-xsl-ns, libxslt }:
-, docbook-xsl-ns
-, libxslt
-}:
 
 stdenv.mkDerivation rec {
   pname = "domterm";
@@ -40,15 +21,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-H1Nzqzz7dv4j9hkb08FCExLeq69EkFNXGzhhl/e+uxI=";
   };
 
-  configureFlags = [
+  configureFlags =
-    "--with-libwebsockets"
+    [ "--with-libwebsockets" "--enable-compiled-in-resources" "--with-qt" ]
-    "--enable-compiled-in-resources"
+    ++ lib.optional withAsciidoctor "--with-asciidoctor"
-    "--with-qt"
+    ++ lib.optional withQtDocking "--with-qt-docking"
-  ]
+    ++ lib.optional withKddockwidgets "--with-kddockwidgets"
-  ++ lib.optional withAsciidoctor "--with-asciidoctor"
+    ++ lib.optional withDocbook "--with-docbook";
-  ++ lib.optional withQtDocking "--with-qt-docking"
-  ++ lib.optional withKddockwidgets "--with-kddockwidgets"
-  ++ lib.optional withDocbook "--with-docbook";
 
   nativeBuildInputs = [
     autoreconfHook
@@ -68,13 +46,9 @@ stdenv.mkDerivation rec {
     perl
     unixtools.xxd
     zlib
-  ]
+  ] ++ lib.optional withKddockwidgets kddockwidgets
-  ++ lib.optional withKddockwidgets kddockwidgets
+    ++ lib.optional withAsciidoctor asciidoctor
-  ++ lib.optional withAsciidoctor asciidoctor
+    ++ lib.optionals withDocbook [ docbook-xsl-ns libxslt ];
-  ++ lib.optionals withDocbook [
-    docbook-xsl-ns
-    libxslt
-  ];
 
   meta = with lib; {
     homepage = "https://domterm.org/";

pkgs/fastn/default.nix

@@ -1,10 +1,4 @@
-{ lib
+{ lib, rustPlatform, fetchFromGitHub, cmake, pkg-config, openssl }:
-, rustPlatform
-, fetchFromGitHub
-, cmake
-, pkg-config
-, openssl
-}:
 
 rustPlatform.buildRustPackage rec {
   pname = "fastn";
@@ -20,7 +14,8 @@ rustPlatform.buildRustPackage rec {
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "fastn-observer-0.1.0" = "sha256-D7ch6zB1xw54vGbpcQ3hf+zG11Le/Fy01W3kHhc8bOg=";
+      "fastn-observer-0.1.0" =
+        "sha256-D7ch6zB1xw54vGbpcQ3hf+zG11Le/Fy01W3kHhc8bOg=";
     };
   };
 
@@ -28,9 +23,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ openssl ];
 
-  checkFlags = [
+  checkFlags = [ "--skip=tests::fbt" ];
-    "--skip=tests::fbt"
-  ];
 
   meta = with lib; {
     homepage = "https://fastn.com/";

pkgs/flatsync/default.nix

@@ -1,22 +1,6 @@
-{ stdenv
+{ stdenv, lib, fetchFromGitLab, rustPlatform, cargo, rustc, meson, ninja
-, lib
+, pkg-config, glib, gobject-introspection, libadwaita, wrapGAppsHook4, openssl
-, fetchFromGitLab
+, appstream-glib, desktop-file-utils, blueprint-compiler, flatpak }:
-, rustPlatform
-, cargo
-, rustc
-, meson
-, ninja
-, pkg-config
-, glib
-, gobject-introspection
-, libadwaita
-, wrapGAppsHook4
-, openssl
-, appstream-glib
-, desktop-file-utils
-, blueprint-compiler
-, flatpak
-}:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flatsync";
@@ -52,12 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook4
   ];
 
-  buildInputs = [
+  buildInputs = [ glib flatpak libadwaita openssl ];
-    glib
-    flatpak
-    libadwaita
-    openssl
-  ];
 
   meta = with lib; {
     homepage = "https://gitlab.gnome.org/Cogitri/flatsync";

pkgs/gnome-search-provider-recoll.nix

@@ -1,14 +1,5 @@
-{ stdenv
+{ stdenv, lib, fetchurl, autoreconfHook, recoll, python3Packages, glib
-, lib
+, gobject-introspection, wrapGAppsHook3, gnome-shell }:
-, fetchurl
-, autoreconfHook
-, recoll
-, python3Packages
-, glib
-, gobject-introspection
-, wrapGAppsHook3
-, gnome-shell
-}:
 
 python3Packages.buildPythonPackage rec {
   pname = "gnome-search-provider-recoll";

pkgs/graphite-design-tool/default.nix

@@ -1,4 +1,5 @@
-{ rustPlatform, cargo-tauri_1, fetchFromGitHub, wrapGAppsHook, wasm-bindgen-cli, pkg-config, lib }:
+{ rustPlatform, cargo-tauri_1, fetchFromGitHub, wrapGAppsHook, wasm-bindgen-cli
+, pkg-config, lib }:
 
 rustPlatform.buildRustPackage rec {
   pname = "graphite-design-tool";
@@ -14,11 +15,13 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-+p9bpj+cSd0Bkpg+e4lwo4C7XqxZBc0McYYsNxAqzaA=";
 
-  nativeBuildInputs = [ cargo-tauri_1 pkg-config wrapGAppsHook wasm-bindgen-cli ];
+  nativeBuildInputs =
+    [ cargo-tauri_1 pkg-config wrapGAppsHook wasm-bindgen-cli ];
 
   meta = with lib; {
     homepage = "https://graphite.rs/";
-    description = "2D vector & raster editor that melds traditional layers & tools with a modern node-based, non-destructive, procedural workflow";
+    description =
+      "2D vector & raster editor that melds traditional layers & tools with a modern node-based, non-destructive, procedural workflow";
     license = licenses.asl20;
     maintainers = with maintainers; [ foo-dogsquared ];
     mainProgram = "graphite";

pkgs/hush-shell.nix

@@ -1,9 +1,4 @@
-{ stdenv
+{ stdenv, lib, fetchFromGitHub, rustPlatform, toybox }:
-, lib
-, fetchFromGitHub
-, rustPlatform
-, toybox
-}:
 
 rustPlatform.buildRustPackage rec {
   pname = "hush";
@@ -23,10 +18,8 @@ rustPlatform.buildRustPackage rec {
   '';
 
   checkInputs = [ toybox ];
-  checkFlags = [
+  checkFlags =
-    "--skip=tests::test_token_kind_size"
+    [ "--skip=tests::test_token_kind_size" "--skip=tests::test_positive" ];
-    "--skip=tests::test_positive"
-  ];
 
   meta = with lib; {
     homepage = "https://github.com/hush-shell/hush";

pkgs/lazyjj/default.nix

@@ -1,14 +1,7 @@
-{
+{ lib, rustPlatform, fetchFromGitHub, jujutsu, }:
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-  jujutsu,
-}:
 
-let
+let version = "0.3.1";
-  version = "0.3.1";
+in rustPlatform.buildRustPackage {
-in
-rustPlatform.buildRustPackage {
   inherit version;
   pname = "lazyjj";
 

pkgs/lwp/default.nix

@@ -1,12 +1,4 @@
-{ stdenv
+{ stdenv, lib, fetchFromGitHub, cmake, SDL2, xorg, xwayland, libconfig }:
-, lib
-, fetchFromGitHub
-, cmake
-, SDL2
-, xorg
-, xwayland
-, libconfig
-}:
 
 stdenv.mkDerivation rec {
   pname = "lwp";
@@ -20,12 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [
+  buildInputs = [ SDL2 xorg.libX11 xwayland libconfig ];
-    SDL2
-    xorg.libX11
-    xwayland
-    libconfig
-  ];
 
   # TODO: Add conditional for Mac systems.
   postPatch = ''
@@ -36,9 +23,7 @@ stdenv.mkDerivation rec {
       --replace "usr/local" "${placeholder "out"}"
   '';
 
-  cmakeFlags = [
+  cmakeFlags = [ "-DPROGRAM_VERSION=${version}" ];
-    "-DPROGRAM_VERSION=${version}"
-  ];
 
   meta = with lib; {
     homepage = "https://github.com/jszczerbinsky/lwp";

pkgs/nautilus-annotations/default.nix

@@ -1,14 +1,5 @@
-{ stdenv
+{ stdenv, lib, fetchFromGitLab, glib, nautilus, gtksourceview5, libadwaita
-, lib
+, autoreconfHook, wrapGAppsHook4, pkg-config }:
-, fetchFromGitLab
-, glib
-, nautilus
-, gtksourceview5
-, libadwaita
-, autoreconfHook
-, wrapGAppsHook4
-, pkg-config
-}:
 
 stdenv.mkDerivation rec {
   pname = "nautilus-annotations";
@@ -22,18 +13,10 @@ stdenv.mkDerivation rec {
     hash = "sha256-BivnmsACnpxdd6FV+ncdDd5ZwtJSSzNExoiCXeXIFkA=";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs =
-    autoreconfHook
+    [ autoreconfHook glib nautilus pkg-config wrapGAppsHook4 ];
-    glib
-    nautilus
-    pkg-config
-    wrapGAppsHook4
-  ];
 
-  buildInputs = [
+  buildInputs = [ libadwaita gtksourceview5 ];
-    libadwaita
-    gtksourceview5
-  ];
 
   preConfigure = ''
     ./bootstrap

pkgs/pd-l2ork/default.nix

@@ -1,14 +1,5 @@
-{ stdenv,
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, bison, fftw, libtool, libjack2
-  lib,
+, bluez, udev }:
-  fetchFromGitHub,
-  autoreconfHook,
-  bison,
-  fftw,
-  libtool,
-  libjack2,
-  bluez,
-  udev
-}:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pd-l2ork";
@@ -21,17 +12,9 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-A+ETptD1R+Pb4r2qgD0YxV7KYeAb9iLBwENhYQyjBc4=";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [ libtool ];
-    libtool
-  ];
 
-  buildInputs = [
+  buildInputs = [ bison fftw libjack2 bluez udev ];
-    bison
-    fftw
-    libjack2
-    bluez
-    udev
-  ];
 
   meta = with lib; {
     homepage = "http://l2ork.music.vt.edu/";

pkgs/pigeon-mail/default.nix

@@ -1,9 +1,4 @@
-{ lib
+{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }:
-, fetchFromGitHub
-, rustPlatform
-, pkg-config
-, openssl
-}:
 
 rustPlatform.buildRustPackage rec {
   pname = "pigeon-mail";
@@ -18,9 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-MRSO89qg08GyyIuzEpSO4qQTZS876U3SeGJ6eCO+3BA=";
 
-  env = {
+  env = { OPENSSL_NO_VENDOR = "1"; };
-    OPENSSL_NO_VENDOR = "1";
-  };
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];

pkgs/purr-data/default.nix

@@ -1,14 +1,5 @@
-{ stdenv,
+{ stdenv, lib, fetchFromGitHub, bison, fftw, libtool, libjack2, bluez, udev
-  lib,
+, wget, }:
-  fetchFromGitHub,
-  bison,
-  fftw,
-  libtool,
-  libjack2,
-  bluez,
-  udev,
-  wget,
-}:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pd-l2ork";
@@ -21,26 +12,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-A+ETptD1R+Pb4r2qgD0YxV7KYeAb9iLBwENhYQyjBc4=";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [ libtool ];
-    libtool
-  ];
 
-  buildInputs = [
+  buildInputs = [ bison fftw libjack2 bluez udev wget ];
-    bison
-    fftw
-    libjack2
-    bluez
-    udev
-    wget
-  ];
 
   preBuild = ''
     patchShebangs l2ork_addons/*.sh
   '';
 
-  buildFlags = [
+  buildFlags = [ "prefix=${placeholder "out"}" ];
-    "prefix=${placeholder "out"}"
-  ];
 
   meta = with lib; {
     homepage = "http://l2ork.music.vt.edu/";

pkgs/rotp-fusion/default.nix

@@ -1,9 +1,4 @@
-{ lib,
+{ lib, fetchFromGitHub, maven, libwebp, vorbis-tools, }:
-  fetchFromGitHub,
-  maven,
-  libwebp,
-  vorbis-tools,
-}:
 
 maven.buildMavenPackage rec {
   pname = "rotp-fusion";
@@ -20,10 +15,7 @@ maven.buildMavenPackage rec {
 
   mvnHash = "";
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [ libwebp vorbis-tools ];
-    libwebp
-    vorbis-tools
-  ];
 
   meta = with lib; {
     description = "Mod of Remnants of the Precursors with more features";

pkgs/rotp-modnar/default.nix

@@ -1,8 +1,4 @@
-{
+{ lib, rotp, fetchFromGitHub, }:
-  lib,
-  rotp,
-  fetchFromGitHub,
-}:
 
 rotp.overrideAttrs (finalAttrs: prevAttrs: {
   src = fetchFromGitHub {

pkgs/sessiond/default.nix

@@ -1,19 +1,6 @@
-{ lib
+{ lib, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, coreutils, glib
-, fetchFromGitHub
+, gobject-introspection, xorg, udev, wireplumber, pipewire, perl
-, fetchpatch
+, python3Packages }:
-, meson
-, ninja
-, pkg-config
-, coreutils
-, glib
-, gobject-introspection
-, xorg
-, udev
-, wireplumber
-, pipewire
-, perl
-, python3Packages
-}:
 
 python3Packages.buildPythonPackage rec {
   pname = "sessiond";
@@ -29,34 +16,21 @@ python3Packages.buildPythonPackage rec {
 
   patches = [
     (fetchpatch {
-      url = "https://github.com/jcrd/sessiond/commit/217ed63e2033c46c637e0564ef44ceaedff3e102.patch";
+      url =
+        "https://github.com/jcrd/sessiond/commit/217ed63e2033c46c637e0564ef44ceaedff3e102.patch";
       hash = "sha256-/GFPwJ4OBskavUJYhR5LGpt+HZABDOCpx6cVYDCYTNE=";
     })
 
     ./0002-meson-Add-python-sessiond-installation.patch
   ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs =
-    meson
+    [ meson ninja pkg-config glib gobject-introspection perl ];
-    ninja
-    pkg-config
-    glib
-    gobject-introspection
-    perl
-  ];
 
-  buildInputs = [
+  buildInputs =
-    udev
+    [ udev xorg.libXi xorg.libX11 xorg.libXext wireplumber pipewire ];
-    xorg.libXi
-    xorg.libX11
-    xorg.libXext
-    wireplumber
-    pipewire
-  ];
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = with python3Packages; [ dbus-python ];
-    dbus-python
-  ];
 
   postPatch = ''
     substituteInPlace ./systemd/sessiond.service \

pkgs/smile/default.nix

@@ -1,19 +1,6 @@
-{ stdenv
+{ stdenv, lib, fetchFromGitHub, meson, ninja, appstream-glib, desktop-file-utils
-, lib
+, gettext, glib, gtk4, libwnck, wrapGAppsHook4, pkg-config, python3Packages
-, fetchFromGitHub
+, gobject-introspection }:
-, meson
-, ninja
-, appstream-glib
-, desktop-file-utils
-, gettext
-, glib
-, gtk4
-, libwnck
-, wrapGAppsHook4
-, pkg-config
-, python3Packages
-, gobject-introspection
-}:
 
 python3Packages.buildPythonApplication rec {
   pname = "smile";
@@ -49,9 +36,7 @@ python3Packages.buildPythonApplication rec {
     wrapGAppsHook4
   ];
 
-  propagatedNativeBuildInputs = [
+  propagatedNativeBuildInputs = [ gobject-introspection ];
-    gobject-introspection
-  ];
 
   propagatedBuildInputs = with python3Packages; [
     pygobject3
@@ -59,10 +44,7 @@ python3Packages.buildPythonApplication rec {
     dbus-python
   ];
 
-  buildInputs = [
+  buildInputs = [ libwnck gtk4 ];
-    libwnck
-    gtk4
-  ];
 
   dontWrapGApps = true;
   preFixup = ''

pkgs/software-heritage/aiohttp-utils.nix

@@ -13,11 +13,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = [ aiohttp gunicorn python-mimeparse ];
-    aiohttp
-    gunicorn
-    python-mimeparse
-  ];
 
   meta = with lib; {
     homepage = "https://github.com/sloria/aiohttp-utils";

pkgs/software-heritage/attrs-strict.nix

@@ -10,10 +10,7 @@ buildPythonPackage rec {
     sha256 = "sha256-YybB5RxP0v/8ndYH3sBsMa3WTu29N6ZR6oj2Y6N8Pxg";
   };
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = [ setuptools-scm attrs ];
-    setuptools-scm
-    attrs
-  ];
 
   meta = with lib; {
     homepage = "https://github.com/bloomberg/attrs-strict";

pkgs/software-heritage/default.nix

@@ -1,16 +1,16 @@
 { lib, callPackage, newScope, python3Packages, ... }:
 
 lib.fix' (self:
-let
+  let callPackage = newScope self;
-  callPackage = newScope self;
+  in lib.recurseIntoAttrs {
-in
+    attrs-strict = callPackage ./attrs-strict.nix { inherit python3Packages; };
-lib.recurseIntoAttrs {
+    aiohttp-utils =
-  attrs-strict = callPackage ./attrs-strict.nix { inherit python3Packages; };
+      callPackage ./aiohttp-utils.nix { inherit python3Packages; };
-  aiohttp-utils = callPackage ./aiohttp-utils.nix { inherit python3Packages; };
 
-  swh-fuse = callPackage ./swh-fuse.nix { inherit python3Packages; };
+    swh-fuse = callPackage ./swh-fuse.nix { inherit python3Packages; };
-  swh-core = callPackage ./swh-core.nix { inherit python3Packages; };
+    swh-core = callPackage ./swh-core.nix { inherit python3Packages; };
-  swh-model = callPackage ./swh-model.nix { inherit python3Packages; };
+    swh-model = callPackage ./swh-model.nix { inherit python3Packages; };
-  swh-web-client = callPackage ./swh-web-client.nix { inherit python3Packages; };
+    swh-web-client =
-  swh-auth = callPackage ./swh-auth.nix { inherit python3Packages; };
+      callPackage ./swh-web-client.nix { inherit python3Packages; };
-})
+    swh-auth = callPackage ./swh-auth.nix { inherit python3Packages; };
+  })

pkgs/software-heritage/swh-auth.nix

@@ -28,7 +28,8 @@ buildPythonPackage rec {
         pname = "python_keycloak";
         hash = "sha256-zIaBJvU1qk8yDcnqsk5GrzgcE7zIjZsHAbBCk+p1zSQ=";
       };
-      propagatedBuildInputs = prev.propagatedBuildInputs ++ [ setuptools deprecation ];
+      propagatedBuildInputs = prev.propagatedBuildInputs
+        ++ [ setuptools deprecation ];
     }))
 
     swh-core

pkgs/speki/default.nix

@@ -1,10 +1,4 @@
-{ rustPlatform
+{ rustPlatform, lib, fetchFromGitHub, pkg-config, openssl, alsa-lib }:
-, lib
-, fetchFromGitHub
-, pkg-config
-, openssl
-, alsa-lib
-}:
 
 rustPlatform.buildRustPackage rec {
   pname = "speki";
@@ -17,9 +11,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-cvtMXtg2c9T4CaWAobagS9pW4pX4Q+nwdBvP+9A0er0=";
   };
 
-  cargoLock = {
+  cargoLock = { lockFile = ./Cargo.lock; };
-    lockFile = ./Cargo.lock;
-  };
 
   env.OPENSSL_NO_VENDOR = "1";
   nativeBuildInputs = [ pkg-config ];

pkgs/tailcall/default.nix

@@ -15,9 +15,12 @@ rustPlatform.buildRustPackage rec {
     lockFile = "${src}/Cargo.lock";
     outputHashes = {
       "genai-0.1.7-wip" = "sha256-peqM0rBLnL4F0M6o8CO/+ttv9eOLV4VkDEy2e4x7dn0=";
-      "htpasswd-verify-0.3.0" = "sha256-GbkY590xWEZ+lVT9nffs4HIRW6CwBjll4rGIk27waxo=";
+      "htpasswd-verify-0.3.0" =
-      "posthog-rs-0.2.3" = "sha256-1HxOEzc8GROStxuxG0cfCNa4iA04sCD7jD6uWT5bl2o=";
+        "sha256-GbkY590xWEZ+lVT9nffs4HIRW6CwBjll4rGIk27waxo=";
-      "serde_json_borrow-0.7.0" = "sha256-UcgIWjdSCkYRYxEcWbwQs+BxX41ITqkvFSFtzEJchVk=";
+      "posthog-rs-0.2.3" =
+        "sha256-1HxOEzc8GROStxuxG0cfCNa4iA04sCD7jD6uWT5bl2o=";
+      "serde_json_borrow-0.7.0" =
+        "sha256-UcgIWjdSCkYRYxEcWbwQs+BxX41ITqkvFSFtzEJchVk=";
     };
   };
 

pkgs/tic-80/default.nix

@@ -1,50 +1,24 @@
 # Build the TIC-80 virtual computer console with the PRO version. The
 # developers are kind enough to make it easy to compile it if you know
 # how.
-{ stdenv
+{ stdenv, lib, SDL2, SDL2_sound, alsa-lib, cmake, fetchFromGitHub, freeglut, git
-, lib
+, gtk3, dbus, libGLU, libX11, libglvnd, libsamplerate, mesa, pkg-config, sndio
-, SDL2
-, SDL2_sound
-, alsa-lib
-, cmake
-, fetchFromGitHub
-, freeglut
-, git
-, gtk3
-, dbus
-, libGLU
-, libX11
-, libglvnd
-, libsamplerate
-, mesa
-, pkg-config
-, sndio
 , zlib
 
-, pulseaudioSupport ? stdenv.isLinux
+, pulseaudioSupport ? stdenv.isLinux, libpulseaudio
-, libpulseaudio
 
-, waylandSupport ? true
+, waylandSupport ? true, wayland, libxkbcommon, libdecor
-, wayland
-, libxkbcommon
-, libdecor
 
-, esoundSupport ? true
+, esoundSupport ? true, espeak
-, espeak
 
-, jackSupport ? true
+, jackSupport ? true, jack2
-, jack2
 
-  # Ruby support requires compiling mruby so we'll skip it for now.
+# Ruby support requires compiling mruby so we'll skip it for now.
-, rubySupport ? false
+, rubySupport ? false, ruby, rake
-, ruby
-, rake
 
-, pythonSupport ? true
+, pythonSupport ? true, python3
-, python3
 
-, withPro ? true
+, withPro ? true }:
-}:
 
 # TODO: Fix the timestamp in the help section.
 stdenv.mkDerivation rec {
@@ -73,20 +47,15 @@ stdenv.mkDerivation rec {
     SDL2_sound
     zlib
     sndio
-  ]
+  ] ++ lib.optional pulseaudioSupport libpulseaudio
-  ++ lib.optional pulseaudioSupport libpulseaudio
+    ++ lib.optional jackSupport jack2 ++ lib.optional esoundSupport espeak
-  ++ lib.optional jackSupport jack2
+    ++ lib.optionals rubySupport [ ruby rake ]
-  ++ lib.optional esoundSupport espeak
+    ++ lib.optional pythonSupport python3
-  ++ lib.optionals rubySupport [
+    ++ lib.optionals (stdenv.isLinux && waylandSupport) [
-    ruby
+      wayland
-    rake
+      libxkbcommon
-  ]
+      libdecor
-  ++ lib.optional pythonSupport python3
+    ];
-  ++ lib.optionals (stdenv.isLinux && waylandSupport) [
-    wayland
-    libxkbcommon
-    libdecor
-  ];
 
   cmakeFlags = lib.optional withPro "-DBUILD_PRO=ON";
 

pkgs/uwsm/default.nix

@@ -1,13 +1,7 @@
-{ lib
+{ lib, python311Packages, fetchFromGitHub, meson, ninja, pkg-config
-, python311Packages
-, fetchFromGitHub
-, meson
-, ninja
-, pkg-config
 
-  # This is for substituting shebangs in its plugins.
+# This is for substituting shebangs in its plugins.
-, coreutils
+, coreutils }:
-}:
 
 python311Packages.buildPythonPackage rec {
   pname = "uwsm";
@@ -21,20 +15,11 @@ python311Packages.buildPythonPackage rec {
     hash = "sha256-n80FZ6rEguTN9ouEqI+bc5FOSeFQ8ynV+XDL2K/ZIxI=";
   };
 
-  patches = [
+  patches = [ ./0001-chore-add-build-backend-for-pyproject.patch ];
-    ./0001-chore-add-build-backend-for-pyproject.patch
-  ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [ meson ninja pkg-config ];
-    meson
-    ninja
-    pkg-config
-  ];
 
-  propagatedBuildInputs = with python311Packages; [
+  propagatedBuildInputs = with python311Packages; [ pyxdg dbus-python ];
-    pyxdg
-    dbus-python
-  ];
 
   postFixup = ''
     substituteInPlace $out/share/uwsm/plugins/*.sh \

pkgs/vgc/default.nix

@@ -1,15 +1,5 @@
-{ stdenv
+{ stdenv, lib, fetchFromGitHub, wrapQtAppsHook, qtbase, cmake, python3, harfbuzz
-, lib
+, freetype, libGLU, git }:
-, fetchFromGitHub
-, wrapQtAppsHook
-, qtbase
-, cmake
-, python3
-, harfbuzz
-, freetype
-, libGLU
-, git
-}:
 
 stdenv.mkDerivation rec {
   pname = "vgc";
@@ -23,20 +13,11 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  patches = [
+  patches = [ ./patches/set-reproducible-build.patch ];
-    ./patches/set-reproducible-build.patch
-  ];
 
   nativeBuildInputs = [ wrapQtAppsHook cmake ];
 
-  buildInputs = [
+  buildInputs = [ python3 git freetype harfbuzz libGLU qtbase ];
-    python3
-    git
-    freetype
-    harfbuzz
-    libGLU
-    qtbase
-  ];
 
   meta = with lib; {
     homepage = "https://www.vgc.io/";

pkgs/willow/default.nix

@@ -1,7 +1,4 @@
-{ lib
+{ lib, buildGoModule, fetchFromGitHub }:
-, buildGoModule
-, fetchFromGitHub
-}:
 
 buildGoModule {
   pname = "willow";
@@ -19,10 +16,7 @@ buildGoModule {
   meta = with lib; {
     homepage = "https://github.com/Amolith/willow";
     description = "Forge-agnostic release tracker";
-    license = with licenses; [
+    license = with licenses; [ mit asl20 ];
-      mit
-      asl20
-    ];
     maintainers = with maintainers; [ foo-dogsquared ];
     mainProgram = "willow";
     platforms = platforms.unix;

pkgs/xs/default.nix

@@ -1,16 +1,5 @@
-{ stdenv
+{ stdenv, lib, fetchFromGitHub, boost, boehmgc, bison, meson, ninja, pkg-config
-, lib
+, libffi, readline, git }:
-, fetchFromGitHub
-, boost
-, boehmgc
-, bison
-, meson
-, ninja
-, pkg-config
-, libffi
-, readline
-, git
-}:
 
 stdenv.mkDerivation rec {
   pname = "xs";
@@ -23,20 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-Yx6zWLZlnlckZyTljgTVCjCPtNfUbM+o4RfuOPpn8ZQ=";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [ meson ninja pkg-config ];
-    meson
-    ninja
-    pkg-config
-  ];
 
-  buildInputs = [
+  buildInputs = [ boost bison boehmgc libffi readline git ];
-    boost
-    bison
-    boehmgc
-    libffi
-    readline
-    git
-  ];
 
   patches = [ ./update-build.patch ];
   postPatch = ''
@@ -45,7 +23,8 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/TieDyedDevil/XS";
-    description = "Extensible shell with functional semantics and conventional syntax";
+    description =
+      "Extensible shell with functional semantics and conventional syntax";
 
     # See doc/ANCENSTORS and doc/COPYING files for more details.
     license = licenses.publicDomain;

subprojects/bahaghari/lib/trivial.nix

@@ -3,20 +3,38 @@
 rec {
   inherit (pkgs.lib.generators) toYAML;
 
-  /* Read YAML files into a Nix expression similar to lib.importJSON and
+  /**
-     lib.importTOML from nixpkgs standard library. Unlike both of them, this
+    Read YAML files into a Nix expression similar to lib.importJSON and
-     unfortunately relies on an import-from-derivation (IFD) so it isn't exactly
+    lib.importTOML from nixpkgs standard library. Unlike both of them, this
-     perfect but it is very close.
+    unfortunately relies on an import-from-derivation (IFD) so it isn't exactly
+    perfect but it is very close.
 
-     This relies on yaml2json which uses the following YAML library which you
+    This relies on yaml2json which uses the following YAML library which you
-     can view the following link for more details on YAML compatibility.
+    can view the following link for more details on YAML compatibility.
 
-     https://pkg.go.dev/gopkg.in/yaml.v3#readme-compatibility
+    https://pkg.go.dev/gopkg.in/yaml.v3#readme-compatibility
 
-     Type: importYAML :: Path -> any
+    # Arguments
 
-     Example:
+    file
-       importYAML ./simple.yml
+    : The filepath of the YAML file.
+
+    # Type
+
+    ```
+    importYAML :: Path -> any
+    ```
+
+    # Example
+
+    ```
+    importYAML ./simple.yml
+    =>
+    {
+      hello = "there";
+      how-are-you-doing = "I'm fine. Thank you for asking.";
+    }
+    ```
   */
   importYAML = path:
     let
@@ -26,44 +44,80 @@ rec {
     in
     lib.importJSON dataDrv;
 
-  /* Convert a given decimal number to a specified base digit with the set of
+  /**
-     glyphs for each digit as returned from lib.toBaseDigits.
+    Convert a given decimal number to a specified base digit with the set of
+    glyphs for each digit as returned from lib.toBaseDigits.
 
-     Type: toBaseDigitWithGlyphs :: Int -> Int -> Attrs -> String
+    # Arguments
 
-     Example:
+    base
-       toBaseDigitWithGlyphs 24 267 {
+    : The base index.
-          "0" = "0";
+
-          "1" = "1";
+    glyphs
-          "2" = "2";
+    : An attribute set of decimal values and their glyphs.
-          # ...
+
-          "22" = "O";
+    i
-          "23" = "P";
+    : The actual integer to be converted.
-        }
+
-      =>
+    # Type
+
+    ```
+    toBaseDigitWithGlyphs :: Int -> Int -> Attrs -> String
+    ```
+
+    # Example
+
+    ```
+    toBaseDigitWithGlyphs 24 267 {
+       "0" = "0";
+       "1" = "1";
+       "2" = "2";
+       # ...
+       "22" = "M";
+       "23" = "N";
+     }
+    =>
+    "12H"
+
+    toBaseDigitWithGlyphs 
+    ```
   */
-  toBaseDigitsWithGlyphs = base: i: glyphs:
+  toBaseDigitsWithGlyphs = base: glyphs: i:
     let
       baseDigits = lib.toBaseDigits base i;
       toBaseDigits = d: glyphs.${builtins.toString d};
     in
     lib.concatMapStrings toBaseDigits baseDigits;
 
-  /* Generates a glyph set usable for `toBaseDigitsWithGlyphs`. Take note the
+  /**
-     given list is assumed to be sorted and the generated glyph set starts at
+    Generates a glyph set usable for `toBaseDigitsWithGlyphs`. Take note the
-     `0` up to (`listLength - 1`).
+    given list is assumed to be sorted and the generated glyph set starts at
+    `0` up to (`listLength - 1`).
 
-     Type: generateGlyphSet :: [ String ] -> Attrs
+    # Arguments
 
-     Example:
+    glyphsList
-       generateGlyphSet [ "0" "1" "2" "3" "4" "5" "6" "7" "8 "9" "A" "B" "C" "D" "E" "F" ]
+    : A sorted list of glyphs.
-       => {
+
-         "0" = "0";
+    # Type
-         "1" = "1";
+
-         # ...
+    ```
-         "14" = "E";
+    generateGlyphSet :: [ String ] -> Attrs
-         "15" = "F";
+    ```
-       }
+
+    # Example
+
+    ```
+    generateGlyphSet [ "0" "1" "2" "3" "4" "5" "6" "7" "8 "9" "A" "B" "C" "D" "E" "F" ]
+    =>
+    {
+      "0" = "0";
+      "1" = "1";
+      # ...
+      "14" = "E";
+      "15" = "F";
+    }
+    ```
   */
   generateGlyphSet = glyphsList:
     let
@@ -74,21 +128,35 @@ rec {
     in
     lib.listToAttrs glyphsList';
 
-  /* Generates a conversion table for a sorted list of glyphs to its decimal
+  /**
-     number. Suitable for creating your own conversion function. Accepts the
+    Generates a conversion table for a sorted list of glyphs to its decimal
-     same argument as `generateGlyphSet`.
+    number. Suitable for creating your own conversion function. Accepts the
+    same argument as `generateGlyphSet`.
 
-     Type: generateConversionTable :: [ String ] -> Attrs
+    # Arguments
 
-     Example:
+    glyphsList
-       generateGlyphSet [ "0" "1" "2" "3" "4" "5" "6" "7" "8 "9" "A" "B" "C" "D" "E" "F" ]
+    : A sorted list of glyphs.
-       => {
+
-         "0" = 0;
+    # Type
-         "1" = 1;
+
-         # ...
+    ```
-         "E" = 14;
+    generateConversionTable :: [ String ] -> Attrs
-         "F" = 15;
+    ```
-       }
+
+    # Example
+
+    ```
+    generateConversionTable [ "0" "1" "2" "3" "4" "5" "6" "7" "8 "9" "A" "B" "C" "D" "E" "F" ]
+    =>
+    {
+      "0" = 0;
+      "1" = 1;
+      # ...
+      "E" = 14;
+      "F" = 15;
+    }
+    ```
   */
   generateConversionTable = glyphsList:
     let
@@ -99,23 +167,37 @@ rec {
     in
     lib.listToAttrs glyphsList';
 
-  /* A factory function for generating an attribute set containing a glyph
+  /**
-     set, a conversion table, and a conversion function to and from decimal.
+    A factory function for generating an attribute set containing a glyph
-     Accepts the same list as `generateGlyphSet` and
+    set, a conversion table, and a conversion function to and from decimal.
-     `generateConversionTable` where it assumes it is sorted and
+    Accepts the same list as `generateGlyphSet` and
-     zero-indexed.
+    `generateConversionTable` where it assumes it is sorted and
+    zero-indexed.
 
-     Type: generateBaseDigitType :: [ String ] -> Attrs
+    # Arguments
 
-     Example:
+    glyphsList
-      generateBaseDigitType [ "0" "1" ]
+    : A sorted list of glyphs.
-      => {
+
-        base = 2;
+    # Type
-        glyphSet = { "0" = "0"; "1" = "1"; };
+
-        conversionTable = { "0" = 0; "1" = 1; };
+    ```
-        fromDec = <function>;
+    generateBaseDigitType :: [ String ] -> Attrs
-        toDec = <function>;
+    ```
-      }
+
+    # Example
+
+    ```
+    generateBaseDigitType [ "0" "1" ]
+    =>
+    {
+      base = 2;
+      glyphSet = { "0" = "0"; "1" = "1"; };
+      conversionTable = { "0" = 0; "1" = 1; };
+      fromDec = <function>;
+      toDec = <function>;
+    }
+    ```
   */
   generateBaseDigitType = glyphsList: rec {
     base = lib.length glyphsList;
@@ -143,84 +225,174 @@ rec {
       lib.foldl (sum: v: sum + v) 0 convertDigitToDec;
   };
 
-  /* Given a range of two numbers, ensure the value is only returned within the
+  /**
-     range.
+    Given a range of two numbers, ensure the value is only returned within the
+    range.
 
-     Type: clamp :: Number -> Number -> Number -> Number
+    # Arguments
 
-     Example:
+    min
-       clamp 0 255 654
+    : Minimum number of the range.
-       => 255
 
-       clamp (-100) 100 (-234)
+    max
-       => -100
+    : Maximum number of the range.
 
-       clamp (-100) 100 54
+    value
-       => 54
+    : Number to be used for the function.
+
+    # Type
+
+    ```
+    clamp :: Number -> Number -> Number -> Number
+    ```
+
+    # Example
+
+    ```
+    clamp 0 255 654
+    =>
+    255
+
+    clamp (-100) 100 (-234)
+    =>
+    -100
+
+    clamp (-100) 100 54
+    =>
+    54
+    ```
   */
   clamp = min: max: value:
     lib.min max (lib.max min value);
 
-  /* Given a value, check if it's a number type.
+  /**
+    Given a value, check if it's a number type.
 
-     Type: isNumber :: Number -> bool
+    # Arguments
 
-     Example:
+    value
-       isNumber 3.0
+    : Numerical value.
-       => true
 
-       isNumber 653
+    # Type
-       => true
 
-       isNumber true
+    ```
-       => false
+    isNumber :: Number -> bool
+    ```
+
+    # Example:
+
+    ```
+    isNumber 3.0
+    =>
+    true
+
+    isNumber 653
+    =>
+    true
+
+    isNumber true
+    =>
+    false
+    ```
   */
   isNumber = v:
     lib.isInt v || lib.isFloat v;
 
-  /* Given a Nix number, force it to be a floating value.
+  /**
+    Given a Nix number, force it to be a floating value.
 
-     Type: toFloat :: Number -> Float
+    # Arguments
 
-     Example:
+    value
-       toFloat 5
+    : The numerical value.
-       => 5.0
 
-       toFloat 59.0
+    # Type
-       => 59.0
+
+    ```
+    toFloat :: Number -> Float
+    ```
+
+    # Example
+
+    ```
+    toFloat 5
+    =>
+    5.0
+
+    toFloat 59.0
+    =>
+    59.0
+    ```
   */
   toFloat = x:
     1.0 * x;
 
-  /* Given an initial range of integers, scale the given number with its own
+  /**
-     set of range.
+    Given an initial range of integers, scale the given number with its own
+    set of range.
 
-     Type: scale :: Attrs -> Number -> Number
+    # Arguments
 
-     Example:
+    rangeSet
-       scale { inMin = 0; inMax = 15; outMin = 0; outMax = 255; } 4
+    : An attribute set containing the following attributes: `inMin` and `inMax`
-       => 68
+    for specifying the input's expected range and `outMin` and `outMax` for the
+    output's.
 
-       scale { inMin = 0; inMax = 15; outMin = 0; outMax = 255; } (-4)
+    value
-       => -68
+    : The numerical value.
 
-       scale { inMin = 0; inMax = 15; outMin = 0; outMax = 255; } 15
+    # Type
-       => 255
+
+    ```
+    scale :: Attrs -> Number -> Number
+    ```
+
+    # Example
+
+    ```
+    scale { inMin = 0; inMax = 15; outMin = 0; outMax = 255; } 4
+    =>
+    68
+
+    scale { inMin = 0; inMax = 15; outMin = 0; outMax = 255; } (-4)
+    =>
+    -68
+
+    scale { inMin = 0; inMax = 15; outMin = 0; outMax = 255; } 15
+    =>
+    255
+    ```
   */
   scale = { inMin, inMax, outMin, outMax }: v:
     ((v - inMin) * (outMax - outMin)) / ((inMax - inMin) + outMin);
 
-  /* Returns a null value if the condition fails. Otherwise, returns the given
+  /**
-     value `as`.
+    Returns a null value if the condition fails. Otherwise, returns the given
+    value `as`.
 
-     Type: optionalNull :: Bool -> Any -> Any
+    # Arguments
 
-     Example:
+    cond
-      optionalNull true "HELLO"
+    : Condition that should evaluate as a boolean.
-      => "HELLO"
 
-      optionalNull (null != null) "HELLO"
+    as
-      => null
+    : Value to be returned if condition returns true.
+
+    # Type
+
+    ```
+    optionalNull :: Bool -> Any -> Any
+    ```
+
+    # Example
+
+    ```
+    optionalNull true "HELLO"
+    => "HELLO"
+
+    optionalNull (null != null) "HELLO"
+    => null
+    ```
   */
   optionalNull = cond: as:
     if cond then

treefmt.toml

@@ -1,7 +1,7 @@
 [global]
 excludes = [
-  "pkgs/firefox-addons/default.nix"
+  "pkgs/firefox-addons/default.nix",
-  "subprojects"
+  "subprojects",
 ]
 
 [formatter.lua]