Makefile

@@ -1,5 +0,0 @@
-check:
-	alejandra --check ./**/*.nix
-
-format:
-	alejandra ./**/*.nix

flake.nix

@@ -34,20 +34,8 @@
     };
   };
 
-  outputs = {
+  outputs = { self, nixpkgs, unstable, nur, utils, rust-overlay, nix-vscode-extensions, nixos-wsl, vscode-server, darwin, home-manager, ... }@inputs: {
-    self,
+
-    nixpkgs,
-    unstable,
-    nur,
-    utils,
-    rust-overlay,
-    nix-vscode-extensions,
-    nixos-wsl,
-    vscode-server,
-    darwin,
-    home-manager,
-    ...
-  } @ inputs: {
     # This repo's overlay plus any other overlays you use
     # If you want to use packages from flakes that are not nixpkgs (such as NUR), add their overlays here.\
     overlays = {
@@ -67,6 +55,7 @@
     };
 
     nixosConfigurations = {
+
       loft = nixpkgs.lib.nixosSystem {
         system = utils.lib.system.x86_64-linux;
         modules = [
@@ -107,6 +96,7 @@
         ];
         specialArgs = { inherit inputs; };
       };
+
     };
 
     darwinConfigurations = {
@@ -133,11 +123,8 @@
         homeDirectory = "/home/michael";
         username = "michael";
         stateVersion = "21.05";
-        configuration = {
+        configuration = { config, pkgs, ... }:
-          config,
+          {
-          pkgs,
-          ...
-        }: {
             programs.home-manager.enable = true;
 
             imports = [
@@ -151,11 +138,8 @@
         homeDirectory = "/home/michael";
         username = "michael";
         stateVersion = "21.05";
-        configuration = {
+        configuration = { config, pkgs, ... }:
-          config,
+          {
-          pkgs,
-          ...
-        }: {
             programs.home-manager.enable = true;
 
             imports = [
@@ -169,11 +153,8 @@
         homeDirectory = "/Users/michael";
         username = "michael";
         stateVersion = "22.05";
-        configuration = {
+        configuration = { config, pkgs, ... }:
-          config,
+          {
-          pkgs,
-          ...
-        }: {
             programs.home-manager.enable = true;
 
             imports = [
@@ -182,6 +163,7 @@
           };
       };
     };
+
   };
   # // utils.lib.eachSystem [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ] (system: {
   # 	nixpkgs = import nixpkgs {

machines/kitchen/configuration.nix

@@ -1,13 +1,12 @@
 # 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’).
+
+{ config, pkgs, ... }:
+
 {
-  config,
+	imports =
-  pkgs,
+		[ # Include the results of the hardware scan.
-  ...
-}: {
-  imports = [
-    # Include the results of the hardware scan.
 			./hardware-configuration.nix
 		];
 
@@ -73,4 +72,5 @@
 	# Before changing this value read the documentation for this option
 	# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
 	system.stateVersion = "22.05"; # Did you read the comment?
+
 }

machines/kitchen/hardware-configuration.nix

@@ -1,13 +1,9 @@
 # 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") ];
 
 	boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];

machines/loft/configuration.nix

@@ -1,13 +1,12 @@
 # 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’).
+
+{ config, pkgs, ... }:
+
 {
-  config,
+	imports =
-  pkgs,
+		[ # Include the results of the hardware scan.
-  ...
-}: {
-  imports = [
-    # Include the results of the hardware scan.
 			./hardware-configuration.nix
 		];
 
@@ -69,8 +68,7 @@
 	# List packages installed in system profile. To search, run:
 	# $ nix search wget
 	environment.systemPackages = with pkgs; [
-    wget
+		wget micro
-    micro
 		google-chrome
 		gnome3.gnome-tweaks
 		gnomeExtensions.gsconnect
@@ -102,4 +100,5 @@
 	# Before changing this value read the documentation for this option
 	# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
 	system.stateVersion = "20.09"; # Did you read the comment?
+
 }

machines/loft/hardware-configuration.nix

@@ -1,13 +1,9 @@
 # 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") ];
 
 	boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];

machines/mac/configuration.nix

@@ -1,8 +1,6 @@
+{ config, pkgs, ... }:
+
 {
-  config,
-  pkgs,
-  ...
-}: {
   users.users.michael = {
     home = "/Users/michael";
     shell = pkgs.zsh;

machines/work/configuration.nix

@@ -1,13 +1,10 @@
-{
+{ lib, pkgs, modulesPath, inputs, ... }:
-  lib,
+
-  pkgs,
+with lib;
-  modulesPath,
+let
-  inputs,
-  ...
-}:
-with lib; let
   defaultUser = "michael";
-in {
+in
+{
   imports = [
     "${modulesPath}/profiles/minimal.nix"
 

modules/containers.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
 	# Enable Podman w/ docker compose compatibility
 	virtualisation.podman = {
 		enable = true;

modules/cups.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
 	# Enable CUPS to print documents.
 	services.printing = {
 		enable = true;

modules/fonts.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
 	# Font Settings
 	fonts = {
 		fonts = with pkgs; [

modules/nix.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }: 
+{
 	nix = {
 		extraOptions = ''
 			experimental-features = flakes nix-command

overlays/default.nix

@@ -1,13 +1,10 @@
-{
+{ nixpkgs, unstable, ... }:
-  nixpkgs,
+
-  unstable,
+let
-  ...
-}: let
   inherit (nixpkgs.lib) composeManyExtensions;
   inherit (builtins) attrNames readDir;
-  localOverlays =
+  localOverlays = map
-    map
     (f: import (./default + "/${f}"))
     (attrNames (readDir ./default));
 in
-  composeManyExtensions localOverlays
+composeManyExtensions (localOverlays)

overlays/default/paperwm.nix

@@ -1,7 +1,5 @@
 self: super: {
-  gnomeExtensions =
+	gnomeExtensions = super.gnomeExtensions // {
-    super.gnomeExtensions
-    // {
 		paperwm = super.gnomeExtensions.paperwm.overrideDerivation (old: {
 			version = "43.0";
 			src = super.fetchFromGitHub {

user/environments/mac/home.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   imports = [
     ../../modules/zsh.nix
     ../../modules/dev.nix

user/environments/wsl/home.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
 	imports = [
 		../../modules/dev.nix
 		../../modules/git.nix

user/modules/dev.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   home.packages = with pkgs; [
     # devbox
     unstable.devbox
@@ -17,7 +18,7 @@
     kubernetes-helm
     # Nix
     nil
-    alejandra
+    nixpkgs-fmt
     # Rust
     (rust-bin.stable.latest.default.override {
       extensions = [ "rust-src" ];

user/modules/firefox.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   # Add Firefox GNOME theme directory
   home.file."firefox-gnome-theme" = {
     target = ".mozilla/firefox/default/chrome/firefox-gnome-theme";

user/modules/fonts.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
 	home.packages = with pkgs; [
 		(nerdfonts.override { fonts = [ "FiraCode" ]; })
 		google-fonts

user/modules/git.nix

@@ -1,8 +1,5 @@
+{ pkgs, lib, ... }:
 {
-  pkgs,
-  lib,
-  ...
-}: {
 	home.packages = with pkgs; [
 		git-lfs
 	];

user/modules/git_nixos.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
 	# Use pkgs.gitAndTools.gitFull in order to get libsecret support
 	programs.git = {
 		package = pkgs.gitAndTools.gitFull;

user/modules/gnome.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
 	home.packages = with pkgs; [
 		gnomeExtensions.caffeine
 		unstable.gnomeExtensions.paperwm

user/modules/nvim.nix

@@ -1,8 +1,5 @@
+{ pkgs, config, ... }:
 {
-  pkgs,
-  config,
-  ...
-}: {
   programs.neovim = {
     enable = true;
   };
@@ -12,8 +9,7 @@
   };
 
   # Copy Neovim config
-  xdg.configFile.nvim.source =
+  xdg.configFile.nvim.source = config.lib.file.mkOutOfStoreSymlink
-    config.lib.file.mkOutOfStoreSymlink
     "${config.home.homeDirectory}/Projects/nix-dots/user/modules/nvim";
 
 	home.packages = with pkgs; [

user/modules/nvim/lua/config/keymaps.lua

@@ -1,8 +1,3 @@
 -- Keymaps are automatically loaded on the VeryLazy event
 -- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
 -- Add any additional keymaps here
-
-local keymap = vim.keymap
-
--- Select all
-keymap.set("n", "<C-a>", "gg<S-v>G$")

user/modules/nvim/lua/plugins/lsp.lua

@@ -42,14 +42,4 @@ return {
       },
     },
   },
-  {
-    "stevearc/conform.nvim",
-    ---@class ConformOpts
-    opts = {
-      ---@type table<string, conform.FormatterUnit[]>
-      formatters_by_ft = {
-        nix = { "alejandra" },
-      },
-    },
-  },
 }

user/modules/vscode.nix

@@ -1,24 +1,20 @@
-{
+{ config, pkgs, ... }:
-  config,
+
-  pkgs,
+let 
-  ...
-}: let
 	package = pkgs.vscodium;
 
 	vscodePname = package.pname;
 
-  configDir =
+	configDir = {
-    {
     "vscode" = "Code";
     "vscode-insiders" = "Code - Insiders";
     "vscodium" = "VSCodium";
-    }
+  }.${vscodePname};
-    .${vscodePname};
 
-  userDir =
+  userDir = if pkgs.stdenv.hostPlatform.isDarwin then
-    if pkgs.stdenv.hostPlatform.isDarwin
+    "Library/Application Support/${configDir}/User"
-    then "Library/Application Support/${configDir}/User"
+  else
-    else "${config.xdg.configHome}/${configDir}/User";
+    "${config.xdg.configHome}/${configDir}/User";
 
   configFilePath = "${userDir}/settings.json";
 	keybindingsFilePath = "${userDir}/keybindings.json";
@@ -43,9 +39,6 @@ in {
 				mhutchie.git-graph
 				waderyan.gitblame
 
-        # SQL
-        qwtel.sqlite-viewer
-
 				# Web Development
 				astro-build.astro-vscode
 				redwan-hossain.auto-rename-tag-clone
@@ -56,7 +49,6 @@ in {
 				esbenp.prettier-vscode
 				antfu.iconify
 				csstools.postcss
-        ms-playwright.playwright
 
 				# Dart / Flutter
 				dart-code.dart-code
@@ -70,7 +62,6 @@ in {
 
 				# Nix
 				jnoortheen.nix-ide
-        kamadorueda.alejandra
 			];
 		};
 	};

user/modules/vscode/settings.json

@@ -147,7 +147,9 @@
 	"[dart]": {
 		"editor.formatOnSave": true,
 		"editor.formatOnType": true,
-    "editor.rulers": [80],
+		"editor.rulers": [
+			80
+		],
 		"editor.selectionHighlight": false,
 		"editor.suggestSelection": "first",
 		"editor.tabCompletion": "onlySnippets",
@@ -156,7 +158,7 @@
 	"[svelte]": {
 		"editor.defaultFormatter": "esbenp.prettier-vscode"
 	},
+	"workbench.colorTheme": "Min Dark",
 	"nix.enableLanguageServer": true,
-  "nix.serverPath": "nil",
+	"nix.serverPath": "nil"
-  "workbench.colorTheme": "Min Dark"
 }

user/modules/zsh.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
 	programs.zsh = {
 		enable = true;
 		plugins = [