Format repo

flake.lock

@@ -549,6 +549,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1726871744,
+        "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nur": {
       "locked": {
         "lastModified": 1729855863,
@@ -608,7 +624,8 @@
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur",
         "sops-nix": "sops-nix",
-        "stylix": "stylix"
+        "stylix": "stylix",
+        "treefmt-nix": "treefmt-nix"
       }
     },
     "rust-overlay": {
@@ -721,6 +738,24 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_4"
+      },
+      "locked": {
+        "lastModified": 1729613947,
+        "narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "aac86347fb5063960eccb19493e0cadcdb4205ca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -7,6 +7,7 @@
     nur.url = "github:nix-community/NUR";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     stylix.url = "github:pizzapim/stylix/release-24.05";
+    treefmt-nix.url = "github:numtide/treefmt-nix";
 
     nix-index-database = {
       url = "github:nix-community/nix-index-database";
@@ -46,13 +47,33 @@
     };
   };
 
-  outputs =
+  outputs = {
-    { self
+    self,
-    , nixpkgs
+    nixpkgs,
-    , ...
+    ...
-    }@inputs:
+  } @ inputs: let
-    let
+    supportedSystems = [
-      mkNixosSystem = {extraModule, nixpkgs' ? nixpkgs, useDefaultConfiguration ? true}: nixpkgs'.lib.nixosSystem rec {
+      "x86_64-linux"
+      "i686-linux"
+      "aarch64-linux"
+    ];
+    forAllSystems' = nixpkgs.lib.genAttrs;
+    forAllSystems = forAllSystems' supportedSystems;
+    pkgsForSystem = system:
+      import nixpkgs {
+        inherit system;
+      };
+
+    treefmtEval = forAllSystems (
+      system: inputs.treefmt-nix.lib.evalModule (pkgsForSystem system) ./treefmt.nix
+    );
+
+    mkNixosSystem = {
+      extraModule,
+      nixpkgs' ? nixpkgs,
+      useDefaultConfiguration ? true,
+    }:
+      nixpkgs'.lib.nixosSystem rec {
         system = "x86_64-linux";
 
         specialArgs = {
@@ -60,14 +81,22 @@
           flake = self;
         };
 
-        modules = [
+        modules =
+          [
             extraModule
-        ] ++ nixpkgs'.lib.optional useDefaultConfiguration ./nixos;
+          ]
+          ++ nixpkgs'.lib.optional useDefaultConfiguration ./nixos;
       };
-    in
+  in {
-    {
+    formatter = forAllSystems (system: (treefmtEval.${system}.config.build.wrapper));
+
     nixosConfigurations = {
-        x260 = mkNixosSystem { extraModule = ({ pkgs, lib, ... }: {
+      x260 = mkNixosSystem {
+        extraModule = {
+          pkgs,
+          lib,
+          ...
+        }: {
           imports = [inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x260];
 
           config = {
@@ -87,17 +116,21 @@
             powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
             boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "rtsx_pci_sdmmc"];
           };
-          });
+        };
       };
 
-        x201 = mkNixosSystem {extraModule = ({ pkgs, lib, ... }: {
+      x201 = mkNixosSystem {
+        extraModule = {
+          pkgs,
+          lib,
+          ...
+        }: {
           imports = [inputs.disko.nixosModules.disko];
           config = {
             networking.hostName = "x201";
 
             boot.initrd.availableKernelModules = ["ehci_pci" "ahci" "usb_storage"];
 
-
             disko.devices = {
               disk = {
                 sda = {
@@ -148,12 +181,12 @@
               };
             };
           };
-          });
+        };
       };
 
       sue-cosmic = mkNixosSystem {
         useDefaultConfiguration = false;
-          extraModule = ({ ... }: {
+        extraModule = {...}: {
           imports = [
             inputs.nixos-hardware.nixosModules.dell-xps-13-9310
             inputs.nixos-cosmic.nixosModules.default
@@ -182,14 +215,12 @@
             swapDevices = [{device = "/dev/disk/by-uuid/96a43c35-0174-4e92-81f0-168a5f601f0b";}];
 
             fileSystems = {
-                "/" =
+              "/" = {
-                  {
                 device = "/dev/disk/by-uuid/31638735-5cc4-4013-8037-17e30edcbb0a";
                 fsType = "ext4";
               };
 
-                "/boot" =
+              "/boot" = {
-                  {
                 device = "/dev/disk/by-uuid/560E-F8A2";
                 fsType = "vfat";
                 options = ["fmask=0022" "dmask=0022"];
@@ -199,10 +230,11 @@
             boot.initrd.luks.devices."luks-8ffd3129-4908-4209-98c4-4eb68a35c494".device = "/dev/disk/by-uuid/8ffd3129-4908-4209-98c4-4eb68a35c494";
             boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage"];
           };
-          });
+        };
       };
 
-        sue = mkNixosSystem {extraModule = ({ ... }: {
+      sue = mkNixosSystem {
+        extraModule = {...}: {
           imports = [inputs.nixos-hardware.nixosModules.dell-xps-13-9310];
 
           config = {
@@ -210,14 +242,12 @@
             networking.hostName = "xps-9315";
             swapDevices = [{device = "/dev/disk/by-uuid/96a43c35-0174-4e92-81f0-168a5f601f0b";}];
             fileSystems = {
-              "/" =
+              "/" = {
-                {
                 device = "/dev/disk/by-uuid/31638735-5cc4-4013-8037-17e30edcbb0a";
                 fsType = "ext4";
               };
 
-              "/boot" =
+              "/boot" = {
-                {
                 device = "/dev/disk/by-uuid/560E-F8A2";
                 fsType = "vfat";
                 options = ["fmask=0022" "dmask=0022"];
@@ -237,7 +267,7 @@
             #   platform = "ipu6ep";
             # };
           };
-        });
+        };
       };
     };
   };

home-manager/default.nix

@@ -1,4 +1,11 @@
-{ pkgs, lib, config, inputs, flake, ... }: {
+{
+  pkgs,
+  lib,
+  config,
+  inputs,
+  flake,
+  ...
+}: {
   imports = [
     ./neovim
     ./firefox
@@ -17,8 +24,7 @@
     mimeApps = {
       enable = true;
 
-      defaultApplications =
+      defaultApplications = let
-        let
         applications = {
           telegram = {
             mimeApp = "org.telegram.desktop.desktop";
@@ -71,7 +77,11 @@
           };
         };
 
-          mimeTypesForApp = { mimeApp, mimeTypes }: map
+        mimeTypesForApp = {
+          mimeApp,
+          mimeTypes,
+        }:
+          map
           (
             mimeType: {"${mimeType}" = mimeApp;}
           )
@@ -86,10 +96,12 @@
     homeDirectory = "/home/pim";
     stateVersion = "23.05";
 
-    packages = (with pkgs; [
+    packages =
+      (with pkgs; [
         jellyfin-media-player
         virt-manager
-    ]) ++ (with pkgs.unstable; [
+      ])
+      ++ (with pkgs.unstable; [
         attic-client
         dbeaver-bin
         devenv

home-manager/firefox/addons.nix

@@ -1,5 +1,4 @@
-pkgs: lib:
+pkgs: lib: let
-let
   rycee-addons = pkgs.nur.repos.rycee.firefox-addons;
   custom-addons = import ./custom-addons.nix pkgs lib;
 in

home-manager/firefox/custom-addons.nix

@@ -1,8 +1,15 @@
-pkgs: lib:
+pkgs: lib: let
-let
   # Stolen from: https://github.com/nix-community/nur-combined/blob/master/repos/rycee/pkgs/firefox-addons/default.nix
-  buildFirefoxXpiAddon = lib.makeOverridable ({ stdenv ? pkgs.stdenv
+  buildFirefoxXpiAddon = lib.makeOverridable ({
-    , fetchurl ? pkgs.fetchurl, pname, version, addonId, url, sha256, meta, ...
+    stdenv ? pkgs.stdenv,
+    fetchurl ? pkgs.fetchurl,
+    pname,
+    version,
+    addonId,
+    url,
+    sha256,
+    meta,
+    ...
   }:
     stdenv.mkDerivation {
       name = "${pname}-${version}";
@@ -25,13 +32,11 @@ in {
     pname = "http-version-indicator";
     version = "3.2.1";
     addonId = "spdyindicator@chengsun.github.com";
-    url =
+    url = "https://addons.mozilla.org/firefox/downloads/file/3767224/http2_indicator-3.2.1.xpi";
-      "https://addons.mozilla.org/firefox/downloads/file/3767224/http2_indicator-3.2.1.xpi";
     sha256 = "be9518017334ce502a1da514542c2ca4f974217d0c8e6c7c31d518aba57c09a8";
     meta = with lib; {
       homepage = "https://github.com/bsiegel/http-version-indicator";
-      description =
+      description = "An indicator showing the HTTP version used to load the page in the address bar.";
-        "An indicator showing the HTTP version used to load the page in the address bar.";
       mozPermissions = ["<all_urls>" "tabs" "webNavigation" "webRequest"];
       platforms = platforms.all;
     };
@@ -40,13 +45,11 @@ in {
     pname = "indicatetls";
     version = "0.3.0";
     addonId = "{252ee273-8c8d-4609-b54d-62ae345be0a1}";
-    url =
+    url = "https://addons.mozilla.org/firefox/downloads/file/3608595/indicatetls-0.3.0.xpi";
-      "https://addons.mozilla.org/firefox/downloads/file/3608595/indicatetls-0.3.0.xpi";
     sha256 = "7a3b7edb1085f7b15d279c1013fac1d68f5247cfd6312d5275cb053e24a79465";
     meta = with lib; {
       homepage = "https://github.com/jannispinter/indicatetls";
-      description =
+      description = "Displays negotiated SSL/TLS protocol version and additional security information in the address bar";
-        "Displays negotiated SSL/TLS protocol version and additional security information in the address bar";
       license = licenses.mpl20;
       mozPermissions = [
         "tabs"
@@ -63,13 +66,11 @@ in {
     pname = "sixindicator";
     version = "1.3.0";
     addonId = "{8c9cad02-c069-4e93-909d-d874da819c49}";
-    url =
+    url = "https://addons.mozilla.org/firefox/downloads/file/3493442/sixindicator-1.3.0.xpi";
-      "https://addons.mozilla.org/firefox/downloads/file/3493442/sixindicator-1.3.0.xpi";
     sha256 = "415ab83ed4ac94d1efe114752a09df29536d1bd54cc9b7e5ce5d9ee55a84226d";
     meta = with lib; {
       homepage = "https://github.com/HostedDinner/SixIndicator";
-      description =
+      description = "Shows a simple icon, if IPv6 or IPv4 was used for the request of the site. When clicking on the icon, more information is shown, like the number of requests per domain and if these requests were made via IPv6 or IPv4.";
-        "Shows a simple icon, if IPv6 or IPv4 was used for the request of the site. When clicking on the icon, more information is shown, like the number of requests per domain and if these requests were made via IPv6 or IPv4.";
       license = licenses.mit;
       mozPermissions = ["tabs" "webRequest" "<all_urls>"];
       platforms = platforms.all;
@@ -79,8 +80,7 @@ in {
     pname = "simple-style-fox-2";
     version = "10.0";
     addonId = "{317526c6-ff2b-49c9-822e-d77b4a3da1d1}";
-    url =
+    url = "https://addons.mozilla.org/firefox/downloads/file/3934220/simple_style_fox_2-10.0.xpi";
-      "https://addons.mozilla.org/firefox/downloads/file/3934220/simple_style_fox_2-10.0.xpi";
     sha256 = "1aaac3ba08d21086d7087015f92a27661940df45a97bf5680588c883f799a97d";
     meta = with lib; {
       description = "Simple style fox 2";

home-manager/firefox/default.nix

@@ -1,5 +1,8 @@
-{ pkgs, lib, ... }:
+{
-let
+  pkgs,
+  lib,
+  ...
+}: let
   firefoxAddons = import ./addons.nix pkgs lib;
   firefoxSettings = {
     "browser.aboutConfig.showWarning" = false;
@@ -14,8 +17,7 @@ let
     "browser.newtabpage.activity-stream.showSponsored" = false;
     "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
   };
-in
+in {
-{
   config = {
     programs.firefox = {
       enable = true;

home-manager/gnome.nix

@@ -1,4 +1,10 @@
-{ pkgs, lib, flake, config, ... }: {
+{
+  pkgs,
+  lib,
+  flake,
+  config,
+  ...
+}: {
   home.packages = with pkgs; [gnome.gnome-tweaks];
 
   dconf.settings = with lib.hm.gvariant; {

home-manager/vscode.nix

@@ -1,4 +1,8 @@
-{ pkgs, lib, ... }: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   programs.vscode = {
     enable = true;
     package = pkgs.vscodium;

nixos/default.nix

@@ -1,4 +1,12 @@
-{ pkgs, config, lib, inputs, flake, system, ... }: {
+{
+  pkgs,
+  config,
+  lib,
+  inputs,
+  flake,
+  system,
+  ...
+}: {
   imports = [
     inputs.home-manager.nixosModules.home-manager
     ./lanzaboote.nix
@@ -122,7 +130,8 @@
     hostPlatform = lib.mkDefault "x86_64-linux";
 
     config = {
-      allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+      allowUnfreePredicate = pkg:
+        builtins.elem (lib.getName pkg) [
           "libfprint-2-tod1-goodix"
         ];
     };

nixos/gnome.nix

@@ -2,21 +2,25 @@
   services.xserver.desktopManager.gnome.enable = true;
 
   environment = {
-    systemPackages = [
+    systemPackages =
+      [
         pkgs.gnome.gnome-shell-extensions
-    ] ++ (with pkgs.gnomeExtensions; [
+      ]
+      ++ (with pkgs.gnomeExtensions; [
         pop-shell
         window-is-ready-remover
         random-wallpaper
         workspaces-indicator-by-open-apps
       ]);
 
-    gnome.excludePackages = (with pkgs; [
+    gnome.excludePackages =
+      (with pkgs; [
         epiphany
         gnome-connections
         gnome-console
         gnome-tour
-    ]) ++ (with pkgs.gnome; [
+      ])
+      ++ (with pkgs.gnome; [
         geary
         gnome-calendar
         gnome-clocks

nixos/lanzaboote.nix

@@ -1,4 +1,9 @@
-{ config, lib, inputs, ... }: {
+{
+  config,
+  lib,
+  inputs,
+  ...
+}: {
   imports = [
     inputs.lanzaboote.nixosModules.lanzaboote
   ];

nixos/sops.nix

@@ -1,4 +1,9 @@
-{ inputs, pkgs, flake, ... }: {
+{
+  inputs,
+  pkgs,
+  flake,
+  ...
+}: {
   imports = [inputs.sops-nix.nixosModules.sops];
 
   environment.systemPackages = with pkgs; [sops];

nixos/stylix.nix

@@ -1,4 +1,8 @@
-{ pkgs, inputs, ... }: {
+{
+  pkgs,
+  inputs,
+  ...
+}: {
   imports = [inputs.stylix.nixosModules.stylix];
 
   stylix = {

nixos/wireguard.nix

@@ -1,4 +1,8 @@
-{ lib, config, ... }: {
+{
+  lib,
+  config,
+  ...
+}: {
   networking = {
     useDHCP = lib.mkDefault true;
     networkmanager.unmanaged = ["tailscale0"];
@@ -10,12 +14,14 @@
         dns = ["192.168.30.131"];
         autostart = false;
         mtu = 1412;
-        peers = [{
+        peers = [
+          {
             presharedKeyFile = config.sops.secrets."wireguard/home/presharedKey".path;
             endpoint = "wg.kun.is:51820";
             publicKey = "fa3mQ7ximJbH7cu2ZbWidto5xBGxEEfWvCCiUDk00Hg=";
             allowedIPs = ["0.0.0.0/0"];
-        }];
+          }
+        ];
       };
 
       home-no-pihole = {
@@ -24,12 +30,14 @@
         dns = ["192.168.10.1"];
         autostart = false;
         mtu = 1412;
-        peers = [{
+        peers = [
+          {
             presharedKeyFile = config.sops.secrets."wireguard/home/presharedKey".path;
             endpoint = "wg.kun.is:51820";
             publicKey = "fa3mQ7ximJbH7cu2ZbWidto5xBGxEEfWvCCiUDk00Hg=";
             allowedIPs = ["0.0.0.0/0"];
-        }];
+          }
+        ];
       };
     };
   };

treefmt.nix

@@ -0,0 +1,4 @@
+{...}: {
+  projectRootFile = "flake.nix";
+  programs.alejandra.enable = true;
+}