formatting: testing auto formatter

icecreammatt · Jan 29, 2024 · c1200ce · c1200ce
1 parent ae1178b
commit c1200ce
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 71 deletions.
diff --git a/flake.nix b/flake.nix
@@ -1,9 +1,8 @@
 # This file is the entrypoint into all the system configurations
-
 {
   description = "System configuration for NixOS, Mac, Asahi, RaspberryPi, NixOS VMs";
 
-  inputs = { 
+  inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
     nixos-hardware.url = "github:nixos/nixos-hardware";
@@ -35,35 +34,41 @@
       url = "github:xremap/nix-flake";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
   };
 
-  outputs = inputs @ { self, nixpkgs, nixos-hardware, home-manager, darwin, hyprland, sops-nix, xremap-flake, ... }:
-    {
-
-      # Gaming PC, VM, Raspberry Pi
-      nixosConfigurations = (
-        import ./hosts/nixos {
-          inherit (nixpkgs) lib;
-          inherit inputs nixpkgs nixos-hardware home-manager hyprland sops-nix xremap-flake;
-        }
-      );
-
-      # M1 Mac + Linux config
-      asahiConfiguration = (
-        import ./hosts/asahi {
-          inherit (nixpkgs) lib;
-          inherit inputs nixpkgs home-manager;
-        }
-      );
+  outputs = inputs @ {
+    self,
+    nixpkgs,
+    nixos-hardware,
+    home-manager,
+    darwin,
+    hyprland,
+    sops-nix,
+    xremap-flake,
+    ...
+  }: {
+    # Gaming PC, VM, Raspberry Pi
+    nixosConfigurations = (
+      import ./hosts/nixos {
+        inherit (nixpkgs) lib;
+        inherit inputs nixpkgs nixos-hardware home-manager hyprland sops-nix xremap-flake;
+      }
+    );
 
-      # Mac x86_64/aarch64 configs
-      darwinConfigurations = (
-        import ./hosts/darwin {
-          inherit (nixpkgs) lib;
-          inherit inputs nixpkgs home-manager darwin;
-        }
-      );
+    # M1 Mac + Linux config
+    asahiConfiguration = (
+      import ./hosts/asahi {
+        inherit (nixpkgs) lib;
+        inherit inputs nixpkgs home-manager;
+      }
+    );
 
+    # Mac x86_64/aarch64 configs
+    darwinConfigurations = (
+      import ./hosts/darwin {
+        inherit (nixpkgs) lib;
+        inherit inputs nixpkgs home-manager darwin;
+      }
+    );
   };
 }
diff --git a/modules/core.nix b/modules/core.nix
@@ -1,63 +1,63 @@
 # Programs to install on all systems
 # Modern Unix https://github.com/ibraheemdev/modern-unix
-
-{ pkgs, lib, isDark, ... }:
-
-let
-  # Override to inject light vs dark theme setting
-  helix_custom = import ./editors/helix.nix { inherit isDark; };
-
-  hello = import ./bin/hello.nix { inherit pkgs; };
-in
 {
+  pkgs,
+  isDark,
+  ...
+}: let
+  # Override to inject light vs dark theme setting
+  helix_custom = import ./editors/helix.nix {inherit isDark;};
+
+  hello = import ./bin/hello.nix {inherit pkgs;};
+in {
   home.packages = with pkgs; [
-    # uutils-coreutils - enable once all is ported
-    # wezterm
-    hello
+    alejandra # The Uncompromising Nix Code Formatter
     bandwhich # network monitor
-    bat       # cat alternative
-    bind      # DNS utils
-    bottom    # btm top alternative
-    choose    # awk like tool
+    bat # cat alternative
+    bind # DNS utils
+    bottom # btm top alternative
+    choose # awk like tool
     coreutils
     curl
-    delta     # diff dool
-    direnv    # auto switch to using nix flake on directory nav
-    du-dust   # space visualizer
-    duf       # du alternative
-    eza       # ls alternative
-    fd        # find alternative
-    fishPlugins.bass  # Fish function making it easy to use utilities written for Bash in Fish shell
+    delta # diff dool
+    direnv # auto switch to using nix flake on directory nav
+    du-dust # space visualizer
+    duf # du alternative
+    eza # ls alternative
+    fd # find alternative
+    fishPlugins.bass # Fish function making it easy to use utilities written for Bash in Fish shell
     fzf
     git
     helix
+    hello
     htop
     jq
     lazygit
-    lsof      # list open fils and connections
-    mdcat     # cat for markdown files
-    mprocs    # task runner
-    neofetch  # os summary
-    nix-tree  # tree view of nix flake dependencies
-    nmap      # network scanner utility
-    nnn       # cli explorer
-    ranger    # cli explorer
+    lsof # list open fils and connections
+    mdcat # cat for markdown files
+    mprocs # task runner
+    neofetch # os summary
+    nil # Yet another language server for Nix
+    nix-tree # tree view of nix flake dependencies
+    nmap # network scanner utility
+    nnn # cli explorer
+    ranger # cli explorer
     ripgrep
-    nil       # Yet another language server for Nix
-    alejandra # The Uncompromising Nix Code Formatter
     rsync
-    sad       # find and replace for terminal
-    sd        # like sed but nicer shorthand syntax
-    skim      # fzf in rust
+    sad # find and replace for terminal
+    sd # like sed but nicer shorthand syntax
+    skim # fzf in rust
     time
     tldr
     tree
     unzip
+    # uutils-coreutils - enable once all is ported
+    # wezterm
     wget
-    xh        # http request viewer
-    xplr      # cli explorer
-    yq        # cli yaml parser
-    zoxide    # z shortcut tool
+    xh # http request viewer
+    xplr # cli explorer
+    yq # cli yaml parser
+    zoxide # z shortcut tool
   ];
 
   imports = [
@@ -71,6 +71,5 @@ in
     ./shell/scripts.nix
     ./shell/xplr.nix
     helix_custom
-];
-
-}
+  ];
+}