[feat] Alejandra formatting

2024-03-21 21:35:51 +05:30
parent e8434fadf5
commit d5dc5a79d3
33 changed files with 699 additions and 589 deletions
--- a/overlays.nix
+++ b/overlays.nix
@@ -1,13 +1,12 @@
-{ inputs, ... }:
-let
+{inputs, ...}: let
  shell-scipts = final: prev: {
-    handlr-xdg = (final.pkgs.writeShellApplication {
+    handlr-xdg = final.pkgs.writeShellApplication {
      name = "xdg-open";
-      runtimeInputs = [ final.pkgs.handlr-regex ];
+      runtimeInputs = [final.pkgs.handlr-regex];
      text = ''
        handlr open "$@"
      '';
-    });
+    };
  };

  misc-applications = final: prev: {
@@ -21,32 +20,31 @@ let
        rev = "v1.6.4";
        sha256 = "sha256-m6reRaJNeFhJBUatfPNm66LwTXPdD/gioT8HTv52QOw";
      };
-      patches = [ patches/goread.patch ];
+      patches = [patches/goread.patch];
      checkPhase = null;
    };
    music-player-git = inputs.music-player.packages.${prev.system}.default;
-    davis =
-      let
-        davis-src = final.pkgs.fetchFromGitHub {
-          owner = "SimonPersson";
-          repo = "davis";
-          rev = "main";
-          sha256 = "sha256-p4l1nF6M28OyIaPorgsyR7NJtmVwpmuws67KvVnJa8s";
-        };
-        cargoToml =
-          builtins.fromTOML (builtins.readFile "${davis-src}/Cargo.toml");
-      in
+    davis = let
+      davis-src = final.pkgs.fetchFromGitHub {
+        owner = "SimonPersson";
+        repo = "davis";
+        rev = "main";
+        sha256 = "sha256-p4l1nF6M28OyIaPorgsyR7NJtmVwpmuws67KvVnJa8s";
+      };
+      cargoToml =
+        builtins.fromTOML (builtins.readFile "${davis-src}/Cargo.toml");
+    in
      final.rustPlatform.buildRustPackage {
        pname = cargoToml.package.name;
        version = cargoToml.package.version;
        src = davis-src;
-        cargoLock = { lockFile = "${davis-src}/Cargo.lock"; };
+        cargoLock = {lockFile = "${davis-src}/Cargo.lock";};
        buildPhase = ''
          runHook cargoBuildHook
          runHook cargoInstallPostBuildHook
        '';
-        runtimeInputs = [ final.pkgs.picat ];
-        buildInputs = [ final.pkgs.picat ];
+        runtimeInputs = [final.pkgs.picat];
+        buildInputs = [final.pkgs.picat];
        installPhase = ''
          mkdir -p $out/bin
          cp $bins $out/bin
@@ -56,31 +54,33 @@ let
        '';
      };

-    picat =
-      let
-        # https://github.com/SimonPersson/picat
-        picat-src = final.pkgs.fetchFromGitHub {
-          owner = "SimonPersson";
-          repo = "picat";
-          rev = "main";
-          sha256 = "sha256-HheBinHW4RLjRtiE8Xe5BoEuSCdtZTA9XkRJgtDkXaM";
-        };
-        cargoToml =
-          builtins.fromTOML (builtins.readFile "${picat-src}/Cargo.toml");
-      in
+    picat = let
+      # https://github.com/SimonPersson/picat
+      picat-src = final.pkgs.fetchFromGitHub {
+        owner = "SimonPersson";
+        repo = "picat";
+        rev = "main";
+        sha256 = "sha256-HheBinHW4RLjRtiE8Xe5BoEuSCdtZTA9XkRJgtDkXaM";
+      };
+      cargoToml =
+        builtins.fromTOML (builtins.readFile "${picat-src}/Cargo.toml");
+    in
      final.rustPlatform.buildRustPackage {
        pname = cargoToml.package.name;
        version = cargoToml.package.version;
        src = picat-src;
-        cargoLock = { lockFile = "${picat-src}/Cargo.lock"; };
+        cargoLock = {lockFile = "${picat-src}/Cargo.lock";};
      };

    psst =
-      if final.pkgs.stdenv.isLinux then
+      if final.pkgs.stdenv.isLinux
+      then
        (prev.psst.overrideAttrs (finalAttrs: prevAttrs: {
-          postInstall = (prevAttrs.postInstall or "") + ''
-            patch $out/share/applications/Psst.desktop < ${./patches/psst.patch}
-          '';
+          postInstall =
+            (prevAttrs.postInstall or "")
+            + ''
+              patch $out/share/applications/Psst.desktop < ${./patches/psst.patch}
+            '';
        }))
      else
        final.rustPlatform.buildRustPackage rec {
@@ -110,79 +110,83 @@ let
  };

  anyrun-overlay = final: prev: {
-    anyrun = (inputs.anyrun.packages.${prev.system}.anyrun.overrideAttrs
-      (finalAttrs: prevAttrs: { cargoPatches = [ ./patches/anyrun.patch ]; }));
+    anyrun =
+      inputs.anyrun.packages.${prev.system}.anyrun.overrideAttrs
+      (finalAttrs: prevAttrs: {cargoPatches = [./patches/anyrun.patch];});
    hyprwin = inputs.anyrun-hyprwin.packages.${prev.system}.hyprwin;
    nixos-options = inputs.anyrun-nixos-options.packages.${prev.system}.default;
    anyrun-rink = inputs.anyrun-rink.packages.${prev.system}.default;
  };
  vimPlugins = final: prev: {
-    vimPlugins = prev.vimPlugins // {
-      comfortable-motion = final.pkgs.vimUtils.buildVimPlugin {
-        name = "comfortable-motion";
-        src = final.pkgs.fetchFromGitHub {
-          owner = "yuttie";
-          repo = "comfortable-motion.vim";
-          rev = "master";
-          sha256 = "sha256-S1LJXmShhpCJIg/FEPx3jFbmPpS/1U4MAQN2RY/nkI0";
+    vimPlugins =
+      prev.vimPlugins
+      // {
+        comfortable-motion = final.pkgs.vimUtils.buildVimPlugin {
+          name = "comfortable-motion";
+          src = final.pkgs.fetchFromGitHub {
+            owner = "yuttie";
+            repo = "comfortable-motion.vim";
+            rev = "master";
+            sha256 = "sha256-S1LJXmShhpCJIg/FEPx3jFbmPpS/1U4MAQN2RY/nkI0";
+          };
+        };
+        sqls-nvim = final.pkgs.vimUtils.buildVimPlugin {
+          name = "sqls-nvim";
+          src = final.pkgs.fetchFromGitHub {
+            owner = "nanotee";
+            repo = "sqls.nvim";
+            rev = "master";
+            sha256 = "sha256-jKFut6NZAf/eIeIkY7/2EsjsIhvZQKCKAJzeQ6XSr0s";
+          };
+        };
+        outline-nvim = final.pkgs.vimUtils.buildVimPlugin {
+          name = "outline-nvim";
+          src = final.pkgs.fetchFromGitHub {
+            owner = "hedyhli";
+            repo = "outline.nvim";
+            rev = "master";
+            sha256 = "sha256-HaxfnvgFy7fpa2CS7/dQhf6dK9+Js7wP5qGdIeXLGPY";
+          };
+        };
+        rest-nvim = final.pkgs.vimUtils.buildVimPlugin {
+          name = "rest-nvim";
+          src = final.pkgs.fetchFromGitHub {
+            owner = "rest-nvim";
+            repo = "rest.nvim";
+            rev = "main";
+            sha256 = "sha256-3EC0j/hEbdQ8nJU0I+LGmE/zNnglO/FrP/6POer0338=";
+          };
        };
      };
-      sqls-nvim = final.pkgs.vimUtils.buildVimPlugin {
-        name = "sqls-nvim";
-        src = final.pkgs.fetchFromGitHub {
-          owner = "nanotee";
-          repo = "sqls.nvim";
-          rev = "master";
-          sha256 = "sha256-jKFut6NZAf/eIeIkY7/2EsjsIhvZQKCKAJzeQ6XSr0s";
-        };
-      };
-      outline-nvim = final.pkgs.vimUtils.buildVimPlugin {
-        name = "outline-nvim";
-        src = final.pkgs.fetchFromGitHub {
-          owner = "hedyhli";
-          repo = "outline.nvim";
-          rev = "master";
-          sha256 = "sha256-HaxfnvgFy7fpa2CS7/dQhf6dK9+Js7wP5qGdIeXLGPY";
-        };
-      };
-      rest-nvim = final.pkgs.vimUtils.buildVimPlugin {
-        name = "rest-nvim";
-        src = final.pkgs.fetchFromGitHub {
-          owner = "rest-nvim";
-          repo = "rest.nvim";
-          rev = "main";
-          sha256 = "sha256-3EC0j/hEbdQ8nJU0I+LGmE/zNnglO/FrP/6POer0338=";
-        };
-      };
-    };
  };
  tmuxPlugins = final: prev: {
-    tmuxPlugins = prev.tmuxPlugins // {
-
-      tmux-super-fingers = final.pkgs.tmuxPlugins.mkTmuxPlugin {
-        pluginName = "tmux-super-fingers";
-        version = "v1-2024-02-14";
-        src = final.pkgs.fetchFromGitHub {
-          owner = "artemave";
-          repo = "tmux_super_fingers";
-          rev = "518044ef78efa1cf3c64f2e693fef569ae570ddd";
-          sha256 = "sha256-iKfx9Ytk2vSuINvQTB6Kww8Vv7i51cFEnEBHLje+IJw=";
+    tmuxPlugins =
+      prev.tmuxPlugins
+      // {
+        tmux-super-fingers = final.pkgs.tmuxPlugins.mkTmuxPlugin {
+          pluginName = "tmux-super-fingers";
+          version = "v1-2024-02-14";
+          src = final.pkgs.fetchFromGitHub {
+            owner = "artemave";
+            repo = "tmux_super_fingers";
+            rev = "518044ef78efa1cf3c64f2e693fef569ae570ddd";
+            sha256 = "sha256-iKfx9Ytk2vSuINvQTB6Kww8Vv7i51cFEnEBHLje+IJw=";
+          };
        };
      };
-    };
  };
  catppuccinThemes = final: prev: {
-    catppuccinThemes = import ./themes/catppuccin.nix { pkgs = final.pkgs; };
+    catppuccinThemes = import ./themes/catppuccin.nix {pkgs = final.pkgs;};
  };

-  nix-index-db = (final: prev: {
-    nix-index-database = final.runCommandLocal "nix-index-database" { } ''
+  nix-index-db = final: prev: {
+    nix-index-database = final.runCommandLocal "nix-index-database" {} ''
      mkdir -p $out
      ln -s ${
        inputs.nix-index-database.legacyPackages.${prev.system}.database
      } $out/files
    '';
-  });
+  };

  # nixneovim = nixneovim.applyPatches {
  #   name = "nixneovim-patched";
@@ -190,22 +194,23 @@ let
  #   patches = [ ./patches/nixneovim.patch ];
  # };

-  tree-sitter-grammars = (final: prev: {
-    tree-sitter-grammars = prev.tree-sitter-grammars // {
-      tree-sitter-just = final.pkgs.tree-sitter.buildGrammar {
-        language = "just";
-        version = "1";
-        src = final.pkgs.fetchFromGitHub {
-          owner = "IndianBoy42";
-          repo = "tree-sitter-just";
-          rev = "613b3fd39183bec94bc741addc5beb6e6f17969f";
-          sha256 = "sha256-OBlXwWriE6cdGn0dhpfSMnJ6Rx1Z7KcXehaamdi/TxQ";
+  tree-sitter-grammars = final: prev: {
+    tree-sitter-grammars =
+      prev.tree-sitter-grammars
+      // {
+        tree-sitter-just = final.pkgs.tree-sitter.buildGrammar {
+          language = "just";
+          version = "1";
+          src = final.pkgs.fetchFromGitHub {
+            owner = "IndianBoy42";
+            repo = "tree-sitter-just";
+            rev = "613b3fd39183bec94bc741addc5beb6e6f17969f";
+            sha256 = "sha256-OBlXwWriE6cdGn0dhpfSMnJ6Rx1Z7KcXehaamdi/TxQ";
+          };
        };
      };
-    };
-  });
-in
-[
+  };
+in [
  catppuccinThemes
  vimPlugins
  tree-sitter-grammars