chore: switch to alejandra and format

flake.nix

@@ -28,8 +28,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     lix-module = {
-      url =
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz";
-        "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     apple-silicon = {
@@ -38,13 +37,24 @@
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, catppuccin, lanzaboote, stablepkgs
+  outputs = {
-    , bleedingpkgs, lix-module, nix-darwin, nix-homebrew, apple-silicon, ...
+    self,
-    }@inputs: rec {
+    nixpkgs,
-      formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt;
+    home-manager,
+    catppuccin,
+    lanzaboote,
+    stablepkgs,
+    bleedingpkgs,
+    lix-module,
+    nix-darwin,
+    nix-homebrew,
+    apple-silicon,
+    ...
+  } @ inputs: rec {
+    formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
     nixosConfigurations = {
       demeter = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs; };
+        specialArgs = {inherit inputs;};
         system = "x86_64-linux";
         modules = [
           ./hosts/demeter
@@ -77,7 +87,7 @@
         ];
       };
       callisto = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs; };
+        specialArgs = {inherit inputs;};
         system = "aarch64-linux";
         modules = [
           ./hosts/callisto
@@ -117,7 +127,7 @@
         ];
       };
       adrastea = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs; };
+        specialArgs = {inherit inputs;};
         system = "x86_64-linux";
         modules = [
           ./hosts/adrastea
@@ -151,12 +161,12 @@
         ];
       };
     };
-      formatter.aarch64-darwin = nixpkgs.legacyPackages.aarch64-darwin.nixfmt;
+    formatter.aarch64-darwin = nixpkgs.legacyPackages.aarch64-darwin.alejandra;
-      formatter.aarch64-linux = nixpkgs.legacyPackages.aarch64-linux.nixfmt;
+    formatter.aarch64-linux = nixpkgs.legacyPackages.aarch64-linux.alejandra;
     # Build darwin flake using:
     # $ darwin-rebuild build --flake .#Youwens-MacBook-Pro
     darwinConfigurations.phobos = nix-darwin.lib.darwinSystem {
-        specialArgs = { inherit inputs; };
+      specialArgs = {inherit inputs;};
       modules = [
         ./hosts/phobos
         home-manager.darwinModules.home-manager

hosts/adrastea/default.nix

@@ -1,11 +1,15 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, inputs, pkgs, lib, ... }:
-
 {
-  imports = [ # Include the results of the hardware scan.
+  config,
+  inputs,
+  pkgs,
+  lib,
+  ...
+}: {
+  imports = [
+    # Include the results of the hardware scan.
     ./hardware-configuration.nix
   ];
 
@@ -32,7 +36,7 @@
     enable = true;
     keyboards = {
       default = {
-        ids = [ "*" ];
+        ids = ["*"];
         settings = {
           main = {
             capslock = "esc";
@@ -44,8 +48,7 @@
     };
   };
 
-  boot.initrd.luks.devices."luks-52d1be6d-b32f-41e0-a6d7-2ff52599fe7c".device =
+  boot.initrd.luks.devices."luks-52d1be6d-b32f-41e0-a6d7-2ff52599fe7c".device = "/dev/disk/by-uuid/52d1be6d-b32f-41e0-a6d7-2ff52599fe7c";
-    "/dev/disk/by-uuid/52d1be6d-b32f-41e0-a6d7-2ff52599fe7c";
 
   services.tlp.enable = true;
 
@@ -80,7 +83,7 @@
     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.
@@ -88,7 +91,7 @@
 
   programs.nix-ld = {
     enable = true;
-    libraries = with pkgs; [ icu xorg.libXtst xorg.libXi ];
+    libraries = with pkgs; [icu xorg.libXtst xorg.libXi];
   };
 
   hardware.nvidia = {
@@ -111,7 +114,7 @@
 
   hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
 
-  services.xserver.videoDrivers = [ "nvidia" ];
+  services.xserver.videoDrivers = ["nvidia"];
 
   # services.desktopManager.plasma6.enable = true;
 
@@ -131,14 +134,14 @@
   users.users.youwen = {
     isNormalUser = true;
     description = "Youwen Wu";
-    extraGroups = [ "networkmanager" "wheel" "nixos" "realtime" ];
+    extraGroups = ["networkmanager" "wheel" "nixos" "realtime"];
   };
 
-  users.groups.realtime = { };
+  users.groups.realtime = {};
 
   nix.settings = {
-    trusted-users = [ "root" "youwen" ];
+    trusted-users = ["root" "youwen"];
-    experimental-features = [ "nix-command" "flakes" ];
+    experimental-features = ["nix-command" "flakes"];
   };
 
   services.udev.extraRules = ''

hosts/adrastea/hardware-configuration.nix

@@ -1,33 +1,34 @@
 # 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 = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
 
-  boot.initrd.availableKernelModules =
+  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod"];
-    [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [];
-  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = ["kvm-amd"];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [];
-  boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/01983a52-5693-4cda-ad2e-5a406776bfb9";
     fsType = "ext4";
   };
 
-  boot.initrd.luks.devices."luks-f169a679-d70b-4dff-a344-7131f3303813".device =
+  boot.initrd.luks.devices."luks-f169a679-d70b-4dff-a344-7131f3303813".device = "/dev/disk/by-uuid/f169a679-d70b-4dff-a344-7131f3303813";
-    "/dev/disk/by-uuid/f169a679-d70b-4dff-a344-7131f3303813";
 
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/3FCB-9D60";
     fsType = "vfat";
-    options = [ "fmask=0022" "dmask=0022" ];
+    options = ["fmask=0022" "dmask=0022"];
   };
 
-  swapDevices =
+  swapDevices = [{device = "/dev/disk/by-uuid/f28d0752-feab-4591-899e-e5deac3712d0";}];
-    [{ device = "/dev/disk/by-uuid/f28d0752-feab-4591-899e-e5deac3712d0"; }];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

hosts/adrastea/home-manager-overrides.nix

@@ -1,4 +1,3 @@
-{ 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/default.nix

@@ -1,11 +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
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, inputs, pkgs, ... }:
-
 {
-  imports = [ # Include the results of the hardware scan.
+  config,
+  inputs,
+  pkgs,
+  ...
+}: {
+  imports = [
+    # Include the results of the hardware scan.
     ./hardware-configuration.nix
     # ./apple-silicon-support
   ];
@@ -23,7 +26,7 @@
     options hid_apple iso_layout=0
   '';
 
-  boot.kernelParams = [ "apple_dcp.show_notch=1" ];
+  boot.kernelParams = ["apple_dcp.show_notch=1"];
 
   networking.hostName = "callisto"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
@@ -33,7 +36,7 @@
     settings.General.EnableNetworkConfiguration = true;
   };
 
-  nixpkgs.overlays = [ inputs.apple-silicon.overlays.apple-silicon-overlay ];
+  nixpkgs.overlays = [inputs.apple-silicon.overlays.apple-silicon-overlay];
 
   programs.light.enable = true;
 
@@ -68,7 +71,7 @@
 
   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
@@ -87,14 +90,14 @@
   users.users.youwen = {
     isNormalUser = true;
     description = "Youwen Wu";
-    extraGroups = [ "networkmanager" "wheel" "nixos" "realtime" ];
+    extraGroups = ["networkmanager" "wheel" "nixos" "realtime"];
   };
 
-  users.groups.realtime = { };
+  users.groups.realtime = {};
 
   nix.settings = {
-    trusted-users = [ "root" "youwen" ];
+    trusted-users = ["root" "youwen"];
-    experimental-features = [ "nix-command" "flakes" ];
+    experimental-features = ["nix-command" "flakes"];
   };
 
   services.udev.extraRules = ''
@@ -155,13 +158,12 @@
   environment.variables = {
     EDITOR = "nvim";
     NIX_AUTO_RUN = 1;
-
   };
   services.keyd = {
     enable = true;
     keyboards = {
       default = {
-        ids = [ "*" ];
+        ids = ["*"];
         settings = {
           main = {
             capslock = "esc";

hosts/callisto/hardware-configuration.nix

@@ -1,15 +1,19 @@
 # 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 = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  config,
+  lib,
+  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.initrd.kernelModules = [];
-  boot.kernelModules = [ ];
+  boot.kernelModules = [];
-  boot.extraModulePackages = [ ];
+  boot.extraModulePackages = [];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/bc88058e-6e3a-4987-b78e-e19cb5611608";
@@ -19,10 +23,10 @@
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/852F-07F1";
     fsType = "vfat";
-    options = [ "fmask=0022" "dmask=0022" ];
+    options = ["fmask=0022" "dmask=0022"];
   };
 
-  swapDevices = [ ];
+  swapDevices = [];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

hosts/demeter/default.nix

@@ -1,11 +1,15 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, inputs, pkgs, lib, ... }:
-
 {
-  imports = [ # Include the results of the hardware scan.
+  config,
+  inputs,
+  pkgs,
+  lib,
+  ...
+}: {
+  imports = [
+    # Include the results of the hardware scan.
     ./hardware-configuration.nix
   ];
 
@@ -61,7 +65,7 @@
     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.
@@ -69,7 +73,7 @@
 
   programs.nix-ld = {
     enable = true;
-    libraries = with pkgs; [ icu xorg.libXtst xorg.libXi ];
+    libraries = with pkgs; [icu xorg.libXtst xorg.libXi];
   };
 
   hardware.nvidia = {
@@ -91,7 +95,7 @@
 
   hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
 
-  services.xserver.videoDrivers = [ "nvidia" ];
+  services.xserver.videoDrivers = ["nvidia"];
 
   services.flatpak.enable = true;
 
@@ -113,14 +117,14 @@
   users.users.youwen = {
     isNormalUser = true;
     description = "Youwen Wu";
-    extraGroups = [ "networkmanager" "wheel" "nixos" "realtime" ];
+    extraGroups = ["networkmanager" "wheel" "nixos" "realtime"];
   };
 
-  users.groups.realtime = { };
+  users.groups.realtime = {};
 
   nix.settings = {
-    trusted-users = [ "root" "youwen" ];
+    trusted-users = ["root" "youwen"];
-    experimental-features = [ "nix-command" "flakes" ];
+    experimental-features = ["nix-command" "flakes"];
   };
 
   services.udev.extraRules = ''

hosts/demeter/hardware-configuration.nix

@@ -1,33 +1,37 @@
 # 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 = [ "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.initrd.kernelModules = [];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = ["kvm-intel"];
-  boot.extraModulePackages = [ ];
+  boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/5a339a7f-8668-42d7-9ecc-d7a8f1d3f7b2";
+    device = "/dev/disk/by-uuid/5a339a7f-8668-42d7-9ecc-d7a8f1d3f7b2";
     fsType = "ext4";
   };
 
   boot.initrd.luks.devices."luks-362ec972-7c5e-4c9f-ba5d-b8f2ed083509".device = "/dev/disk/by-uuid/362ec972-7c5e-4c9f-ba5d-b8f2ed083509";
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/27EE-D950";
+    device = "/dev/disk/by-uuid/27EE-D950";
     fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
+    options = ["fmask=0022" "dmask=0022"];
   };
 
-  swapDevices =
+  swapDevices = [
-    [ { device = "/dev/disk/by-uuid/670fc084-d593-44b3-aed9-78d95fec71de"; }
+    {device = "/dev/disk/by-uuid/670fc084-d593-44b3-aed9-78d95fec71de";}
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/phobos/default.nix

@@ -1,10 +1,15 @@
-{ inputs, config, pkgs, ... }: {
+{
+  inputs,
+  config,
+  pkgs,
+  ...
+}: {
   # Expose the package set, including overlays, for convenience.
   # darwinPackages = inputs.self.darwinConfigurations."Youwens-MacBook-Pro".pkgs;
 
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
-  environment.systemPackages = with pkgs; [ ];
+  environment.systemPackages = with pkgs; [];
 
   # Use a custom configuration.nix location.
   # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
@@ -45,8 +50,8 @@
       noto-fonts
       noto-fonts-cjk
       noto-fonts-emoji
-      (nerdfonts.override { fonts = [ "CascadiaCode" ]; })
+      (nerdfonts.override {fonts = ["CascadiaCode"];})
-      (google-fonts.override { fonts = [ "Lora" ]; })
+      (google-fonts.override {fonts = ["Lora"];})
     ];
   };
 }

modules/darwin/homebrew.nix

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

modules/darwin/yabai.nix

@@ -1,4 +1,8 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   services.yabai = {
     enable = true;
     enableScriptingAddition = true;
@@ -28,4 +32,3 @@
     blur_radius = 5.0;
   };
 }
-

modules/nixos/fonts/default.nix

@@ -1,18 +1,18 @@
-{ pkgs, ... }: {
+{pkgs, ...}: {
   fonts = {
     enableDefaultPackages = true;
     fontconfig = {
       defaultFonts = {
-        serif = [ "Noto Serif" ];
+        serif = ["Noto Serif"];
-        sansSerif = [ "Noto Sans" ];
+        sansSerif = ["Noto Sans"];
       };
     };
     packages = with pkgs; [
       noto-fonts
       noto-fonts-cjk
       noto-fonts-emoji
-      (nerdfonts.override { fonts = [ "CascadiaCode" ]; })
+      (nerdfonts.override {fonts = ["CascadiaCode"];})
-      (google-fonts.override { fonts = [ "Lora" ]; })
+      (google-fonts.override {fonts = ["Lora"];})
     ];
   };
 }

modules/nixos/greeter/default.nix

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

modules/nixos/networking/default.nix

@@ -2,5 +2,5 @@
   services.openssh.enable = true;
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];
-  networking.nameservers = [ "1.1.1.1" "1.0.0.1" ];
+  networking.nameservers = ["1.1.1.1" "1.0.0.1"];
 }

users/youwen/common/core.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{pkgs, ...}: {
   home.file.".essentials" = {
     source = ./essentials;
     recursive = true;
@@ -15,7 +15,7 @@
     '';
   };
 
-  programs.fzf = { enable = true; };
+  programs.fzf = {enable = true;};
 
   programs.git = {
     enable = true;
@@ -57,7 +57,7 @@
 
   programs.gh = {
     enable = true;
-    extensions = [ pkgs.github-copilot-cli ];
+    extensions = [pkgs.github-copilot-cli];
   };
 
   programs.oh-my-posh = {
@@ -68,7 +68,6 @@
     useTheme = "gruvbox";
   };
 
-
   programs.direnv.enable = true;
 
   programs.fish = {
@@ -79,8 +78,7 @@
     };
     functions = {
       update-nixos = {
-        description =
+        description = "Update the system flake and attempt to build and switch to the new configuration.";
-          "Update the system flake and attempt to build and switch to the new configuration.";
         body = ''
           cd /etc/nixos
           nix flake update

users/youwen/common/default.nix

@@ -1 +1 @@
-{ imports = [ ./core.nix ]; }
+{imports = [./core.nix];}

users/youwen/darwin/darwin-home.nix

@@ -1,6 +1,9 @@
-{ inputs, config, pkgs, ... }:
-
 {
+  inputs,
+  config,
+  pkgs,
+  ...
+}: {
   home.username = "youwen";
   home.homeDirectory = "/Users/youwen";
 
@@ -79,5 +82,4 @@
 
   # Let home Manager install and manage itself.
   programs.home-manager.enable = true;
-
 }

users/youwen/linux/desktop/default.nix

@@ -7,4 +7,3 @@
     ../waybar/desktop
   ];
 }
-

users/youwen/linux/home.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   home.username = "youwen";
   home.homeDirectory = "/home/youwen";
 

users/youwen/linux/hyprland/common.nix

@@ -1,9 +1,8 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-{
   wayland.windowManager.hyprland = {
     enable = true;
     settings = {
-      exec-once = [ "waypaper --restore" ];
+      exec-once = ["waypaper --restore"];
       "$mod" = "SUPER";
       "$Left" = "Y";
       "$Right" = "O";
@@ -164,8 +163,7 @@
         "ignorezero,swaync-control-center"
         "blur,logout_dialog"
       ];
-      monitor =
+      monitor = ["DP-1,2560x1440@165,1920x0,auto" "HDMI-A-1,1920x1080@60,0x0,1"];
-        [ "DP-1,2560x1440@165,1920x0,auto" "HDMI-A-1,1920x1080@60,0x0,1" ];
       dwindle = {
         pseudotile = "yes";
         preserve_split = "yes";
@@ -284,17 +282,15 @@
   services.hypridle = {
     enable = true;
     settings = {
-      lock_cmd =
+      lock_cmd = "pidof hyprlock || hyprlock"; # avoid starting multiple hyprlock instances.
-        "pidof hyprlock || hyprlock"; # avoid starting multiple hyprlock instances.
       before_sleep_cmd = "loginctl lock-session"; # lock before suspend.
-      after_sleep_cmd =
+      after_sleep_cmd = "hyprctl dispatch dpms on"; # to avoid having to press a key twice to turn on the display.
-        "hyprctl dispatch dpms on"; # to avoid having to press a key twice to turn on the display.
     };
   };
 
   xdg.portal = {
     enable = true;
-    configPackages = [ pkgs.xdg-desktop-portal-hyprland ];
+    configPackages = [pkgs.xdg-desktop-portal-hyprland];
-    extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
+    extraPortals = [pkgs.xdg-desktop-portal-hyprland];
   };
 }

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

@@ -1 +1 @@
-{ imports = [ ../common.nix ]; }
+{imports = [../common.nix];}

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

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

users/youwen/linux/laptop/default.nix

@@ -1,8 +1,6 @@
-{ pkgs, ... }: {
+{pkgs, ...}: {
-  imports =
+  imports = [../theming ../home.nix ../programs ../hyprland/laptop ../waybar/laptop];
-    [ ../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,3 @@
-{ pkgs, ... }:
+{pkgs, ...}: let
-let createCommon = import ../common-packages.nix;
+  createCommon = import ../common-packages.nix;
-in { home.packages = ((createCommon pkgs) ++ [ ]); }
+in {home.packages = (createCommon pkgs) ++ [];}

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

@@ -1,7 +1,9 @@
-{ pkgs, ... }:
+{pkgs, ...}: let
-let createCommon = import ../common-packages.nix;
+  createCommon = import ../common-packages.nix;
 in {
-  home.packages = ((createCommon pkgs) ++ (with pkgs; [
+  home.packages =
+    (createCommon pkgs)
+    ++ (with pkgs; [
       spotify
       bitwarden-desktop
       modrinth-app
@@ -9,5 +11,5 @@ in {
       wine
       sbctl
       r2modman
-  ]));
+    ]);
 }

users/youwen/linux/theming/default.nix

@@ -1,5 +1,5 @@
-{ pkgs, ... }: {
+{pkgs, ...}: {
-  imports = [ ./catppuccin.nix ];
+  imports = [./catppuccin.nix];
 
   gtk = {
     enable = true;
@@ -8,7 +8,7 @@
       name = "Bibata-Modern-Ice";
       size = 26;
     };
-    iconTheme = { name = "Papirus-Dark"; };
+    iconTheme = {name = "Papirus-Dark";};
   };
 
   qt = {
@@ -23,8 +23,6 @@
       theme=GraphiteNordDark
     '';
 
-    "Kvantum/GraphiteNord".source =
+    "Kvantum/GraphiteNord".source = "${pkgs.graphite-kde-theme}/share/Kvantum/GraphiteNord";
-      "${pkgs.graphite-kde-theme}/share/Kvantum/GraphiteNord";
   };
-
 }

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

@@ -9,21 +9,21 @@
         width = 1600;
         reload-style-on-change = true;
         margin = "10px 0px 0px 0px";
-        modules-left = [ "hyprland/window" "hyprland/workspaces" ];
+        modules-left = ["hyprland/window" "hyprland/workspaces"];
-        modules-right = [ "backlight" "group/adjustable" "custom/weather" ];
+        modules-right = ["backlight" "group/adjustable" "custom/weather"];
-        modules-center = [ "network" "group/hardware" "clock" ];
+        modules-center = ["network" "group/hardware" "clock"];
         "hyprland/workspaces" = {
           active-only = false;
           all-outputs = false;
           format = "{icon}";
           persistent-workspaces = {
-            eDP-1 = [ 1 ];
+            eDP-1 = [1];
-            DP-1 = [ 2 3 4 5 ];
+            DP-1 = [2 3 4 5];
           };
         };
         "group/hardware" = {
           orientation = "inherit";
-          modules = [ "cpu" "memory" "battery" ];
+          modules = ["cpu" "memory" "battery"];
         };
         "group/adjustable" = {
           orientation = "inherit";
@@ -31,7 +31,7 @@
             transition-duration = 500;
             transition-left-to-right = true;
           };
-          modules = [ "pulseaudio" "mpris" ];
+          modules = ["pulseaudio" "mpris"];
         };
         "custom/weather" = {
           orientation = "horizontal";
@@ -51,12 +51,12 @@
         #   format-paused = " 󰏤 {title}  ";
         #   format-stopped = "Nothing Playing";
         # };
-        tray = { spacing = 10; };
+        tray = {spacing = 10;};
-        clock = { format = "{:%a %b %d, %I:%M %p} "; };
+        clock = {format = "{:%a %b %d, %I:%M %p} ";};
         backlight = {
           device = "intel_backlight";
           format = "{percent}% {icon}";
-          format-icons = [ "󰃞" "󰃠" ];
+          format-icons = ["󰃞" "󰃠"];
         };
         battery = {
           states = {
@@ -65,9 +65,9 @@
             critical = 10;
           };
           format = "{capacity}% {icon}";
-          format-icons = [ "󰁻" "󰁽" "󰁿" "󰂀" "󰁹" ];
+          format-icons = ["󰁻" "󰁽" "󰁿" "󰂀" "󰁹"];
         };
-        "hyprland/window" = { format = "{class}"; };
+        "hyprland/window" = {format = "{class}";};
         network = {
           format-wifi = "{essid} ";
           format-linked = "{ifname} (No IP) ";
@@ -81,7 +81,7 @@
           format-muted = " {format_source}";
           format-source = "{volume}% ";
           format-source-muted = "";
-          format-icons = { default = [ "" "" "" ]; };
+          format-icons = {default = ["" "" ""];};
         };
       };
     };

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

@@ -9,23 +9,21 @@
         # width = 1000;
         reload-style-on-change = true;
         margin = "5px 0px 0px 0px";
-        modules-left =
+        modules-left = ["hyprland/window" "hyprland/workspaces" "network" "clock"];
-          [ "hyprland/window" "hyprland/workspaces" "network" "clock" ];
+        modules-right = ["group/hardware" "backlight" "group/adjustable" "custom/weather"];
-        modules-right =
-          [ "group/hardware" "backlight" "group/adjustable" "custom/weather" ];
         # modules-center = [ "network" "group/hardware" "clock" ];
         "hyprland/workspaces" = {
           active-only = false;
           all-outputs = false;
           format = "{icon}";
           persistent-workspaces = {
-            eDP-1 = [ 1 ];
+            eDP-1 = [1];
-            DP-1 = [ 2 3 4 5 ];
+            DP-1 = [2 3 4 5];
           };
         };
         "group/hardware" = {
           orientation = "inherit";
-          modules = [ "cpu" "battery" ];
+          modules = ["cpu" "battery"];
         };
         "group/adjustable" = {
           orientation = "inherit";
@@ -33,7 +31,7 @@
             transition-duration = 500;
             transition-left-to-right = true;
           };
-          modules = [ "pulseaudio" "mpris" ];
+          modules = ["pulseaudio" "mpris"];
         };
         "custom/weather" = {
           orientation = "horizontal";
@@ -53,12 +51,12 @@
         #   format-paused = " 󰏤 {title}  ";
         #   format-stopped = "Nothing Playing";
         # };
-        tray = { spacing = 10; };
+        tray = {spacing = 10;};
-        clock = { format = "{:%a %b %d, %I:%M %p} "; };
+        clock = {format = "{:%a %b %d, %I:%M %p} ";};
         backlight = {
           device = "intel_backlight";
           format = "{percent}% {icon}";
-          format-icons = [ "󰃞" "󰃠" ];
+          format-icons = ["󰃞" "󰃠"];
         };
         battery = {
           states = {
@@ -67,9 +65,9 @@
             critical = 10;
           };
           format = "{capacity}% {icon}";
-          format-icons = [ "󰁻" "󰁽" "󰁿" "󰂀" "󰁹" ];
+          format-icons = ["󰁻" "󰁽" "󰁿" "󰂀" "󰁹"];
         };
-        "hyprland/window" = { format = "{class}"; };
+        "hyprland/window" = {format = "{class}";};
         network = {
           format-wifi = "{essid} ";
           format-linked = "{ifname} (No IP) ";
@@ -83,7 +81,7 @@
           format-muted = " {format_source}";
           format-source = "{volume}% ";
           format-source-muted = "";
-          format-icons = { default = [ "" "" "" ]; };
+          format-icons = {default = ["" "" ""];};
         };
       };
     };