chore: adapt flake for 'nix flake check'

SwarselSystems.org

@@ -608,7 +608,6 @@ In this section I am creating some attributes that define general concepts of my
         };
       });
   formatter = forEachSystem (pkgs: pkgs.nixpkgs-fmt);
-  overlays = [
   checks = forAllSystems (
         system:
         let
@@ -616,6 +615,7 @@ In this section I am creating some attributes that define general concepts of my
         in
           import ./checks { inherit self inputs system pkgs; }
   );
+  overlaysList = [
     (import ./overlays { inherit inputs; }).additions
     (import ./overlays { inherit inputs; }).modifications
     (import ./overlays { inherit inputs; }).nixpkgs-stable
@@ -840,7 +840,7 @@ This is the "reference implementation" of a setup that runs without NixOS, only
     imports = builtins.attrValues outputs.homeManagerModules;
 
     nixpkgs = {
-      inherit (outputs) overlays;
+      overlays = outputs.overlaysList;
       config = {
         allowUnfree = true;
       };
@@ -933,7 +933,7 @@ My work machine. Built for more security, this is the gold standard of my config
 
 
     nixpkgs = {
-      inherit (outputs) overlays;
+      overlays = outputs.overlaysList;
       config = {
         allowUnfree = true;
       };
@@ -1151,7 +1151,7 @@ My work machine. Built for more security, this is the gold standard of my config
 
 
     nixpkgs = {
-      inherit (outputs) overlays;
+      overlays = outputs.overlaysList;
       config = {
         allowUnfree = true;
       };
@@ -1745,11 +1745,11 @@ This is a shorthand for calling emacsclient mostly. Also, it hides the kittyterm
 #+end_src
 
 #+begin_src nix :tangle pkgs/e/default.nix
-  { writeShellApplication, emacs-pgtk, sway, jq }:
+  { writeShellApplication, emacs30-pgtk, sway, jq }:
 
   writeShellApplication {
     name = "e";
-    runtimeInputs = [ emacs-pgtk sway jq ];
+    runtimeInputs = [ emacs30-pgtk sway jq ];
     text = builtins.readFile ../../scripts/e.sh;
   }
 
@@ -5683,7 +5683,7 @@ This section sets up all the imports that are used in the home-manager section.
     nix.settings.experimental-features = "nix-command flakes";
     nixpkgs = {
       hostPlatform = "x86_64-darwin";
-      inherit (outputs) overlays;
+      overlays = outputs.overlaysList;
       config = {
         allowUnfree = true;
       };

flake.nix

@@ -185,8 +185,9 @@
               nativeBuildInputs = [ pkgs.nix pkgs.home-manager pkgs.git ];
             };
           });
+
+      # this sets the formatter that is going to be used by nix fmt
       formatter = forEachSystem (pkgs: pkgs.nixpkgs-fmt);
-      overlays = [
       checks = forAllSystems (
         system:
         let
@@ -194,6 +195,7 @@
         in
         import ./checks { inherit self inputs system pkgs; }
       );
+      overlaysList = [
         (import ./overlays { inherit inputs; }).additions
         (import ./overlays { inherit inputs; }).modifications
         (import ./overlays { inherit inputs; }).nixpkgs-stable

pkgs/e/default.nix

@@ -1,7 +1,7 @@
-{ writeShellApplication, emacs-pgtk, sway, jq }:
+{ writeShellApplication, emacs30-pgtk, sway, jq }:
 
 writeShellApplication {
   name = "e";
-  runtimeInputs = [ emacs-pgtk sway jq ];
+  runtimeInputs = [ emacs30-pgtk sway jq ];
   text = builtins.readFile ../../scripts/e.sh;
 }

profiles/common/home/packages.nix

@@ -37,6 +37,9 @@
     statix
     nix-tree
 
+    # shellscripts
+    shfmt
+
     # local file sharing
     wormhole-rs
 

profiles/darwin/common/nixos/default.nix

@@ -10,7 +10,7 @@ in
   nix.settings.experimental-features = "nix-command flakes";
   nixpkgs = {
     hostPlatform = "x86_64-darwin";
-    inherit (outputs) overlays;
+    overlays = outputs.overlaysList;
     config = {
       allowUnfree = true;
     };

profiles/home-manager/default.nix

@@ -4,7 +4,7 @@
   imports = builtins.attrValues outputs.homeManagerModules;
 
   nixpkgs = {
-    inherit (outputs) overlays;
+    overlays = outputs.overlaysList;
     config = {
       allowUnfree = true;
     };

profiles/nbl-imba-2/default.nix

@@ -29,7 +29,7 @@ in
 
 
   nixpkgs = {
-    inherit (outputs) overlays;
+    overlays = outputs.overlaysList;
     config = {
       allowUnfree = true;
     };

profiles/server/winters/default.nix

@@ -23,7 +23,7 @@ in
 
 
   nixpkgs = {
-    inherit (outputs) overlays;
+    overlays = outputs.overlaysList;
     config = {
       allowUnfree = true;
     };

programs/emacs/init.el

@@ -1194,6 +1194,11 @@ create a new one."
 
 (use-package nixpkgs-fmt)
 
+(use-package shfmt
+  :config
+  (setq shfmt-command "shfmt")
+  (setq shfmt-arguments '("-i" "4" "-s" "-sr")))
+
 (setq markdown-command "pandoc")
 
 (use-package markdown-mode