fmt: nixfmt strict

scarlet-storm · Dec 31, 2024 · 8343232 · 8343232
1 parent 697c64f
commit 8343232
Show file tree

Hide file tree

Showing 38 changed files with 54 additions and 180 deletions.
diff --git a/config/disko/luks-btrfs.nix b/config/disko/luks-btrfs.nix
@@ -49,9 +49,7 @@
                   subvolumes = {
                     "/nixos" = {
                       mountpoint = "/";
-                      mountOptions = [
-                        "compress-force=zstd"
-                      ];
+                      mountOptions = [ "compress-force=zstd" ];
                     };
                     "/nixos/root" = { };
                     "/nixos/home" = { };

diff --git a/config/home-manager/firefox.nix b/config/home-manager/firefox.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}:
+{ config, pkgs, ... }:
 
 let
   catppuccin_pink = pkgs.stdenvNoCC.mkDerivation rec {
@@ -125,9 +121,7 @@ in
         "widget.use-xdg-desktop-portal.file-picker" = 1;
         # "privacy.resistFingerprinting" = true;
       };
-      extensions = [
-        catppuccin_pink
-      ];
+      extensions = [ catppuccin_pink ];
       search = {
         force = true;
         engines = {
@@ -156,9 +150,7 @@ in
           };
         };
         default = "Brave";
-        order = [
-          "Brave"
-        ];
+        order = [ "Brave" ];
       };
     };
   };

diff --git a/config/home-manager/generic.nix b/config/home-manager/generic.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  nixgl,
-  ...
-}:
+{ pkgs, nixgl, ... }:
 {
   nixpkgs.overlays = [ nixgl.overlay ];
   targets.genericLinux.enable = true;

diff --git a/config/homes/base.nix b/config/homes/base.nix
@@ -27,9 +27,7 @@
     EDITOR = "vim";
   };
   systemd.user = {
-    tmpfiles.rules = [
-      "D %t/ssh-control - - - - -"
-    ];
+    tmpfiles.rules = [ "D %t/ssh-control - - - - -" ];
     startServices = "sd-switch";
   };
   nix.gc = {

diff --git a/config/homes/kanata.nix b/config/homes/kanata.nix
@@ -7,12 +7,8 @@ in
     inherit username;
     homeDirectory = "/home/${username}";
   };
-  imports = [
-    ./base.nix
-  ];
+  imports = [ ./base.nix ];
 
-  home.packages = with pkgs; [
-    fanbox-dl
-  ];
+  home.packages = with pkgs; [ fanbox-dl ];
   home.stateVersion = "24.11";
 }
diff --git a/config/homes/violet.nix b/config/homes/violet.nix
@@ -16,11 +16,7 @@ let
       ...
     }:
     pkgs.symlinkJoin {
-      inherit (pkg)
-        name
-        pname
-        version
-        ;
+      inherit (pkg) name pname version;
       inherit postBuild;
       paths = [
         (pkgs.runCommandLocal "${execName}-wrapped"
@@ -57,12 +53,7 @@ in
     inherit username;
     homeDirectory = "/home/${username}";
   };
-  nixpkgs.config.allowUnfreePredicate = (
-    pkg:
-    builtins.elem (lib.getName pkg) [
-      "discord"
-    ]
-  );
+  nixpkgs.config.allowUnfreePredicate = (pkg: builtins.elem (lib.getName pkg) [ "discord" ]);
   news.display = "silent";
   home.packages =
     let

diff --git a/config/homes/violet@aqours.nix b/config/homes/violet@aqours.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  homeManagerConfig,
-  ...
-}:
+{ pkgs, homeManagerConfig, ... }:
 
 let
   f3KanataIdolized = pkgs.fetchurl {

diff --git a/config/homes/violet@liella.nix b/config/homes/violet@liella.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  homeManagerConfig,
-  ...
-}:
+{ pkgs, homeManagerConfig, ... }:
 let
   pShizuku2x = pkgs.fetchurl {
     url = "https://i.idol.st/u/card/art/2x/831UR-Osaka-Shizuku-That-s-So-Cute-Briar-Rose-nf1fKb.png";

diff --git a/config/hosts/x86_64-linux/aqours/default.nix b/config/hosts/x86_64-linux/aqours/default.nix
@@ -84,9 +84,7 @@ in
   nixpkgs.overlays = [
     (final: prev: {
       kdePackages = prev.kdePackages.overrideScope (
-        kfinal: kprev: {
-          qtwebengine = prev.emptyDirectory;
-        }
+        kfinal: kprev: { qtwebengine = prev.emptyDirectory; }
       );
     })
   ];

diff --git a/config/hosts/x86_64-linux/aqours/hardware-configuration.nix b/config/hosts/x86_64-linux/aqours/hardware-configuration.nix
@@ -10,9 +10,7 @@
 }:
 
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot.initrd.availableKernelModules = [
     "ahci"

diff --git a/config/hosts/x86_64-linux/liella/hardware-configuration.nix b/config/hosts/x86_64-linux/liella/hardware-configuration.nix
@@ -9,9 +9,7 @@
 }:
 
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot.initrd.availableKernelModules = [
     "xhci_pci"

diff --git a/config/hosts/x86_64-linux/marchenstar/fs.nix b/config/hosts/x86_64-linux/marchenstar/fs.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  config,
-  ...
-}:
+{ lib, config, ... }:
 {
   services.zfs.trim.interval = "daily";
   # for fun
@@ -157,11 +153,7 @@
               }
             ];
             cache = [ "/dev/disk/by-partlabel/cache0" ];
-            log = [
-              {
-                members = [ "/dev/disk/by-partlabel/vdev1-slog0" ];
-              }
-            ];
+            log = [ { members = [ "/dev/disk/by-partlabel/vdev1-slog0" ]; } ];
           };
         };
         options = {

diff --git a/config/hosts/x86_64-linux/marchenstar/hardware-configuration.nix b/config/hosts/x86_64-linux/marchenstar/hardware-configuration.nix
@@ -10,9 +10,7 @@
 }:
 
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot.initrd.availableKernelModules = [
     "ahci"

diff --git a/config/hosts/x86_64-linux/marchenstar/net.nix b/config/hosts/x86_64-linux/marchenstar/net.nix
@@ -43,9 +43,7 @@
     mode = "0600";
   };
   boot.initrd = {
-    availableKernelModules = [
-      "r8169"
-    ];
+    availableKernelModules = [ "r8169" ];
     systemd.network.enable = true;
     systemd.network.networks."10-default" = config.systemd.network.networks."10-default";
     network = {

diff --git a/config/nixos/base/net.nix b/config/nixos/base/net.nix
@@ -54,7 +54,5 @@ in
     checkReversePath = "strict";
     filterForward = true;
   };
-  environment.systemPackages = with pkgs; [
-    wireguard-tools
-  ];
+  environment.systemPackages = with pkgs; [ wireguard-tools ];
 }
diff --git a/config/nixos/base/ntp.nix b/config/nixos/base/ntp.nix
@@ -1,7 +1,4 @@
-{
-  lib,
-  ...
-}:
+{ lib, ... }:
 
 let
   ntsServers = [

diff --git a/config/nixos/builders/default.nix b/config/nixos/builders/default.nix
@@ -1,7 +1,5 @@
 {
-  imports = [
-    ./machines.nix
-  ];
+  imports = [ ./machines.nix ];
   nix = {
     extraOptions = ''
       builders-use-substitutes = true

diff --git a/config/nixos/builders/machines.nix b/config/nixos/builders/machines.nix
@@ -1,7 +1,4 @@
-{
-  lib,
-  ...
-}:
+{ lib, ... }:
 
 {
   nix.buildMachines = lib.map (

diff --git a/config/nixos/desktop/plasma.nix b/config/nixos/desktop/plasma.nix
@@ -1,9 +1,7 @@
 { pkgs, ... }:
 
 {
-  imports = [
-    ./common.nix
-  ];
+  imports = [ ./common.nix ];
   services.desktopManager.plasma6.enable = true;
   services.displayManager.sddm = {
     enable = true;

diff --git a/config/nixos/hardware/amd.nix b/config/nixos/hardware/amd.nix
@@ -1,6 +1,4 @@
-{
-  ...
-}:
+{ ... }:
 
 {
   boot.kernelParams = [ "amd_pstate=active" ];

diff --git a/config/nixos/hardware/gpu/nouveau.nix b/config/nixos/hardware/gpu/nouveau.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  lib,
-  ...
-}:
+{ pkgs, lib, ... }:
 
 # TODO: create specialisation ?
 {
@@ -37,8 +33,7 @@
               "--sysconfdir=/etc"
             ]
           ) prevAttrs.mesonFlags
-          ++ [
-          ];
+          ++ [ ];
         preConfigure =
           prevAttrs.preConfigure
           + ''

diff --git a/config/nixos/hardware/gpu/nvidia.nix b/config/nixos/hardware/gpu/nvidia.nix
@@ -6,9 +6,7 @@
 }:
 
 {
-  imports = [
-    modules.nixos.unfree
-  ];
+  imports = [ modules.nixos.unfree ];
   services.xserver.videoDrivers = [ "nvidia" ];
   hardware.nvidia = {
     modesetting.enable = true;

diff --git a/config/nixos/home-manager.nix b/config/nixos/home-manager.nix
@@ -17,10 +17,6 @@
         extraSpecialArgs = homeManagerExtraArgs;
       };
     }
-    {
-      unfree.packageList = [
-        "discord"
-      ];
-    }
+    { unfree.packageList = [ "discord" ]; }
   ];
 }
diff --git a/config/nixos/lanzaboote/default.nix b/config/nixos/lanzaboote/default.nix
@@ -7,9 +7,7 @@
 }:
 
 {
-  imports = [
-    inputs.lanzaboote.nixosModules.lanzaboote
-  ];
+  imports = [ inputs.lanzaboote.nixosModules.lanzaboote ];
   environment.systemPackages = [
     pkgs.sbsigntool
     pkgs.mokutil

diff --git a/config/nixos/net/networkd-wifi.nix b/config/nixos/net/networkd-wifi.nix
@@ -1,6 +1,4 @@
-{
-  ...
-}:
+{ ... }:
 
 {
   # Wifi using systemd-networkd ??

diff --git a/config/nixos/net/nm-wifi.nix b/config/nixos/net/nm-wifi.nix
@@ -1,6 +1,4 @@
-{
-  ...
-}:
+{ ... }:
 
 {
   # Use NetworkManager for wifi, since all devices have GUI

diff --git a/config/nixos/qemu.nix b/config/nixos/qemu.nix
@@ -1,7 +1,4 @@
-{
-  pkgs,
-  ...
-}:
+{ pkgs, ... }:
 
 {
   virtualisation.libvirtd = {
@@ -35,7 +32,5 @@
   systemd.services.libvirt-guests.unitConfig.After = [ "network-online.target" ];
   systemd.services.libvirt-guests.unitConfig.Wants = [ "network-online.target" ];
   systemd.services.libvirtd.path = [ pkgs.passt ];
-  users.users.qemu-libvirtd.extraGroups = [
-    "kvm"
-  ];
+  users.users.qemu-libvirtd.extraGroups = [ "kvm" ];
 }
diff --git a/config/nixos/sops.nix b/config/nixos/sops.nix
@@ -1,7 +1,4 @@
-{
-  secrets,
-  ...
-}:
+{ secrets, ... }:
 let
   ageKeyFile = "/var/lib/sops-nix/key.txt";
 in

diff --git a/config/nixos/steam.nix b/config/nixos/steam.nix
@@ -1,13 +1,7 @@
-{
-  pkgs,
-  modules,
-  ...
-}:
+{ pkgs, modules, ... }:
 
 {
-  imports = [
-    modules.nixos.unfree
-  ];
+  imports = [ modules.nixos.unfree ];
   unfree.packageList = [
     "steam"
     "steam-unwrapped"

diff --git a/config/nixos/unfree.nix b/config/nixos/unfree.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}:
+{ config, lib, ... }:
 
 let
   cfg = config.unfree;

diff --git a/config/nixos/users/kanata.nix b/config/nixos/users/kanata.nix
@@ -11,9 +11,7 @@ in
   sops.secrets."users/${name}/password".neededForUsers = true;
   users.users.${name} = {
     isNormalUser = true;
-    extraGroups = [
-      "wheel"
-    ];
+    extraGroups = [ "wheel" ];
     linger = false;
     uid = 1000;
     shell = pkgs.fish;