From 93deb49d44925f3277a6cc6ccc3da8c876a9cc3b Mon Sep 17 00:00:00 2001 From: tristan Date: Tue, 29 Apr 2025 02:08:33 +0100 Subject: [PATCH] framework: reformat --- hardware/framework-13.nix | 73 +++++++++++++++++++-------------------- home/programs/mpd.nix | 3 +- home/programs/work.nix | 2 +- home/programs/xr.nix | 2 +- nixos/services/musnix.nix | 8 ++++- 5 files changed, 46 insertions(+), 42 deletions(-) diff --git a/hardware/framework-13.nix b/hardware/framework-13.nix index 72e8c3a..b8ef1a9 100644 --- a/hardware/framework-13.nix +++ b/hardware/framework-13.nix @@ -1,44 +1,48 @@ -{ 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 = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/mapper/crypted"; - fsType = "btrfs"; - options = [ "subvol=@root" ]; - }; + fileSystems."/" = { + device = "/dev/mapper/crypted"; + fsType = "btrfs"; + options = ["subvol=@root"]; + }; boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/84ad0e15-0056-4d46-801d-7735c2c6a5f6"; - fileSystems."/home" = - { device = "/dev/mapper/crypted"; - fsType = "btrfs"; - options = [ "subvol=@home" ]; - }; + fileSystems."/home" = { + device = "/dev/mapper/crypted"; + fsType = "btrfs"; + options = ["subvol=@home"]; + }; - fileSystems."/nix" = - { device = "/dev/mapper/crypted"; - fsType = "btrfs"; - neededForBoot = true; - options = [ "subvol=@nix" "noatime" ]; - }; + fileSystems."/nix" = { + device = "/dev/mapper/crypted"; + fsType = "btrfs"; + neededForBoot = true; + options = ["subvol=@nix" "noatime"]; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-label/BOOT"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-label/BOOT"; + fsType = "vfat"; + }; - swapDevices = - [ { device = "/dev/disk/by-label/SWAP"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-label/SWAP";} + ]; # 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 @@ -50,7 +54,6 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - networking.hostName = "framework-13"; system.stateVersion = "24.11"; # do not change @@ -76,13 +79,9 @@ } ]; - stylix.fonts.sizes = { applications = 12; desktop = 10; terminal = 15; }; - } - - diff --git a/home/programs/mpd.nix b/home/programs/mpd.nix index ba20bc9..0086100 100644 --- a/home/programs/mpd.nix +++ b/home/programs/mpd.nix @@ -3,8 +3,7 @@ pkgs, config, ... -}: -let +}: let terminal = config.programs.terminal; termcmd = "${terminal}/bin/${terminal.pname}"; host = "alpine"; diff --git a/home/programs/work.nix b/home/programs/work.nix index c90572c..5830e43 100644 --- a/home/programs/work.nix +++ b/home/programs/work.nix @@ -62,7 +62,7 @@ in { programs.chromium = { extensions = [ - {id = "bfogiafebfohielmmehodmfbbebbbpei";} + {id = "bfogiafebfohielmmehodmfbbebbbpei";} ]; }; } diff --git a/home/programs/xr.nix b/home/programs/xr.nix index 89dd23d..15414d7 100644 --- a/home/programs/xr.nix +++ b/home/programs/xr.nix @@ -17,7 +17,7 @@ }; home.file.".config/openvr/openvrpaths.vrpath" = { text = builtins.toJSON { - "config" = [ + "config" = [ "${config.home.homeDirectory}/.local/share/Steam/config" ]; "external_drivers" = null; diff --git a/nixos/services/musnix.nix b/nixos/services/musnix.nix index 95cc14a..eeff1e2 100644 --- a/nixos/services/musnix.nix +++ b/nixos/services/musnix.nix @@ -1,4 +1,10 @@ -{ inputs, user, pkgs, lib, ... }: { +{ + inputs, + user, + pkgs, + lib, + ... +}: { imports = [inputs.musnix.nixosModules.musnix]; users.users.${user}.extraGroups = ["audio"]; musnix = {