chore: switch to nixfmt-rfc-style

flake.nix

@@ -72,41 +72,52 @@
     manga-tui.url = "github:josueBarretogit/manga-tui";
   };
 
-  outputs = {
+  outputs =
+    {
       nixpkgs,
       nix-darwin,
       ...
-  } @ inputs: let
+    }@inputs:
-  in {
+    let
+    in
+    {
       formatter = with nixpkgs.legacyPackages; {
-      x86_64-linux = x86_64-linux.alejandra;
+        x86_64-linux = x86_64-linux.nixfmt-rfc-style;
-      aarch64-linux = aarch64-linux.alejandra;
+        aarch64-linux = aarch64-linux.nixfmt-rfc-style;
-      aarch64-darwin = aarch64-darwin.alejandra;
+        aarch64-darwin = aarch64-darwin.nixfmt-rfc-style;
       };
 
       nixosConfigurations = {
         demeter = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs;};
+          specialArgs = {
+            inherit inputs;
+          };
           modules = [
             ./hosts/demeter
           ];
         };
 
         callisto = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs;};
+          specialArgs = {
+            inherit inputs;
+          };
           modules = [
             ./hosts/callisto
           ];
         };
         adrastea = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs;};
+          specialArgs = {
+            inherit inputs;
+          };
           modules = [
             ./hosts/adrastea
           ];
         };
       };
       darwinConfigurations.phobos = nix-darwin.lib.darwinSystem {
-      specialArgs = {inherit inputs;};
+        specialArgs = {
+          inherit inputs;
+        };
         modules = [
           ./hosts/phobos
         ];

hosts/adrastea/configuration.nix

@@ -7,7 +7,8 @@
   pkgs,
   lib,
   ...
-}: {
+}:
+{
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
@@ -83,7 +84,9 @@
     LC_TIME = "en_US.UTF-8";
   };
 
-  systemd.services = {NetworkManager-wait-online.enable = false;};
+  systemd.services = {
+    NetworkManager-wait-online.enable = false;
+  };
 
   # Enable the X11 windowing system.
   # You can disable this if you're only using the Wayland session.
@@ -91,7 +94,11 @@
 
   programs.nix-ld = {
     enable = true;
-    libraries = with pkgs; [icu xorg.libXtst xorg.libXi];
+    libraries = with pkgs; [
+      icu
+      xorg.libXtst
+      xorg.libXi
+    ];
   };
 
   hardware.nvidia = {
@@ -138,8 +145,14 @@
   };
 
   nix.settings = {
-    trusted-users = ["root" "youwen"];
+    trusted-users = [
-    experimental-features = ["nix-command" "flakes"];
+      "root"
+      "youwen"
+    ];
+    experimental-features = [
+      "nix-command"
+      "flakes"
+    ];
   };
 
   services.udev.extraRules = ''

hosts/adrastea/default.nix

@@ -2,7 +2,8 @@
   inputs,
   system,
   ...
-}: {
+}:
+{
   imports = with inputs; [
     ./configuration.nix
     ../../modules/linux/gaming
@@ -21,7 +22,9 @@
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
       home-manager.backupFileExtension = "backup";
-      home-manager.extraSpecialArgs = {inherit inputs;};
+      home-manager.extraSpecialArgs = {
+        inherit inputs;
+      };
       home-manager.users.youwen = {
         imports = [
           ./home-manager-extras

hosts/adrastea/hardware-configuration.nix

@@ -7,10 +7,17 @@
   pkgs,
   modulesPath,
   ...
-}: {
+}:
+{
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod"];
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
@@ -25,7 +32,10 @@
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/3FCB-9D60";
     fsType = "vfat";
-    options = ["fmask=0022" "dmask=0022"];
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
   };
 
   swapDevices = [ { device = "/dev/disk/by-uuid/f28d0752-feab-4591-899e-e5deac3712d0"; } ];
@@ -39,6 +49,5 @@
   # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode =
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hosts/adrastea/home-manager-extras/default.nix

@@ -1,3 +1,6 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
-  wayland.windowManager.hyprland.settings.monitor = pkgs.lib.mkForce ["eDP-1,2560x1440@165,0x0,1.6"];
+{
+  wayland.windowManager.hyprland.settings.monitor = pkgs.lib.mkForce [
+    "eDP-1,2560x1440@165,0x0,1.6"
+  ];
 }

hosts/callisto/configuration.nix

@@ -6,7 +6,8 @@
   inputs,
   pkgs,
   ...
-}: {
+}:
+{
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
@@ -36,9 +37,11 @@
     settings.General.EnableNetworkConfiguration = true;
   };
 
-  nixpkgs.overlays = let
+  nixpkgs.overlays =
+    let
       stablepkgs = inputs.stablepkgs.legacyPackages.${pkgs.system};
-  in [
+    in
+    [
       inputs.apple-silicon.overlays.apple-silicon-overlay
       inputs.vesktop-bin.overlays.default
     ];
@@ -76,7 +79,11 @@
 
   programs.nix-ld = {
     enable = true;
-    libraries = with pkgs; [icu xorg.libXtst xorg.libXi];
+    libraries = with pkgs; [
+      icu
+      xorg.libXtst
+      xorg.libXi
+    ];
   };
 
   # Configure keymap in X11
@@ -100,8 +107,14 @@
   };
 
   nix.settings = {
-    trusted-users = ["root" "youwen"];
+    trusted-users = [
-    experimental-features = ["nix-command" "flakes"];
+      "root"
+      "youwen"
+    ];
+    experimental-features = [
+      "nix-command"
+      "flakes"
+    ];
   };
 
   services.udev.extraRules = ''

hosts/callisto/default.nix

@@ -2,7 +2,8 @@
   inputs,
   system,
   ...
-}: {
+}:
+{
   imports = with inputs; [
     ./configuration.nix
     ../../modules/linux/audio

hosts/callisto/hardware-configuration.nix

@@ -7,12 +7,16 @@
   pkgs,
   modulesPath,
   ...
-}: {
+}:
+{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["usb_storage" "sdhci_pci"];
+  boot.initrd.availableKernelModules = [
+    "usb_storage"
+    "sdhci_pci"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
@@ -27,7 +31,10 @@
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/852F-07F1";
     fsType = "vfat";
-    options = ["fmask=0022" "dmask=0022"];
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
   };
 
   swapDevices = [ ];

hosts/callisto/home-manager-extras/default.nix

@@ -1,3 +1,4 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   home.file.".config/neofetch/config.conf".source = ./neofetch-asahi.conf;
 }

hosts/demeter/configuration.nix

@@ -7,7 +7,8 @@
   pkgs,
   lib,
   ...
-}: {
+}:
+{
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
@@ -65,7 +66,9 @@
     LC_TIME = "en_US.UTF-8";
   };
 
-  systemd.services = {NetworkManager-wait-online.enable = false;};
+  systemd.services = {
+    NetworkManager-wait-online.enable = false;
+  };
 
   # Enable the X11 windowing system.
   # You can disable this if you're only using the Wayland session.
@@ -73,7 +76,11 @@
 
   programs.nix-ld = {
     enable = true;
-    libraries = with pkgs; [icu xorg.libXtst xorg.libXi];
+    libraries = with pkgs; [
+      icu
+      xorg.libXtst
+      xorg.libXi
+    ];
   };
 
   hardware.nvidia = {
@@ -121,8 +128,14 @@
   };
 
   nix.settings = {
-    trusted-users = ["root" "youwen"];
+    trusted-users = [
-    experimental-features = ["nix-command" "flakes"];
+      "root"
+      "youwen"
+    ];
+    experimental-features = [
+      "nix-command"
+      "flakes"
+    ];
   };
 
   services.udev.extraRules = ''

hosts/demeter/default.nix

@@ -2,7 +2,8 @@
   inputs,
   system,
   ...
-}: {
+}:
+{
   imports = with inputs; [
     ./configuration.nix
     ../../modules/linux/gaming
@@ -23,7 +24,9 @@
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
       home-manager.backupFileExtension = "backup";
-      home-manager.extraSpecialArgs = {inherit inputs;};
+      home-manager.extraSpecialArgs = {
+        inherit inputs;
+      };
       home-manager.users.youwen = {
         imports = [
           ../../users/youwen/linux/desktop

hosts/demeter/hardware-configuration.nix

@@ -7,12 +7,20 @@
   pkgs,
   modulesPath,
   ...
-}: {
+}:
+{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
@@ -27,7 +35,10 @@
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/27EE-D950";
     fsType = "vfat";
-    options = ["fmask=0022" "dmask=0022"];
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
   };
 
   swapDevices = [

hosts/demeter/home-manager-extras/default.nix

@@ -2,8 +2,12 @@
   inputs,
   pkgs,
   ...
-}: {
+}:
-  wayland.windowManager.hyprland.settings.monitor = ["DP-1,2560x1440@165,1920x0,auto" "HDMI-A-1,1920x1080@60,0x0,1"];
+{
+  wayland.windowManager.hyprland.settings.monitor = [
+    "DP-1,2560x1440@165,1920x0,auto"
+    "HDMI-A-1,1920x1080@60,0x0,1"
+  ];
   # wayland.windowManager.hyprland.package = inputs.stablepkgs.legacyPackages.${pkgs.system}.hyprland;
   wayland.windowManager.hyprland.settings.render.explicit_sync = 0;
 }

hosts/phobos/configuration.nix

@@ -3,7 +3,8 @@
   config,
   pkgs,
   ...
-}: {
+}:
+{
   # Expose the package set, including overlays, for convenience.
   # darwinPackages = inputs.self.darwinConfigurations."Youwens-MacBook-Pro".pkgs;
 
@@ -28,8 +29,7 @@
   programs.fish.enable = true;
   programs.bash.enable = true;
 
-  system.configurationRevision =
+  system.configurationRevision = config.self.rev or config.self.dirtyRev or null;
-    config.self.rev or config.self.dirtyRev or null;
 
   nixpkgs.hostPlatform = "aarch64-darwin";
 

hosts/phobos/default.nix

@@ -1,9 +1,12 @@
-{inputs, ...}: {
+{ inputs, ... }:
+{
   imports = with inputs; [
     ./configuration.nix
     home-manager.darwinModules.home-manager
     {
-      extraSpecialArgs = {inherit inputs;};
+      extraSpecialArgs = {
+        inherit inputs;
+      };
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
       home-manager.users.youwen.imports = [

modules/darwin/homebrew.nix

@@ -1,4 +1,5 @@
-{inputs, ...}: {
+{ inputs, ... }:
+{
   nix-homebrew = {
     enable = true;
     enableRosetta = true;

modules/darwin/yabai.nix

@@ -2,7 +2,8 @@
   config,
   pkgs,
   ...
-}: {
+}:
+{
   services.yabai = {
     enable = true;
     enableScriptingAddition = true;

modules/linux/core/default.nix

@@ -2,7 +2,8 @@
   inputs,
   pkgs,
   ...
-}: {
+}:
+{
   environment.systemPackages = [
     inputs.personal-neovim.packages.${pkgs.system}.default
   ];

modules/linux/desktop-portal/default.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   xdg.portal = {
     enable = true;
     extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];

modules/linux/fonts/default.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   fonts = {
     enableDefaultPackages = true;
     fontconfig = {

modules/linux/gaming/default.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   environment.systemPackages = with pkgs; [
     ryujinx
   ];
@@ -14,8 +15,8 @@
 
   nixpkgs.config.packageOverrides = pkgs: {
     steam = pkgs.steam.override {
-      extraPkgs = pkgs:
+      extraPkgs =
-        with pkgs; [
+        pkgs: with pkgs; [
           xorg.libXcursor
           xorg.libXi
           xorg.libXinerama

modules/linux/greeter/default.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   services.greetd = {
     enable = true;
     settings = {

modules/linux/networking/default.nix

@@ -11,7 +11,8 @@ let
       to = 42872;
     }
   ];
-in {
+in
+{
   services.openssh.enable = true;
   networking.firewall = {
     allowedTCPPorts = universalAllowedPorts;
@@ -20,5 +21,8 @@ in {
     allowedTCPPortRanges = universalAllowedRanges;
   };
   networking.firewall.enable = true;
-  networking.nameservers = ["1.1.1.1" "1.0.0.1"];
+  networking.nameservers = [
+    "1.1.1.1"
+    "1.0.0.1"
+  ];
 }

modules/linux/spotifyd/default.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   services.spotifyd = {
     enable = true;
     # settings = {global = 320;};

overlays/default.nix

@@ -2,11 +2,13 @@
   inputs,
   pkgs,
   ...
-}: let
+}:
+let
   stablepkgs = inputs.stablepkgs.legacyPackages.${pkgs.system};
   bleedingpkgs = inputs.bleedingpkgs.legacyPackages.${pkgs.system};
   nixpkgs-small = inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system};
-in {
+in
+{
   nixpkgs.overlays = [
     (self: super: {
       xdg-desktop-portal-hyprland = nixpkgs-small.xdg-desktop-portal-hyprland;

users/youwen/common/core.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   home.file.".essentials" = {
     source = ./essentials;
     recursive = true;
@@ -15,7 +16,9 @@
     '';
   };
 
-  programs.fzf = {enable = true;};
+  programs.fzf = {
+    enable = true;
+  };
 
   programs.git = {
     enable = true;

users/youwen/darwin/darwin-home.nix

@@ -3,7 +3,8 @@
   config,
   pkgs,
   ...
-}: {
+}:
+{
   home.username = "youwen";
   home.homeDirectory = "/Users/youwen";
 

users/youwen/linux/home.nix

@@ -2,7 +2,8 @@
   inputs,
   pkgs,
   ...
-}: {
+}:
+{
   home.username = "youwen";
   home.homeDirectory = "/home/youwen";
 

users/youwen/linux/hyprland/common.nix

@@ -3,7 +3,8 @@
   inputs,
   system,
   ...
-}: {
+}:
+{
   home.packages = with pkgs; [
     wl-clipboard
     grim
@@ -120,9 +121,7 @@
           ",XF86AudioRewind, exec, playerctl previous"
         ]
         ++ (
-          if pkgs.system != "aarch64-linux"
+          if pkgs.system != "aarch64-linux" then [ "$mod, F, exec, zen" ] else [ "$mod, F, exec, librewolf" ]
-          then ["$mod, F, exec, zen"]
-          else ["$mod, F, exec, librewolf"]
         );
       bindm = [
         "$mod, mouse:272, movewindow"

users/youwen/linux/hyprland/laptop/default.nix

@@ -1,4 +1,5 @@
-{lib, ...}: {
+{ lib, ... }:
+{
   imports = [ ../common.nix ];
   wayland.windowManager.hyprland.settings.input.touchpad = {
     natural_scroll = true;

users/youwen/linux/laptop/default.nix

@@ -1,5 +1,12 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
-  imports = [../theming ../home.nix ../programs ../hyprland/laptop ../waybar/laptop];
+{
+  imports = [
+    ../theming
+    ../home.nix
+    ../programs
+    ../hyprland/laptop
+    ../waybar/laptop
+  ];
 
   # some overrides for laptop specifically
   programs.kitty.settings.font_size = pkgs.lib.mkForce 11;

users/youwen/linux/packages/aarch-64/default.nix

@@ -1,3 +1,7 @@
-{pkgs, ...}: let
+{ pkgs, ... }:
+let
   createCommon = import ../common-packages.nix;
-in {home.packages = (createCommon pkgs) ++ [];}
+in
+{
+  home.packages = (createCommon pkgs) ++ [ ];
+}

users/youwen/linux/packages/common-packages.nix

@@ -1,5 +1,4 @@
-pkgs:
+pkgs: with pkgs; [
-with pkgs; [
   neofetch
 
   # archives

users/youwen/linux/packages/x86_64/default.nix

@@ -2,13 +2,16 @@
   pkgs,
   inputs,
   ...
-}: let
+}:
+let
   createCommon = import ../common-packages.nix;
   zen-browser = inputs.zen-browser.packages.${pkgs.system}.specific;
-in {
+in
+{
   home.packages =
     (createCommon pkgs)
-    ++ (with pkgs;
+    ++ (
+      with pkgs;
       [
         bitwarden-desktop
         modrinth-app
@@ -17,7 +20,8 @@ in {
         sbctl
         r2modman
       ]
-      ++ [zen-browser]);
+      ++ [ zen-browser ]
+    );
 
   xdg.mimeApps = {
     enable = true;

users/youwen/linux/programs/default.nix

@@ -2,7 +2,8 @@
   pkgs,
   inputs,
   ...
-}: {
+}:
+{
   programs.kitty = {
     enable = true;
     theme = "Tokyo Night";

users/youwen/linux/spicetify/default.nix

@@ -2,9 +2,11 @@
   inputs,
   pkgs,
   ...
-}: let
+}:
+let
   spicepkgs = inputs.spicetify.legacyPackages.${pkgs.system};
-in {
+in
+{
   imports = [
     inputs.spicetify.homeManagerModules.default
   ];

users/youwen/linux/theming/default.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   imports = [ ./catppuccin.nix ];
 
   gtk = {
@@ -8,7 +9,9 @@
       name = "Bibata-Modern-Ice";
       size = 26;
     };
-    iconTheme = {name = "Papirus-Dark";};
+    iconTheme = {
+      name = "Papirus-Dark";
+    };
   };
 
   qt = {

users/youwen/linux/waybar/desktop/default.nix

@@ -75,13 +75,31 @@
           on-click = "pamixer -t";
           on-scroll-up = "pamixer set 5%+";
           on-scroll-down = "pamixer set 5%-";
-          format-icons = ["" "" "" "" ""];
+          format-icons = [
+            ""
+            ""
+            ""
+            ""
+            ""
+          ];
         };
 
         battery = {
           interval = 10;
           format = "{icon}{capacity}%";
-          format-icons = ["󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
+          format-icons = [
+            "󰂎"
+            "󰁺"
+            "󰁻"
+            "󰁼"
+            "󰁽"
+            "󰁾"
+            "󰁿"
+            "󰂀"
+            "󰂁"
+            "󰂂"
+            "󰁹"
+          ];
           tooltip = true;
           tooltip-format = "{timeTo}";
         };
@@ -115,7 +133,18 @@
         "hyprland/workspaces" = {
           show-special = true;
           persistent-workspaces = {
-            "*" = [1 2 3 4 5 6 7 8 9 10];
+            "*" = [
+              1
+              2
+              3
+              4
+              5
+              6
+              7
+              8
+              9
+              10
+            ];
           };
           format = "{icon}";
           format-icons = {

users/youwen/linux/waybar/laptop/default.nix

@@ -24,7 +24,10 @@
 
         reload_style_on_change = true;
 
-        modules-left = ["hyprland/workspaces" "hyprland/window"];
+        modules-left = [
+          "hyprland/workspaces"
+          "hyprland/window"
+        ];
         modules-right = [
           "tray"
           "idle_inhibitor"
@@ -74,13 +77,31 @@
           on-click = "pamixer -t";
           on-scroll-up = "pamixer set 5%+";
           on-scroll-down = "pamixer set 5%-";
-          format-icons = ["" "" "" "" ""];
+          format-icons = [
+            ""
+            ""
+            ""
+            ""
+            ""
+          ];
         };
 
         battery = {
           interval = 10;
           format = "{icon} {capacity}%";
-          format-icons = ["󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
+          format-icons = [
+            "󰂎"
+            "󰁺"
+            "󰁻"
+            "󰁼"
+            "󰁽"
+            "󰁾"
+            "󰁿"
+            "󰂀"
+            "󰂁"
+            "󰂂"
+            "󰁹"
+          ];
           tooltip = true;
           tooltip-format = "{timeTo}";
         };
@@ -114,7 +135,18 @@
         "hyprland/workspaces" = {
           show-special = true;
           persistent-workspaces = {
-            "*" = [1 2 3 4 5 6 7 8 9 10];
+            "*" = [
+              1
+              2
+              3
+              4
+              5
+              6
+              7
+              8
+              9
+              10
+            ];
           };
           format = "{icon}";
           format-icons = {