Use alejandra for formatting Nix files

2024-02-13 21:33:32 +00:00 · 2024-02-13 21:33:32 +00:00 · 7302dae7ec
parent 7db4788e49
commit 7302dae7ec
17 changed files with 273 additions and 244 deletions
--- a/flake.nix
+++ b/flake.nix
@ -7,21 +7,28 @@
    opdavies-nvim.url = "github:opdavies/opdavies.nvim";
  };

-  outputs = inputs@{ flake-parts, self, ... }:
-    let
-      system = "x86_64-linux";
-      username = "opdavies";
+  outputs = inputs @ {
+    flake-parts,
+    self,
+    ...
+  }: let
+    system = "x86_64-linux";
+    username = "opdavies";

-      pkgs = inputs.nixpkgs.legacyPackages.${system};
+    pkgs = inputs.nixpkgs.legacyPackages.${system};

-      nixos-system = import ./system/nixos { inherit inputs pkgs self system username; };
-      wsl-system = import ./system/wsl2 { inherit inputs pkgs self system username; };
-    in
-    flake-parts.lib.mkFlake { inherit inputs; } {
-      systems = [ "x86_64-linux" ];
+    nixos-system = import ./system/nixos {inherit inputs pkgs self system username;};
+    wsl-system = import ./system/wsl2 {inherit inputs pkgs self system username;};
+  in
+    flake-parts.lib.mkFlake {inherit inputs;} {
+      systems = ["x86_64-linux"];

-      perSystem = { pkgs, self', ... }: {
-        formatter = pkgs.nixpkgs-fmt;
+      perSystem = {
+        pkgs,
+        self',
+        ...
+      }: {
+        formatter = pkgs.alejandra;
      };

      flake = {
--- a/system/nixos/configuration.nix
+++ b/system/nixos/configuration.nix
@ -1,27 +1,28 @@
-{ inputs, desktop ? false, hostname, pkgs, system }:
-
-let
+{
+  inputs,
+  desktop ? false,
+  hostname,
+  pkgs,
+  system,
+}: let
  pkgs-2311 = inputs.nixpkgs-2311.legacyPackages.${system};

  configure-gtk = pkgs.writeTextFile {
    name = "configure-gtk";
    destination = "/bin/configure-gtk";
    executable = true;
-    text =
-      let
-        schema = pkgs.gsettings-desktop-schemas;
-        datadir = "${schema}/share/gsettings-schemas/${schema.name}";
-      in
-      ''
-        export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS
-        gnome_schema=org.gnome.desktop.interface
-        gsettings set $gnome_schema gtk-theme 'Breeze Dark'
-      '';
+    text = let
+      schema = pkgs.gsettings-desktop-schemas;
+      datadir = "${schema}/share/gsettings-schemas/${schema.name}";
+    in ''
+      export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS
+      gnome_schema=org.gnome.desktop.interface
+      gsettings set $gnome_schema gtk-theme 'Breeze Dark'
+    '';
  };

  username = "opdavies";
-in
-{
+in {
  nixpkgs = {
    config = {
      allowUnfree = true;
@ -81,7 +82,7 @@ in

    windowManager.i3 = {
      enable = true;
-      extraPackages = with pkgs; [ i3status i3lock i3blocks ];
+      extraPackages = with pkgs; [i3status i3lock i3blocks];
    };
  };

@ -116,8 +117,8 @@ in
  users.users.${username} = {
    isNormalUser = true;
    description = "Oliver Davies";
-    extraGroups = [ "docker" "networkmanager" "wheel" ];
-    packages = with pkgs; [ ];
+    extraGroups = ["docker" "networkmanager" "wheel"];
+    packages = with pkgs; [];
  };

  security.sudo.wheelNeedsPassword = false;
@ -133,7 +134,8 @@ in
      xfce.thunar
      xfce.thunar-volman
      xfce.tumbler
-    ] ++ pkgs.lib.optionals desktop [
+    ]
+    ++ pkgs.lib.optionals desktop [
      acpi
      dunst
      libnotify
@ -182,7 +184,7 @@ in
    fontconfig = {
      enable = true;
      defaultFonts = {
-        monospace = [ "JetBrainsMono Nerd Font Mono" ];
+        monospace = ["JetBrainsMono Nerd Font Mono"];
      };
    };

@ -214,32 +216,30 @@ in

    settings = {
      auto-optimise-store = true;
-      experimental-features = [ "nix-command" "flakes" ];
+      experimental-features = ["nix-command" "flakes"];
      warn-dirty = false;
    };
  };

  # Make Caps lock work as an Escape key on press and Ctrl on hold.
-  services.interception-tools =
-    let
-      dfkConfig = pkgs.writeText "dual-function-keys.yaml" ''
-        MAPPINGS:
-          - KEY: KEY_CAPSLOCK
-            TAP: KEY_ESC
-            HOLD: KEY_LEFTCTRL
-      '';
-    in
-    {
-      enable = true;
-      plugins = pkgs.lib.mkForce [ pkgs.interception-tools-plugins.dual-function-keys ];
-      udevmonConfig = ''
-        - JOB: "${pkgs.interception-tools}/bin/intercept -g $DEVNODE | ${pkgs.interception-tools-plugins.dual-function-keys}/bin/dual-function-keys -c ${dfkConfig} | ${pkgs.interception-tools}/bin/uinput -d $DEVNODE"
-          DEVICE:
-            NAME: "AT Translated Set 2 keyboard"
-            EVENTS:
-              EV_KEY: [[KEY_CAPSLOCK, KEY_ESC, KEY_LEFTCTRL]]
-      '';
-    };
+  services.interception-tools = let
+    dfkConfig = pkgs.writeText "dual-function-keys.yaml" ''
+      MAPPINGS:
+        - KEY: KEY_CAPSLOCK
+          TAP: KEY_ESC
+          HOLD: KEY_LEFTCTRL
+    '';
+  in {
+    enable = true;
+    plugins = pkgs.lib.mkForce [pkgs.interception-tools-plugins.dual-function-keys];
+    udevmonConfig = ''
+      - JOB: "${pkgs.interception-tools}/bin/intercept -g $DEVNODE | ${pkgs.interception-tools-plugins.dual-function-keys}/bin/dual-function-keys -c ${dfkConfig} | ${pkgs.interception-tools}/bin/uinput -d $DEVNODE"
+        DEVICE:
+          NAME: "AT Translated Set 2 keyboard"
+          EVENTS:
+            EV_KEY: [[KEY_CAPSLOCK, KEY_ESC, KEY_LEFTCTRL]]
+    '';
+  };

  system.autoUpgrade = {
    allowReboot = true;
@ -257,7 +257,7 @@ in

  programs.firefox = {
    enable = true;
-    languagePacks = [ "en-GB" ];
+    languagePacks = ["en-GB"];
    package = pkgs.firefox-devedition;
    preferences = {
      "intl.accept_languages" = "en-GB, en";
--- a/system/nixos/default.nix
+++ b/system/nixos/default.nix
@ -1,24 +1,29 @@
-{ inputs, pkgs, self, system, username }:
-
-{ desktop ? false, hostname }:
-
-let
-  configuration = import ./configuration.nix { inherit desktop hostname inputs pkgs system; };
+{
+  inputs,
+  pkgs,
+  self,
+  system,
+  username,
+}: {
+  desktop ? false,
+  hostname,
+}: let
+  configuration = import ./configuration.nix {inherit desktop hostname inputs pkgs system;};
  hardware-configuration = import ./hardware-configuration.nix;
 in
-inputs.nixpkgs.lib.nixosSystem {
-  modules = [
-    inputs.home-manager.nixosModules.home-manager
-    {
-      home-manager = {
-        extraSpecialArgs = { inherit inputs desktop self username; };
-        useGlobalPkgs = true;
-        useUserPackages = true;
-        users."${username}" = import ./home-manager;
-      };
-    }
+  inputs.nixpkgs.lib.nixosSystem {
+    modules = [
+      inputs.home-manager.nixosModules.home-manager
+      {
+        home-manager = {
+          extraSpecialArgs = {inherit inputs desktop self username;};
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          users."${username}" = import ./home-manager;
+        };
+      }

-    configuration
-    hardware-configuration
-  ];
-}
+      configuration
+      hardware-configuration
+    ];
+  }
--- a/system/nixos/hardware-configuration.nix
+++ b/system/nixos/hardware-configuration.nix
@ -1,14 +1,17 @@
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [(modulesPath + "/installer/scan/not-detected.nix")];

-  boot.initrd.availableKernelModules =
-    [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.kernelParams = [ "i8042.reset" ];
-  boot.extraModulePackages = [ ];
+  boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-intel"];
+  boot.kernelParams = ["i8042.reset"];
+  boot.extraModulePackages = [];

  boot.kernelPackages = pkgs.linuxPackages_latest;
  hardware.enableAllFirmware = true;
@ -23,8 +26,7 @@
    fsType = "vfat";
  };

-  swapDevices =
-    [{ device = "/dev/disk/by-label/swap"; }];
+  swapDevices = [{device = "/dev/disk/by-label/swap";}];

  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
  # (the default) this is the recommended approach. When using systemd-networkd it's
@ -39,5 +41,4 @@
  hardware.bluetooth.enable = true;
  hardware.cpu.intel.updateMicrocode =
    lib.mkDefault config.hardware.enableRedistributableFirmware;
-
 }
--- a/system/nixos/home-manager/default.nix
+++ b/system/nixos/home-manager/default.nix
@ -1,33 +1,43 @@
-{ config, desktop, inputs, pkgs, self, username, ... }:
-
-let
-  desktop-config = import ./desktop.nix { inherit config inputs pkgs username; };
-  shared-config = import ../../shared/home-manager.nix { inherit inputs pkgs self username; };
-  shared-packages = import ../../shared/home-manager-packages.nix { inherit inputs pkgs; };
-in
 {
-  imports = if desktop then [ desktop-config shared-config ] else [ shared-config ];
+  config,
+  desktop,
+  inputs,
+  pkgs,
+  self,
+  username,
+  ...
+}: let
+  desktop-config = import ./desktop.nix {inherit config inputs pkgs username;};
+  shared-config = import ../../shared/home-manager.nix {inherit inputs pkgs self username;};
+  shared-packages = import ../../shared/home-manager-packages.nix {inherit inputs pkgs;};
+in {
+  imports =
+    if desktop
+    then [desktop-config shared-config]
+    else [shared-config];

-  home.packages = shared-packages ++ pkgs.lib.optionals desktop [
-    pkgs.discord
-    pkgs.gimp
-    pkgs.gscan2pdf
-    pkgs.i3-auto-layout
-    pkgs.kdenlive
-    pkgs.meslo-lg
-    pkgs.obs-studio
-    pkgs.okular
-    pkgs.pamixer
-    pkgs.pass
-    pkgs.pavucontrol
-    pkgs.pinentry
-    pkgs.slack
-    pkgs.via
-    pkgs.vlc
-    pkgs.xsel
-    pkgs.xcape
-    pkgs.zoom-us
-  ];
+  home.packages =
+    shared-packages
+    ++ pkgs.lib.optionals desktop [
+      pkgs.discord
+      pkgs.gimp
+      pkgs.gscan2pdf
+      pkgs.i3-auto-layout
+      pkgs.kdenlive
+      pkgs.meslo-lg
+      pkgs.obs-studio
+      pkgs.okular
+      pkgs.pamixer
+      pkgs.pass
+      pkgs.pavucontrol
+      pkgs.pinentry
+      pkgs.slack
+      pkgs.via
+      pkgs.vlc
+      pkgs.xsel
+      pkgs.xcape
+      pkgs.zoom-us
+    ];

  home.sessionVariables = {
    EDITOR = "nvim";
--- a/system/nixos/home-manager/desktop.nix
+++ b/system/nixos/home-manager/desktop.nix
@ -1,6 +1,9 @@
-{ config, inputs, pkgs, username }:
-
 {
+  config,
+  inputs,
+  pkgs,
+  username,
+}: {
  imports = [
    ./modules/alacritty.nix
    ./modules/autorandr.nix
--- a/system/nixos/home-manager/modules/alacritty.nix
+++ b/system/nixos/home-manager/modules/alacritty.nix
@ -21,7 +21,7 @@
        glyph_offset.y = 6;
      };

-      shell = { program = "zsh"; };
+      shell = {program = "zsh";};
    };
  };
 }
--- a/system/nixos/home-manager/modules/autorandr.nix
+++ b/system/nixos/home-manager/modules/autorandr.nix
@ -1,6 +1,4 @@
-{ username, ... }:
-
-{
+{username, ...}: {
  services.autorandr.enable = true;

  xdg.configFile."autorandr/postswitch" = {
@ -15,33 +13,31 @@
  programs.autorandr = {
    enable = true;

-    profiles =
-      let
-        laptop = "00ffffffffffff000daef21400000000161c0104a51f117802ee95a3544c99260f505400000001010101010101010101010101010101363680a0703820402e1e240035ad10000018000000fe004e3134304843472d4751320a20000000fe00434d4e0a202020202020202020000000fe004e3134304843472d4751320a2000bb";
-        monitor = "00ffffffffffff004c2d1710424e58432b1f0103803f24782ac8b5ad50449e250f5054bfef80714f810081c081809500a9c0b300010108e80030f2705a80b0588a0078682100001e000000fd00324b1e873c000a202020202020000000fc004c5532385235350a2020202020000000ff0048345a524130303132380a20200183020335f04961120313041f10605f2309070783010000e305c0006b030c002000b83c2000200167d85dc401788003e20f81e3060501023a801871382d40582c450078682100001e023a80d072382d40102c458078682100001e04740030f2705a80b0588a0078682100001e565e00a0a0a029503020350078682100001a000049";
-      in
-      {
-        laptop = {
-          config.eDP-1 = {
-            enable = true;
-            mode = "1920x1080";
-            primary = true;
-            rate = "59.95";
-          };
-
-          fingerprint.eDP-1 = laptop;
+    profiles = let
+      laptop = "00ffffffffffff000daef21400000000161c0104a51f117802ee95a3544c99260f505400000001010101010101010101010101010101363680a0703820402e1e240035ad10000018000000fe004e3134304843472d4751320a20000000fe00434d4e0a202020202020202020000000fe004e3134304843472d4751320a2000bb";
+      monitor = "00ffffffffffff004c2d1710424e58432b1f0103803f24782ac8b5ad50449e250f5054bfef80714f810081c081809500a9c0b300010108e80030f2705a80b0588a0078682100001e000000fd00324b1e873c000a202020202020000000fc004c5532385235350a2020202020000000ff0048345a524130303132380a20200183020335f04961120313041f10605f2309070783010000e305c0006b030c002000b83c2000200167d85dc401788003e20f81e3060501023a801871382d40582c450078682100001e023a80d072382d40102c458078682100001e04740030f2705a80b0588a0078682100001e565e00a0a0a029503020350078682100001a000049";
+    in {
+      laptop = {
+        config.eDP-1 = {
+          enable = true;
+          mode = "1920x1080";
+          primary = true;
+          rate = "59.95";
        };

-        desktop = {
-          config.HDMI-1 = {
-            enable = true;
-            mode = "2560x1440";
-            primary = true;
-            rate = "59.95";
-          };
-
-          fingerprint.HDMI-1 = monitor;
-        };
+        fingerprint.eDP-1 = laptop;
      };
+
+      desktop = {
+        config.HDMI-1 = {
+          enable = true;
+          mode = "2560x1440";
+          primary = true;
+          rate = "59.95";
+        };
+
+        fingerprint.HDMI-1 = monitor;
+      };
+    };
  };
 }
--- a/system/nixos/home-manager/modules/espanso.nix
+++ b/system/nixos/home-manager/modules/espanso.nix
@ -1,7 +1,6 @@
 let
  baseUrl = "https://www.oliverdavies.uk";
-in
-{
+in {
  services.espanso = {
    enable = true;

--- a/system/nixos/home-manager/modules/i3.nix
+++ b/system/nixos/home-manager/modules/i3.nix
@ -1,19 +1,23 @@
-{ config, inputs, self, username, pkgs, ... }:
-
-let
-  modifier = "Mod4";
-in
 {
+  config,
+  inputs,
+  self,
+  username,
+  pkgs,
+  ...
+}: let
+  modifier = "Mod4";
+in {
  xsession.windowManager.i3 = {
    enable = true;

    config = {
      assigns = {
-        "7" = [{ class = "vlc"; }];
-        "8" = [{ class = "0ad"; }];
+        "7" = [{class = "vlc";}];
+        "8" = [{class = "0ad";}];
        "9" = [
-          { class = "Slack"; }
-          { class = "discord"; }
+          {class = "Slack";}
+          {class = "discord";}
        ];
      };

@ -81,47 +85,49 @@ in
    '';

    config = {
-      bars = [{
-        position = "bottom";
-        statusCommand = "${pkgs.i3status}/bin/i3status";
-        colors = {
-          background = "#161616";
-          statusline = "#ffffff";
-          separator = "#333333";
+      bars = [
+        {
+          position = "bottom";
+          statusCommand = "${pkgs.i3status}/bin/i3status";
+          colors = {
+            background = "#161616";
+            statusline = "#ffffff";
+            separator = "#333333";

-          focusedWorkspace = {
-            background = "#444444";
-            border = "#555555";
-            text = "#ffffff";
+            focusedWorkspace = {
+              background = "#444444";
+              border = "#555555";
+              text = "#ffffff";
+            };
+
+            activeWorkspace = {
+              background = "#555555";
+              border = "#666666";
+              text = "#ffffff";
+            };
+
+            inactiveWorkspace = {
+              background = "#111111";
+              border = "#000000";
+              text = "#888888";
+            };
+
+            bindingMode = {
+              background = "#ff0000";
+              border = "#880000";
+              text = "#ffffff";
+            };
+
+            urgentWorkspace = {
+              background = "#ff0000";
+              border = "#880000";
+              text = "#ffffff";
+            };
          };
+        }
+      ];

-          activeWorkspace = {
-            background = "#555555";
-            border = "#666666";
-            text = "#ffffff";
-          };
-
-          inactiveWorkspace = {
-            background = "#111111";
-            border = "#000000";
-            text = "#888888";
-          };
-
-          bindingMode = {
-            background = "#ff0000";
-            border = "#880000";
-            text = "#ffffff";
-          };
-
-          urgentWorkspace = {
-            background = "#ff0000";
-            border = "#880000";
-            text = "#ffffff";
-          };
-        };
-      }];
-
-      fonts.names = [ "GeistMono" ];
+      fonts.names = ["GeistMono"];

      gaps = {
        smartBorders = "on";
--- a/system/shared/home-manager-packages.nix
+++ b/system/shared/home-manager-packages.nix
@ -1,4 +1,8 @@
-{ inputs, pkgs, ... }:
+{
+  inputs,
+  pkgs,
+  ...
+}:
 with pkgs; [
  awscli2
  bottom
--- a/system/shared/home-manager.nix
+++ b/system/shared/home-manager.nix
@ -1,6 +1,9 @@
-{ inputs, pkgs, username, self }:
-
 {
+  inputs,
+  pkgs,
+  username,
+  self,
+}: {
  home.username = "${username}";
  home.homeDirectory = "/home/${username}";

@ -9,7 +12,7 @@
  programs.home-manager.enable = true;

  imports = [
-    (import ./modules/neovim.nix { inherit inputs; })
+    (import ./modules/neovim.nix {inherit inputs;})
    ./modules/git.nix
    ./modules/starship.nix
    ./modules/tmux.nix
@ -38,7 +41,7 @@
    nix-direnv.enable = true;
  };

-  home.sessionPath = [ "$HOME/.config/bin" ];
+  home.sessionPath = ["$HOME/.config/bin"];

  xdg.configFile."ripgrep/config".text = ''
    --follow
--- a/system/shared/modules/git.nix
+++ b/system/shared/modules/git.nix
@ -48,12 +48,10 @@
        current-branch = "rev-parse --abbrev-ref HEAD";
        dc = "diff --color --word-diff --cached";
        df = "diff --color --word-diff";
-        dup =
-          "!git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -";
+        dup = "!git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -";
        fixup = "commit --fixup";
        issues = "!gh issue list --web";
-        mup =
-          "!git master-to-main-wrapper checkout %BRANCH% && git fetch origin && echo && git sl %BRANCH%..origin/%BRANCH% && echo && git pull --quiet && git checkout -";
+        mup = "!git master-to-main-wrapper checkout %BRANCH% && git fetch origin && echo && git sl %BRANCH%..origin/%BRANCH% && echo && git pull --quiet && git checkout -";
        no-ff = "merge --no-ff";
        pl = "pull";
        prune = "remote prune origin";
@ -65,12 +63,10 @@
        repush = "!git pull --rebase && git push";
        ri = "rebase --interactive";
        rid = "!git rebase -i $(git merge-base develop HEAD)";
-        rim =
-          "!git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)";
+        rim = "!git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)";
        rip = "!git rebase -i $(git merge-base production HEAD)";
        ris = "!git rebase -i $(git merge-base staging HEAD)";
-        riu =
-          "!git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})";
+        riu = "!git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})";
        rmup = "!git mup && git master-to-main-wrapper rebase %BRANCH%";
        sl = "log --oneline --decorate -20";
        sla = "log --oneline --decorate --graph --all -20";
@ -92,7 +88,7 @@
        };
        checkout.defaultRemote = "origin";
        color.ui = true;
-        commit = { template = "~/.gitmessage"; };
+        commit = {template = "~/.gitmessage";};
        core = {
          editor = "nvim";
          excludesFile = "~/.config/git/ignore";
--- a/system/shared/modules/neovim.nix
+++ b/system/shared/modules/neovim.nix
@ -1,10 +1,7 @@
-{ inputs }: { pkgs, ... }:
-
-let
+{inputs}: {pkgs, ...}: let
  system = pkgs.system;
-in
-{
-  programs.neovim = inputs.opdavies-nvim.lib.mkHomeManager { inherit system; };
+in {
+  programs.neovim = inputs.opdavies-nvim.lib.mkHomeManager {inherit system;};

  home.file.".markdownlint.yaml".text = ''
    default: true
--- a/system/shared/modules/tmux.nix
+++ b/system/shared/modules/tmux.nix
@ -1,6 +1,4 @@
-{ pkgs, ... }:
-
-{
+{pkgs, ...}: {
  programs.tmux = {
    enable = true;
    terminal = "tmux-256color";
--- a/system/shared/modules/zsh.nix
+++ b/system/shared/modules/zsh.nix
@ -200,19 +200,19 @@
      plugins = [
        {
          name = "themes/robbyrussell";
-          tags = [ "from:oh-my-zsh" "as:theme" ];
+          tags = ["from:oh-my-zsh" "as:theme"];
        }
        {
          name = "plugin/git";
-          tags = [ "from:oh-my-zsh" ];
+          tags = ["from:oh-my-zsh"];
        }
        {
          name = "plugin/vi-mode";
-          tags = [ "from:oh-my-zsh" ];
+          tags = ["from:oh-my-zsh"];
        }
-        { name = "mollifier/cd-gitroot"; }
-        { name = "zsh-users/zsh-completions"; }
-        { name = "zsh-users/zsh-syntax-highlighting"; }
+        {name = "mollifier/cd-gitroot";}
+        {name = "zsh-users/zsh-completions";}
+        {name = "zsh-users/zsh-syntax-highlighting";}
      ];
    };
  };
--- a/system/wsl2/default.nix
+++ b/system/wsl2/default.nix
@ -1,24 +1,28 @@
-{ inputs, pkgs, self, system, username }:
-
-let
-  shared-config = import ../shared/home-manager.nix { inherit inputs pkgs self username; };
-  shared-packages = import ../shared/home-manager-packages.nix { inherit inputs pkgs; };
+{
+  inputs,
+  pkgs,
+  self,
+  system,
+  username,
+}: let
+  shared-config = import ../shared/home-manager.nix {inherit inputs pkgs self username;};
+  shared-packages = import ../shared/home-manager-packages.nix {inherit inputs pkgs;};
 in
-inputs.home-manager.lib.homeManagerConfiguration {
-  inherit pkgs;
+  inputs.home-manager.lib.homeManagerConfiguration {
+    inherit pkgs;

-  modules = [
-    {
-      imports = [ shared-config ];
+    modules = [
+      {
+        imports = [shared-config];

-      home.packages = shared-packages;
+        home.packages = shared-packages;

-      home.sessionVariables = {
-        EDITOR = "nvim";
-        PATH = "$PATH:./vendor/bin:./node_modules/.bin";
-        PULUMI_SKIP_UPDATE_CHECK = "true";
-        RIPGREP_CONFIG_PATH = "$HOME/.config/ripgrep/config";
-      };
-    }
-  ];
-}
+        home.sessionVariables = {
+          EDITOR = "nvim";
+          PATH = "$PATH:./vendor/bin:./node_modules/.bin";
+          PULUMI_SKIP_UPDATE_CHECK = "true";
+          RIPGREP_CONFIG_PATH = "$HOME/.config/ripgrep/config";
+        };
+      }
+    ];
+  }