statix, deadnix, alejandra

flake/packages.nix

@@ -1,6 +1,5 @@
 {inputs, ...}: {
   perSystem = {
-    system,
     config,
     pkgs,
     ...

lib/binds.nix

@@ -66,7 +66,7 @@
     mkSetLuaBinding = binding: action:
       mkLuaBinding binding.value action binding.description;
 
-    pushDownDefault = attr: mapAttrs (_: value: mkDefault value) attr;
+    pushDownDefault = attr: mapAttrs (_: mkDefault) attr;
   };
 in
   binds

lib/dag.nix

@@ -84,7 +84,7 @@ in {
     normalizedDag =
       mapAttrs (n: v: {
         name = n;
-        data = v.data;
+        inherit (v) data;
         after = v.after ++ dagBefore dag n;
       })
       dag;
@@ -117,7 +117,6 @@ in {
   entriesBetween = tag: let
     go = i: before: after: entries: let
       name = "${tag}-${toString i}";
-      i' = i + 1;
     in
       if entries == []
       then empty

lib/types/plugins.nix

@@ -5,7 +5,7 @@
 }: let
   inherit (lib.options) mkOption;
   inherit (lib.attrsets) attrNames mapAttrs' filterAttrs nameValuePair;
-  inherit (lib.strings) hasPrefix removePrefix isString;
+  inherit (lib.strings) hasPrefix removePrefix;
   inherit (lib.types) submodule either package enum str lines attrsOf anything listOf nullOr;
 
   # Get the names of all flake inputs that start with the given prefix.

modules/plugins/assistant/copilot/config.nix

@@ -30,14 +30,14 @@ in {
         "copilot-lua"
         # cfg.copilotNodePackage
       ]
-      ++ optionals (cfg.cmp.enable) [
+      ++ optionals cfg.cmp.enable [
         "copilot-cmp"
       ];
 
     vim.luaConfigRC.copilot = entryAnywhere ''
       require("copilot").setup(${toLuaObject cfg.setupOpts})
 
-      ${lib.optionalString (cfg.cmp.enable) ''
+      ${lib.optionalString cfg.cmp.enable ''
         require("copilot_cmp").setup()
       ''}
     '';

modules/plugins/dashboard/startify/startify.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.types) listOf attrs bool enum str oneOf int;
 in {

modules/plugins/lsp/config.nix

@@ -103,11 +103,11 @@ in {
           end
         end
 
-        ${optionalString (config.vim.ui.breadcrumbs.enable) ''local navic = require("nvim-navic")''}
+        ${optionalString config.vim.ui.breadcrumbs.enable ''local navic = require("nvim-navic")''}
         default_on_attach = function(client, bufnr)
           attach_keymaps(client, bufnr)
           format_callback(client, bufnr)
-          ${optionalString (config.vim.ui.breadcrumbs.enable) ''
+          ${optionalString config.vim.ui.breadcrumbs.enable ''
           -- let navic attach to buffers
           if client.server_capabilities.documentSymbolProvider then
             navic.attach(client, bufnr)

modules/plugins/projects/project-nvim/project-nvim.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkRenamedOptionModule;
   inherit (lib.types) bool listOf str enum;

modules/plugins/statusline/lualine/config.nix

@@ -15,7 +15,7 @@
 in {
   config = mkMerge [
     # TODO: move into nvim-tree file
-    (mkIf (config.vim.filetree.nvimTree.enable) {
+    (mkIf config.vim.filetree.nvimTree.enable {
       vim.statusline.lualine.setupOpts = {
         extensions = ["nvim-tree"];
       };
@@ -44,11 +44,11 @@ in {
         statusline.lualine.setupOpts = {
           options = {
             icons_enabled = cfg.icons.enable;
-            theme = cfg.theme;
+            inherit (cfg) theme;
             component_separators = [cfg.componentSeparator.left cfg.componentSeparator.right];
             section_separators = [cfg.sectionSeparator.left cfg.sectionSeparator.right];
             globalstatus = cfg.globalStatus;
-            refresh = cfg.refresh;
+            inherit (cfg) refresh;
           };
 
           sections = {

modules/plugins/theme/supported_themes.nix

@@ -6,10 +6,7 @@
   inherit (lib.trivial) boolToString warnIf;
 in {
   onedark = {
-    setup = {
+    setup = {style ? "dark"}: ''
-      style ? "dark",
-      transparent,
-    }: ''
       -- OneDark theme
       require('onedark').setup {
         style = "${style}"
@@ -33,10 +30,7 @@ in {
   };
 
   dracula = {
-    setup = {
+    setup = {transparent}: ''
-      style ? null,
-      transparent,
-    }: ''
       require('dracula').setup({
         transparent_bg = ${boolToString transparent},
       });

modules/plugins/ui/colorizer/colorizer.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkOption mkEnableOption;
   inherit (lib.types) attrsOf enum nullOr submodule bool str;
   inherit (lib.modules) mkRenamedOptionModule;

modules/plugins/ui/smartcolumn/smartcolumn.nix

@@ -1,6 +1,6 @@
 {lib, ...}: let
   inherit (lib.options) mkOption mkEnableOption literalExpression;
-  inherit (lib.types) nullOr int str attrsOf either listOf;
+  inherit (lib.types) nullOr str attrsOf either listOf;
   inherit (lib.modules) mkRenamedOptionModule;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {

modules/plugins/utility/binds/cheatsheet/cheatsheet.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption;
 in {
   options.vim.binds.cheatsheet = {

modules/plugins/utility/binds/cheatsheet/config.nix

@@ -8,7 +8,7 @@
 
   cfg = config.vim.binds.cheatsheet;
 in {
-  config = mkIf (cfg.enable) {
+  config = mkIf cfg.enable {
     vim.startPlugins = ["cheatsheet-nvim"];
 
     vim.luaConfigRC.cheaetsheet-nvim = entryAnywhere ''

modules/plugins/utility/binds/which-key/config.nix

@@ -10,7 +10,7 @@
 
   cfg = config.vim.binds.whichKey;
 in {
-  config = mkIf (cfg.enable) {
+  config = mkIf cfg.enable {
     vim.startPlugins = ["which-key"];
 
     vim.luaConfigRC.whichkey = entryAnywhere ''
@@ -23,7 +23,7 @@ in {
           ["<tab>"] = "TAB",
         },
 
-        ${optionalString (config.vim.ui.borders.plugins.which-key.enable) ''
+        ${optionalString config.vim.ui.borders.plugins.which-key.enable ''
         window = {
           border = "${config.vim.ui.borders.plugins.which-key.style}",
         },

modules/plugins/utility/binds/which-key/which-key.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.types) attrsOf nullOr str;
 in {

modules/plugins/utility/ccc/config.nix

@@ -8,7 +8,7 @@
 
   cfg = config.vim.utility.ccc;
 in {
-  config = mkIf (cfg.enable) {
+  config = mkIf cfg.enable {
     vim.startPlugins = [
       "ccc"
     ];

modules/plugins/utility/diffview/config.nix

@@ -7,7 +7,7 @@
 
   cfg = config.vim.utility.diffview-nvim;
 in {
-  config = mkIf (cfg.enable) {
+  config = mkIf cfg.enable {
     vim.startPlugins = [
       "diffview-nvim"
       "plenary-nvim"

modules/plugins/utility/icon-picker/config.nix

@@ -8,7 +8,7 @@
 
   cfg = config.vim.utility.icon-picker;
 in {
-  config = mkIf (cfg.enable) {
+  config = mkIf cfg.enable {
     vim.startPlugins = [
       "icon-picker-nvim"
       "dressing-nvim"

modules/plugins/utility/images/image-nvim/config.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }: let
   inherit (lib.modules) mkIf;

modules/plugins/utility/images/image-nvim/image-nvim.nix

@@ -1,8 +1,4 @@
-{
+{lib, ...}: let
-  config,
-  lib,
-  ...
-}: let
   inherit (lib.options) mkEnableOption mkOption;
 
   inherit (lib.types) enum listOf str nullOr int;

modules/plugins/utility/preview/glow/config.nix

@@ -12,7 +12,7 @@
   self = import ./glow.nix {
     inherit lib config pkgs;
   };
-  mappings = self.options.vim.utility.preview.glow.mappings;
+  inherit (self.options.vim.utility.preview.glow) mappings;
 in {
   config = mkIf cfg.enable {
     vim.startPlugins = ["glow-nvim"];

modules/plugins/utility/telescope/config.nix

@@ -16,7 +16,7 @@
 
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
-  config = mkIf (cfg.enable) {
+  config = mkIf cfg.enable {
     vim.startPlugins = [
       "telescope"
       "plenary-nvim"

modules/plugins/utility/wakatime/config.nix

@@ -9,7 +9,7 @@
 
   cfg = config.vim.utility.vim-wakatime;
 in {
-  config = mkIf (cfg.enable) {
+  config = mkIf cfg.enable {
     vim.startPlugins = [
       pkgs.vimPlugins.vim-wakatime
     ];