apply nix-fmt

flake.nix

@@ -47,8 +47,7 @@
       systems = [ "x86_64-linux" "aarch64-linux" ];
       forEachSystem = f: lib.genAttrs systems (sys: f pkgsFor.${sys});
       pkgsFor = nixpkgs.legacyPackages;
-    in
+    in {
-    {
       inherit lib;
       nixosModules = import ./modules/nixos;
       homeManagerModules = import ./modules/home-manager;

home/global/default.nix

@@ -1,7 +1,6 @@
-{ inputs, outputs, lib, config, pkgs, ... }: {
+{ outputs, lib, config, pkgs, ... }: {
-  imports = [
+  imports = [ ../modules/tui ]
-    ../modules/tui
+    ++ (builtins.attrValues outputs.homeManagerModules);
-  ] ++ (builtins.attrValues outputs.homeManagerModules);
 
   nixpkgs = {
     overlays = builtins.attrValues outputs.overlays;
@@ -14,7 +13,7 @@
   nix = {
     package = lib.mkDefault pkgs.nix;
     settings = {
-      experimental-features = ["nix-command" "flakes" ];
+      experimental-features = [ "nix-command" "flakes" ];
       warn-dirty = false;
     };
   };
@@ -24,9 +23,7 @@
     homeDirectory = lib.mkDefault "/home/${config.home.username}";
     stateVersion = lib.mkDefault "24.11";
 
-    sessionVariables = {
+    sessionVariables = { EDITOR = "nvim"; };
-      EDITOR = "nvim";
-    };
   };
 
   programs = {

home/hosts/generic.nix

@@ -1,10 +1,6 @@
-{ inputs, outputs, lib, config, pkgs, ... }: {
+{ ... }: {
-  imports = [
+  imports = [ ../global ];
-    ../global
-  ];
 
   # packages
-  home.packages = with pkgs; [
+  # home.packages = with pkgs; [ ];
-
-  ];
 }

home/hosts/penguin-duet.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }: {
+{ ... }: {
   imports = [
     ../global
     ../modules/tui/extras
@@ -7,6 +7,5 @@
   ];
 
   # packages
-  home.packages = with pkgs; [
+  # home.packages = with pkgs; [ ];
-  ];
 }

home/hosts/penguin-fw.nix

@@ -1,13 +1,10 @@
-{ inputs, outputs, lib, config, pkgs, ... }: {
+{ pkgs, ... }: {
-  imports = [
+  imports =
-    ../global
+    [ ../global ../modules/tui/extras ../modules/gui ../lib/chromeos.nix ];
-    ../modules/tui/extras
-    ../modules/gui
-    ../lib/chromeos.nix
-  ];
 
   # extra packages
-  home.packages = with pkgs; [
+  home.packages = with pkgs;
-    dive # Explore docker images
+    [
-  ];
+      dive # Explore docker images
+    ];
 }

home/hosts/pixnix.nix

@@ -1,4 +1,4 @@
-{ inputs, outputs, lib, config, pkgs, ... }: {
+{ pkgs, ... }: {
   imports = [
     ../global
     ../modules/tui/extras
@@ -7,7 +7,5 @@
   ];
 
   # packages
-  home.packages = with pkgs; [
+  home.packages = with pkgs; [ vagrant ];
-    vagrant
-  ];
 }

home/lib/chromeos.nix

@@ -12,4 +12,4 @@ in {
     '';
   };
   home.packages = with pkgs; [ nixgl.nixGLMesa ];
-}
+}

home/modules/gui/chrome.nix

@@ -1,5 +1 @@
-{ pkgs, inputs, outputs, lib, ... }: {
+{ pkgs, ... }: { home.packages = with pkgs; [ google-chrome ]; }
-  home.packages = with pkgs; [
-    google-chrome
-  ];
-}

home/modules/gui/default.nix

@@ -1,14 +1,6 @@
 { pkgs, ... }: {
   # Common GUI apps
-  imports = [
+  imports = [ ./firefox.nix ./vscode.nix ];
-    ./firefox.nix
-    ./vscode.nix
-  ];
 
-  home.packages = with pkgs; [
+  home.packages = with pkgs; [ gimp-with-plugins lagrange qFlipper remmina ];
-    gimp-with-plugins
-    lagrange
-    qFlipper
-    remmina
-  ];
 }

home/modules/gui/firefox.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, inputs, ... }:
+{ pkgs, inputs, ... }:
 
 let
   addons = inputs.firefox-addons.packages.${pkgs.system};
@@ -45,4 +45,4 @@ in
     "x-scheme-handler/http" = [ "firefox.desktop" ];
     "x-scheme-handler/https" = [ "firefox.desktop" ];
   };
-}
+}

home/modules/gui/vscode.nix

@@ -1,89 +1,91 @@
-{ config, outputs, pkgs, lib, ... }: {
+{ config, pkgs, ... }: {
 
-  home.packages = with pkgs; [
+  home.packages = with pkgs; [ hadolint ];
-    hadolint
-  ];
 
   programs.vscode = {
     enable = true;
     enableExtensionUpdateCheck = false;
     enableUpdateCheck = false;
     package = pkgs.vscode;
-    extensions = with pkgs.vscode-extensions; [
+    extensions = with pkgs.vscode-extensions;
-      # extensions available as nix packages
+      [
-      bbenoist.nix
+        # extensions available as nix packages
-      github.vscode-github-actions
+        bbenoist.nix
-      golang.go
+        github.vscode-github-actions
-      hashicorp.terraform
+        golang.go
-      ms-azuretools.vscode-docker
+        hashicorp.terraform
-      ms-kubernetes-tools.vscode-kubernetes-tools
+        ms-azuretools.vscode-docker
-      ms-vscode-remote.remote-ssh
+        ms-kubernetes-tools.vscode-kubernetes-tools
-      ms-vscode.powershell
+        ms-vscode-remote.remote-ssh
-      redhat.vscode-yaml
+        ms-vscode.powershell
-      tailscale.vscode-tailscale
+        redhat.vscode-yaml
-      tamasfe.even-better-toml
+        tailscale.vscode-tailscale
-      timonwong.shellcheck
+        tamasfe.even-better-toml
-      vscodevim.vim
+        timonwong.shellcheck
-      yzhang.markdown-all-in-one
+        vscodevim.vim
-    ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+        yzhang.markdown-all-in-one
-      # extensions from the vscode marketplace
+      ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-      {
+        # extensions from the vscode marketplace
-        name = "auto-align";
+        {
-        publisher = "bladnman";
+          name = "auto-align";
-        version = "0.0.13";
+          publisher = "bladnman";
-        sha256 = "sha256-N5XMHW6UadKjE29p2vevtjgqLA4QysYu2xT3njmyHLk=";
+          version = "0.0.13";
-      }
+          sha256 = "sha256-N5XMHW6UadKjE29p2vevtjgqLA4QysYu2xT3njmyHLk=";
-      {
+        }
-        name = "gemini-improved";
+        {
-        publisher = "printfn";
+          name = "gemini-improved";
-        version = "1.0.6";
+          publisher = "printfn";
-        sha256 = "sha256-PqDBxCT+7wApSwESJRgEes4+sItIF7T3KsIlVaNj2Fg=";
+          version = "1.0.6";
-      }
+          sha256 = "sha256-PqDBxCT+7wApSwESJRgEes4+sItIF7T3KsIlVaNj2Fg=";
-      {
+        }
-        name = "hadolint";
+        {
-        publisher = "exiasr";
+          name = "hadolint";
-        version = "1.1.2";
+          publisher = "exiasr";
-        sha256 = "sha256-6GO1f8SP4CE8yYl87/tm60FdGHqHsJA4c2B6UKVdpgM=";
+          version = "1.1.2";
-      }
+          sha256 = "sha256-6GO1f8SP4CE8yYl87/tm60FdGHqHsJA4c2B6UKVdpgM=";
-      {
+        }
-        name = "hcl";
+        {
-        publisher = "hashicorp";
+          name = "hcl";
-        version = "0.3.2";
+          publisher = "hashicorp";
-        sha256 = "sha256-cxF3knYY29PvT3rkRS8SGxMn9vzt56wwBXpk2PqO0mo=";
+          version = "0.3.2";
-      }
+          sha256 = "sha256-cxF3knYY29PvT3rkRS8SGxMn9vzt56wwBXpk2PqO0mo=";
-      {
+        }
-        name = "jinjahtml";
+        {
-        publisher = "samuelcolvin";
+          name = "jinjahtml";
-        version = "0.20.0";
+          publisher = "samuelcolvin";
-        sha256 = "sha256-wADL3AkLfT2N9io8h6XYgceKyltJCz5ZHZhB14ipqpM=";
+          version = "0.20.0";
-      }
+          sha256 = "sha256-wADL3AkLfT2N9io8h6XYgceKyltJCz5ZHZhB14ipqpM=";
-      {
+        }
-        name = "markdown-table-prettify";
+        {
-        publisher = "darkriszty";
+          name = "markdown-table-prettify";
-        version = "3.6.0";
+          publisher = "darkriszty";
-        sha256 = "sha256-FZTiNGSY+8xk3DJsTKQu4AHy1UFvg0gbrzPpjqRlECI=";
+          version = "3.6.0";
-      }
+          sha256 = "sha256-FZTiNGSY+8xk3DJsTKQu4AHy1UFvg0gbrzPpjqRlECI=";
-      {
+        }
-        name = "snippet";
+        {
-        publisher = "vscode-snippet";
+          name = "snippet";
-        version = "1.2.0";
+          publisher = "vscode-snippet";
-        sha256 = "sha256-eka7JRzSN7VWkLu2kITb5mSYZHpw7Hx8mZboQsFhpms=";
+          version = "1.2.0";
-      }
+          sha256 = "sha256-eka7JRzSN7VWkLu2kITb5mSYZHpw7Hx8mZboQsFhpms=";
-    ];
+        }
+      ];
     globalSnippets = {
       "Insert datestamp" = {
-        prefix = ["date"];
+        prefix = [ "date" ];
-        body = ["\"\${CURRENT_YEAR}-\${CURRENT_MONTH}-\${CURRENT_DATE}\""];
+        body = [ ''"''${CURRENT_YEAR}-''${CURRENT_MONTH}-''${CURRENT_DATE}"'' ];
         description = "Insert date";
       };
       "Insert timestamp" = {
-        prefix = ["datetime"];
+        prefix = [ "datetime" ];
-        body = ["\"\${CURRENT_YEAR}-\${CURRENT_MONTH}-\${CURRENT_DATE}T\${CURRENT_HOUR}:\${CURRENT_MINUTE}:\${CURRENT_SECOND}Z\""];
+        body = [
+          ''
+            "''${CURRENT_YEAR}-''${CURRENT_MONTH}-''${CURRENT_DATE}T''${CURRENT_HOUR}:''${CURRENT_MINUTE}:''${CURRENT_SECOND}Z"''
+        ];
         description = "Insert date and time";
       };
       "Torchlight line number markup" = {
-        prefix = ["torchlight"];
+        prefix = [ "torchlight" ];
-        body = ["torchlight! {\"lineNumbers\":true}"];
+        body = [ ''torchlight! {"lineNumbers":true}'' ];
         description = "Enable Torchlight line numbers";
       };
     };
@@ -91,100 +93,95 @@
       {
         key = "backspace";
         command = "-markdown.extension.onBackspaceKey";
-        when = "editorTextFocus && !editorHasMultipleSelections && !editorReadonly && !markdown.extension.editor.cursor.inFencedCodeBlock && !markdown.extension.editor.cursor.inMathEnv && !suggestWidgetVisible && vim.mode != 'CommandlineInProgress' && vim.mode != 'EasyMotionInputMode' && vim.mode != 'EasyMotionMode' && vim.mode != 'Normal' && vim.mode != 'Replace' && vim.mode != 'SearchInProgressMode' && vim.mode != 'SurroundInputMode' && vim.mode != 'Visual' && vim.mode != 'VisualBlock' && vim.mode != 'VisualLine' && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+        when =
+          "editorTextFocus && !editorHasMultipleSelections && !editorReadonly && !markdown.extension.editor.cursor.inFencedCodeBlock && !markdown.extension.editor.cursor.inMathEnv && !suggestWidgetVisible && vim.mode != 'CommandlineInProgress' && vim.mode != 'EasyMotionInputMode' && vim.mode != 'EasyMotionMode' && vim.mode != 'Normal' && vim.mode != 'Replace' && vim.mode != 'SearchInProgressMode' && vim.mode != 'SurroundInputMode' && vim.mode != 'Visual' && vim.mode != 'VisualBlock' && vim.mode != 'VisualLine' && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
       }
       {
         key = "ctrl+shift+alt+down";
         command = "-markdown.extension.onCopyLineDown";
-        when = "editorTextFocus && !editorReadonly && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+        when =
+          "editorTextFocus && !editorReadonly && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
       }
       {
         key = "ctrl+shift+alt+up";
         command = "-markdown.extension.onCopyLineUp";
-        when = "editorTextFocus && !editorReadonly && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+        when =
+          "editorTextFocus && !editorReadonly && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
       }
       {
         key = "ctrl+enter";
         command = "-markdown.extension.onCtrlEnterKey";
-        when = "editorTextFocus && !editorHasMultipleSelections && !editorReadonly && !markdown.extension.editor.cursor.inFencedCodeBlock && !markdown.extension.editor.cursor.inMathEnv && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+        when =
+          "editorTextFocus && !editorHasMultipleSelections && !editorReadonly && !markdown.extension.editor.cursor.inFencedCodeBlock && !markdown.extension.editor.cursor.inMathEnv && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
       }
       {
         key = "enter";
         command = "-markdown.extension.onEnterKey";
-        when = "editorTextFocus && !editorHasMultipleSelections && !editorReadonly && !markdown.extension.editor.cursor.inFencedCodeBlock && !markdown.extension.editor.cursor.inMathEnv && !suggestWidgetVisible && vim.mode != 'CommandlineInProgress' && vim.mode != 'EasyMotionInputMode' && vim.mode != 'EasyMotionMode' && vim.mode != 'Normal' && vim.mode != 'Replace' && vim.mode != 'SearchInProgressMode' && vim.mode != 'SurroundInputMode' && vim.mode != 'Visual' && vim.mode != 'VisualBlock' && vim.mode != 'VisualLine' && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+        when =
+          "editorTextFocus && !editorHasMultipleSelections && !editorReadonly && !markdown.extension.editor.cursor.inFencedCodeBlock && !markdown.extension.editor.cursor.inMathEnv && !suggestWidgetVisible && vim.mode != 'CommandlineInProgress' && vim.mode != 'EasyMotionInputMode' && vim.mode != 'EasyMotionMode' && vim.mode != 'Normal' && vim.mode != 'Replace' && vim.mode != 'SearchInProgressMode' && vim.mode != 'SurroundInputMode' && vim.mode != 'Visual' && vim.mode != 'VisualBlock' && vim.mode != 'VisualLine' && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
       }
       {
         key = "ctrl+]";
         command = "-markdown.extension.onIndentLines";
-        when = "editorTextFocus && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+        when =
+          "editorTextFocus && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
       }
       {
         key = "alt+down";
         command = "-markdown.extension.onMoveLineDown";
-        when = "editorTextFocus && !editorReadonly && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+        when =
+          "editorTextFocus && !editorReadonly && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
       }
       {
         key = "alt+up";
         command = "-markdown.extension.onMoveLineUp";
-        when = "editorTextFocus && !editorReadonly && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+        when =
+          "editorTextFocus && !editorReadonly && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
       }
       {
         key = "ctrl+[";
         command = "-markdown.extension.onOutdentLines";
-        when = "editorTextFocus && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+        when =
+          "editorTextFocus && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
       }
       {
         key = "shift+enter";
         command = "-markdown.extension.onShiftEnterKey";
-        when = "editorTextFocus && !editorHasMultipleSelections && !editorReadonly && !markdown.extension.editor.cursor.inFencedCodeBlock && !markdown.extension.editor.cursor.inMathEnv && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+        when =
+          "editorTextFocus && !editorHasMultipleSelections && !editorReadonly && !markdown.extension.editor.cursor.inFencedCodeBlock && !markdown.extension.editor.cursor.inMathEnv && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
       }
       {
         key = "shift+tab";
         command = "-markdown.extension.onShiftTabKey";
-        when = "editorTextFocus && markdown.extension.editor.cursor.inList && !editorHasMultipleSelections && !editorReadonly && !editorTabMovesFocus && !hasOtherSuggestions && !hasSnippetCompletions && !inSnippetMode && !markdown.extension.editor.cursor.inFencedCodeBlock && !markdown.extension.editor.cursor.inMathEnv && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+        when =
+          "editorTextFocus && markdown.extension.editor.cursor.inList && !editorHasMultipleSelections && !editorReadonly && !editorTabMovesFocus && !hasOtherSuggestions && !hasSnippetCompletions && !inSnippetMode && !markdown.extension.editor.cursor.inFencedCodeBlock && !markdown.extension.editor.cursor.inMathEnv && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
       }
       {
         key = "tab";
         command = "-markdown.extension.onTabKey";
-        when = "editorTextFocus && markdown.extension.editor.cursor.inList && !editorHasMultipleSelections && !editorReadonly && !editorTabMovesFocus && !hasOtherSuggestions && !hasSnippetCompletions && !inSnippetMode && !inlineSuggestionVisible && !markdown.extension.editor.cursor.inFencedCodeBlock && !markdown.extension.editor.cursor.inMathEnv && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
+        when =
+          "editorTextFocus && markdown.extension.editor.cursor.inList && !editorHasMultipleSelections && !editorReadonly && !editorTabMovesFocus && !hasOtherSuggestions && !hasSnippetCompletions && !inSnippetMode && !inlineSuggestionVisible && !markdown.extension.editor.cursor.inFencedCodeBlock && !markdown.extension.editor.cursor.inMathEnv && !suggestWidgetVisible && editorLangId =~ /^markdown$|^rmd$|^quarto$/";
       }
     ];
     languageSnippets = {
       jinja-yaml = {
         "Insert SLS header" = {
           isFileTemplate = true;
-          prefix = ["sls"];
+          prefix = [ "sls" ];
-          body = [
+          body = [ "# -*- coding: utf-8 -*-" "# vim: ft=yaml" "---" "$0" ];
-            "# -*- coding: utf-8 -*-"
-            "# vim: ft=yaml"
-            "---"
-            "\$0"
-          ];
         };
       };
       jinja-html = {
         "Insert jinja header" = {
           isFileTemplate = true;
-          prefix = ["jinja"];
+          prefix = [ "jinja" ];
-          body = [
+          body = [ "# -*- coding: utf-8 -*-" "# vim: ft=jinja" "$0" ];
-            "# -*- coding: utf-8 -*-"
-            "# vim: ft=jinja"
-            "\$0"
-          ];
         };
       };
     };
     userSettings = {
-      "autoalign.moveableItems" = [
+      "autoalign.moveableItems" = [ "=" ":" "+=" "-=" ];
-        "="
+      "autoalign.nonMoveableItemsAdditional" = [ "ks=" "ds=" ];
-        ":"
-        "+="
-        "-="
-      ];
-      "autoalign.nonMoveableItemsAdditional" = [
-        "ks="
-        "ds="
-      ];
       "diffEditor.ignoreTrimWhitespace" = false;
       "editor.acceptSuggestionOnCommitCharacter" = false;
       "editor.acceptSuggestionOnEnter" = "off";
@@ -219,19 +216,15 @@
       "powershell.promptToUpdatePowerShell" = false;
       "security.workspace.trust.untrustedFiles" = "open";
       "update.mode" = "none";
-      "vim.normalModeKeyBindings" = [
+      "vim.normalModeKeyBindings" = [{
-        {
+        "after" = [ "@q" ];
-          "after" = ["@q"];
+        "before" = [ "Q" ];
-          "before" = ["Q"];
+      }];
-        }
-      ];
       "vim.statusBarColorControl" = false;
       "vim.useCtrlKeys" = false;
       "window.restoreWindows" = "none";
       "workbench.startupEditor" = "none";
-      "yaml.customTags" = [
+      "yaml.customTags" = [ "!reference sequence" ];
-        "!reference sequence"
-      ];
       "[markdown]" = {
         "editor.defaultFormatter" = "yzhang.markdown-all-in-one";
         "editor.quickSuggestions" = {

home/modules/tui/default.nix

@@ -1,14 +1,7 @@
 { pkgs, ... }: {
   # Core CLI apps
 
-  imports = [
+  imports = [ ./git.nix ./shell ./nix-index.nix ./neovim ./tmux.nix ./vim.nix ];
-    ./git.nix
-    ./shell
-    ./nix-index.nix
-    ./neovim
-    ./tmux.nix
-    ./vim.nix
-  ];
 
   home.packages = with pkgs; [
     apg # Automatic password generator

home/modules/tui/extras/default.nix

@@ -1,10 +1,7 @@
 { pkgs, ... }: {
   # Extra CLI apps
 
-  imports = [
+  imports = [ ../default.nix ./go.nix ];
-    ../default.nix
-    ./go.nix
-  ];
 
   home.packages = with pkgs; [
     android-tools # Android SDK
@@ -20,12 +17,8 @@
   ];
 
   programs.fish = {
-    shellAbbrs = rec {
+    shellAbbrs = rec { k = "kubectl"; };
-      k = "kubectl";
-    };
 
-    functions = {
+    functions = { nugo = "hugo new content/posts/$argv/index.md"; };
-      nugo = "hugo new content/posts/$argv/index.md";
-    };
   };
-}
+}

home/modules/tui/extras/go.nix

@@ -1,6 +1,6 @@
-{ pkgs, lib, ... }: {
+{ pkgs, ... }: {
   programs.go = {
     enable = true;
     package = pkgs.go;
   };
-}
+}

home/modules/tui/git.nix

@@ -1,22 +1,20 @@
 { lib, ... }:
-  let
+let email = lib.concatStringsSep "" [ "john@bo" "wdre.net" ];
-    email = lib.concatStringsSep "" [ "john@bo" "wdre.net" ];
+in {
-  in
+  programs.git = {
-  {
+    enable = lib.mkDefault true;
-    programs.git = {
+    delta.enable = true;
-      enable = lib.mkDefault true;
+    aliases = {
-      delta.enable = true;
+      graph = "log --decorate --oneline --graph";
-      aliases = {
+      fast-forward = "merge --ff-only";
-        graph = "log --decorate --oneline --graph";
-        fast-forward = "merge --ff-only";
-      };
-      userEmail = lib.mkDefault email;
-      userName = lib.mkDefault "John Bowdre";
-      extraConfig = {
-        gpg.format = "ssh";
-        init.defaultBranch = "main";
-        pull.rebase = false;
-        user.signingKey = "~/.ssh/id_ed25519.pub";
-      };
     };
-  }
+    userEmail = lib.mkDefault email;
+    userName = lib.mkDefault "John Bowdre";
+    extraConfig = {
+      gpg.format = "ssh";
+      init.defaultBranch = "main";
+      pull.rebase = false;
+      user.signingKey = "~/.ssh/id_ed25519.pub";
+    };
+  };
+}

home/modules/tui/neovim/autocmds.nix

@@ -16,18 +16,14 @@
     # Enable spellcheck for some filetypes
     {
       event = "FileType";
-      pattern = [
+      pattern = [ "markdown" ];
-        "markdown"
-      ];
       command = "setlocal spell spelllang=en";
     }
 
     # Enable wrap for some filetypes
     {
       event = "FileType";
-      pattern = [
+      pattern = [ "markdown" ];
-        "markdown"
-      ];
       command = "setlocal wrap linebreak";
     }
   ];

home/modules/tui/neovim/completion.nix

@@ -1,6 +1,6 @@
 {
   programs.nixvim = {
-    opts.completeopt = ["menu" "menuone" "noselect"];
+    opts.completeopt = [ "menu" "menuone" "noselect" ];
 
     plugins = {
       luasnip.enable = true;
@@ -25,7 +25,8 @@
         enable = true;
 
         settings = {
-          snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end";
+          snippet.expand =
+            "function(args) require('luasnip').lsp_expand(args.body) end";
 
           mapping = {
             "<C-d>" = "cmp.mapping.scroll_docs(-4)";
@@ -33,15 +34,16 @@
             "<C-Space>" = "cmp.mapping.complete()";
             "<C-e>" = "cmp.mapping.close()";
             "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
-            "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
+            "<S-Tab>" =
+              "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
             "<CR>" = "cmp.mapping.confirm({ select = true })";
           };
 
           sources = [
-            {name = "path";}
+            { name = "path"; }
-            {name = "nvim_lsp";}
+            { name = "nvim_lsp"; }
-            {name = "luasnip";}
+            { name = "luasnip"; }
-            {name = "nixpkgs_maintainers";}
+            { name = "nixpkgs_maintainers"; }
             {
               name = "buffer";
               # words from other open buffers can also be suggested
@@ -52,4 +54,4 @@
       };
     };
   };
-}
+}

home/modules/tui/neovim/default.nix

@@ -17,10 +17,7 @@
     performance = {
       combinePlugins = {
         enable = true;
-        standalonePlugins = [
+        standalonePlugins = [ "hmts.nvim" "nvim-treesitter" ];
-          "hmts.nvim"
-          "nvim-treesitter"
-        ];
       };
       byteCompileLua.enable = true;
     };

home/modules/tui/neovim/keymaps.nix

@@ -6,80 +6,69 @@
     };
 
     keymaps = let
-      normal =
+      normal = lib.mapAttrsToList (key: action: {
-        lib.mapAttrsToList
+        mode = "n";
-        (key: action: {
+        inherit action key;
-          mode = "n";
+      }) {
-          inherit action key;
+        "<Space>" = "<NOP>";
-        })
-        {
-          "<Space>" = "<NOP>";
 
-          # Esc to clear search results
+        # Esc to clear search results
-          "<esc>" = ":noh<CR>";
+        "<esc>" = ":noh<CR>";
 
-          # fix Y behavior
+        # fix Y behavior
-          Y = "y$";
+        Y = "y$";
 
-          # toggle between two most recent files
+        # toggle between two most recent files
-          "<C-c>" = ":b#<CR>";
+        "<C-c>" = ":b#<CR>";
 
-          # close by Ctrl+x
+        # close by Ctrl+x
-          "<C-x>" = ":close<CR>";
+        "<C-x>" = ":close<CR>";
 
-          # save by Space+s or Ctrl+s
+        # save by Space+s or Ctrl+s
-          "<leader>s" = ":w<CR>";
+        "<leader>s" = ":w<CR>";
-          "<C-s>" = ":w<CR>";
+        "<C-s>" = ":w<CR>";
 
-          # H, L to jump to start/end of line
+        # H, L to jump to start/end of line
-          L = "$";
+        L = "$";
-          H = "^";
+        H = "^";
 
-          # resize with arrows
+        # resize with arrows
-          "<C-Up>" = ":resize -2<CR>";
+        "<C-Up>" = ":resize -2<CR>";
-          "<C-Down>" = ":resize +2<CR>";
+        "<C-Down>" = ":resize +2<CR>";
-          "<C-Left>" = ":vertical resize +2<CR>";
+        "<C-Left>" = ":vertical resize +2<CR>";
-          "<C-Right>" = ":vertical resize -2<CR>";
+        "<C-Right>" = ":vertical resize -2<CR>";
 
-          # move current line up/down
+        # move current line up/down
-          # M = Alt
+        # M = Alt
-          "<M-k>" = ":move-2<CR>";
+        "<M-k>" = ":move-2<CR>";
-          "<M-j>" = ":move+<CR>";
+        "<M-j>" = ":move+<CR>";
-        };
+      };
-      visual =
+      visual = lib.mapAttrsToList (key: action: {
-        lib.mapAttrsToList
+        mode = "v";
-        (key: action: {
+        inherit action key;
-          mode = "v";
+      }) {
-          inherit action key;
+        # better indenting
-        })
+        ">" = ">gv";
-        {
+        "<" = "<gv";
-          # better indenting
+        "<TAB>" = ">gv";
-          ">" = ">gv";
+        "<S-TAB>" = "<gv";
-          "<" = "<gv";
-          "<TAB>" = ">gv";
-          "<S-TAB>" = "<gv";
 
-          # move selected line/block in visual mode
+        # move selected line/block in visual mode
-          "K" = ":m '<-2<CR>gv=gv";
+        "K" = ":m '<-2<CR>gv=gv";
-          "J" = ":m '>+1<CR>gv=gv";
+        "J" = ":m '>+1<CR>gv=gv";
 
-          # sort
+        # sort
-          "<leader>s" = ":sort<CR>";
+        "<leader>s" = ":sort<CR>";
-        };
+      };
-      insert =
+      insert = lib.mapAttrsToList (key: action: {
-        lib.mapAttrsToList
+        mode = "i";
-        (key: action: {
+        inherit action key;
-          mode = "i";
+      }) {
-          inherit action key;
+        # Save by Ctrl+s
-        })
+        "<C-s>" = "<Esc>:w<CR>";
-        {
+      };
-          # Save by Ctrl+s
+    in config.lib.nixvim.keymaps.mkKeymaps { options.silent = true; }
-          "<C-s>" = "<Esc>:w<CR>";
+    (normal ++ visual ++ insert);
-        };
-    in
-      config.lib.nixvim.keymaps.mkKeymaps
-      {options.silent = true;}
-      (normal ++ visual ++ insert);
   };
 }
 

home/modules/tui/neovim/options.nix

@@ -1,9 +1,7 @@
 {
   programs.nixvim = {
     clipboard = {
-      providers = {
+      providers = { xsel.enable = true; };
-        xsel.enable = true;
-      };
       register = "unnamed";
     };
 
@@ -14,11 +12,15 @@
       cursorline = true; # highlight the screen line of the cursor
       expandtab = true; # expand <Tab> to spaces in Insert mode
       fileencoding = "utf-8"; # file-content encoding for the current buffer
-      foldlevel = 99; # folds with a level higher than this number will be closed
+      foldlevel =
+        99; # folds with a level higher than this number will be closed
       hidden = true; # Keep closed buffer open in the background
-      ignorecase = true; # when search query is lowercase match both lower and upper patterns
+      ignorecase =
-      inccommand = "split"; # search and replace: preview changes in quickfix list
+        true; # when search query is lowercase match both lower and upper patterns
-      incsearch = true; # incremental search: show match for partly typed search command
+      inccommand =
+        "split"; # search and replace: preview changes in quickfix list
+      incsearch =
+        true; # incremental search: show match for partly typed search command
       laststatus = 3; # when to use a status line for the last window
       modeline = true; # tags such as 'vim:ft=sh'
       modelines = 5; # check first and last five lines for modelines
@@ -29,14 +31,16 @@
       scrolloff = 8; # number of lines to show around the cursor
       shiftwidth = 2; # number of spaces used for each step of (auto)indent
       signcolumn = "yes"; # whether to show the signcolumn
-      smartcase = true; # override ignorecase if search pattern containers upper case
+      smartcase =
+        true; # override ignorecase if search pattern containers upper case
       spell = false; # highlight spelling mistakes
       splitbelow = true; # A new window is put below the current one
       splitright = true; # A new window is put right of the corrent one
       swapfile = false; # Disable the swap file
       tabstop = 2; # number of spaces a <Tab> in the text stands for
       termguicolors = true; # enables 24-bit colors
-      textwidth = 0; # maximum width of text that is being inserted, a longer line will be broken after whitespace to this width
+      textwidth =
+        0; # maximum width of text that is being inserted, a longer line will be broken after whitespace to this width
       undofile = true; # save and restore undo history
       updatetime = 100; # Faster completion
       wrap = false; # prevent wrapping text

home/modules/tui/neovim/plugins/comment.nix

@@ -1,7 +1,6 @@
 {
   programs.nixvim.plugins.comment = {
     enable = true;
-
     settings = {
       opleader.line = "<C-_>";
       toggler.line = "<C-_>";

home/modules/tui/neovim/plugins/floaterm.nix

@@ -1,12 +1,9 @@
 {
   programs.nixvim.plugins.floaterm = {
     enable = true;
-
     width = 0.8;
     height = 0.8;
-
     title = "";
-
     keymaps.toggle = "<leader>,";
   };
-}
+}

home/modules/tui/neovim/plugins/harpoon.nix

@@ -17,4 +17,4 @@
       };
     };
   };
-}
+}

home/modules/tui/neovim/plugins/md-preview.nix

@@ -9,12 +9,10 @@
       };
     };
 
-    files."after/ftplugin/markdown.lua".keymaps = [
+    files."after/ftplugin/markdown.lua".keymaps = [{
-      {
+      mode = "n";
-        mode = "n";
+      key = "<leader>m";
-        key = "<leader>m";
+      action = ":MarkdownPreview<cr>";
-        action = ":MarkdownPreview<cr>";
+    }];
-      }
-    ];
   };
-}
+}

home/modules/tui/neovim/plugins/telescope.nix

@@ -30,4 +30,4 @@
       };
     };
   };
-}
+}

home/modules/tui/neovim/plugins/treesitter.nix

@@ -23,4 +23,4 @@
 
     hmts.enable = true;
   };
-}
+}

home/modules/tui/neovim/plugins/trim.nix

@@ -4,13 +4,8 @@
     settings = {
       highlight = false;
       trim_last_line = false;
-      ft_blocklist = [
+      ft_blocklist =
-        "checkhealth"
+        [ "checkhealth" "floaterm" "lsipinfo" "neo-tree" "TelescopePrompt" ];
-        "floaterm"
-        "lsipinfo"
-        "neo-tree"
-        "TelescopePrompt"
-      ];
     };
   };
 }

home/modules/tui/nix-index.nix

@@ -1,10 +1,10 @@
-{ pkgs, lib, config, ... }:
+{ lib, config, ... }:
 let
   inherit (lib) mkIf;
-  hasPackage = pname: lib.any (p: p ? pname && p.name == pname) config.home.packages;
+  hasPackage = pname:
+    lib.any (p: p ? pname && p.name == pname) config.home.packages;
   hasFish = hasPackage "fish";
-in
+in {
-{
   programs.nix-index = {
     enable = true;
     enableFishIntegration = mkIf hasFish true;

home/modules/tui/shell/aliases.nix

@@ -1,6 +1,6 @@
 {
   cat = "bat";
-  ccat = "egrep -v '^\s*(#|\\$)'";
+  ccat = "egrep -v '^s*(#|\\$)'";
   g = "git";
   gg = "git graph";
   gs = "git status";

home/modules/tui/shell/default.nix

@@ -1,17 +1,12 @@
 {
-  imports = [
+  imports = [ ./eza.nix ./fish ];
-    ./eza.nix
-    ./fish
-  ];
 
-  home = {
+  home = { shellAliases = import ./aliases.nix; };
-    shellAliases = import ./aliases.nix;
-  };
 
   programs = {
     zoxide = {
       enable = true;
-      options = ["--cmd" "j"];
+      options = [ "--cmd" "j" ];
     };
 
     direnv = {
@@ -23,9 +18,7 @@
 
     bat = {
       enable = true;
-      config = {
+      config = { theme = "gruvbox-dark"; };
-        theme = "gruvbox-dark";
-      };
     };
   };
 }

home/modules/tui/shell/eza.nix

@@ -2,9 +2,7 @@
   programs.eza = {
     enable = true;
     enableFishIntegration = false;
-    extraOptions = [
+    extraOptions = [ "--group-directories-first" ];
-      "--group-directories-first"
-    ];
     git = true;
   };
 
@@ -14,4 +12,4 @@
     ll = "eza -alhg";
     lt = "eza --tree";
   };
-}
+}

home/modules/tui/shell/fish/abbrs.nix

@@ -8,4 +8,4 @@
     gc = "git commit -S";
     gcm = "git commit -S -m";
   };
-}
+}

home/modules/tui/shell/fish/default.nix

@@ -1,9 +1,5 @@
 { pkgs, ... }: {
-  imports = [
+  imports = [ ./abbrs.nix ./functions.nix ./shell-init.nix ];
-    ./abbrs.nix
-    ./functions.nix
-    ./shell-init.nix
-  ];
 
   programs = {
     fish = {
@@ -27,9 +23,7 @@
       enableTransience = true;
       settings = {
         container.disabled = true;
-        nix_shell = {
+        nix_shell = { format = "via [$symbol]($style) "; };
-          format = "via [$symbol]($style) ";
-        };
       };
     };
   };

home/modules/tui/shell/fish/functions.nix

@@ -5,15 +5,20 @@
     # Disable greeting
     fish_greeting = "";
 
-    get-local-ip = "ip addr show $(ip route | grep default | awk '{print $5}') | grep 'inet ' | awk '{print $2}' | cut -d/ -f1";
+    get-local-ip =
+      "ip addr show $(ip route | grep default | awk '{print $5}') | grep 'inet ' | awk '{print $2}' | cut -d/ -f1";
 
     ssh = "TERM=xterm command ssh $argv";
     # Rebuild home-manager
-    switch-home = "home-manager switch -b backup --flake ${config.home.homeDirectory}/.dotfiles#$USER@$(hostname -s)";
+    switch-home =
-    switch-nix = "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}/.dotfiles";
+      "home-manager switch -b backup --flake ${config.home.homeDirectory}/.dotfiles#$USER@$(hostname -s)";
-    upgrade-nix = "nix-channel --update; nix-env --install --attr nixpkgs.nix nixpkgs.cacert";
+    switch-nix =
+      "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}/.dotfiles";
+    upgrade-nix =
+      "nix-channel --update; nix-env --install --attr nixpkgs.nix nixpkgs.cacert";
 
     # Trees
-    tt = "cbonsai -S -t 0.25 -c \"&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,🌸,🌺,💮\"";
+    tt = ''
+      cbonsai -S -t 0.25 -c "&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,🌸,🌺,💮"'';
   };
 }

home/modules/tui/shell/fish/shell-init.nix

@@ -62,4 +62,4 @@
     ''
       cbonsai -p -m "$(fortune -s -n 300)" -c "&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,🌸,🌺,💮"
     '';
-}
+}

home/modules/tui/tmux.nix

@@ -10,9 +10,7 @@
     historyLimit = 100000;
     keyMode = "vi";
     mouse = true;
-    plugins = with pkgs.tmuxPlugins; [
+    plugins = with pkgs.tmuxPlugins; [ tokyo-night-tmux ];
-      tokyo-night-tmux
-    ];
     extraConfig = ''
       # new panes inherit current working directory
       bind '%' split-window -h -c '#{pane_current_path}'

home/modules/tui/vim.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }: {
+{ pkgs, ... }: {
   programs.vim = {
     enable = true;
     # defaultEditor = true;

modules/nixos/default.nix

@@ -4,4 +4,4 @@
 {
   # List your module files here
   # my-module = import ./my-module.nix;
-}
+}

nixos/common/global/default.nix

@@ -1,4 +1,4 @@
-{ inputs, outputs,... }: {
+{ inputs, outputs, ... }: {
   imports = [
     inputs.home-manager.nixosModules.home-manager
     ./fish.nix
@@ -12,9 +12,7 @@
 
   nixpkgs = {
     overlays = builtins.attrValues outputs.overlays;
-    config = {
+    config = { allowUnfree = true; };
-      allowUnfree = true;
-    };
   };
 
   environment.enableAllTerminfo = true;
@@ -22,4 +20,4 @@
   hardware.enableRedistributableFirmware = true;
   networking.domain = "vim.wtf";
 
-}
+}

nixos/common/global/fish.nix

@@ -7,4 +7,4 @@
       functions.enable = true;
     };
   };
-}
+}

nixos/common/global/locale.nix

@@ -14,4 +14,4 @@
     };
   };
   time.timeZone = lib.mkDefault "America/Chicago";
-}
+}

nixos/common/global/network-manager.nix

@@ -1,3 +1,3 @@
 { lib, ... }: {
   systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
-}
+}

nixos/common/global/nix.nix

@@ -1,5 +1,4 @@
-{ inputs, lib, ... }:
+{ inputs, lib, ... }: {
-{
   nix = {
     settings = {
       trusted-users = [ "root" "@wheel" ];
@@ -19,4 +18,4 @@
 
     nixPath = [ "nixpkgs=${inputs.nixpkgs.outPath}" ];
   };
-}
+}

nixos/common/global/tailscale.nix

@@ -1,7 +1,6 @@
-{ lib, ... }:
+{ lib, ... }: {
-{
   services.tailscale = {
     enable = true;
     useRoutingFeatures = lib.mkDefault "client";
   };
-}
+}

nixos/common/optional/docker.nix

@@ -1,5 +1 @@
-{
+{ virtualisation.docker = { enable = true; }; }
-  virtualisation.docker = {
-    enable = true;
-  };
-}

nixos/common/optional/gnome.nix

@@ -9,9 +9,7 @@
           wayland = true;
         };
       };
-      desktopManager = {
+      desktopManager = { gnome.enable = true; };
-        gnome.enable = true;
-      };
       xkb.layout = "us";
       xkb.variant = "";
     };

nixos/common/optional/libvirtd.nix

@@ -1,5 +1 @@
-{
+{ virtualisation.libvirtd = { enable = true; }; }
-  virtualisation.libvirtd = {
-    enable = true;
-  };
-}

nixos/common/optional/pipewire.nix

@@ -8,4 +8,4 @@
     pulse.enable = true;
     jack.enable = true;
   };
-}
+}

nixos/common/optional/printing.nix

@@ -1,5 +1 @@
-{
+{ services.printing = { enable = true; }; }
-  services.printing = {
-    enable = true;
-  };
-}

nixos/common/optional/sshd.nix

@@ -1,3 +1 @@
-{
+{ services.sshd.enable = true; }
-  services.sshd.enable = true;
-}

nixos/common/optional/tailscale-exit-node.nix

@@ -1,6 +1,4 @@
 {
   imports = [ ../global/tailscale.nix ];
-  services.tailscale = {
+  services.tailscale = { useRoutingFeatures = "both"; };
-    useRoutingFeatures = "both";
+}
-  };
-}

nixos/common/optional/wireshark.nix

@@ -1,5 +1 @@
-{
+{ programs.wireshark = { enable = true; }; }
-  programs.wireshark = {
-    enable = true;
-  };
-}

nixos/common/users/john/default.nix

@@ -1,15 +1,12 @@
 { pkgs, config, ... }:
-let ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
+let
-in
+  ifTheyExist = groups:
-{
+    builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
+in {
   users.users.john = {
     isNormalUser = true;
     shell = pkgs.fish;
-    extraGroups = [
+    extraGroups = [ "audio" "video" "wheel" ] ++ ifTheyExist [
-      "audio"
-      "video"
-      "wheel"
-    ] ++ ifTheyExist [
       "docker"
       "libvirtd"
       "mysql"
@@ -22,6 +19,7 @@ in
     packages = [ pkgs.home-manager ];
   };
 
-  home-manager.users.john = import ../../../../home/${config.networking.hostName}.nix;
+  home-manager.users.john =
+    import ../../../../home/${config.networking.hostName}.nix;
 
-}
+}

nixos/pixnix/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }: {
+{ inputs, ... }: {
   imports = [
     inputs.hardware.nixosModules.common-cpu-intel
     inputs.hardware.nixosModules.common-pc-ssd

nixos/pixnix/hardware-configuration.nix

@@ -1,13 +1,12 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
-  imports = [
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
 
   boot = {
     initrd = {
-      availableKernelModules = [ "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ];
+      availableKernelModules =
+        [ "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ];
       kernelModules = [ ];
     };
     kernelModules = [ "kvm-intel" ];
@@ -21,7 +20,6 @@
     };
   };
 
-
   fileSystems = {
     "/" = {
       device = "/dev/disk/by-uuid/b2c7656b-2292-4dc9-94f2-a66690a14969";
@@ -33,13 +31,13 @@
     };
   };
 
-  swapDevices = [{
+  swapDevices =
-    device = "/dev/disk/by-uuid/9cd48b44-07e5-4d0f-aaf0-7ca07e7b7945";
+    [{ device = "/dev/disk/by-uuid/9cd48b44-07e5-4d0f-aaf0-7ca07e7b7945"; }];
-  }];
 
   networking.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

nixpkgs.nix

@@ -1,8 +1,9 @@
 # A nixpkgs instance that is grabbed from the pinned nixpkgs commit in the lock file
 # This is useful to avoid using channels when using legacy nix commands
-let lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked;
+let
-in
+  lock =
-import (fetchTarball {
+    (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked;
+in import (fetchTarball {
   url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz";
   sha256 = lock.narHash;
-})
+})

overlays/default.nix

@@ -1,17 +1,17 @@
 # This file defines overlays
-{ inputs, ... }:
+{ inputs, ... }: {
-{
   # This one brings our custom packages from the 'pkgs' directory
   additions = final: _prev: import ../pkgs { pkgs = final; };
 
   # This one contains whatever you want to overlay
   # You can change versions, add patches, set compilation flags, anything really.
   # https://nixos.wiki/wiki/Overlays
-  modifications = final: prev: {
+  modifications = final: prev:
-    # example = prev.example.overrideAttrs (oldAttrs: rec {
+    {
-    # ...
+      # example = prev.example.overrideAttrs (oldAttrs: rec {
-    # });
+      # ...
-  };
+      # });
+    };
 
   # When applied, the stable nixpkgs set (declared in the flake inputs) will
   # be accessible through 'pkgs.stable'
@@ -22,4 +22,4 @@
     };
   };
   nixgl = inputs.nixgl.overlay;
-}
+}

pkgs/default.nix

@@ -1,6 +1,7 @@
 # Custom packages, that can be defined similarly to ones from nixpkgs
 # You can build them using 'nix build .#example' or (legacy) 'nix-build -A example'
 
-{ pkgs ? (import ../nixpkgs.nix) { } }: {
+{ pkgs ? (import ../nixpkgs.nix) { } }:
+{
   # example = pkgs.callPackage ./example { };
-}
+}

pkgs/trekscii/default.nix

@@ -1,8 +1,6 @@
 { lib, stdenv, fetchFromGitHub }:
-let
+let pname = "trekscii";
-  pname = "trekscii";
+in stdenv.mkDerivation {
-in
-stdenv.mkDerivation {
   inherit pname;
   version = "unstable-2022-06-27";
 
@@ -17,7 +15,5 @@ stdenv.mkDerivation {
     install -Dm 0755 bin/trekscii $out/bin/trekscii
   '';
 
-  meta = with lib; {
+  meta = with lib; { platforms = platforms.all; };
-    platforms = platforms.all;
+}
-  };
-}

shell.nix

@@ -7,4 +7,4 @@
     NIX_CONFIG = "experimental-features = nix-command flakes";
     nativeBuildInputs = with pkgs; [ nix home-manager git ];
   };
-}
+}