Format code with alejandra

flake.nix

@@ -56,15 +56,13 @@
     };
   };
 
-  outputs =
+  outputs = {
-    {
     self,
     nixpkgs,
     home-manager,
     systems,
     ...
-    }@inputs:
+  } @ inputs: let
-    let
     inherit (self) outputs;
     lib = nixpkgs.lib // home-manager.lib;
     forEachSystem = f: lib.genAttrs (import systems) (system: f pkgsFor.${system});
@@ -79,8 +77,7 @@
           warn-dirty = false;
         }
     );
-    in
+  in {
-    {
     inherit lib;
 
     nixosModules = import ./modules/nixos;

homes/julian/aspi.nix

@@ -20,11 +20,9 @@
     ./features/suites/cli
     ./features/suites/desktop
     ./features/suites/development
-
   ];
 
   hostName = "aspi";
   is-nixos = true;
   terminal = "kitty";
-
 }

homes/julian/features/alacritty/default.nix

@@ -4,9 +4,7 @@
   inputs,
   config,
   ...
-}:
+}: {
-
-{
   home.packages = with pkgs; [alacritty];
 
   home.file = {

homes/julian/features/desktop/default.nix

@@ -3,11 +3,9 @@
   pkgs,
   inputs,
   ...
-}:
+}: let
-let
   inherit (inputs.nix-colors.lib-contrib {inherit pkgs;}) gtkThemeFromScheme;
-in
+in {
-{
   # Do not make conditional, just toggle things on and off
   imports = [inputs.nix-colors.homeManagerModules.default]; # TODO: what does this do
 
@@ -29,6 +27,5 @@ in
       name = "macOS-BigSur";
       size = 24;
     };
-
   };
 }

homes/julian/features/emacs/default.nix

@@ -4,18 +4,13 @@
   config,
   ...
 }:
-
+with lib; let
-with lib;
-
-let
   doomRepoUrl = "https://github.com/doomemacs/doomemacs";
   configRepoUrl = "https://gitlab.julian-mutter.de/julian/emacs-config";
-in
+in {
-{
   home.sessionPath = ["/home/julian/.config/emacs/bin"];
 
-  home.packages =
+  home.packages = with pkgs;
-    with pkgs;
     [
       binutils # native-comp needs 'as', provided by this
 
@@ -30,7 +25,8 @@ in
 
       ## Module dependencies
       (aspellWithDicts (
-        ds: with ds; [
+        ds:
+          with ds; [
             en
             en-computers
             en-science
@@ -46,6 +42,8 @@ in
 
       # Code formatters for use with doom emacs
       nixfmt-rfc-style # nix
+      alejandra # nix
+
       nixd # nix lsp
       dockfmt # docker
       google-java-format # java

homes/julian/features/fish/default.nix

@@ -3,10 +3,7 @@
   pkgs,
   ...
 }:
-
+with lib; {
-with lib;
-
-{
   home.file = {
     ".config/starship.toml".source = ./starship.toml;
     ".config/fish/conf.d/last-working-dir.fish".source = ./last-working-dir.fish;

homes/julian/features/fonts/default.nix

@@ -4,10 +4,7 @@
   config,
   ...
 }:
-
+with lib; {
-with lib;
-
-{
   fonts.fontconfig.enable = true; # required to autoload fonts from packages
   home.packages = with pkgs; [
     nerd-fonts.fira-code

homes/julian/features/gammastep/default.nix

@@ -9,6 +9,5 @@
     settings = {
       general.adjustment-method = "wayland";
     };
-
   };
 }

homes/julian/features/hyprland/default.nix

@@ -4,14 +4,12 @@
   config,
   lib,
   ...
-}:
+}: let
-
+  inherit
-let
+    (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
-  inherit (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
     palette
     ;
-in
+in {
-{
   imports = [
     # inputs.hyprland.homeManagerModules.default
     ./waybar

homes/julian/features/hyprland/hyprbars.nix

@@ -4,8 +4,7 @@
   lib,
   outputs,
   ...
-}:
+}: let
-let
   getHostname = x: lib.last (lib.splitString "@" x);
   # remoteColorschemes = lib.mapAttrs' (n: v: {
   #   name = getHostname n;
@@ -27,8 +26,7 @@ let
           ${lib.getExe pkgs.gnused} -i '/Initialized successfully/d' main.cpp
         '';
     });
-in
+in {
-{
   wayland.windowManager.hyprland = {
     plugins = [hyprbars];
     settings = {
@@ -40,8 +38,7 @@ in
         # bar_text_size = config.fontProfiles.regular.size;
         bar_part_of_window = true;
         bar_precedence_over_border = true;
-        hyprbars-button =
+        hyprbars-button = let
-          let
           closeAction = "hyprctl dispatch killactive";
 
           isOnSpecial = ''hyprctl activewindow -j | jq -re 'select(.workspace.name == "special")' >/dev/null'';
@@ -50,8 +47,7 @@ in
           minimizeAction = "${isOnSpecial} && ${moveToActive} || ${moveToSpecial}";
 
           maximizeAction = "hyprctl dispatch fullscreen 1";
-          in
+        in [
-          [
           # Red close button
           # "${rgb config.colorscheme.colors.red},12,,${closeAction}"
           # # Yellow "minimize" (send to special workspace) button

homes/julian/features/hyprland/hyprlock/default.nix

@@ -5,13 +5,12 @@
   pkgs,
   inputs,
   ...
-}:
+}: let
-let
+  inherit
-  inherit (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
+    (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
     palette
     ;
-in
+in {
-{
   programs.hyprlock.enable = true;
   programs.hyprlock.settings = {
     general = {

homes/julian/features/hyprland/mako/default.nix

@@ -5,13 +5,12 @@
   pkgs,
   inputs,
   ...
-}:
+}: let
-let
+  inherit
-  inherit (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
+    (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
     palette
     ;
-in
+in {
-{
   home.packages = with pkgs; [libnotify];
 
   services.mako = {

homes/julian/features/hyprland/swayidle.nix

@@ -3,8 +3,7 @@
   lib,
   config,
   ...
-}:
+}: let
-let
   swaylock = "${config.programs.swaylock.package}/bin/swaylock";
   pgrep = "${pkgs.procps}/bin/pgrep";
   pactl = "${pkgs.pulseaudio}/bin/pactl";
@@ -15,13 +14,11 @@ let
   lockTime = 4 * 60; # TODO: configurable desktop (10 min)/laptop (4 min)
 
   # Makes two timeouts: one for when the screen is not locked (lockTime+timeout) and one for when it is.
-  afterLockTimeout =
+  afterLockTimeout = {
-    {
     timeout,
     command,
     resumeCommand ? null,
-    }:
+  }: [
-    [
     {
       timeout = lockTime + timeout;
       inherit command resumeCommand;
@@ -31,8 +28,7 @@ let
       inherit resumeCommand timeout;
     }
   ];
-in
+in {
-{
   services.swayidle = {
     enable = true;
     systemdTarget = "graphical-session.target";

homes/julian/features/hyprland/swaylock.nix

@@ -2,11 +2,9 @@
   config,
   pkgs,
   ...
-}:
+}: let
-let
   inherit (config.colorscheme) colors;
-in
+in {
-{
   programs.swaylock = {
     enable = true;
     settings = {

homes/julian/features/hyprland/waybar/default.nix

@@ -5,11 +5,9 @@
   lib,
   inputs,
   ...
-}:
+}: let
-let
   palette = (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name}).palette;
-in
+in {
-{
   programs.waybar = {
     enable = true;
     systemd.enable = true;

homes/julian/features/hyprland/waypipe.nix

@@ -3,8 +3,7 @@
   lib,
   config,
   ...
-}:
+}: {
-{
   home.packages = [pkgs.waypipe];
   systemd.user.services = {
     waypipe-client = {

homes/julian/features/hyprland/wlogout/default.nix

@@ -5,13 +5,12 @@
   pkgs,
   inputs,
   ...
-}:
+}: let
-let
+  inherit
-  inherit (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
+    (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
     palette
     ;
-in
+in {
-{
   home.packages = with pkgs; [wlogout];
 
   # xdg.configFile."wlogout/style.css".text = ''

homes/julian/features/hyprland/wofi/default.nix

@@ -5,13 +5,12 @@
   pkgs,
   inputs,
   ...
-}:
+}: let
-let
+  inherit
-  inherit (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
+    (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
     palette
     ;
-in
+in {
-{
   home.packages = with pkgs; [wofi];
 
   xdg.configFile."wofi/config".source = ./config;

homes/julian/features/hyprland/zathura.nix

@@ -1,8 +1,6 @@
-{ config, ... }:
+{config, ...}: let
-let
   inherit (config.colorscheme) colors;
-in
+in {
-{
   programs.zathura = {
     enable = true;
     options = {

homes/julian/features/i3/default.nix

@@ -3,8 +3,7 @@
   pkgs,
   config,
   ...
-}:
+}: {
-{
   imports = [../rofi];
 
   services.dunst.enable = true;
@@ -36,7 +35,9 @@
 
   # Overwrite default home-manager config file
   xdg.configFile."i3/config".source = lib.mkForce (
-    if config.hostName == "kardorf" then ./i3/config-kardorf else ./i3/config
+    if config.hostName == "kardorf"
+    then ./i3/config-kardorf
+    else ./i3/config
   );
 
   home.file = {

homes/julian/features/kitty/default.nix

@@ -3,9 +3,7 @@
   pkgs,
   config,
   ...
-}:
+}: {
-
-{
   programs.kitty = {
     enable = true;
     shellIntegration.enableFishIntegration = true;

homes/julian/features/neovim/default.nix

@@ -3,10 +3,7 @@
   pkgs,
   inputs,
   ...
-}:
+}: {
-
-{
-
   imports = [inputs.nixvim.homeManagerModules.nixvim];
 
   home.sessionVariables = {
@@ -39,7 +36,6 @@
     opts = {
       number = false;
       relativenumber = false;
-
     };
     clipboard.register = "unnamedplus"; # Use system clipboard
 
@@ -157,8 +153,6 @@
           lua_ls.enable = true;
         };
       };
-
     };
-
   };
 }

homes/julian/features/nix-helper/default.nix

@@ -2,9 +2,7 @@
   lib,
   pkgs,
   ...
-}:
+}: {
-
-{
   home.sessionVariables = {
     FLAKE = "/home/julian/.dotfiles";
   };

homes/julian/features/rofi/default.nix

@@ -2,9 +2,7 @@
   lib,
   pkgs,
   ...
-}:
+}: {
-
-{
   # this would need you to config rofi using home-manager
   # programs.rofi = { enable = true; };
 

homes/julian/features/suites/cli/default.nix

@@ -1,9 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  ...
-}:
-
-{
   home.packages = with pkgs; [
     bat
     du-dust # Like du tree but better

homes/julian/features/suites/desktop/default.nix

@@ -2,9 +2,7 @@
   lib,
   pkgs,
   ...
-}:
+}: {
-
-{
   services.blueman-applet.enable = true;
   services.nextcloud-client.enable = true;
   services.nextcloud-client.startInBackground = true;

homes/julian/features/suites/development/default.nix

@@ -1,10 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  ...
-}:
-
-{
-
   home.packages = with pkgs; [
     watchexec # Run command when any file in current dir changes
     android-tools # adb
@@ -29,7 +23,8 @@
     julia-bin
     (texlive.combine {
       # for rendering latex in inkscape
-      inherit (texlive)
+      inherit
+        (texlive)
         scheme-medium
         standalone
         amsmath

homes/julian/features/topgrade/default.nix

@@ -7,8 +7,7 @@
       misc.assume_yes = true;
       misc.no_retry = true;
 
-      pre_commands."Update flake" =
+      pre_commands."Update flake" = "git -C /home/julian/.dotfiles checkout origin/flake-updates -- flake.lock";
-        "git -C /home/julian/.dotfiles checkout origin/flake-updates -- flake.lock";
 
       linux.nix_arguments = "--flake /home/julian/.dotfiles";
       linux.home_manager_arguments = [

homes/julian/features/wezterm/default.nix

@@ -3,9 +3,7 @@
   pkgs,
   config,
   ...
-}:
+}: {
-
-{
   programs.wezterm = {
     enable = true;
     extraConfig = ''

homes/julian/features/yazi/default.nix

@@ -2,8 +2,7 @@
   pkgs,
   inputs,
   ...
-}:
+}: {
-{
   programs.zoxide.enable = true;
   programs.zoxide.enableFishIntegration = true;
 

homes/julian/features/zsh/default.nix

@@ -2,8 +2,7 @@
   lib,
   pkgs,
   ...
-}:
+}: {
-{
   home.file = {
     ".config/starship.toml".source = ./starship.toml;
   };

homes/julian/global/default.nix

@@ -5,13 +5,14 @@
   config,
   outputs,
   ...
-}:
+}: {
-{
+  imports =
-  imports = [
+    [
       ../features/fonts
       # ../features/cli
       # ../features/helix
-  ] ++ (builtins.attrValues outputs.homeManagerModules);
+    ]
+    ++ (builtins.attrValues outputs.homeManagerModules);
 
   nix = {
     package = lib.mkDefault pkgs.nix;
@@ -51,5 +52,4 @@
   # home.file = {
   #   ".colorscheme.json".text = builtins.toJSON config.colorscheme;
   # };
-
 }

homes/julian/global/mimeapps.nix

@@ -6,9 +6,11 @@
 #   inherit pkgs;
 #   inherit lib;
 # };
-
+{
-{ lib, pkgs, ... }:
+  lib,
-let
+  pkgs,
+  ...
+}: let
   package-names = with pkgs; {
     "x-scheme-handler/tg" = telegram-desktop;
     "x-scheme-handler/mailto" = thunderbird;
@@ -42,4 +44,5 @@ let
 in
   lib.mapAttrs (mimeType: package: [
     "${package}/share/applications/${package.pname}.desktop"
-]) package-names
+  ])
+  package-names

homes/julian/hm-standalone-config.nix

@@ -1,9 +1,5 @@
 # Only apply this to home-manager standalone
-{
+{outputs, ...}: {
-  outputs,
-  ...
-}:
-{
   # Apply overlays
   nixpkgs = {
     overlays = builtins.attrValues outputs.overlays;
@@ -43,6 +39,5 @@
     ];
 
     # nix.settings. # warn-dirty = false; # TODO: do I want this
-
   };
 }

homes/julian/kardorf.nix

@@ -17,11 +17,9 @@
     ./features/suites/cli
     ./features/suites/desktop
     ./features/suites/development
-
   ];
 
   hostName = "kardorf";
   is-nixos = true;
   terminal = "kitty";
-
 }

homes/julian/pianonix.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  ...
-}:
-{
   imports = [
     ./global
 
@@ -34,8 +30,7 @@
 
   # Autostart link
   home.file = {
-    ".config/autostart/sheet-organizer.desktop".source =
+    ".config/autostart/sheet-organizer.desktop".source = "${pkgs.sheet-organizer}/share/applications/sheet-organizer.desktop";
-      "${pkgs.sheet-organizer}/share/applications/sheet-organizer.desktop";
     ".config/sheet-organizer/config.toml".text = ''
       working_directory = "/home/julian/Klavier"
     '';

homes/julian/v3ms/default.nix

@@ -2,8 +2,7 @@
   lib,
   pkgs,
   ...
-}:
+}: {
-{
   imports = [
     ../global
 

homes/julian/v3ms/fonts.nix

@@ -1,7 +1,5 @@
 {pkgs, ...}:
-
+with pkgs; [
-with pkgs;
-[
   nerd-fonts.fira-code
   font-awesome
   dejavu_fonts

homes/julian/v3ms/packages.nix

@@ -1,7 +1,5 @@
 {pkgs, ...}:
-
+with pkgs; [
-with pkgs;
-[
   # Rust setup
   rustc
   rustfmt

hosts/aspi/default.nix

@@ -46,5 +46,4 @@
 
   # Enable touchpad support
   services.libinput.enable = true;
-
 }

hosts/aspi/hardware-configuration.nix

@@ -2,9 +2,7 @@
   config,
   lib,
   ...
-}:
+}: {
-
-{
   boot.initrd.availableKernelModules = [
     "vmd"
     "xhci_pci"

hosts/builder/default.nix

@@ -1,9 +1,11 @@
 # sudo nixos-rebuild switch --flake .#builder --target-host root@192.168.3.118
 # or
 # deploy .#builder
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     ./hardware-configuration.nix
 
@@ -209,8 +211,7 @@
     };
 
     virtualHosts."binarycache.julian-mutter.de" = {
-      locations."/".proxyPass =
+      locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
-        "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
     };
 
     clientMaxBodySize = "2G";

hosts/builder/hardware-configuration.nix

@@ -7,9 +7,7 @@
   pkgs,
   modulesPath,
   ...
-}:
+}: {
-
-{
   imports = [(modulesPath + "/profiles/qemu-guest.nix")];
 
   boot.initrd.availableKernelModules = [

hosts/common/global/default.nix

@@ -1,11 +1,9 @@
 # Common config for all hosts
-
 {
   inputs,
   outputs,
   ...
-}:
+}: {
-{
   imports =
     [
       ./fish.nix # fish for admin
@@ -34,5 +32,4 @@
   home-manager.extraSpecialArgs = {
     inherit inputs outputs;
   };
-
 }

hosts/common/global/nix.nix

@@ -2,9 +2,7 @@
   lib,
   outputs,
   ...
-}:
+}: {
-{
-
   # Apply overlays
   nixpkgs = {
     # TODO: apply this to hm and nixos without duplicate code
@@ -61,5 +59,4 @@
   # Add each flake input as a registry and nix_path
   # registry = lib.mapAttrs (_: flake: { inherit flake; }) flakeInputs;
   # nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
-
 }

hosts/common/global/root.nix

@@ -1,6 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-
-{
   # Packages needed as root
   environment.systemPackages = with pkgs; [
     vim

hosts/common/global/sops.nix

@@ -2,13 +2,11 @@
   inputs,
   config,
   ...
-}:
+}: let
-let
   isEd25519 = k: k.type == "ed25519";
   getKeyPath = k: k.path;
   keys = builtins.filter isEd25519 config.services.openssh.hostKeys;
-in
+in {
-{
   imports = [inputs.sops-nix.nixosModules.sops];
 
   sops.age = {
@@ -18,7 +16,6 @@ in
     keyFile = "/home/julian/.config/sops/age/keys.txt";
     # Generate key if none of the above worked. With this, building will still work, just without secrets
     generateKey = true;
-
   };
 
   sops.defaultSopsFile = ../secrets.yaml;

hosts/common/optional/authentication.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   # Make programs like nextcloud client access saved passwords
   programs.seahorse.enable = true;
   services.gnome.gnome-keyring.enable = true;

hosts/common/optional/flatpak.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  ...
-}:
-{
   services.flatpak.enable = true;
   xdg.portal.enable = true;
   xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-gtk];

hosts/common/optional/gamemode.nix

@@ -1,6 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
-
   programs.gamemode = {
     enable = true;
     settings = {
@@ -20,5 +18,4 @@
       };
     };
   };
-
 }

hosts/common/optional/gdm.nix

@@ -3,10 +3,7 @@
   lib,
   pkgs,
   ...
-}:
+}: {
-
-{
-
   services.xserver.displayManager.gdm = {
     enable = true;
   };

hosts/common/optional/greetd.nix

@@ -3,17 +3,14 @@
   lib,
   config,
   ...
-}:
+}: let
-let
   homeCfgs = config.home-manager.users;
   homeSharePaths = lib.mapAttrsToList (_: v: "${v.home.path}/share") homeCfgs;
   vars = ''XDG_DATA_DIRS="$XDG_DATA_DIRS:${lib.concatStringsSep ":" homeSharePaths}" GTK_USE_PORTAL=0'';
 
   julianCfg = homeCfgs.julian;
 
-  sway-kiosk =
+  sway-kiosk = command: "${lib.getExe pkgs.sway} --unsupported-gpu --config ${pkgs.writeText "kiosk.config" ''
-    command:
-    "${lib.getExe pkgs.sway} --unsupported-gpu --config ${pkgs.writeText "kiosk.config" ''
     output * bg #000000 solid_color
     xwayland disable
     input "type:touchpad" {
@@ -21,8 +18,7 @@ let
     }
     exec '${vars} ${command}; ${pkgs.sway}/bin/swaymsg exit'
   ''}";
-in
+in {
-{
   users.extraUsers.greeter = {
     # For caching and such
     home = "/tmp/greeter-home";

hosts/common/optional/hyprland.nix

@@ -4,10 +4,7 @@
   pkgs,
   inputs,
   ...
-}:
+}: {
-
-{
-
   programs.hyprland.enable = true;
   programs.hyprland.package = inputs.hyprland.packages.${pkgs.system}.hyprland; # does only work with nixos-unstable
   programs.hyprland.xwayland.enable = true;

hosts/common/optional/i3.nix

@@ -3,8 +3,7 @@
   lib,
   pkgs,
   ...
-}:
+}: {
-{
   services.xserver.windowManager.i3.enable = true;
   services.xserver.windowManager.i3.package = pkgs.i3-gaps;
   services.displayManager.defaultSession = "none+i3";

hosts/common/optional/kerberos.nix

@@ -1,5 +1,4 @@
 {
-
   security.krb5.enable = true;
   security.krb5.settings = {
     # domain_realm = {

hosts/common/optional/openssh.nix

@@ -3,11 +3,9 @@
   lib,
   config,
   ...
-}:
+}: let
-let
   hosts = lib.attrNames outputs.nixosConfigurations;
-in
+in {
-{
   services.openssh = {
     enable = true;
     settings = {
@@ -48,5 +46,4 @@ in
   #       ]);
   #   });
   # };
-
 }

hosts/common/optional/pcmanfm.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  ...
-}:
-{
   environment.systemPackages = with pkgs; [
     shared-mime-info # extended mimetype support
     lxde.lxmenu-data # open with "Installed Applications"

hosts/common/optional/podman.nix

@@ -1,8 +1,6 @@
-{ config, ... }:
+{config, ...}: let
-let
   dockerEnabled = config.virtualisation.docker.enable;
-in
+in {
-{
   virtualisation.podman = {
     enable = true;
     dockerCompat = !dockerEnabled;

hosts/common/optional/redshift.nix

@@ -3,10 +3,7 @@
   lib,
   pkgs,
   ...
-}:
+}: {
-
-{
-
   # Set location used by redshift
   location.provider = "manual";
   location.latitude = 47.92;

hosts/common/optional/thunar.nix

@@ -3,10 +3,7 @@
   lib,
   pkgs,
   ...
-}:
+}: {
-
-{
-
   programs.thunar.enable = true;
   programs.xfconf.enable = true; # Persist saved preferences
   programs.thunar.plugins = with pkgs.xfce; [

hosts/common/optional/virtualbox.nix

@@ -3,10 +3,7 @@
   lib,
   pkgs,
   ...
-}:
+}: {
-
-{
-
   virtualisation.virtualbox.host.enable = true;
   # virtualisation.virtualbox.host.enableExtensionPack = true;
   # virtualisation.virtualbox.guest.enable = true;

hosts/common/users/julian/default.nix

@@ -3,11 +3,9 @@
   config,
   lib,
   ...
-}:
+}: let
-let
   ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
-in
+in {
-{
   users.mutableUsers = false;
   users.users.julian = {
     description = "Julian";
@@ -45,5 +43,4 @@ in
   home-manager.users.julian = import ../../../../homes/julian/${config.networking.hostName}.nix;
 
   security.pam.services.swaylock = {}; # Make swaylock unlocking work
-
 }

hosts/kardorf/default.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  ...
-}:
-{
   imports = [
     ./hardware-configuration.nix
 

hosts/kardorf/hardware-configuration.nix

@@ -5,9 +5,7 @@
   config,
   lib,
   ...
-}:
+}: {
-
-{
   boot.initrd.availableKernelModules = [
     "ehci_pci"
     "ahci"

hosts/pianonix/default.nix

@@ -1,15 +1,13 @@
 # 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’).
-
 {
   lib,
   inputs,
   config,
   pkgs,
   ...
-}:
+}: {
-{
   imports = [
     inputs.nixos-hardware.nixosModules.raspberry-pi-4
 

hosts/pianonix/hardware-configuration.nix

@@ -7,9 +7,7 @@
   pkgs,
   modulesPath,
   ...
-}:
+}: {
-
-{
   imports = [(modulesPath + "/installer/scan/not-detected.nix")];
 
   boot.initrd.availableKernelModules = ["xhci_pci"];

modules/home-manager/colors.nix

@@ -1,11 +1,6 @@
-{
+{lib, ...}: let
-  lib,
-  ...
-}:
-let
   inherit (lib) types mkOption;
-in
+in {
-{
   options.colorscheme = {
     name = mkOption {
       type = types.str;

modules/home-manager/fonts.nix

@@ -2,8 +2,7 @@
   lib,
   config,
   ...
-}:
+}: let
-let
   mkFontOption = kind: {
     name = lib.mkOption {
       type = lib.types.str;
@@ -25,8 +24,7 @@ let
     };
   };
   cfg = config.fontProfiles;
-in
+in {
-{
   options.fontProfiles = {
     enable = lib.mkEnableOption "Whether to enable font profiles";
     monospace = mkFontOption "monospace";

modules/home-manager/hostname.nix

@@ -1,11 +1,6 @@
-{
+{lib, ...}: let
-  lib,
-  ...
-}:
-let
   inherit (lib) types mkOption;
-in
+in {
-{
   options.hostName = mkOption {
     type = types.str;
   };

modules/home-manager/monitors.nix

@@ -2,11 +2,9 @@
   lib,
   config,
   ...
-}:
+}: let
-let
   inherit (lib) mkOption types;
-in
+in {
-{
   options.monitors = mkOption {
     type = types.listOf (
       types.submodule {

modules/home-manager/non-nixos.nix

@@ -1,11 +1,6 @@
-{
+{lib, ...}: let
-  lib,
-  ...
-}:
-let
   inherit (lib) types mkOption;
-in
+in {
-{
   options.is-nixos = mkOption {
     type = types.bool;
   };

modules/home-manager/terminal.nix

@@ -3,8 +3,7 @@
   lib,
   pkgs,
   ...
-}:
+}: {
-{
   options.terminal = lib.mkOption {
     type = lib.types.str;
     example = "alacritty";

modules/nixos/syncthing.nix

@@ -2,12 +2,9 @@
   lib,
   config,
   ...
-}:
+}: let
-
-let
   cfg = config.modules.syncthing;
-in
+in {
-{
   options.modules.syncthing = {
     enable = lib.mkOption {default = false;};
     overrideSettings = lib.mkOption {default = false;};

overlays/default.nix

@@ -1,20 +1,19 @@
-{
+{inputs, ...}: {
-  inputs,
-  ...
-}:
-{
   # For every flake input, aliases 'pkgs.inputs.${flake}' to
   # 'inputs.${flake}.packages.${pkgs.system}' or
   # 'inputs.${flake}.legacyPackages.${pkgs.system}'
   flake-inputs = final: _: {
-    inputs = builtins.mapAttrs (
+    inputs =
-      _: flake:
+      builtins.mapAttrs (
-      let
+        _: flake: let
           legacyPackages = (flake.legacyPackages or {}).${final.system} or {};
           packages = (flake.packages or {}).${final.system} or {};
         in
-      if legacyPackages != { } then legacyPackages else packages
+          if legacyPackages != {}
-    ) inputs;
+          then legacyPackages
+          else packages
+      )
+      inputs;
   };
 
   input-flake-packages = final: prev: {
@@ -44,5 +43,4 @@
   };
 
   nix-matlab = inputs.nix-matlab.overlay;
-
 }

pkgs/acer-battery-health-mode/default.nix

@@ -2,7 +2,6 @@
   writeShellApplication,
   kmod,
 }:
-
 writeShellApplication {
   name = "acer-battery-health-mode";
 

pkgs/conda-direnv/default.nix

@@ -3,7 +3,6 @@
   yq,
   writeShellApplication,
 }:
-
 writeShellApplication {
   name = "conda-direnv";
 

pkgs/default.nix

@@ -1,8 +1,4 @@
-{
+{pkgs ? import <nixpkgs> {}, ...}: {
-  pkgs ? import <nixpkgs> { },
-  ...
-}:
-{
   conda-direnv = pkgs.callPackage ./conda-direnv {};
   deploy-to-pianopi = pkgs.callPackage ./deploy-to-pianopi {};
   edit-config = pkgs.callPackage ./edit-config {};

pkgs/deploy-to-pianopi/default.nix

@@ -2,7 +2,6 @@
   rsync,
   writeShellApplication,
 }:
-
 writeShellApplication {
   name = "deploy-to-pianopi";
 

pkgs/hyprshot-gui/default.nix

@@ -7,7 +7,6 @@
   hyprshot,
   zenity,
 }:
-
 stdenv.mkDerivation rec {
   pname = "hyprshot-gui";
   version = "2023-10-20";

pkgs/install/default.nix

@@ -1,4 +1,8 @@
-{ writeShellScriptBin, gum, ... }:
+{
+  writeShellScriptBin,
+  gum,
+  ...
+}:
 # https://github.com/IogaMaster/dotfiles/blob/main/packages/install/default.nix
 writeShellScriptBin "install" ''
   ${gum}/bin/gum style --border normal --margin "1" --padding "1 2" --border-foreground 212 "✨ IogaMaster's dotfiles installer ✨"

pkgs/lntocp/default.nix

@@ -1,7 +1,4 @@
-{
+{writeShellApplication}:
-  writeShellApplication,
-}:
-
 writeShellApplication {
   name = "lntocp";
 

pkgs/open-messaging/default.nix

@@ -4,7 +4,6 @@
   telegram-desktop,
   thunderbird,
 }:
-
 writeShellApplication {
   name = "open-messaging";
 

pkgs/pob2/default.nix

@@ -5,8 +5,7 @@
   fetchFromGitHub,
   unzip,
   ...
-}:
+}: let
-let
   data = stdenv.mkDerivation (finalAttrs: {
     pname = "path-of-building-data";
     version = "dev-version";

pkgs/pulseaudio-popup/default.nix

@@ -4,7 +4,6 @@
   jgmenu,
   pulseaudio,
 }:
-
 writeShellApplication {
   name = "pulseaudio-popup";
 

pkgs/sos/default.nix

@@ -3,7 +3,6 @@
   nix-output-monitor,
   jq,
 }:
-
 writeShellApplication {
   name = "sos";
 

pkgs/wl-ocr/default.nix

@@ -8,8 +8,7 @@
   tesseract5,
   wl-clipboard,
   langs ? "eng+hun+fra+jpn+jpn_vert+kor+kor_vert+pol+ron+spa",
-}:
+}: let
-let
   _ = lib.getExe;
 in
   writeShellScriptBin "wl-ocr" ''

pkgs/xwacomcalibrate/default.nix

@@ -5,7 +5,6 @@
   xdotool,
   bc,
 }:
-
 writeShellApplication {
   name = "xwacomcalibrate";
 

shell.nix

@@ -1,8 +1,4 @@
-{
+{pkgs ? import <nixpkgs> {}, ...}: {
-  pkgs ? import <nixpkgs> { },
-  ...
-}:
-{
   default = pkgs.mkShell {
     NIX_CONFIG = "extra-experimental-features = nix-command flakes ca-derivations";
     nativeBuildInputs = with pkgs; [

shells/default/default.nix

@@ -4,11 +4,12 @@
   lib,
   # You also have access to your flake's inputs.
   inputs,
-
   # All other arguments come from NixPkgs. You can use `pkgs` to pull shells or helpers
   # programmatically or you may add the named attributes as arguments here.
-pkgs, stdenv, ... }:
+  pkgs,
-
+  stdenv,
+  ...
+}:
 pkgs.mkShell {
   # Create your shell
 }