[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/common/firefox.nix
+++ b/common/firefox.nix
@@ -1,9 +1,12 @@
-{ device, pkgs, ... }: {
+{
+  device,
+  pkgs,
+  ...
+}: {
  programs.firefox = {
    enable = device.isLinux;
    profiles.default = {
-      userChrome =
-        let
+      userChrome = let
        csshacks = pkgs.fetchFromGitHub {
          owner = "MrOtherGuy";
          repo = "firefox-csshacks";
@@ -11,7 +14,9 @@
          sha256 = "sha256-XJ+MTEADzOsCIh0I8EAxbtIpDHfMJsN68sKBy7/1l60=";
        };
      in
-          /* css */
+        /*
+        css
+        */
        ''
          /* @import url(${csshacks}/chrome/toolbars_below_content.css); */
          /* @import url(${csshacks}/chrome/scrollable_menupopups.css); */
@@ -27,8 +32,7 @@
    policies = {
      ExtensionSettings = {
        "uBlock0@raymondhill.net" = {
-          install_url =
-            "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
          installation_mode = "force_installed";
        };
      };
--- a/common/goread.nix
+++ b/common/goread.nix
@@ -4,7 +4,8 @@
    enable = true;
    config = {
      urls = {
-        categories = [{
+        categories = [
+          {
            name = "Rust";
            desc = "Stuff related to the rust programming language";
            subscriptions = [
@@ -35,9 +36,9 @@
                url = "https://old.reddit.com/r/nixos/.rss";
              }
            ];
-          }];
-      };
-    };
-  };
-
+          }
+        ];
+      };
+    };
+  };
 }
--- a/common/home.nix
+++ b/common/home.nix
@@ -1,5 +1,13 @@
-{ inputs, config, pkgs, lib, device, ... }: {
-  imports = [
+{
+  inputs,
+  config,
+  pkgs,
+  lib,
+  device,
+  ...
+}: {
+  imports =
+    [
      inputs.nix-index-database.hmModules.nix-index
      ./tmux.nix
      ./wezterm.nix
@@ -7,10 +15,12 @@
      ./goread.nix
      ./ncmpcpp.nix
      # ./neomutt.nix
-  ] ++ lib.optionals device.isLinux [ ../linux ];
+    ]
+    ++ lib.optionals device.isLinux [../linux];

  home.packages = with pkgs;
    [
+      sony-headphones-client
      sd
      go
      p7zip
@@ -38,7 +48,7 @@
      macchina
      ripgrep
      fd
-      nixfmt
+      alejandra
      dust
      cachix
      rustup
@@ -52,7 +62,8 @@
      pfetch-rs
      psst
      abaddon
-    ] ++ lib.optionals device.isLinux [
+    ]
+    ++ lib.optionals device.isLinux [
      mpv
      catppuccinThemes.gtk
      catppuccinThemes.papirus-folders
@@ -74,7 +85,8 @@
      lsof
      wl-clipboard
      ncpamixer
-    ] ++ lib.optionals device.isMac [ ];
+    ]
+    ++ lib.optionals device.isMac [];

  xdg.enable = true;
  xdg.userDirs = {
@@ -171,9 +183,10 @@
      enable = true;
      enableFishIntegration = true;
      enableNushellIntegration = true;
-      settings =
-        let flavour = "mocha"; # Replace with your preferred palette
-        in {
+      settings = let
+        flavour = "mocha"; # Replace with your preferred palette
+      in
+        {
          # Check https://starship.rs/config/#prompt
          format = "$all$character";
          palette = "catppuccin_${flavour}";
@@ -186,7 +199,8 @@
            truncation_length = 4;
            style = "bold lavender";
          };
-        } // builtins.fromTOML (builtins.readFile
+        }
+        // builtins.fromTOML (builtins.readFile
          (pkgs.catppuccinThemes.starship + /palettes/${flavour}.toml));
    };
    eza = {
@@ -229,7 +243,9 @@
        email = "uttarayan21@gmail.com";
        base_url = "https://pass.uttarayan.me";
        pinentry =
-          if device.isMac then pkgs.pinentry_mac else pkgs.pinentry-gnome3;
+          if device.isMac
+          then pkgs.pinentry_mac
+          else pkgs.pinentry-gnome3;
      };
    };

@@ -251,10 +267,9 @@
  home = {
    username = device.user;
    homeDirectory =
-      if device.isMac then
-        lib.mkForce "/Users/${device.user}"
-      else
-        lib.mkForce "/home/${device.user}";
+      if device.isMac
+      then lib.mkForce "/Users/${device.user}"
+      else lib.mkForce "/home/${device.user}";

    stateVersion = "23.11";

@@ -266,9 +281,11 @@
      EDITOR = "nvim";
      SHELL = "${pkgs.nushellFull}/bin/nu";
      CARGO_TARGET_DIR = "${config.xdg.cacheHome}/cargo/target";
-      BROWSER = if device.isMac then "open" else "xdg-open";
+      BROWSER =
+        if device.isMac
+        then "open"
+        else "xdg-open";
    };
    sessionPath = ["${config.home.homeDirectory}/.cargo/bin"];
  };
 }
-
--- a/common/ncmpcpp.nix
+++ b/common/ncmpcpp.nix
@@ -1,7 +1,8 @@
 {pkgs, ...}: {
  programs.ncmpcpp = {
    enable = true;
-    bindings = pkgs.lib.attrsets.mapAttrsToList (key: value: {
+    bindings =
+      pkgs.lib.attrsets.mapAttrsToList (key: value: {
        key = key;
        command = value;
      }) {
--- a/common/newsboat.nix
+++ b/common/newsboat.nix
@@ -14,19 +14,16 @@
      }
      {
        title = "Jon Gjengset's YouTube";
-        url =
-          "https://www.youtube.com/feeds/videos.xml?channel_id=UC_iD0xppBwwsrM9DegC5cQQ";
+        url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC_iD0xppBwwsrM9DegC5cQQ";
        tags = ["rust" "youtube"];
      }
    ];
-    extraConfig =
-      let
+    extraConfig = let
      dracula = builtins.fetchurl {
        url = "https://raw.githubusercontent.com/dracula/newsboat/main/newsboat";
        sha256 = "sha256:08b00ilc5zk5fkzqqd6aghcpya3d00s9kvv65b8c50rg7ikm88xr";
      };
-      in
-      ''
+    in ''
      include ${dracula}
      unbind-key g
      bind-key g home
--- a/common/nvim.nix
+++ b/common/nvim.nix
@@ -1,4 +1,10 @@
-{ pkgs, config, inputs, device, ... }: {
+{
+  pkgs,
+  config,
+  inputs,
+  device,
+  ...
+}: {
  imports = [inputs.nixneovim.nixosModules.default];
  programs.nixneovim = {
    enable = true;
@@ -80,7 +86,9 @@
      undofile = true;
    };

-    globals = { mapleader = " "; };
+    globals = {
+      mapleader = " ";
+    };
    plugins = {
      lspconfig = {
        enable = true;
@@ -89,12 +97,14 @@
          nil = {
            enable = true;
            extraConfig =
-              /* lua */
+              # lua
              ''
                settings = {
                  ['nil'] = {
                    formatting = {
-                      command = { "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt" },
+                      -- command = { "$\{pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt" },
+                      -- command = { "$\{pkgs.nixfmt}/bin/nixfmt" },
+                      command = { "${pkgs.alejandra}/bin/alejandra" },
                    },
                    nix = {
                      flake = {
@@ -113,7 +123,7 @@
          sqls = {
            enable = true;
            onAttachExtra =
-              /* lua */
+              # lua
              ''
                require('sqls').on_attach(client, bufnr)
              '';
@@ -121,7 +131,7 @@
          # rust-analyzer.enable = true;
        };
        extraLua.pre =
-          /* lua */
+          # lua
          ''
            local lsp_zero = require'lsp-zero'
            local lspconfig = require 'lspconfig'
@@ -163,7 +173,10 @@
            enable = true;
          };
        };
-        grammars = with pkgs.tree-sitter-grammars; [ tree-sitter-just tree-sitter-norg-meta ];
+        grammars = with pkgs.tree-sitter-grammars; [
+          tree-sitter-just
+          tree-sitter-norg-meta
+        ];
        installAllGrammars = true;
      };

@@ -174,7 +187,6 @@
        # cursorword.enable = true;
        starter.enable = true;
      };
-
    };
    colorschemes = {
      catppuccin = {
@@ -221,18 +233,21 @@
      };
    };

-    extraConfigLua =
-      let
-        codelldb = if device.isLinux then pkgs.vscode-extensions.vadimcn.vscode-lldb.adapter else null;
+    extraConfigLua = let
+      codelldb =
+        if device.isLinux
+        then pkgs.vscode-extensions.vadimcn.vscode-lldb.adapter
+        else null;
      liblldb =
-          if device.isLinux then
-            "${codelldb}/lldb/lib/liblldb.so"
+        if device.isLinux
+        then "${codelldb}/lldb/lib/liblldb.so"
        # else if device.isMac then
        #   "${codelldb}/lldb/lib/liblldb.dylib"
-          else null
-        ;
+        else null;
    in
-        /* lua */
+      /*
+      lua
+      */
      ''
        require'neotest'.setup({
          adapters = {
@@ -287,8 +302,7 @@
                autoload_configurations = false,
                ${pkgs.lib.optionalString device.isLinux ''
          adapter = require'rustaceanvim.config'.get_codelldb_adapter("${codelldb}/bin/codelldb", "${liblldb}")
-                ''
-                }
+        ''}
            },
        }

@@ -441,4 +455,3 @@
    package = pkgs.neovim-nightly;
  };
 }
-
--- a/common/tmux.nix
+++ b/common/tmux.nix
@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-let
+{pkgs, ...}: let
  scratchpad = pkgs.writeShellScript "scratchpad" ''
    width=''${2:-95%}
    height=''${2:-95%}
--- a/common/tuifeed.nix
+++ b/common/tuifeed.nix
@@ -10,5 +10,4 @@
      };
    };
  };
-
 }
--- a/common/wezterm.nix
+++ b/common/wezterm.nix
@@ -2,7 +2,9 @@
  programs.wezterm = {
    enable = true;
    extraConfig =
-      /* lua */
+      /*
+      lua
+      */
      ''
        local wezterm = require 'wezterm';
        return {
--- a/darwin/device.nix
+++ b/darwin/device.nix
@@ -1,4 +1,11 @@
-{ devices, inputs, overlays, home-manager, nix-darwin, ... }:
+{
+  devices,
+  inputs,
+  overlays,
+  home-manager,
+  nix-darwin,
+  ...
+}:
 builtins.listToAttrs (builtins.map (device: {
    name = device.name;
    value = nix-darwin.lib.darwinSystem {
@@ -24,4 +31,5 @@ builtins.listToAttrs (builtins.map (device: {
        }
      ];
    };
-}) devices)
+  })
+  devices)
--- a/flake.nix
+++ b/flake.nix
@@ -68,17 +68,16 @@
    };
  };

-  outputs =
-    { nixpkgs
-    , home-manager
-    , nix-darwin
-    , flake-utils
-    , anyrun
-    , nur
-    , neovim-nightly-overlay
-    , ...
-    }@inputs:
-    let
+  outputs = {
+    nixpkgs,
+    home-manager,
+    nix-darwin,
+    flake-utils,
+    anyrun,
+    nur,
+    neovim-nightly-overlay,
+    ...
+  } @ inputs: let
    config_devices = [
      {
        name = "mirai";
@@ -111,7 +110,9 @@
    mkDevice = {device}: {
      isLinux = !isNull (builtins.match ".*-linux" device.system);
      isNix =
-          if (builtins.hasAttr "isNix" device) then device.isNix else false;
+        if (builtins.hasAttr "isNix" device)
+        then device.isNix
+        else false;
      isMac = !isNull (builtins.match ".*-darwin" device.system);
      system = device.system;
      name = device.name;
@@ -125,26 +126,26 @@
    linux_devices = builtins.filter (x: x.isLinux) devices;
    darwin_devices = builtins.filter (x: x.isMac) devices;

-      overlays = import ./overlays.nix {
-        inherit inputs;
-      };
+    overlays = import ./overlays.nix {inherit inputs;};
+  in {
+    nixosConfigurations = let
+      devices = nixos_devices;
    in
-    {
-      nixosConfigurations =
-        let devices = nixos_devices;
-        in import ./nixos/device.nix {
+      import ./nixos/device.nix {
        inherit devices inputs nixpkgs home-manager overlays nur;
      };

-      darwinConfigurations =
-        let devices = darwin_devices;
-        in import ./darwin/device.nix {
+    darwinConfigurations = let
+      devices = darwin_devices;
+    in
+      import ./darwin/device.nix {
        inherit devices inputs nixpkgs home-manager overlays nix-darwin;
      };

-      homeConfigurations =
-        let devices = linux_devices;
-        in import ./linux/device.nix {
+    homeConfigurations = let
+      devices = linux_devices;
+    in
+      import ./linux/device.nix {
        inherit devices inputs nixpkgs home-manager overlays;
      };
  };
--- a/linux/anyrun.nix
+++ b/linux/anyrun.nix
@@ -1,4 +1,10 @@
-{ inputs, pkgs, device, osConfig, ... }: {
+{
+  inputs,
+  pkgs,
+  device,
+  osConfig,
+  ...
+}: {
  imports = [inputs.anyrun.nixosModules.home-manager];
  programs.anyrun = {
    enable = true;
@@ -26,10 +32,12 @@

    extraConfigFiles = {
      "nixos-options.ron".text = let
-        nixos-options = pkgs.lib.optionalString device.isNix
+        nixos-options =
+          pkgs.lib.optionalString device.isNix
          osConfig.system.build.manual.optionsJSON
          + "/share/doc/nixos/options.json";
-        hm-options = inputs.home-manager.packages.${pkgs.system}.docs-json
+        hm-options =
+          inputs.home-manager.packages.${pkgs.system}.docs-json
          + "/share/doc/home-manager/options.json";
        # or alternatively if you wish to read any other documentation options, such as home-manager
        # get the docs-json package from the home-manager flake
@@ -42,7 +50,12 @@
        # };
        options = builtins.toJSON ({
            ":hm" = [hm-options];
-        } // (if device.isNix then { ":nix" = [ nixos-options ]; } else { }));
+          }
+          // (
+            if device.isNix
+            then {":nix" = [nixos-options];}
+            else {}
+          ));
      in ''
        Config(
            options: ${options},
@@ -56,7 +69,9 @@
        )
      '';
      "websearch.ron".text =
-        /* ron */
+        /*
+        ron
+        */
        ''
          Config(
              prefix: "?",
--- a/linux/default.nix
+++ b/linux/default.nix
@@ -1,4 +1,10 @@
-{ pkgs, device, nur, inputs, ... }: {
+{
+  pkgs,
+  device,
+  nur,
+  inputs,
+  ...
+}: {
  imports = [
    ../common/firefox.nix
    ../linux/hyprland.nix
@@ -9,7 +15,6 @@
    ../linux/mpd.nix
  ];

-
  services.kdeconnect.enable = true;
  services.kdeconnect.indicator = true;
  services.swayosd.enable = true;
--- a/linux/device.nix
+++ b/linux/device.nix
@@ -1,4 +1,10 @@
-{ devices, inputs, overlays, home-manager, ... }:
+{
+  devices,
+  inputs,
+  overlays,
+  home-manager,
+  ...
+}:
 builtins.listToAttrs (builtins.map (device: {
    name = device.user;
    value = let
@@ -6,7 +12,8 @@ builtins.listToAttrs (builtins.map (device: {
        inherit overlays;
        system = device.system;
      };
-  in home-manager.lib.homeManagerConfiguration {
+    in
+      home-manager.lib.homeManagerConfiguration {
        inherit pkgs;
        extraSpecialArgs = {
          inherit inputs;
@@ -14,4 +21,5 @@ builtins.listToAttrs (builtins.map (device: {
        };
        modules = [{nixpkgs.config.allowUnfree = true;} ../common/home.nix];
      };
-}) devices)
+  })
+  devices)
--- a/linux/hyprland.nix
+++ b/linux/hyprland.nix
@@ -1,8 +1,12 @@
-{ pkgs, inputs, ... }: {
+{
+  pkgs,
+  inputs,
+  ...
+}: {
  imports = [../modules/hyprpaper.nix inputs.hyprlock.homeManagerModules.hyprlock];

-  programs.hyprpaper =
-    let wallpapers = import ../utils/wallhaven.nix { inherit pkgs; };
+  programs.hyprpaper = let
+    wallpapers = import ../utils/wallhaven.nix {inherit pkgs;};
  in {
    enable = true;
    systemd.enable = true;
--- a/linux/ironbar/default.nix
+++ b/linux/ironbar/default.nix
@@ -1,4 +1,8 @@
-{ inputs, pkgs, ... }: {
+{
+  inputs,
+  pkgs,
+  ...
+}: {
  imports = [inputs.ironbar.homeManagerModules.default];
  programs.ironbar = {
    enable = true;
@@ -48,7 +52,8 @@
          }
          {type = "tray";}
        ];
-        start = [{
+        start = [
+          {
            type = "workspaces";
            name_map = {
              "1" = "icon:foot";
@@ -64,7 +69,8 @@
            };
            favorites = ["1" "2" "3" "4" "5" "6" "7" "8" "9" "10"];
            all_monitors = true;
-        }];
+          }
+        ];
      };
    };
    style = let
@@ -79,6 +85,7 @@
        sha256 = "sha256-vfwfBE3iqIN1cGoItSssR7h0z6tuJAhNarkziGFlNBw";
      };
      mocha = builtins.readFile "${catppuccin}/mocha.css";
-    in mocha + builtins.readFile ./ironbar.css;
+    in
+      mocha + builtins.readFile ./ironbar.css;
  };
 }
--- a/linux/mpd.nix
+++ b/linux/mpd.nix
@@ -1,4 +1,8 @@
-{ pkgs, config, ... }: {
+{
+  pkgs,
+  config,
+  ...
+}: {
  services.mpd = {
    enable = true;
  };
--- a/modules/goread.nix
+++ b/modules/goread.nix
@@ -1,14 +1,17 @@
-{ pkgs, config, lib, ... }:
-with lib;
-let
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib; let
  cfg = config.programs.goread;
  # configDir =
  #   if pkgs.stdenv.isDarwin then
  #     "${config.home.homeDirectory}Library/Application Support/goread"
  #   else
  #     "${config.xdg.configHome}/goread";
-in
-{
+in {
  options = {
    programs.goread = {
      enable = mkEnableOption "goread - a terminal RSS/Atom reader";
@@ -42,6 +45,5 @@ in
      "goread/urls.yml".text = generators.toYAML {} cfg.config.urls;
      # "goread/colorscheme.json".text = lib.generators.toJSON cfg.config.colorscheme;
    };
-
  };
 }
--- a/modules/hyprpaper.nix
+++ b/modules/hyprpaper.nix
@@ -1,8 +1,11 @@
-{ pkgs, config, lib, ... }:
-
-with lib;
-
-let cfg = config.programs.hyprpaper;
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.programs.hyprpaper;
 in {
  options = {
    programs.hyprpaper = {
@@ -43,8 +46,7 @@ in {
        extraConfig = mkOption {
          type = str;
          default = "";
-          description =
-            "Check https://github.com/hyprwm/hyprpaper#usage for info";
+          description = "Check https://github.com/hyprwm/hyprpaper#usage for info";
          example = ''
            newConfigOption = foo,bar
          '';
@@ -80,13 +82,16 @@ in {

        # hyprpaper.settings.preload
        ${(lists.foldl (acc: v:
-          acc + ''
+          acc
+          + ''
            preload = ${v}
-          '') "" cfg.settings.preload)}
+          '') ""
+        cfg.settings.preload)}

        # hyprpaper.settings.wallpapers
        ${(lists.foldl (acc: v:
-          acc + ''
+          acc
+          + ''
            wallpaper = ${v}
          '') "" (pkgs.lib.attrsets.mapAttrsToList (name: val: name + "," + val)
          cfg.settings.wallpapers))}
--- a/modules/tuifeed.nix
+++ b/modules/tuifeed.nix
@@ -1,12 +1,13 @@
-{ pkgs, config, lib, ... }:
-
-with lib;
-
-let
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib; let
  cfg = config.programs.tuifeed;
  tomlFormat = pkgs.formats.toml {};
-in
-{
+in {
  options = {
    programs.tuifeed = {
      enable = mkEnableOption "tuifeed - a terminal RSS/Atom reader";
@@ -32,7 +33,6 @@ in
          '';
          example = {};
        };
-
      };
    };
  };
@@ -46,6 +46,5 @@ in
        "article-title" = cfg.config.article_title;
      };
    };
-
  };
 }
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -1,7 +1,11 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-{ pkgs, device, ... }: {
+{
+  pkgs,
+  device,
+  ...
+}: {
  imports = [
    # Include the results of the hardware scan.
    ./ryu.nix
@@ -28,20 +32,16 @@
  };
  boot.plymouth.enable = true;
  boot.plymouth.theme = "catppuccin-mocha";
-  boot.plymouth.themePackages = with pkgs;
-    [ (catppuccin-plymouth.override { variant = "mocha"; }) ];
+  boot.plymouth.themePackages = with pkgs; [(catppuccin-plymouth.override {variant = "mocha";})];

-  services.greetd =
-    let
+  services.greetd = let
    tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet";
    hyprland-session = "${pkgs.hyprland}/share/wayland-sessions";
-    in
-    {
+  in {
    enable = true;
    settings = {
      default_session = {
-          command =
-            "${tuigreet} --time --remember --remember-session --sessions ${hyprland-session}";
+        command = "${tuigreet} --time --remember --remember-session --sessions ${hyprland-session}";
        user = "greeter";
      };
    };
@@ -90,8 +90,7 @@
  networking.nameservers = ["1.1.1.1" "8.8.8.8"];
  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.

-  services.udev.packages =
-    [ pkgs.yubikey-personalization pkgs.yubikey-personalization-gui ];
+  services.udev.packages = [pkgs.yubikey-personalization pkgs.yubikey-personalization-gui];
  services.yubikey-agent.enable = true;

  # Configure network proxy if necessary
@@ -204,14 +203,19 @@
  networking.firewall = {
    enable = true;
    allowedTCPPortRanges = [
-      { from = 1714; to = 1764; } # KDE Connect
+      {
+        from = 1714;
+        to = 1764;
+      } # KDE Connect
    ];
    allowedUDPPortRanges = [
-      { from = 1714; to = 1764; } # KDE Connect
+      {
+        from = 1714;
+        to = 1764;
+      } # KDE Connect
    ];
  };

-
  # This value determines the NixOS release from which the default
  # settings for stateful data, like file locations and database versions
  # on your system were taken. It‘s perfectly fine and recommended to leave
--- a/nixos/device.nix
+++ b/nixos/device.nix
@@ -1,4 +1,12 @@
-{ nixpkgs, devices, inputs, overlays, home-manager, nur, ... }:
+{
+  nixpkgs,
+  devices,
+  inputs,
+  overlays,
+  home-manager,
+  nur,
+  ...
+}:
 builtins.listToAttrs (builtins.map (device: {
    name = device.name;
    value = nixpkgs.lib.nixosSystem {
@@ -27,4 +35,5 @@ builtins.listToAttrs (builtins.map (device: {
        }
      ];
    };
-}) devices)
+  })
+  devices)
--- a/nixos/ryu.nix
+++ b/nixos/ryu.nix
@@ -1,9 +1,13 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
  imports = [(modulesPath + "/installer/scan/not-detected.nix")];

  hardware.opengl = {
@@ -14,7 +18,6 @@

  services.xserver.videoDrivers = ["nvidia"]; # or "nvidiaLegacy470 etc.
  hardware.nvidia = {
-
    # Modesetting is required.
    modesetting.enable = true;

@@ -45,12 +48,9 @@
    package = config.boot.kernelPackages.nvidiaPackages.beta;
  };

-
  # hardware.bluetooth.settings = {

-
-  boot.initrd.availableKernelModules =
-    [ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = ["vmd" "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
  boot.initrd.kernelModules = [];
  boot.kernelModules = ["kvm-intel"];
  boot.extraModulePackages = [];
--- 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];
      text = ''
        handlr open "$@"
      '';
-    });
+    };
  };

  misc-applications = final: prev: {
@@ -25,8 +24,7 @@ let
      checkPhase = null;
    };
    music-player-git = inputs.music-player.packages.${prev.system}.default;
-    davis =
-      let
+    davis = let
      davis-src = final.pkgs.fetchFromGitHub {
        owner = "SimonPersson";
        repo = "davis";
@@ -56,8 +54,7 @@ let
        '';
      };

-    picat =
-      let
+    picat = let
      # https://github.com/SimonPersson/picat
      picat-src = final.pkgs.fetchFromGitHub {
        owner = "SimonPersson";
@@ -76,9 +73,12 @@ let
      };

    psst =
-      if final.pkgs.stdenv.isLinux then
+      if final.pkgs.stdenv.isLinux
+      then
        (prev.psst.overrideAttrs (finalAttrs: prevAttrs: {
-          postInstall = (prevAttrs.postInstall or "") + ''
+          postInstall =
+            (prevAttrs.postInstall or "")
+            + ''
              patch $out/share/applications/Psst.desktop < ${./patches/psst.patch}
            '';
        }))
@@ -110,14 +110,17 @@ 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 // {
+    vimPlugins =
+      prev.vimPlugins
+      // {
        comfortable-motion = final.pkgs.vimUtils.buildVimPlugin {
          name = "comfortable-motion";
          src = final.pkgs.fetchFromGitHub {
@@ -157,8 +160,9 @@ let
      };
  };
  tmuxPlugins = final: prev: {
-    tmuxPlugins = prev.tmuxPlugins // {
-
+    tmuxPlugins =
+      prev.tmuxPlugins
+      // {
        tmux-super-fingers = final.pkgs.tmuxPlugins.mkTmuxPlugin {
          pluginName = "tmux-super-fingers";
          version = "v1-2024-02-14";
@@ -175,14 +179,14 @@ let
    catppuccinThemes = import ./themes/catppuccin.nix {pkgs = final.pkgs;};
  };

-  nix-index-db = (final: prev: {
+  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,8 +194,10 @@ let
  #   patches = [ ./patches/nixneovim.patch ];
  # };

-  tree-sitter-grammars = (final: prev: {
-    tree-sitter-grammars = prev.tree-sitter-grammars // {
+  tree-sitter-grammars = final: prev: {
+    tree-sitter-grammars =
+      prev.tree-sitter-grammars
+      // {
        tree-sitter-just = final.pkgs.tree-sitter.buildGrammar {
          language = "just";
          version = "1";
@@ -203,9 +209,8 @@ let
          };
        };
      };
-  });
-in
-[
+  };
+in [
  catppuccinThemes
  vimPlugins
  tree-sitter-grammars
--- a/themes/catppuccin.nix
+++ b/themes/catppuccin.nix
@@ -1,12 +1,11 @@
-{ pkgs, ... }:
-let
-  mkCatppuccin =
-    { owner ? "catppuccin"
-    , version ? "0.0.1"
-    , item
-    , rev ? "main"
-    , sha256 ? pkgs.lib.fakeSha256
-    , override ? null
+{pkgs, ...}: let
+  mkCatppuccin = {
+    owner ? "catppuccin",
+    version ? "0.0.1",
+    item,
+    rev ? "main",
+    sha256 ? pkgs.lib.fakeSha256,
+    override ? null,
  }:
    pkgs.stdenv.mkDerivation {
      inherit version override;
@@ -23,12 +22,13 @@ let
    };

  flavors = ["latte" "frappe" "macchiato" "mocha"];
-  mapFlavor = flavorMap: (flavor: {
+  mapFlavor = flavorMap:
+    (flavor: {
      name = flavor;
      value = flavorMap flavor;
-  }) flavors;
-in
-{
+    })
+    flavors;
+in {
  bat = mkCatppuccin {
    item = "bat";
    sha256 = "sha256-yHt3oIjUnljARaihalcWSNldtaJfVDfmfiecYfbzGs0";
@@ -60,15 +60,15 @@ in
    sha256 = "sha256-czvR3bVZ0NfBmuu0JixalS7B1vf1uEGSTSUVVTclKxI";
  };

-  gtk = (pkgs.catppuccin-gtk.override {
+  gtk = pkgs.catppuccin-gtk.override {
    variant = "mocha";
    size = "standard";
    accents = ["mauve"];
    tweaks = ["normal"];
-  });
+  };

-  papirus-folders = (pkgs.catppuccin-papirus-folders.override {
+  papirus-folders = pkgs.catppuccin-papirus-folders.override {
    accent = "mauve";
    flavor = "mocha";
-  });
+  };
 }
--- a/utils/wallhaven.nix
+++ b/utils/wallhaven.nix
@@ -1,9 +1,10 @@
-{ pkgs, ... }:
-let
-  getWall = { url, sha256 ? pkgs.lib.fakeSha256 }:
+{pkgs, ...}: let
+  getWall = {
+    url,
+    sha256 ? pkgs.lib.fakeSha256,
+  }:
    builtins.fetchurl {inherit url sha256;};
-in
-rec {
+in rec {
  inherit getWall;
  # Some predefined wallpapers
  lights = getWall {