Update helix config

home/default.nix

@@ -1,9 +1,13 @@
-{ config, lib, inputs, self, ... }:
+{
-let
+  config,
+  lib,
+  inputs,
+  self,
+  ...
+}: let
   myHmConf = config.myOptions.home-manager;
   username = config.myOptions.system.username;
-in
+in {
-{
   home-manager = lib.mkIf myHmConf.enable {
     # Use verbose mode for home-manager
     verbose = true;

home/impermanence/default.nix

@@ -11,14 +11,17 @@ in {
 
   config = mkIf cfg.enable {
     home.persistence."${cfg.persistentMountPoint}" = {
-      directories = [
+      directories =
+        [
           ".cache/nix"
           ".cache/nix-index"
-      ] ++ cfg.extraDirectories;
+        ]
+        ++ cfg.extraDirectories;
 
-      files = [
+      files =
-
+        [
-      ] ++ cfg.extraFiles;
+        ]
+        ++ cfg.extraFiles;
 
       # Allow other users (such as root), to access files through the bind
       # mounted directories listed in `directories`. Useful for `sudo` operations,
@@ -27,13 +30,15 @@ in {
     };
 
     home.persistence."${cfg.persistentDataMountPoint}" = {
-      directories = [
+      directories =
+        [
+        ]
+        ++ cfg.extraDataDirectories;
 
-      ] ++ cfg.extraDataDirectories;
+      files =
-
+        [
-      files = [
+        ]
-
+        ++ cfg.extraDataFiles;
-      ] ++ cfg.extraDataFiles;
 
       # See comment for this above
       allowOther = true;

home/packages/cli/scripts/default.nix

@@ -1,9 +1,5 @@
-{
+{pkgs, ...}: let
-  pkgs,
+  scriptPkgs = import ./packages {inherit pkgs;};
-  ...
-}: let
-
-  scriptPkgs = (import ./packages {inherit pkgs;});
 in {
   home.packages = with scriptPkgs; [
     bitcoin

home/packages/cli/scripts/packages/bitcoin.nix

@@ -1,5 +1,4 @@
-{pkgs, ...}:
+{pkgs, ...}: (pkgs.writeShellApplication {
-(pkgs.writeShellApplication {
   name = "bitcoin";
   runtimeInputs = with pkgs; [coreutils curl jq];
   text = ''

home/packages/cli/scripts/packages/cheatsh/default.nix

@@ -1,5 +1,4 @@
-{pkgs, ...}:
+{pkgs, ...}: (pkgs.writeShellApplication {
-(pkgs.writeShellApplication {
   name = "cheat.sh";
   runtimeInputs = with pkgs; [coreutils curl jq gnugrep fzf];
   text = ''

home/packages/cli/scripts/packages/colors256/default.nix

@@ -1,9 +1,7 @@
-{pkgs, ...}:
+{pkgs, ...}: (pkgs.writeShellApplication {
-(pkgs.writeShellApplication {
   name = "colors-256";
   runtimeInputs = with pkgs; [coreutils];
   text = ''
     ${builtins.readFile ./colors-256.sh}
   '';
 })
-

home/packages/cli/scripts/packages/default.nix

@@ -1,7 +1,4 @@
-{
+{pkgs, ...}: let
-  pkgs,
-  ...
-}: let
   packages = {
     bitcoin = pkgs.callPackage ./bitcoin.nix {};
     cheatsh = pkgs.callPackage ./cheatsh {};
@@ -11,4 +8,3 @@
   };
 in
   packages
-

home/packages/cli/scripts/packages/gh-notify/default.nix

@@ -1,5 +1,4 @@
-{pkgs, ...}:
+{pkgs, ...}: (pkgs.writeShellApplication {
-(pkgs.writeShellApplication {
   name = "gh-notify";
   runtimeInputs = with pkgs; [
     coreutils
@@ -12,5 +11,3 @@
     ${builtins.readFile ./gh-notify.sh}
   '';
 })
-
-

home/packages/cli/scripts/packages/unix/default.nix

@@ -1,10 +1,7 @@
-{pkgs, ...}:
+{pkgs, ...}: (pkgs.writeShellApplication {
-(pkgs.writeShellApplication {
   name = "unix";
   runtimeInputs = with pkgs; [coreutils];
   text = ''
     ${builtins.readFile ./unix.sh}
   '';
 })
-
-

home/packages/gui/wayland/swappy.nix

@@ -7,7 +7,6 @@
   ...
 }: let
   inherit (lib) mkIf;
-
 in {
   config = mkIf osConfig.myOptions.home-manager.wms.isWayland {
     home.packages = with pkgs; [swappy];

home/packages/gui/wayland/wlogout.nix

@@ -5,11 +5,8 @@
   ...
 }: let
   inherit (lib) mkIf;
-
 in {
   config = mkIf osConfig.myOptions.home-manager.wms.isWayland {
     home.packages = with pkgs; [wlogout];
   };
 }
-
-

home/programs/graphical/apps/obs.nix

@@ -16,6 +16,3 @@ in {
     ];
   };
 }
-
-
-

home/programs/graphical/apps/qbittorrent.nix

@@ -14,4 +14,3 @@ in {
     ];
   };
 }
-

home/programs/graphical/apps/stremio.nix

@@ -14,4 +14,3 @@ in {
     ];
   };
 }
-

home/programs/graphical/apps/webcord/default.nix

@@ -31,4 +31,3 @@ in {
     };
   };
 }
-

home/programs/graphical/bars/eww/default.nix

@@ -6,7 +6,7 @@
 }: let
   inherit (lib) mkIf;
 
-  scriptPkgs = (import ../../../../packages/cli/scripts/packages {inherit pkgs;});
+  scriptPkgs = import ../../../../packages/cli/scripts/packages {inherit pkgs;};
 
   cfg = osConfig.myOptions.home-manager.programs.bars.eww;
 in {

home/programs/graphical/browsers/chromium/default.nix

@@ -14,7 +14,8 @@ in {
       enable = true;
 
       package = pkgs.ungoogled-chromium.override {
-        commandLineArgs = [
+        commandLineArgs =
+          [
             # Ungoogled features
             "--disable-search-engine-collection"
             "--extension-mime-request-handling=always-prompt-for-install"
@@ -60,7 +61,8 @@ in {
             "--disable-sync"
             "--disable-speech-api"
             "--disable-speech-synthesis-api"
-        ] ++ optionals isWayland [
+          ]
+          ++ optionals isWayland [
             "--ozone-platform=wayland"
             "--enable-features=UseOzonePlatform"
           ];
@@ -68,4 +70,3 @@ in {
     };
   };
 }
-

home/programs/graphical/browsers/default.nix

@@ -6,4 +6,3 @@ _: {
     ./firefox
   ];
 }
-

home/programs/graphical/browsers/schizofox/default.nix

@@ -143,9 +143,9 @@ in {
           ];
 
           extraExtensions = builtins.foldl' (acc: ext: acc // {ext.id = {install_url = mkUrl ext.name;};}) {} extensions;
-        in extraExtensions;
+        in
+          extraExtensions;
       };
     };
   };
 }
-

home/programs/graphical/wms/hyprland/config/gestures.nix

@@ -10,4 +10,3 @@
     };
   };
 }
-

home/programs/graphical/wms/hyprland/config/input.nix

@@ -1,7 +1,4 @@
-{
+{osConfig, ...}: let
-  osConfig,
-  ...
-}: let
   cfg = osConfig.myOptions.home-manager.wms.hyprland;
 in {
   wayland.windowManager.hyprland.settings = {
@@ -29,4 +26,3 @@ in {
     monitor = cfg.monitor;
   };
 }
-

home/programs/graphical/wms/hyprland/config/keybinds.nix

@@ -1,4 +1,8 @@
-{ config, osConfig, ... }: let
+{
+  config,
+  osConfig,
+  ...
+}: let
   cfgPreferences = osConfig.myOptions.home-manager.preferences;
 in {
   wayland.windowManager.hyprland = {
@@ -191,7 +195,6 @@ in {
         # Global keybinds (passing keys to other programs)
         #
         "CTRL, F10, pass, ^(com\.obsproject\.Studio)$"
-
       ];
 
       # Mouse bindings

home/programs/graphical/wms/hyprland/config/style.nix

@@ -1,10 +1,5 @@
-{
+{config, ...}: {
-  config,
-  ...
-}:
-{
   wayland.windowManager.hyprland.settings = {
-
     #
     # Window gaps
     #
@@ -81,7 +76,6 @@
       "col.shadow_inactive" = "rgba(0F0F0F99)";
     };
 
-
     #
     # Window Blur
     #
@@ -92,7 +86,6 @@
       passes = 1;
     };
 
-
     #
     # Dim inactive windows
     #
@@ -124,4 +117,3 @@
     misc.animate_manual_resizes = true;
   };
 }
-

home/programs/graphical/wms/hyprland/config/window_rules.nix

@@ -109,4 +109,3 @@
     ];
   };
 }
-

home/programs/graphical/wms/hyprland/default.nix

@@ -6,7 +6,7 @@
 }: let
   inherit (lib) mkIf;
 
-  hyprPkgs = (import ./packages {inherit pkgs;});
+  hyprPkgs = import ./packages {inherit pkgs;};
 
   # TODO: Switch to flake
   hyprlandPkg = pkgs.hyprland;

home/programs/graphical/wms/hyprland/packages/default.nix

@@ -1,7 +1,4 @@
-{
+{pkgs, ...}: let
-  pkgs,
-  ...
-}: let
   packages = {
     hyprland-move-window = pkgs.callPackage ./hyprland-move-window {};
     brightness = pkgs.callPackage ./brightness {};

home/programs/graphical/wms/hyprland/packages/hyprland-move-window/default.nix

@@ -2,4 +2,3 @@
 pkgs.writeShellScriptBin "hyprland-move-window" ''
   ${builtins.readFile ./hyprland-move-window.sh}
 ''
-

home/programs/graphical/wms/hyprland/packages/quick-record/default.nix

@@ -13,4 +13,3 @@ pkgs.writeShellApplication {
     ${builtins.readFile ./quick-record.sh}
   '';
 }
-

home/programs/graphical/wms/hyprland/packages/toggle-fake-fullscreen/default.nix

@@ -10,5 +10,3 @@ pkgs.writeShellApplication {
     ${builtins.readFile ./toggle-fake-fullscreen.sh}
   '';
 }
-
-

home/programs/graphical/wms/hyprland/packages/toggle-notifications/default.nix

@@ -10,6 +10,3 @@ pkgs.writeShellApplication {
     ${builtins.readFile ./toggle-notifications.sh}
   '';
 }
-
-
-

home/programs/terminal/editors/default.nix

@@ -1,6 +1,6 @@
 _: {
   imports = [
     ./neovim
+    ./helix
   ];
 }
-

home/programs/terminal/editors/helix/default.nix

@@ -0,0 +1,49 @@
+{pkgs, ...}: {
+  programs.helix = {
+    enable = true;
+
+    settings = {
+      theme = "tokyonight";
+      editor = {
+        line-number = "relative";
+        bufferline = "multiple";
+        cursor-shape.insert = "bar";
+        lsp.display-messages = true;
+      };
+      keys = {
+        normal = {
+          esc = ["collapse_selection" "keep_primary_selection"];
+        };
+      };
+    };
+
+    languages = {
+      language = [
+        {
+          name = "python";
+          scope = "source.python";
+          injection-regex = "python";
+          file-types = ["py" "pyi" "py3" "pyw" ".pythonstartup" ".pythonrc"];
+          shebangs = ["python"];
+          roots = ["." "pyproject.toml" "pyrightconfig.json"];
+          comment-token = "#";
+          language-servers = ["basedpyright" "ruff"];
+          indent = {
+            tab-width = 4;
+            unit = "    ";
+          };
+          auto-format = true;
+        }
+      ];
+      language-server = {
+        ruff = {
+          command = "ruff-lsp";
+        };
+        basedpyright = {
+          command = "basedpyright-langserver";
+          args = ["--stdio"];
+        };
+      };
+    };
+  };
+}

home/programs/terminal/emulators/default.nix

@@ -8,5 +8,3 @@ _: {
     ./kitty.nix
   ];
 }
-
-

home/programs/terminal/emulators/foot.nix

@@ -1,7 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  ...
-}: {
   home.packages = with pkgs; [
     libsixel # for displaying images
   ];
@@ -62,4 +59,3 @@
     };
   };
 }
-

home/programs/terminal/emulators/kitty.nix

@@ -92,4 +92,3 @@ in {
     };
   };
 }
-

home/programs/terminal/file-managers/default.nix

@@ -9,4 +9,3 @@ _: {
     ./ranger.nix
   ];
 }
-

home/programs/terminal/file-managers/ranger.nix

@@ -16,4 +16,3 @@ in {
     ${(optionalString config.programs.kitty.enable "set preview_images_method kitty")}
   '';
 }
-

home/programs/terminal/file-managers/xplr/default.nix

@@ -49,4 +49,3 @@
     }
   '';
 }
-

home/programs/terminal/file-managers/xplr/plugins.nix

@@ -12,4 +12,3 @@ pkgs: {
     hash = "sha256-k/yre9SYNPYBM2W1DPpL6Ypt3w3EMO9dznHwa+fw/n0=";
   };
 }
-

home/programs/terminal/file-managers/yazi/default.nix

@@ -38,4 +38,3 @@
     };
   };
 }
-

home/programs/terminal/file-managers/yazi/theme/icons.nix

@@ -144,4 +144,3 @@
     "*.pkg" = "";
   };
 }
-

home/programs/terminal/file-managers/yazi/theme/manager.nix

@@ -61,4 +61,3 @@
     syntect_theme = "";
   };
 }
-

home/programs/terminal/file-managers/yazi/theme/status.nix

@@ -43,4 +43,3 @@
     permissions_s = {fg = "darkgray";};
   };
 }
-

home/programs/terminal/shell/zsh/aliases.nix

@@ -1,8 +1,11 @@
-{ config, pkgs, lib, ... }:
-let
-  nr = "${pkgs.nixos-rebuild}/bin/nixos-rebuild";
-in
 {
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  nr = "${pkgs.nixos-rebuild}/bin/nixos-rebuild";
+in {
   programs.zsh.shellAliases = {
     # I'm not the greatest typist
     sl = "ls";

home/programs/terminal/shell/zsh/default.nix

@@ -1,4 +1,8 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     ./plugins.nix
     ./aliases.nix

home/programs/terminal/shell/zsh/init.nix

@@ -1,9 +1,6 @@
-_:
+_: let
-let
   inherit (builtins) readFile;
-in
+in {
-{
-
   # I prefer having the rc files split across multiple files in my system rather
   # than just using readFile and putting them all into the generated zshrc
   # this also allows me to source them individually if I need to

home/programs/terminal/shell/zsh/plugins.nix

@@ -1,8 +1,10 @@
-{ config, pkgs, ... }:
-let
-  inherit (pkgs) fetchFromGitHub;
-in
 {
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (pkgs) fetchFromGitHub;
+in {
   programs.zsh.plugins = [
     {
       name = "zsh-nix-shell";

home/programs/terminal/tools/fastfetch.nix

@@ -11,4 +11,3 @@ in {
     programs.fastfetch.enable = true;
   };
 }
-

home/programs/terminal/tools/git/aliases.nix

@@ -1,9 +1,5 @@
-{
+{pkgs, ...}: let
-  pkgs,
+  scriptPkgs = import ./bin {inherit pkgs;};
-  ...
-}: let
-
-  scriptPkgs = (import ./bin {inherit pkgs;});
 in {
   programs.git = {
     aliases = {
@@ -70,6 +66,8 @@ in {
 
       set-upstream = "!git branch --set-upstream-to=origin/`git symbolic-ref --short HEAD`";
 
+      fixup-picker = "!git log -n 50 --pretty=format:'%h %s' --no-merges | fzf | cut -c -7 | xargs -o git commit --fixup";
+
       staash = "stash --all";
       stash-staged = "!sh -c 'git stash --keep-index; git stash push -m \"staged\" --keep-index; git stash pop stash@{1}'";
 

home/programs/terminal/tools/git/bin/default.nix

@@ -1,7 +1,4 @@
-{
+{pkgs, ...}: let
-  pkgs,
-  ...
-}: let
   packages = {
     better-git-branch = pkgs.callPackage ./better-git-branch {};
   };

home/programs/terminal/tools/git/default.nix

@@ -1,8 +1,10 @@
-{ osConfig, pkgs, ... }:
-let
-  myGitConf = osConfig.myOptions.home-manager.git;
-in
 {
+  osConfig,
+  pkgs,
+  ...
+}: let
+  myGitConf = osConfig.myOptions.home-manager.git;
+in {
   imports = [
     ./gh.nix
     ./ignores.nix

home/programs/terminal/tools/iamb.nix

@@ -33,10 +33,12 @@ in {
       };
 
       default_profile = cfg.defaultProfile;
-      profiles = lib.mapAttrs (name: profile: {
+      profiles =
+        lib.mapAttrs (name: profile: {
           user_id = profile.userId;
           url = profile.homeServer;
-      }) cfg.profiles;
+        })
+        cfg.profiles;
 
       dirs = {
         cache = "${config.xdg.cacheHome}/iamb/";

home/programs/terminal/tools/newsboat/default.nix

@@ -1,5 +1,9 @@
 # Config copied from https://git.notashelf.dev/NotAShelf/nyx
-{ pkgs, lib, ... }: let 
+{
+  pkgs,
+  lib,
+  ...
+}: let
   inherit (lib) getExe;
 
   mpv = "${getExe pkgs.mpv}";

home/programs/terminal/tools/newsboat/urls.nix

@@ -57,4 +57,3 @@
     {url = "https://kiszamolo.hu/feed";}
   ];
 }
-

home/programs/terminal/tools/ssh.nix

@@ -1,7 +1,6 @@
 {
   programs = {
     ssh = {
-
       # TODO: Enable this after figuring out how to add protected/encrypted blocks here.
       # I don't like the idea of expising IPs/hostnames in the config.
       # For now, I just persist the .ssh directory, managing stuff manually.

home/programs/xdg/config-files.nix

@@ -7,7 +7,6 @@
   XDG_RUNTIME_DIR = config.home.sessionVariables.XDG_RUNTIME_DIR;
   XDG_BIN_HOME = config.home.sessionVariables.XDG_BIN_HOME;
 in {
-
   # Variables set to force apps into the XDG base directories
   # These will get set at login
   # Defined in /etc/profiles/per-user/$USER/etc/profile.d/hm-session-vars.sh

home/programs/xdg/default.nix

@@ -1,4 +1,8 @@
-{config, pkgs, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     ./mime-apps.nix
     ./user-dirs.nix

home/programs/xdg/mime-apps.nix

@@ -1,8 +1,5 @@
 # Manage $XDG_CONFIG_HOME/mimeapps.list
-{
+{osConfig, ...}: let
-  osConfig,
-  ...
-}: let
   cfgPreferences = osConfig.myOptions.home-manager.preferences;
 in {
   xdg.mimeApps = let

home/services/hyprpaper.nix

@@ -31,4 +31,3 @@ in {
     '';
   };
 }
-

home/themes/cursor.nix

@@ -1,7 +1,4 @@
-{
+{osConfig, ...}: let
-  osConfig,
-  ...
-}: let
   cfg = osConfig.myOptions.home-manager.theme.cursor;
 in {
   home = {

home/themes/gtk.nix

@@ -18,7 +18,11 @@ in {
       GTK_THEME = "${cfg.theme.name}";
 
       # gtk applications should use filepickers specified by xdg
-      GTK_USE_PORTAL = "${toString (if cfg.usePortal then 1 else 0)}";
+      GTK_USE_PORTAL = "${toString (
+        if cfg.usePortal
+        then 1
+        else 0
+      )}";
     };
   };
 

home/themes/qt.nix

@@ -80,7 +80,6 @@ in {
     };
     "Kvantum/${cfg.kvantumTheme.name}".source = "${cfg.kvantumTheme.package}/share/Kvantum/${cfg.kvantumTheme.name}";
 
-
     # Set icon theme using qtct
     "qt5ct/qt5ct.conf".text = lib.generators.toINI {} {
       Appearance = {

hosts/default.nix

@@ -1,5 +1,4 @@
-{ inputs, ... }:
+{inputs, ...}: let
-let
   inherit (inputs) self;
   inherit (inputs.nixpkgs) lib;
 
@@ -9,27 +8,30 @@ let
     ../home
     ../options
   ];
-in
+in {
-{
   herugrim = lib.nixosSystem {
     system = "x86_64-linux";
     specialArgs = {inherit lib inputs self;};
-    modules = [
+    modules =
+      [
         ./herugrim
         inputs.home-manager.nixosModules.home-manager
         inputs.impermanence.nixosModules.impermanence
         inputs.lanzaboote.nixosModules.lanzaboote
-    ] ++ shared;
+      ]
+      ++ shared;
   };
 
   voyager = lib.nixosSystem {
     system = "x86_64-linux";
     specialArgs = {inherit lib inputs self;};
-    modules = [
+    modules =
+      [
         ./voyager
         inputs.home-manager.nixosModules.home-manager
         inputs.impermanence.nixosModules.impermanence
         inputs.lanzaboote.nixosModules.lanzaboote
-    ] ++ shared;
+      ]
+      ++ shared;
   };
 }

hosts/herugrim/default.nix

@@ -1,5 +1,8 @@
-{ lib, pkgs, ... }:
 {
+  lib,
+  pkgs,
+  ...
+}: {
   imports = [
     ./hardware-configuration.nix
   ];

hosts/herugrim/hardware-configuration.nix

@@ -1,11 +1,15 @@
 # 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, ... }:
-
 {
-  imports =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
   boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod"];
@@ -15,45 +19,45 @@
 
   boot.initrd.luks.devices."cryptfs".device = "/dev/disk/by-label/NIXCRYPTROOT";
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
     fsType = "btrfs";
     options = ["subvol=root" "noatime" "compress=zstd:3"];
   };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
     fsType = "btrfs";
     options = ["subvol=home" "noatime" "compress=zstd:3"];
   };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
     fsType = "btrfs";
     options = ["subvol=nix" "noatime" "compress=zstd:3"];
   };
 
-  fileSystems."/var/log" =
+  fileSystems."/var/log" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
     fsType = "btrfs";
     options = ["subvol=log" "noatime" "compress=zstd:3"];
     neededForBoot = true;
   };
 
-  fileSystems."/persist" =
+  fileSystems."/persist" = {
-    { device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/NIXROOT";
     fsType = "btrfs";
     options = ["subvol=persist" "noatime" "compress=zstd:3"];
     neededForBoot = true;
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-label/NIXBOOT";
+    device = "/dev/disk/by-label/NIXBOOT";
     fsType = "vfat";
   };
 
-  swapDevices =
+  swapDevices = [
-    [ { device = "/dev/disk/by-label/SWAP"; }
+    {device = "/dev/disk/by-label/SWAP";}
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/voyager/default.nix

@@ -1,12 +1,14 @@
 # Edit this configuration file to define what should be installed on
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
-
-{ config, lib, pkgs, ... }:
-
 {
-  imports =
+  config,
-    [ # Include the results of the hardware scan.
+  lib,
+  pkgs,
+  ...
+}: {
+  imports = [
+    # Include the results of the hardware scan.
     ./hardware-configuration.nix
   ];
 
@@ -83,6 +85,7 @@
             ".local/state/nvim"
             ".config/github-copilot"
             ".config/ipython"
+            ".cache/pre-commit"
 
             # Services
             ".local/state/wireplumber" # volume settings

hosts/voyager/hardware-configuration.nix

@@ -1,11 +1,15 @@
 # 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, ... }:
-
 {
-  imports =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
   boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usb_storage" "sd_mod"];
@@ -15,45 +19,45 @@
 
   boot.initrd.luks.devices."cryptfs".device = "/dev/disk/by-label/NIXOS-CRYPTFS";
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-label/NIXOS-FS";
+    device = "/dev/disk/by-label/NIXOS-FS";
     fsType = "btrfs";
     options = ["subvol=root" "noatime" "compress=zstd:3"];
   };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    { device = "/dev/disk/by-label/NIXOS-FS";
+    device = "/dev/disk/by-label/NIXOS-FS";
     fsType = "btrfs";
     options = ["subvol=nix" "noatime" "compress=zstd:3"];
   };
 
-  fileSystems."/persist" =
+  fileSystems."/persist" = {
-    { device = "/dev/disk/by-label/NIXOS-FS";
+    device = "/dev/disk/by-label/NIXOS-FS";
     fsType = "btrfs";
     options = ["subvol=persist" "noatime" "compress=zstd:3"];
     neededForBoot = true;
   };
 
-  fileSystems."/data" =
+  fileSystems."/data" = {
-    { device = "/dev/disk/by-label/NIXOS-FS";
+    device = "/dev/disk/by-label/NIXOS-FS";
     fsType = "btrfs";
     options = ["subvol=data" "noatime" "compress=zstd:3"];
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-label/EFI";
+    device = "/dev/disk/by-label/EFI";
     fsType = "vfat";
     options = ["fmask=0022" "dmask=0022"];
   };
 
-  fileSystems."/.btrfs" =
+  fileSystems."/.btrfs" = {
-    { device = "/dev/disk/by-label/NIXOS-FS";
+    device = "/dev/disk/by-label/NIXOS-FS";
     fsType = "btrfs";
     options = ["noatime" "compress=zstd:3"];
   };
 
-  swapDevices =
+  swapDevices = [
-    [ { device = "/dev/disk/by-label/SWAP"; }
+    {device = "/dev/disk/by-label/SWAP";}
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

options/device/hardware.nix

@@ -1,7 +1,6 @@
 {lib, ...}: let
   inherit (lib) mkOption mkEnableOption types;
-in
+in {
-{
   options.myOptions.device = {
     cpu.type = mkOption {
       type = with types; nullOr (enum ["intel" "amd"]);

options/device/roles.nix

@@ -1,4 +1,8 @@
-{ lib, config, ... }: let 
+{
+  lib,
+  config,
+  ...
+}: let
   inherit (lib) mkOption types;
 
   cfg = config.myOptions.device.roles;

options/home/default.nix

@@ -1,7 +1,7 @@
-{ lib, ... }: with lib; let
+{lib, ...}:
+with lib; let
   inherit (lib) mkEnableOption mkOption;
-in
+in {
-{
   imports = [
     ./programs
     ./git.nix
@@ -21,4 +21,3 @@ in
     };
   };
 }
-

options/home/git.nix

@@ -1,7 +1,7 @@
-{ lib, ... }: with lib; let
+{lib, ...}:
+with lib; let
   inherit (lib) mkEnableOption mkOption;
-in
+in {
-{
   options.myOptions.home-manager.git = {
     userName = mkOption {
       type = types.str;

options/home/preferences.nix

@@ -1,13 +1,15 @@
 {lib, ...}: let
   inherit (lib) mkOption types;
 
-  mkPreferenceCmdOption = name: commandDefault: mkOption {
+  mkPreferenceCmdOption = name: commandDefault:
+    mkOption {
       type = types.str;
       description = "The command to start your preferred ${name}.";
       default = commandDefault;
     };
 
-  mkPreferenceDesktopOption = name: desktopDefault: mkOption {
+  mkPreferenceDesktopOption = name: desktopDefault:
+    mkOption {
       type = types.str;
       description = "The desktop (application) file for your preferred ${name}.";
       default = desktopDefault;
@@ -17,8 +19,7 @@
     command = mkPreferenceCmdOption name commandDefault;
     desktop = mkPreferenceDesktopOption name desktopDefault;
   };
-in 
+in {
-{
   options.myOptions.home-manager.preferences = {
     browser = mkPreferenceOptions "browser" "firefox" "firefox.desktop";
     terminalEmulator = mkPreferenceOptions "terminal emulator" "kitty" "kitty.desktop";

options/home/programs/default.nix

@@ -1,7 +1,7 @@
-{ lib, ... }: with lib; let
+{lib, ...}:
+with lib; let
   inherit (lib) mkEnableOption mkOption types;
-in
+in {
-{
   imports = [
     ./iamb.nix
   ];

options/home/programs/iamb.nix

@@ -6,8 +6,7 @@
   inherit (lib) mkEnableOption mkOption types mkIf;
 
   cfg = config.myOptions.home-manager.programs.applications.iamb;
-in
+in {
-{
   options.myOptions.home-manager.programs.applications.iamb = {
     enable = mkEnableOption "iamb (vim-inspired terminal Matrix client)";
     defaultProfile = mkOption {
@@ -48,4 +47,3 @@ in
     ];
   };
 }
-

options/home/services.nix

@@ -1,7 +1,7 @@
-{ lib, ... }: with lib; let
+{lib, ...}:
+with lib; let
   inherit (lib) mkEnableOption mkOption types;
-in
+in {
-{
   options.myOptions.home-manager.services = {
     dunst.enable = mkEnableOption "Dunst (lightweight notification daemon)";
     hyprpaper = {
@@ -14,4 +14,3 @@ in
     };
   };
 }
-

options/home/theme.nix

@@ -1,7 +1,10 @@
-{ lib, pkgs, ... }: let
-  inherit (lib) mkEnableOption mkOption types;
-in 
 {
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkOption types;
+in {
   options.myOptions.home-manager.theme = {
     gtk = {
       enable = mkEnableOption "GTK theming optionss";
@@ -141,6 +144,5 @@ in
         description = "The size of the cursor";
       };
     };
-
   };
 }

options/home/wms.nix

@@ -11,7 +11,6 @@ in {
         Hyprland wayland compositor.
       '';
 
-
       monitor = mkOption {
         type = types.listOf types.str;
         default = [];

options/security/auditd.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }: with lib; let
-  inherit (lib) mkEnableOption mkOption literalExpression types;
-in
 {
+  lib,
+  config,
+  ...
+}:
+with lib; let
+  inherit (lib) mkEnableOption mkOption literalExpression types;
+in {
   options.myOptions.security.auditd = {
     enable = mkEnableOption "the audit daemon.";
     autoPrune = {
@@ -58,4 +62,3 @@ in
     };
   };
 }
-

options/system/boot/default.nix

@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ...}: let
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
   inherit (lib) mkOption mkEnableOption literalExpression;
 
   cfg = config.myOptions.system.boot;
@@ -16,15 +21,15 @@ in {
       description = "The kernel to use for the system.";
     };
 
-    tmpOnTmpfs =
+    tmpOnTmpfs = mkEnableOption ''
-      mkEnableOption ''
       `/tmp` living on tmpfs. false means it will be cleared manually on each reboot
 
       This option defaults to `true` if the host provides patches to the kernel package in
       `boot.kernelPatches`
     '';
 
-    silentBoot = mkEnableOption ''
+    silentBoot =
+      mkEnableOption ''
         almost entirely silent boot process through `quiet` kernel parameter
       ''
       // {default = cfg.plymouth.enable;};

options/system/boot/plymouth.nix

@@ -1,7 +1,7 @@
-{ lib, ... }: with lib; let
+{lib, ...}:
+with lib; let
   inherit (lib) mkEnableOption mkOption types;
-in
+in {
-{
   options.myOptions.system.boot.plymouth = {
     enable = mkEnableOption ''
       Plymouth boot splash.

options/system/boot/secure-boot.nix

@@ -1,7 +1,7 @@
-{ lib, ... }: with lib; let
+{lib, ...}:
+with lib; let
   inherit (lib) mkEnableOption;
-in
+in {
-{
   options.myOptions.system.boot.secure-boot = {
     enable = mkEnableOption ''
       secure-boot using lanzaboote.

options/system/default.nix

@@ -1,7 +1,7 @@
-{ lib, ... }: with lib; let
+{lib, ...}:
+with lib; let
   inherit (lib) mkOption;
-in
+in {
-{
   imports = [
     ./boot
     ./impermanence.nix

options/system/impermanence.nix

@@ -1,9 +1,13 @@
-{ lib, config, ... }: with lib; let
+{
+  lib,
+  config,
+  ...
+}:
+with lib; let
   inherit (lib) mkEnableOption mkOption literalExpression types;
 
   cfg = config.myOptions.system.impermanence;
-in
+in {
-{
   options.myOptions.system.impermanence = {
     root = {
       enable = mkEnableOption ''

options/workstation/default.nix

@@ -1,9 +1,13 @@
-{ lib, config, ... }: with lib; let
+{
+  lib,
+  config,
+  ...
+}:
+with lib; let
   inherit (lib) mkEnableOption mkOption literalExpression types;
 
   cfg = config.myOptions.workstation;
-in
+in {
-{
   options.myOptions.workstation = {
     printing = {
       enable = mkEnableOption ''

system/roles/laptop/power/acpi.nix

@@ -1,4 +1,9 @@
-{ pkgs, lib, config, ...}: let
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   deviceType = config.myOptions.device.roles.type;
   acceptedTypes = ["laptop"];
@@ -20,4 +25,3 @@ in {
     };
   };
 }
-

system/roles/laptop/power/default.nix

@@ -1,4 +1,9 @@
-{ pkgs, lib, config, ...}: let
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   deviceType = config.myOptions.device.roles.type;
   acceptedTypes = ["laptop"];

system/roles/laptop/power/power-profiles-daemon/default.nix

@@ -1,4 +1,9 @@
-{ pkgs, lib, config, ...}: let
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   inherit (lib.modules) mkForce;
   inherit (lib.strings) makeBinPath;

system/roles/laptop/power/upower.nix

@@ -1,4 +1,9 @@
-{ pkgs, lib, config, ...}: let
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   deviceType = config.myOptions.device.roles.type;
   acceptedTypes = ["laptop"];
@@ -16,4 +21,3 @@ in {
     };
   };
 }
-

system/roles/laptop/touchpad.nix

@@ -1,4 +1,8 @@
-{ lib, config, ...}: let
+{
+  lib,
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   deviceType = config.myOptions.device.roles.type;
   acceptedTypes = ["laptop"];

system/roles/workstation/display/login/greetd.nix

@@ -7,7 +7,6 @@
   inherit (lib) mkIf getExe;
   inherit (lib.strings) concatStringsSep;
 
-
   deviceType = config.myOptions.device.roles.type;
   acceptedTypes = ["laptop" "desktop"];
 

system/roles/workstation/display/login/pam.nix

@@ -1,4 +1,8 @@
-{lib, config, ...}: let
+{
+  lib,
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   deviceType = config.myOptions.device.roles.type;
   acceptedTypes = ["laptop" "desktop"];

system/roles/workstation/display/wayland/xdg-portals.nix

@@ -23,7 +23,10 @@ in {
         # Note: this assumes a wlroots based compositor if it's not hyprland
         # which may not always actually be the case, however, I can't be bothered to handle
         # everything here and I don't plan on moving WMs any time soon.
-        portal = if cfgHyprlandEnabled then "hyprland" else "wlr";
+        portal =
+          if cfgHyprlandEnabled
+          then "hyprland"
+          else "wlr";
       in {
         # Use this portal for every interface, unless a specific override is present
         default = ["gtk"];

system/roles/workstation/fonts.nix

@@ -1,4 +1,9 @@
-{pkgs, lib, config, ...}: let
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   deviceType = config.myOptions.device.roles.type;
   acceptedTypes = ["laptop" "desktop"];
@@ -15,26 +20,30 @@ in {
             "Noto Color Emoji"
           ];
         in {
-          monospace = [
+          monospace =
+            [
               "Monaspace Krypton"
               "Source Code Pro Medium"
               "Source Han Mono"
             ]
             ++ common;
 
-          sansSerif = [
+          sansSerif =
+            [
               "Noto Sans"
               "Jost"
               "Lexend"
             ]
             ++ common;
 
-          serif = [
+          serif =
+            [
               "Noto Serif"
             ]
             ++ common;
 
-          emoji = [
+          emoji =
+            [
               "Noto Color Emoji"
             ]
             ++ common;

system/roles/workstation/programs/misc.nix

@@ -1,4 +1,8 @@
-{ lib, config, ...}: let
+{
+  lib,
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   deviceType = config.myOptions.device.roles.type;
   acceptedTypes = ["laptop" "desktop"];

system/roles/workstation/programs/physlock.nix

@@ -1,4 +1,8 @@
-{ lib, config, ...}: let
+{
+  lib,
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   deviceType = config.myOptions.device.roles.type;
   acceptedTypes = ["laptop" "desktop"];

system/roles/workstation/programs/steam.nix

@@ -16,4 +16,3 @@ in {
     };
   };
 }
-

system/roles/workstation/programs/thunar.nix

@@ -34,4 +34,3 @@ in {
     services.tumbler.enable = true;
   };
 }
-

system/roles/workstation/services/default.nix

@@ -8,4 +8,3 @@
     ./gnome-keyring.nix
   ];
 }
-

system/roles/workstation/services/earlyoom.nix

@@ -1,4 +1,9 @@
-{pkgs, lib, config, ...}: let
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   deviceType = config.myOptions.device.roles.type;
   acceptedTypes = ["laptop" "desktop"];

system/roles/workstation/services/gnome-keyring.nix

@@ -1,4 +1,9 @@
-{pkgs, lib, config, ...}: let
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
   inherit (lib) mkIf;
   deviceType = config.myOptions.device.roles.type;
   acceptedTypes = ["laptop" "desktop"];