format stuff

home/default.nix

@@ -1,20 +1,21 @@
-{ impermanence, pkgs, ... }:
-let
-  user = import ../users/user.nix;
-in
 {
+  impermanence,
+  pkgs,
+  ...
+}: let
+  user = import ../users/user.nix;
+in {
   programs.fuse.userAllowOther = true;
 
   fileSystems."/home/${user.primary.userName}" = {
     device = "tmpfs";
     fsType = "tmpfs";
-    options = [ "mode=0755" "uid=1000" "gid=100" ];
+    options = ["mode=0755" "uid=1000" "gid=100"];
   };
 
   home-manager.useUserPackages = true;
   home-manager.useGlobalPkgs = true;
-  home-manager.users.${user.primary.userName} = { pkgs, ... }: {
+  home-manager.users.${user.primary.userName} = {pkgs, ...}: {
-
     imports = [
       impermanence.nixosModules.home-manager.impermanence
 
@@ -36,7 +37,7 @@ in
     home.packages = with pkgs; [
       _1password-gui
       brightnessctl
-      (discord.override { withOpenASAR = true; })
+      discord
       evince
       gnome.eog
       gnome.gnome-system-monitor

home/dev.nix

@@ -1,8 +1,6 @@
-{ pkgs, ... }:
+{pkgs, ...}: let
-let
   user = import ../users/user.nix;
-in
+in {
-{
   imports = [
     ./nvim.nix
   ];
@@ -10,14 +8,13 @@ in
   home.packages = with pkgs; [
     git-crypt
     lazydocker
-    nixpkgs-fmt
     ripgrep
   ];
   programs = {
     gh = {
       enable = true;
       settings.git_protocol = "ssh";
-      extensions = [ pkgs.gh-dash ];
+      extensions = [pkgs.gh-dash];
     };
     git = {
       enable = true;
@@ -34,7 +31,7 @@ in
         init.defaultBranch = "main";
         push.autoSetupRemote = true;
       };
-      ignores = [ "/.nix" "/.direnv" ];
+      ignores = ["/.nix" "/.direnv"];
     };
     lazygit = {
       enable = true;

home/downloader.nix

@@ -1,4 +1,4 @@
-{ ... }: {
+{...}: {
   programs = {
     aria2 = {
       enable = true;

home/firefox.nix

@@ -1,10 +1,12 @@
-{ pkgs, osConfig, ... }:
 {
+  pkgs,
+  osConfig,
+  ...
+}: {
   programs = {
     firefox = {
       enable = true;
-      package =
+      package = pkgs.firefox.override {
-        (pkgs.firefox.override {
         extraPolicies = {
           DontCheckDefaultBrowser = true;
           DisablePocket = true;
@@ -56,20 +58,53 @@
             };
           };
           Preferences = {
-              "browser.crashReports.unsubmittedCheck.autoSubmit2" = { Value = false; Status = "locked"; };
+            "browser.crashReports.unsubmittedCheck.autoSubmit2" = {
-              "browser.selfsupport.url" = { Value = ""; Status = "locked"; };
+              Value = false;
-              "browser.aboutConfig.showWarning" = { Value = false; Status = "locked"; };
+              Status = "locked";
-              "browser.aboutHomeSnippets.updateUrl" = { Value = ""; Status = "locked"; };
+            };
-              "browser.startup.homepage_override.mstone" = { Value = "ignore"; Status = "locked"; };
+            "browser.selfsupport.url" = {
-              "browser.startup.homepage_override.buildID" = { Value = ""; Status = "locked"; };
+              Value = "";
-              "browser.tabs.firefox-view" = { Value = false; Status = "locked"; };
+              Status = "locked";
-              "dom.security.https_only_mode" = { Value = true; Status = "locked"; };
+            };
-              "extensions.htmlaboutaddons.recommendations.enabled" = { Value = false; Status = "locked"; };
+            "browser.aboutConfig.showWarning" = {
-              "extensions.recommendations.themeRecommendationUrl" = { Value = ""; Status = "locked"; };
+              Value = false;
-              "network.IDN_show_punycode" = { Value = true; Status = "locked"; };
+              Status = "locked";
+            };
+            "browser.aboutHomeSnippets.updateUrl" = {
+              Value = "";
+              Status = "locked";
+            };
+            "browser.startup.homepage_override.mstone" = {
+              Value = "ignore";
+              Status = "locked";
+            };
+            "browser.startup.homepage_override.buildID" = {
+              Value = "";
+              Status = "locked";
+            };
+            "browser.tabs.firefox-view" = {
+              Value = false;
+              Status = "locked";
+            };
+            "dom.security.https_only_mode" = {
+              Value = true;
+              Status = "locked";
+            };
+            "extensions.htmlaboutaddons.recommendations.enabled" = {
+              Value = false;
+              Status = "locked";
+            };
+            "extensions.recommendations.themeRecommendationUrl" = {
+              Value = "";
+              Status = "locked";
+            };
+            "network.IDN_show_punycode" = {
+              Value = true;
+              Status = "locked";
+            };
+          };
         };
       };
-        });
       profiles.default = {
         id = 0;
         name = "Default";

home/kitty.nix

@@ -1,16 +1,14 @@
-{ pkgs, ... }:
+{pkgs, ...}: let
-let
   dracula = pkgs.fetchFromGitHub {
     owner = "dracula";
     repo = "kitty";
     rev = "87717a3f00e3dff0fc10c93f5ff535ea4092de70";
     hash = "sha256-78PTH9wE6ktuxeIxrPp0ZgRI8ST+eZ3Ok2vW6BCIZkc=";
   };
-in
+in {
-{
   programs.kitty = {
     enable = true;
-    font.package = (pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; });
+    font.package = pkgs.nerdfonts.override {fonts = ["FiraCode"];};
     font.name = "FiraCode Nerd Font";
     extraConfig = ''
       font_size	14

home/media.nix

@@ -1,6 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-
-{
   xdg.desktopEntries."mpv".name = "mpv Media Player";
   xdg.desktopEntries."mpv".exec = "mpv --player-operation-mode=pseudo-gui -- %U";
   xdg.desktopEntries."mpv".noDisplay = true;
@@ -16,18 +14,21 @@
   ];
   programs.mpv = {
     enable = true;
-    package = pkgs.mpv.override { youtubeSupport = true; };
+    package = pkgs.mpv.override {youtubeSupport = true;};
     config = {
       hwdec = "auto-safe";
       gpu-context = "wayland";
     };
-    defaultProfiles = [ "gpu-hq" ];
+    defaultProfiles = ["gpu-hq"];
-    scripts = with pkgs.mpvScripts; [ mpris ];
+    scripts = with pkgs.mpvScripts; [mpris];
   };
   services = {
     spotifyd = {
       enable = true;
-      package = (pkgs.spotifyd.override { withKeyring = true; withMpris = true; });
+      package = pkgs.spotifyd.override {
+        withKeyring = true;
+        withMpris = true;
+      };
       settings = {
         global = {
           use_keyring = true;

home/nvim.nix

@@ -1,6 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-
-{
   xdg.desktopEntries."nvim".name = "Neovim wrapper";
   xdg.desktopEntries."nvim".exec = "nvim %F";
   xdg.desktopEntries."nvim".noDisplay = true;
@@ -25,7 +23,7 @@
     ];
     plugins = with pkgs.vimPlugins; [
       dracula-nvim
-      (nvim-treesitter.withPlugins (plugins: with plugins; [ bash dockerfile gitcommit gitignore git_rebase go markdown markdown_inline nix rust toml yaml ]))
+      (nvim-treesitter.withPlugins (plugins: with plugins; [bash dockerfile gitcommit gitignore git_rebase go markdown markdown_inline nix rust toml yaml]))
       nvim-treesitter-context
       nvim-treesitter-refactor
       telescope-nvim

home/persistence.nix

@@ -1,4 +1,4 @@
-{ ... }: {
+{...}: {
   home.persistence."/persist/home" = {
     allowOther = true;
     directories = [

home/scripts.nix

@@ -1,9 +1,11 @@
-{ osConfig, pkgs, ... }:
+{
-let
+  osConfig,
+  pkgs,
+  ...
+}: let
   notify-send = "${pkgs.libnotify}/bin/notify-send";
   dmenu = "${pkgs.rofi-wayland}/bin/rofi -dmenu";
-in
+in {
-{
   xdg.configFile = {
     "scripts/power_menu.sh" = {
       executable = true;
@@ -40,11 +42,9 @@ in
       '';
     };
 
-    "scripts/volume_up.sh" =
+    "scripts/volume_up.sh" = let
-      let
       wpctl = "${pkgs.wireplumber}/bin/wpctl";
-      in
+    in {
-      {
       executable = true;
       text = ''
         #!/bin/sh
@@ -56,12 +56,10 @@ in
       '';
     };
 
-    "scripts/tmux_sessions.sh" =
+    "scripts/tmux_sessions.sh" = let
-      let
       kitty = "${pkgs.kitty}/bin/kitty";
       tmux = "${pkgs.tmux}/bin/tmux";
-      in
+    in {
-      {
       executable = true;
       text = ''
         #!/bin/sh
@@ -77,13 +75,11 @@ in
             ;;
         esac'';
     };
-    "scripts/power_profile.sh" =
+    "scripts/power_profile.sh" = let
-      let
       sudo = "/run/wrappers/bin/sudo";
       cpupower = "${osConfig.boot.kernelPackages.cpupower}/bin/cpupower";
       powerprofilesctl = "${pkgs.power-profiles-daemon}/bin/powerprofilesctl";
-      in
+    in {
-      {
       executable = true;
       text = ''
         #!/bin/sh

home/sway/default.nix

@@ -1,6 +1,9 @@
-{ config, lib, pkgs, ... }:
-
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   imports = [
     ./gnome-keyring.nix
     ./gtk.nix
@@ -19,10 +22,10 @@
   wayland.windowManager.sway.enable = true;
   wayland.windowManager.sway.package = pkgs.sway;
   wayland.windowManager.sway.config.modifier = "Mod4";
-  wayland.windowManager.sway.config.bars = [ ];
+  wayland.windowManager.sway.config.bars = [];
   wayland.windowManager.sway.xwayland = true;
   wayland.windowManager.sway.config.fonts = {
-    names = [ "FiraCode Nerd Font" ];
+    names = ["FiraCode Nerd Font"];
     size = 11.0;
   };
   wayland.windowManager.sway.config.input = {
@@ -82,8 +85,7 @@
     };
   };
 
-  wayland.windowManager.sway.config.keybindings =
+  wayland.windowManager.sway.config.keybindings = let
-    let
     modifier = config.wayland.windowManager.sway.config.modifier;
   in
     lib.mkOptionDefault {
@@ -112,10 +114,19 @@
     };
 
   wayland.windowManager.sway.config.startup = [
-    { command = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; }
+    {command = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";}
-    { command = "~/.config/scripts/chpaper.sh"; always = true; }
+    {
-    { command = "systemctl --user restart waybar.service"; always = true; }
+      command = "~/.config/scripts/chpaper.sh";
-    { command = "systemctl --user restart kanshi.service"; always = true; }
+      always = true;
+    }
+    {
+      command = "systemctl --user restart waybar.service";
+      always = true;
+    }
+    {
+      command = "systemctl --user restart kanshi.service";
+      always = true;
+    }
   ];
 
   wayland.windowManager.sway.config.window.commands = [
@@ -216,4 +227,3 @@
   wayland.windowManager.sway.config.window.titlebar = false;
   wayland.windowManager.sway.config.floating.titlebar = false;
 }
-

home/sway/dunst.nix

@@ -1,9 +1,11 @@
-{ config, pkgs, ... }:
+{
-let
+  config,
+  pkgs,
+  ...
+}: let
   dmenu = "${config.programs.rofi.package}/bin/rofi -dmenu";
   firefox = "${config.programs.firefox.package}/bin/firefox";
-in
+in {
-{
   services.dunst = {
     enable = true;
     iconTheme.name = config.gtk.iconTheme.name;

home/sway/gnome-keyring.nix

@@ -1,5 +1,3 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-
-{
   services.gnome-keyring.enable = true;
 }

home/sway/gtk.nix

@@ -1,5 +1,8 @@
-{ lib, pkgs, ... }:
+{
-let
+  lib,
+  pkgs,
+  ...
+}: let
   gtkTheme = {
     name = "Dracula";
     package = pkgs.dracula-gtk;
@@ -7,15 +10,17 @@ let
 
   iconTheme = {
     name = "Newaita-dark";
-    package = pkgs.newaita-icon-theme.override { panel = "dark"; folder = "bluegray"; };
+    package = pkgs.newaita-icon-theme.override {
+      panel = "dark";
+      folder = "bluegray";
+    };
   };
 
   cursorTheme = {
     name = "Bibata-Modern-Classic";
     package = pkgs.bibata-cursors;
   };
-in
+in {
-{
   gtk.enable = true;
   gtk.theme = gtkTheme;
   home.sessionVariables.GTK_THEME = gtkTheme.name;

home/sway/kanshi.nix

@@ -1,6 +1,4 @@
-{ ... }:
+{...}: {
-
-{
   services.kanshi.enable = true;
   services.kanshi.profiles = {
     undocked = {

home/sway/rofi/default.nix

@@ -1,6 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-
-{
   xdg.desktopEntries."rofi".name = "Rofi";
   xdg.desktopEntries."rofi".exec = "rofi -show";
   xdg.desktopEntries."rofi".noDisplay = true;

home/sway/swayidle.nix

@@ -1,11 +1,15 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-
-{
   services.swayidle.enable = true;
   services.swayidle.events = [
-    { event = "before-sleep"; command = "${pkgs.swaylock}/bin/swaylock -f -i /tmp/lockpaper.jpg"; }
+    {
+      event = "before-sleep";
+      command = "${pkgs.swaylock}/bin/swaylock -f -i /tmp/lockpaper.jpg";
+    }
   ];
   services.swayidle.timeouts = [
-    { timeout = 600; command = "${pkgs.swaylock}/bin/swaylock -f -i /tmp/lockpaper.jpg"; }
+    {
+      timeout = 600;
+      command = "${pkgs.swaylock}/bin/swaylock -f -i /tmp/lockpaper.jpg";
+    }
   ];
 }

home/sway/wallpapers.nix

@@ -1,6 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-
-{
   xdg.dataFile."wallpapers/catppuccin".source = "${pkgs.catppuccin-wallpapers}/share/wallpapers";
   xdg.configFile."scripts/chpaper.sh" = {
     text = ''

home/sway/waybar/default.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   programs.waybar.enable = true;
   programs.waybar.systemd.enable = true;
   programs.waybar.style = ./style.css;
@@ -10,9 +12,9 @@
       layer = "top";
       position = "top";
       height = 28;
-      modules-left = [ "sway/workspaces" "sway/window" "sway/mode" ];
+      modules-left = ["sway/workspaces" "sway/window" "sway/mode"];
-      modules-center = [ ];
+      modules-center = [];
-      modules-right = [ "tray" "custom/power_profile" "idle_inhibitor" "network" "bluetooth" "pulseaudio" "backlight" "battery" "clock" ];
+      modules-right = ["tray" "custom/power_profile" "idle_inhibitor" "network" "bluetooth" "pulseaudio" "backlight" "battery" "clock"];
       "sway/mode" = {
         "format" = "{}";
       };
@@ -35,7 +37,7 @@
       };
       "backlight" = {
         "format" = "{icon}";
-        "format-icons" = [ "" "" "" "" ];
+        "format-icons" = ["" "" "" ""];
       };
       "battery" = {
         "states" = {
@@ -47,7 +49,7 @@
         "format-alt" = "{icon} {capacity}% ({time})";
         "format-charging" = " {capacity}%";
         "format-plugged" = "‭ﮣ {capacity}%";
-        "format-icons" = [ "" "" "" "" "" "" "" "" "" "" "" ];
+        "format-icons" = ["" "" "" "" "" "" "" "" "" "" ""];
         "tooltip" = false;
       };
       "network" = {
@@ -73,7 +75,7 @@
           "phone" = "";
           "portable" = "";
           "car" = "";
-          "default" = [ "奄" "奔" "墳" ];
+          "default" = ["奄" "奔" "墳"];
         };
         "on-click" = "${pkgs.pavucontrol}/bin/pavucontrol";
       };
@@ -88,11 +90,9 @@
       "tray" = {
         "spacing" = 4;
       };
-      "custom/power_profile" =
+      "custom/power_profile" = let
-        let
         script = "${config.xdg.configHome}/scripts/power_profile.sh";
-        in
+      in {
-        {
         exec = "${script} icon";
         on-click = "${script} toggle";
         format = "{}";

home/terminal.nix

@@ -1,12 +1,13 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     ./kitty.nix
     ./tmux.nix
   ];
 
-
   xdg.desktopEntries."btop".name = "btop++";
   xdg.desktopEntries."btop".exec = "btop";
   xdg.desktopEntries."btop".noDisplay = true;
@@ -34,7 +35,7 @@
     exa = {
       enable = true;
       enableAliases = true;
-      extraOptions = [ "--group-directories-first" "--group" ];
+      extraOptions = ["--group-directories-first" "--group"];
       git = true;
       icons = true;
     };

home/tmux.nix

@@ -1,6 +1,4 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-
-{
   programs.tmux = {
     enable = true;
     shell = "${pkgs.zsh}/bin/zsh";

home/virt-manager.nix

@@ -1,18 +1,18 @@
-{ pkgs, ... }: {
+{pkgs, ...}: {
-  home.packages = [ pkgs.virt-manager ];
+  home.packages = [pkgs.virt-manager];
   dconf.settings = {
     "org/virt-manager/virt-manager/confirm" = {
       "forcepoweroff" = false;
     };
     "org/virt-manager/virt-manager/connections" = {
-      "autoconnect" = [ "qemu:///system" ];
+      "autoconnect" = ["qemu:///system"];
-      "uris" = [ "qemu:///system" ];
+      "uris" = ["qemu:///system"];
     };
-    "org/virt-manager/virt-manager/new-vm" = { "firmware" = "uefi"; };
+    "org/virt-manager/virt-manager/new-vm" = {"firmware" = "uefi";};
     "org/virt-manager/virt-manager/stats" = {
       "enable-disk-poll" = true;
       "enable-net-poll" = true;
     };
-    "org/virt-manager/virt-manager/vmlist-fields" = { "network-traffic" = true; };
+    "org/virt-manager/virt-manager/vmlist-fields" = {"network-traffic" = true;};
   };
 }

packages/adi1090x-plymouth/default.nix

@@ -1,5 +1,10 @@
-{ lib, stdenvNoCC, fetchFromGitHub, pack ? "pack_1", theme ? "cuts" }:
+{
-
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  pack ? "pack_1",
+  theme ? "cuts",
+}:
 stdenvNoCC.mkDerivation {
   pname = "adi1090x-plymouth";
   version = "latest";

packages/catppuccin-wallpapers/default.nix

@@ -1,5 +1,8 @@
-{ lib, stdenvNoCC, fetchFromGitHub }:
+{
-
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+}:
 stdenvNoCC.mkDerivation {
   pname = "catppuccin-wallpapers";
   version = "latest";

packages/default.nix

@@ -1,6 +1,6 @@
 self: super: {
-  adi1090x-plymouth = super.callPackage ./adi1090x-plymouth { };
+  adi1090x-plymouth = super.callPackage ./adi1090x-plymouth {};
-  catppuccin-wallpapers = super.callPackage ./catppuccin-wallpapers { };
+  catppuccin-wallpapers = super.callPackage ./catppuccin-wallpapers {};
-  dracula-gtk = super.callPackage ./dracula-gtk { };
+  dracula-gtk = super.callPackage ./dracula-gtk {};
-  newaita-icon-theme = super.callPackage ./newaita-icon-theme { };
+  newaita-icon-theme = super.callPackage ./newaita-icon-theme {};
 }

packages/dracula-gtk/default.nix

@@ -1,5 +1,11 @@
-{ lib, stdenvNoCC, fetchFromGitHub, gtk3, gnome-themes-extra, gtk-engine-murrine }:
+{
-
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  gtk3,
+  gnome-themes-extra,
+  gtk-engine-murrine,
+}:
 stdenvNoCC.mkDerivation {
   pname = "dracula-gtk";
   version = "4.0";
@@ -11,13 +17,13 @@ stdenvNoCC.mkDerivation {
     hash = "sha256-2lmpEPYxdbRnKgcJ792cuzyOBmOIWhja18q+F3Pxgjs=";
   };
 
-  nativeBuildInputs = [ gtk3 ];
+  nativeBuildInputs = [gtk3];
 
   buildInputs = [
     gnome-themes-extra
   ];
 
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+  propagatedUserEnvPkgs = [gtk-engine-murrine];
 
   installPhase = ''
     runHook preInstall

packages/newaita-icon-theme/default.nix

@@ -1,5 +1,14 @@
-{ lib, stdenvNoCC, fetchFromGitHub, gtk3, gnome, gnome-icon-theme, hicolor-icon-theme, panel ? "dark", folder ? "default" }:
+{
-
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  gtk3,
+  gnome,
+  gnome-icon-theme,
+  hicolor-icon-theme,
+  panel ? "dark",
+  folder ? "default",
+}:
 stdenvNoCC.mkDerivation {
   pname = "newaita-icon-theme";
   version = "latest";
@@ -11,7 +20,7 @@ stdenvNoCC.mkDerivation {
     hash = "sha256-tqtjUy8RjvOu0NaK+iE0R1g7/eqCpmhbdxuNGd/YfSI=";
   };
 
-  nativeBuildInputs = [ gtk3 ];
+  nativeBuildInputs = [gtk3];
 
   propagatedBuildInputs = [
     gnome.adwaita-icon-theme

system/default.nix

@@ -1,5 +1,9 @@
-{ config, lib, pkgs, ... }: {
+{
-
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   imports = [
     ./filesystem.nix
     ./gnome-keyring.nix
@@ -37,7 +41,7 @@
       LC_TIME = "en_US.UTF-8";
       LC_ALL = "en_US.UTF-8";
     };
-    supportedLocales = [ "en_US.UTF-8/UTF-8" ];
+    supportedLocales = ["en_US.UTF-8/UTF-8"];
   };
 
   networking = {
@@ -79,7 +83,7 @@
       tctiEnvironment.enable = true;
     };
     sudo = {
-      package = pkgs.sudo.override { withInsults = true; };
+      package = pkgs.sudo.override {withInsults = true;};
       extraConfig = ''
         Defaults lecture="never"
 
@@ -97,7 +101,7 @@
     portal = {
       enable = true;
       wlr.enable = true;
-      extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+      extraPortals = [pkgs.xdg-desktop-portal-gtk];
     };
   };
 

system/disk.nix

@@ -1,4 +1,4 @@
-{ ... }: {
+{...}: {
   boot = {
     resumeDevice = "/dev/vg0/swap";
     initrd.luks.devices = {
@@ -11,5 +11,5 @@
     };
   };
 
-  swapDevices = [{ device = "/dev/vg0/swap"; }];
+  swapDevices = [{device = "/dev/vg0/swap";}];
 }

system/filesystem.nix

@@ -1,28 +1,28 @@
-{ ... }: {
+{...}: {
   boot.tmpOnTmpfs = true;
   fileSystems = {
     "/" = {
       device = "tmpfs";
       fsType = "tmpfs";
-      options = [ "defaults" "uid=0" "gid=0" "mode=0755" ];
+      options = ["defaults" "uid=0" "gid=0" "mode=0755"];
       neededForBoot = true;
     };
     "/nix" = {
       device = "/dev/vg0/system";
       fsType = "btrfs";
-      options = [ "subvol=/@nix" "compress-force=zstd" ];
+      options = ["subvol=/@nix" "compress-force=zstd"];
       neededForBoot = true;
     };
     "/persist" = {
       device = "/dev/vg0/system";
       fsType = "btrfs";
-      options = [ "subvol=/@persist" "compress-force=zstd" ];
+      options = ["subvol=/@persist" "compress-force=zstd"];
       neededForBoot = true;
     };
     "/mnt/system" = {
       device = "/dev/vg0/system";
       fsType = "btrfs";
-      options = [ "subvol=/" "compress-force=zstd" ];
+      options = ["subvol=/" "compress-force=zstd"];
     };
     "/boot" = {
       device = "/dev/disk/by-partlabel/ESP";

system/gnome-keyring.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   programs.seahorse.enable = true;
   services.gnome.gnome-keyring.enable = true;
   security.pam.services.passwd.enableGnomeKeyring = true;

system/gtk.nix

@@ -1,4 +1,3 @@
-{ ... }:
+{...}: {
-{
   programs.dconf.enable = true;
 }

system/hardware.nix

@@ -1,12 +1,16 @@
-{ lib, pkgs, config, ... }: {
+{
-
+  lib,
-  imports = [ ./disk.nix ./kernel.nix ];
+  pkgs,
+  config,
+  ...
+}: {
+  imports = [./disk.nix ./kernel.nix];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 
   hardware.opengl = {
     enable = true;
-    extraPackages = [ pkgs.intel-media-driver ];
+    extraPackages = [pkgs.intel-media-driver];
     driSupport = true;
   };
 
@@ -19,7 +23,7 @@
 
   hardware.sensor.hddtemp = {
     enable = true;
-    drives = [ "/dev/disk/by-path/pci-0000:01:00.0-nvme-1" ];
+    drives = ["/dev/disk/by-path/pci-0000:01:00.0-nvme-1"];
   };
 
   boot.loader = {

system/kernel.nix

@@ -1,5 +1,8 @@
-{ lib, pkgs, ... }: {
+{
-
+  lib,
+  pkgs,
+  ...
+}: {
   boot = {
     initrd = {
       availableKernelModules = [
@@ -11,9 +14,9 @@
         "sd_mod"
         "rtsx_pci_sdmmc"
       ];
-      kernelModules = [ "i915" ];
+      kernelModules = ["i915"];
     };
-    kernelModules = [ "kvm-intel" ];
+    kernelModules = ["kvm-intel"];
     kernelPackages = pkgs.linuxKernel.packages.linux_zen;
   };
 

system/nix.nix

@@ -1,4 +1,4 @@
-{ ... }: {
+{...}: {
   nix.settings = {
     substituters = [
       "https://nix-community.cachix.org/"
@@ -7,7 +7,7 @@
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
     ];
     auto-optimise-store = true;
-    experimental-features = [ "nix-command" "flakes" ];
+    experimental-features = ["nix-command" "flakes"];
   };
   nixpkgs.config.allowUnfree = true;
 }

system/packages.nix

@@ -1,12 +1,11 @@
-{ pkgs, ... }: {
+{pkgs, ...}: {
-
   fonts = {
     enableDefaultFonts = true;
     fontDir.enable = true;
     fonts = with pkgs; [
       cantarell-fonts
       liberation_ttf
-      (nerdfonts.override { fonts = [ "FiraCode" ]; })
+      (nerdfonts.override {fonts = ["FiraCode"];})
       noto-fonts
       noto-fonts-cjk
       noto-fonts-emoji
@@ -31,5 +30,5 @@
     xwayland.enable = true;
     zsh.enable = true;
   };
-  environment.pathsToLink = [ "/share/zsh" ];
+  environment.pathsToLink = ["/share/zsh"];
 }

system/persistence.nix

@@ -1,5 +1,4 @@
-{ ... }:
+{...}: {
-{
   environment.persistence."/persist/system" = {
     hideMounts = true;
     directories = [

system/plymouth.nix

@@ -1,10 +1,14 @@
-{ pkgs, ... }: {
+{pkgs, ...}: {
-
   boot.consoleLogLevel = 3;
-  boot.kernelParams = [ "quiet" ];
+  boot.kernelParams = ["quiet"];
   boot.plymouth = {
     enable = true;
-    themePackages = [ (pkgs.adi1090x-plymouth.override { pack = "pack_3"; theme = "owl"; }) ];
+    themePackages = [
+      (pkgs.adi1090x-plymouth.override {
+        pack = "pack_3";
+        theme = "owl";
+      })
+    ];
     theme = "adi1090x";
   };
 }

system/secureboot.nix

@@ -1,5 +1,8 @@
-{ lib, pkgs, ... }:
 {
+  lib,
+  pkgs,
+  ...
+}: {
   boot.bootspec.enable = true;
   boot.loader.systemd-boot.enable = lib.mkForce false;
   boot.lanzaboote = {

system/services.nix

@@ -1,10 +1,10 @@
-{ pkgs, ... }: {
+{pkgs, ...}: {
   services = {
     blueman.enable = true;
     dbus = {
       enable = true;
       apparmor = "enabled";
-      packages = [ pkgs.gcr pkgs.gcr_4 ];
+      packages = [pkgs.gcr pkgs.gcr_4];
     };
     fstrim.enable = true;
     fwupd.enable = true;
@@ -20,7 +20,7 @@
     power-profiles-daemon.enable = true;
     resolved.enable = true;
     thermald.enable = true;
-    udev.packages = [ pkgs.yubikey-personalization ];
+    udev.packages = [pkgs.yubikey-personalization];
     udisks2.enable = true;
   };
 }

system/swaylock.nix

@@ -1,5 +1,3 @@
-{ ... }:
+{...}: {
-
+  security.pam.services.swaylock = {};
-{
-  security.pam.services.swaylock = { };
 }

system/virtualisation.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{pkgs, ...}: {
   virtualisation = {
     docker = {
       enable = true;
@@ -9,7 +9,7 @@
       enable = true;
       qemu.ovmf = {
         enable = true;
-        packages = [ pkgs.OVMFFull.fd ];
+        packages = [pkgs.OVMFFull.fd];
       };
     };
   };

users/default.nix

@@ -1,9 +1,6 @@
-{ pkgs, ... }:
+{pkgs, ...}: let
-
-let
   user = import ./user.nix;
-in
+in {
-{
   users.mutableUsers = false;
   users.users = {
     root.hashedPassword = user.root.hashedPassword;
@@ -12,7 +9,7 @@ in
       hashedPassword = user.primary.hashedPassword;
       description = user.primary.realName;
       isNormalUser = true;
-      extraGroups = [ "docker" "libvirtd" "networkmanager" "tss" "wheel" ];
+      extraGroups = ["docker" "libvirtd" "networkmanager" "tss" "wheel"];
       shell = pkgs.zsh;
     };
   };