format stuff

home/default.nix

@@ -1,8 +1,10 @@
-{ 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}" = {
@@ -14,7 +16,6 @@ in
   home-manager.useUserPackages = true;
   home-manager.useGlobalPkgs = true;
   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,7 +8,6 @@ in
   home.packages = with pkgs; [
     git-crypt
     lazydocker
-    nixpkgs-fmt
     ripgrep
   ];
   programs = {

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;
@@ -27,7 +25,10 @@
   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;

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
@@ -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 {
@@ -113,9 +115,18 @@
 
   wayland.windowManager.sway.config.startup = [
     {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;
@@ -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;

home/tmux.nix

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

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/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";

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";

system/default.nix

@@ -1,5 +1,9 @@
-{ config, lib, pkgs, ... }: {
+{
-
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
   imports = [
     ./filesystem.nix
     ./gnome-keyring.nix

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,5 +1,9 @@
-{ lib, pkgs, config, ... }: {
+{
-
+  lib,
+  pkgs,
+  config,
+  ...
+}: {
   imports = [./disk.nix ./kernel.nix];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

system/kernel.nix

@@ -1,5 +1,8 @@
-{ lib, pkgs, ... }: {
+{
-
+  lib,
+  pkgs,
+  ...
+}: {
   boot = {
     initrd = {
       availableKernelModules = [

system/packages.nix

@@ -1,5 +1,4 @@
 {pkgs, ...}: {
-
   fonts = {
     enableDefaultFonts = true;
     fontDir.enable = true;

system/persistence.nix

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

system/plymouth.nix

@@ -1,10 +1,14 @@
 {pkgs, ...}: {
-
   boot.consoleLogLevel = 3;
   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/swaylock.nix

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

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;