README.md

@@ -3,9 +3,6 @@
 This is a repository that implements liminalOS, my personal Linux distribution
 based on [NixOS](https://nixos.org/).
 
-Time wasted writing Nix code:
-![](https://wakatime.com/badge/user/018dc5b8-ba5a-4572-a38a-b526d1b28240/project/c59b3d5e-0c9c-4bd5-a752-e75522ab0cdc.svg)
-
 <!-- prettier-ignore -->
 > **lim·i·nal**  
 > 1. between or belonging to two different places, states, etc.

flake.nix

@@ -28,7 +28,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz";
+      url =
+        "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     apple-silicon = {
@@ -37,21 +38,10 @@
     };
   };
 
-  outputs = {
+  outputs = { self, nixpkgs, home-manager, catppuccin, lanzaboote, stablepkgs
-    self,
+    , bleedingpkgs, lix-module, nix-darwin, nix-homebrew, apple-silicon, ...
-    nixpkgs,
-    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;
+      formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt;
       nixosConfigurations = {
         demeter = nixpkgs.lib.nixosSystem {
           specialArgs = { inherit inputs; };
@@ -161,8 +151,8 @@
           ];
         };
       };
-    formatter.aarch64-darwin = nixpkgs.legacyPackages.aarch64-darwin.alejandra;
+      formatter.aarch64-darwin = nixpkgs.legacyPackages.aarch64-darwin.nixfmt;
-    formatter.aarch64-linux = nixpkgs.legacyPackages.aarch64-linux.alejandra;
+      formatter.aarch64-linux = nixpkgs.legacyPackages.aarch64-linux.nixfmt;
       # Build darwin flake using:
       # $ darwin-rebuild build --flake .#Youwens-MacBook-Pro
       darwinConfigurations.phobos = nix-darwin.lib.darwinSystem {

hosts/adrastea/default.nix

@@ -1,15 +1,11 @@
 # 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, ... }:
+
 {
-  config,
+  imports = [ # Include the results of the hardware scan.
-  inputs,
-  pkgs,
-  lib,
-  ...
-}: {
-  imports = [
-    # Include the results of the hardware scan.
     ./hardware-configuration.nix
   ];
 
@@ -48,7 +44,8 @@
     };
   };
 
-  boot.initrd.luks.devices."luks-52d1be6d-b32f-41e0-a6d7-2ff52599fe7c".device = "/dev/disk/by-uuid/52d1be6d-b32f-41e0-a6d7-2ff52599fe7c";
+  boot.initrd.luks.devices."luks-52d1be6d-b32f-41e0-a6d7-2ff52599fe7c".device =
+    "/dev/disk/by-uuid/52d1be6d-b32f-41e0-a6d7-2ff52599fe7c";
 
   services.tlp.enable = true;
 

hosts/adrastea/hardware-configuration.nix

@@ -1,16 +1,13 @@
 # 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, ... }:
+
 {
-  config,
-  lib,
-  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 = [ ];
@@ -20,7 +17,8 @@
     fsType = "ext4";
   };
 
-  boot.initrd.luks.devices."luks-f169a679-d70b-4dff-a344-7131f3303813".device = "/dev/disk/by-uuid/f169a679-d70b-4dff-a344-7131f3303813";
+  boot.initrd.luks.devices."luks-f169a679-d70b-4dff-a344-7131f3303813".device =
+    "/dev/disk/by-uuid/f169a679-d70b-4dff-a344-7131f3303813";
 
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/3FCB-9D60";
@@ -28,7 +26,8 @@
     options = [ "fmask=0022" "dmask=0022" ];
   };
 
-  swapDevices = [{device = "/dev/disk/by-uuid/f28d0752-feab-4591-899e-e5deac3712d0";}];
+  swapDevices =
+    [{ 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,3 +1,4 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   wayland.windowManager.hyprland.settings.monitor = pkgs.lib.mkForce [ "eDP-1,2560x1440@165,0x0,1.6" ];
 }

hosts/callisto/default.nix

@@ -1,14 +1,11 @@
 # 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, ... }:
+
 {
-  config,
+  imports = [ # Include the results of the hardware scan.
-  inputs,
-  pkgs,
-  ...
-}: {
-  imports = [
-    # Include the results of the hardware scan.
     ./hardware-configuration.nix
     # ./apple-silicon-support
   ];
@@ -158,6 +155,7 @@
   environment.variables = {
     EDITOR = "nvim";
     NIX_AUTO_RUN = 1;
+
   };
   services.keyd = {
     enable = true;

hosts/callisto/hardware-configuration.nix

@@ -1,13 +1,9 @@
 # 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, ... }:
+
 {
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot.initrd.availableKernelModules = [ "usb_storage" "sdhci_pci" ];

hosts/demeter/default.nix

@@ -1,15 +1,11 @@
 # 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, ... }:
+
 {
-  config,
+  imports = [ # Include the results of the hardware scan.
-  inputs,
-  pkgs,
-  lib,
-  ...
-}: {
-  imports = [
-    # Include the results of the hardware scan.
     ./hardware-configuration.nix
   ];
 

hosts/demeter/hardware-configuration.nix

@@ -1,15 +1,11 @@
 # 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, ... }:
+
 {
-  config,
+  imports =
-  lib,
+    [ (modulesPath + "/installer/scan/not-detected.nix")
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
@@ -17,21 +13,21 @@
   boot.kernelModules = [ "kvm-intel" ];
   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" ];
     };
 
-  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,9 +1,4 @@
-{
+{ inputs, config, pkgs, ... }: {
-  inputs,
-  config,
-  pkgs,
-  ...
-}: {
   # Expose the package set, including overlays, for convenience.
   # darwinPackages = inputs.self.darwinConfigurations."Youwens-MacBook-Pro".pkgs;
 

modules/darwin/yabai.nix

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

modules/nixos/greeter/default.nix

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

users/youwen/common/core.nix

@@ -68,8 +68,6 @@
     useTheme = "gruvbox";
   };
 
-  programs.direnv.enable = true;
-
   programs.fish = {
     enable = true;
     shellAliases = {
@@ -78,7 +76,8 @@
     };
     functions = {
       update-nixos = {
-        description = "Update the system flake and attempt to build and switch to the new configuration.";
+        description =
+          "Update the system flake and attempt to build and switch to the new configuration.";
         body = ''
           cd /etc/nixos
           nix flake update

users/youwen/darwin/darwin-home.nix

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

users/youwen/linux/desktop/default.nix

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

users/youwen/linux/home.nix

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

users/youwen/linux/hyprland/common.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   wayland.windowManager.hyprland = {
     enable = true;
     settings = {
@@ -163,7 +164,8 @@
         "ignorezero,swaync-control-center"
         "blur,logout_dialog"
       ];
-      monitor = ["DP-1,2560x1440@165,1920x0,auto" "HDMI-A-1,1920x1080@60,0x0,1"];
+      monitor =
+        [ "DP-1,2560x1440@165,1920x0,auto" "HDMI-A-1,1920x1080@60,0x0,1" ];
       dwindle = {
         pseudotile = "yes";
         preserve_split = "yes";
@@ -282,9 +284,11 @@
   services.hypridle = {
     enable = true;
     settings = {
-      lock_cmd = "pidof hyprlock || hyprlock"; # avoid starting multiple hyprlock instances.
+      lock_cmd =
+        "pidof hyprlock || hyprlock"; # avoid starting multiple hyprlock instances.
       before_sleep_cmd = "loginctl lock-session"; # lock before suspend.
-      after_sleep_cmd = "hyprctl dispatch dpms on"; # to avoid having to press a key twice to turn on the display.
+      after_sleep_cmd =
+        "hyprctl dispatch dpms on"; # to avoid having to press a key twice to turn on the display.
     };
   };
 

users/youwen/linux/laptop/default.nix

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

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

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

users/youwen/linux/theming/default.nix

@@ -23,6 +23,8 @@
       theme=GraphiteNordDark
     '';
 
-    "Kvantum/GraphiteNord".source = "${pkgs.graphite-kde-theme}/share/Kvantum/GraphiteNord";
+    "Kvantum/GraphiteNord".source =
+      "${pkgs.graphite-kde-theme}/share/Kvantum/GraphiteNord";
   };
+
 }

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

@@ -9,8 +9,10 @@
         # width = 1000;
         reload-style-on-change = true;
         margin = "5px 0px 0px 0px";
-        modules-left = ["hyprland/window" "hyprland/workspaces" "network" "clock"];
+        modules-left =
-        modules-right = ["group/hardware" "backlight" "group/adjustable" "custom/weather"];
+          [ "hyprland/window" "hyprland/workspaces" "network" "clock" ];
+        modules-right =
+          [ "group/hardware" "backlight" "group/adjustable" "custom/weather" ];
         # modules-center = [ "network" "group/hardware" "clock" ];
         "hyprland/workspaces" = {
           active-only = false;