repo: format tree

3 files changed, 72 insertions, 38 deletions

diff --git a/fw/configuration.nix b/fw/configuration.nix
index c440db4..0b9ebe3 100644
--- a/fw/configuration.nix
+++ b/fw/configuration.nix
@@ -1,10 +1,14 @@
-{ config, lib, pkgs, ... }:
 {
-  imports =
-    [
-      ../nixos
-      ./hardware-configuration.nix
-    ];
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  imports = [
+    ../nixos
+    ./hardware-configuration.nix
+  ];
 
   config.nixos = {
     username = "stefan";
@@ -13,7 +17,10 @@
   };
 
   config = {
-    nix.settings.experimental-features = [ "nix-command" "flakes" ];
+    nix.settings.experimental-features = [
+      "nix-command"
+      "flakes"
+    ];
     services.openssh.enable = true;
 
     programs.light.enable = true;
@@ -37,7 +44,11 @@
       };
     };
 
-    users.users."stefan".extraGroups = [ "input" "uinput" "video" ]; # TODO: remove
+    users.users."stefan".extraGroups = [
+      "input"
+      "uinput"
+      "video"
+    ]; # TODO: remove
 
     environment.gnome.excludePackages = with pkgs; [
       gnome-photos
@@ -67,16 +78,16 @@
 
     # Enable automatic login for the user.
     # services.getty.autologinUser = "stefan";
-    
+
     # services.interception-tools = {
-      # enable = true;
-      # plugins = [ pkgs.interception ]
-      # udevmonConfig = ''
-      #    - JOB: "${pkgs.interception-tools}/bin/intercept -g $DEVNODE | ${pkgs.interception-tools-plugins.caps2esc}/bin/caps2esc | ${pkgs.interception-tools}/bin/uinput -d $DEVNODE"
-      #      DEVICE:
-      #        EVENTS:
-      #          EV_KEY: [KEY_CAPSLOCK, KEY_ESC]
-      # '';
+    # enable = true;
+    # plugins = [ pkgs.interception ]
+    # udevmonConfig = ''
+    #    - JOB: "${pkgs.interception-tools}/bin/intercept -g $DEVNODE | ${pkgs.interception-tools-plugins.caps2esc}/bin/caps2esc | ${pkgs.interception-tools}/bin/uinput -d $DEVNODE"
+    #      DEVICE:
+    #        EVENTS:
+    #          EV_KEY: [KEY_CAPSLOCK, KEY_ESC]
+    # '';
     # };
     services.fwupd.enable = true;
     # systemd.services.fprintd = {
diff --git a/fw/hardware-configuration.nix b/fw/hardware-configuration.nix
index 3d723db..b4ec7c2 100644
--- a/fw/hardware-configuration.nix
+++ b/fw/hardware-configuration.nix
@@ -1,34 +1,50 @@
 # 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,
+  ...
+}:
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "thunderbolt"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/fbc7b13a-334d-4049-bde3-7c7d4dd36bef";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/fbc7b13a-334d-4049-bde3-7c7d4dd36bef";
+    fsType = "ext4";
+  };
 
-  boot.initrd.luks.devices."luks-76360bfd-a645-4066-bfbe-3c7436497b11".device = "/dev/disk/by-uuid/76360bfd-a645-4066-bfbe-3c7436497b11";
+  boot.initrd.luks.devices."luks-76360bfd-a645-4066-bfbe-3c7436497b11".device =
+    "/dev/disk/by-uuid/76360bfd-a645-4066-bfbe-3c7436497b11";
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/2EDA-D947";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/05b9cfcd-b396-4165-86dd-deacea6ecb28"; }
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/2EDA-D947";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
     ];
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/05b9cfcd-b396-4165-86dd-deacea6ecb28"; }
+  ];
 
   # 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
diff --git a/fw/home.nix b/fw/home.nix
index 0f4ee8a..2be461e 100644
--- a/fw/home.nix
+++ b/fw/home.nix
@@ -1,4 +1,10 @@
-{ inputs, config, lib, pkgs, ... }:
+{
+  inputs,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 {
   imports = [
     ../modules/global.nix
@@ -19,7 +25,7 @@
   config.modules = {
     global = {
       wayland = true;
-  
+
       extraPackages = with pkgs; [
         wmenu
         cmatrix
@@ -27,6 +33,7 @@
         pfetch
         nicotine-plus
         mpc
+        ncmpcpp
       ];
     };