format + add alpine

flake.nix

@@ -49,6 +49,8 @@
           ./home/desktop/hyprland/.
         ];
 
+      alpine = mkConf [./hardware/alpine.nix] [];
+
       vm-sway =
         builtins.trace ''
           use super+enter to start a terminal.

hardware/alpine.nix

@@ -1,11 +1,14 @@
-# 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,
+  ...
+}: let
+  user = config.user;
+in {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
   boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "sd_mod"];
@@ -13,33 +16,33 @@
   boot.kernelModules = ["kvm-amd"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/979fe496-10e8-41be-97d1-3d000cd2b384";
+    device = "/dev/disk/by-uuid/979fe496-10e8-41be-97d1-3d000cd2b384";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/72d527de-fead-43d5-8f29-e06d2c584a18";
+    device = "/dev/disk/by-uuid/72d527de-fead-43d5-8f29-e06d2c584a18";
     fsType = "ext4";
   };
 
-  fileSystems."/mnt/disk1" =
+  fileSystems."/mnt/disk1" = {
-    { device = "/dev/disk/by-uuid/caba0b6c-00d2-495a-8c04-67ea584f1a63";
+    device = "/dev/disk/by-uuid/caba0b6c-00d2-495a-8c04-67ea584f1a63";
     fsType = "ext4";
   };
 
-  fileSystems."/mnt/disk2" =
+  fileSystems."/mnt/disk2" = {
-    { device = "/dev/disk/by-uuid/e3828580-625e-4f93-974f-9c7fed99dee2";
+    device = "/dev/disk/by-uuid/e3828580-625e-4f93-974f-9c7fed99dee2";
     fsType = "ext4";
   };
 
-  fileSystems."/mnt/disk3" =
+  fileSystems."/mnt/disk3" = {
-    { device = "/dev/disk/by-uuid/28f15a05-d550-4a41-a951-244af6140831";
+    device = "/dev/disk/by-uuid/28f15a05-d550-4a41-a951-244af6140831";
     fsType = "ext4";
   };
 
-  fileSystems."/mnt/parity1" =
+  fileSystems."/mnt/parity1" = {
-    { device = "/dev/disk/by-uuid/09fc062c-1a61-4e1b-802c-60f7178bc713";
+    device = "/dev/disk/by-uuid/09fc062c-1a61-4e1b-802c-60f7178bc713";
     fsType = "ext4";
   };
 
@@ -47,6 +50,21 @@
 
   # /mnt/disk1:/mnt/disk2:/mnt/disk3 /mnt/storage mergerfs direct_io,use_ino,allow_other,minfreespace=50G,fsname=mergerfs,category.create=mfs,func.mkdir=epall 0 0
 
+  fileSystems."/mnt/storage" = {
+    device = "/mnt/disk1:/mnt/disk2:/mnt/disk3";
+    fsType = "mergerfs";
+    depends = ["/mnt/disk1" "/mnt/disk2" "/mnt/disk3"];
+    options = [
+      "direct_io"
+      "use_ino"
+      "allow_other"
+      "minfreespace=50G"
+      "fsname=mergerfs"
+      "category.create=mfs"
+      "func.mkdir=epall"
+    ];
+  };
+
   # auto-generated-config: looks sus
 
   # fileSystems."/mnt/storage" =
@@ -60,8 +78,8 @@
   #     options = [ "bind" ];
   #   };
 
-  swapDevices =
+  swapDevices = [
-    [ { device = "/dev/disk/by-uuid/27ad4809-211f-4ae9-90da-d17d9c1df271"; }
+    {device = "/dev/disk/by-uuid/27ad4809-211f-4ae9-90da-d17d9c1df271";}
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -76,6 +94,11 @@
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   system.stateVersion = "24.05"; # don't change.
+  home-manager.users.${user}.imports = [
+    {
+      home.stateVersion = "24.05";
+    }
+  ];
 
   services.snapraid = {
     enable = true;
@@ -95,7 +118,4 @@
       "/mnt/parity1/SnapRAID.parity"
     ];
   };
-
-
 }
-

home/desktop/hyprland/default.nix

@@ -197,9 +197,11 @@ in {
         window=$(echo "$windows" | ${menu})
         hyprctl dispatch focuswindow title:"$window"
       '';
-      hotkeys = [{
+      hotkeys = [
+        {
           key = "tab";
-      }];
+        }
+      ];
     }
   ];
 

home/desktop/utils/display.nix

@@ -1,6 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs, ...
-}: {
   home.packages = with pkgs; [wlr-randr nwg-displays];
 
   wayland.windowManager.hyprland.settings.source = [

home/programs/graphical.nix

@@ -1,4 +1,8 @@
-{pkgs,lib, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   imports = [
     ./qutebrowser.nix
     ./pcmanfm.nix

home/programs/mpv.nix

@@ -22,5 +22,4 @@
       (pkgs.callPackage ../../pkgs/mpv-skipsilence.nix {inherit (pkgs.mpvScripts) buildLua;})
     ];
   };
-
 }

home/programs/work.nix

@@ -1,12 +1,14 @@
-{config, pkgs, ...}:
+{
-let
+  config,
+  pkgs,
+  ...
+}: let
   modifier = config.windowManager.modifierKey;
   pwa = {
     slack = "mpagibdhafmlkgpemeicgogjnhclenoc";
     teams = "cifhbcnohmdccbgoicgdjpfamggdegmo";
   };
-in
+in {
-{
   roles.email = {
     enable = true;
     email = "tristan.beedell@cryoserver.com";

pkgs/mpv-skipsilence.nix

@@ -1,9 +1,9 @@
-{ lib
+{
-, buildLua
+  lib,
-, fetchgit
+  buildLua,
-, gitUpdater
+  fetchgit,
+  gitUpdater,
 }:
-
 buildLua rec {
   pname = "mpv-skipsilence";
   version = "1.0";
@@ -20,5 +20,4 @@ buildLua rec {
     license = licenses.unlicense; # actually they don't have a license
     maintainers = [];
   };
-
 }