tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

framework: reformat

Browse source
This commit is contained in:
tristan 2025-04-29 02:08:33 +01:00
parent e97a74b983
commit 93deb49d44
5 changed files with 46 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

51
hardware/framework-13.nix
View file

@ -1,43 +1,47 @@
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ (modulesPath + "/installer/scan/not-detected.nix") lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/mapper/crypted"; device = "/dev/mapper/crypted";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@root" ]; options = ["subvol=@root"];
}; };
boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/84ad0e15-0056-4d46-801d-7735c2c6a5f6"; boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/84ad0e15-0056-4d46-801d-7735c2c6a5f6";
fileSystems."/home" = fileSystems."/home" = {
{ device = "/dev/mapper/crypted"; device = "/dev/mapper/crypted";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@home" ]; options = ["subvol=@home"];
}; };
fileSystems."/nix" = fileSystems."/nix" = {
{ device = "/dev/mapper/crypted"; device = "/dev/mapper/crypted";
fsType = "btrfs"; fsType = "btrfs";
neededForBoot = true; neededForBoot = true;
options = [ "subvol=@nix" "noatime" ]; options = ["subvol=@nix" "noatime"];
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-label/BOOT"; device = "/dev/disk/by-label/BOOT";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices = [
[ { device = "/dev/disk/by-label/SWAP"; } {device = "/dev/disk/by-label/SWAP";}
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@ -50,7 +54,6 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
networking.hostName = "framework-13"; networking.hostName = "framework-13";
system.stateVersion = "24.11"; # do not change system.stateVersion = "24.11"; # do not change
@ -76,13 +79,9 @@
} }
]; ];
stylix.fonts.sizes = { stylix.fonts.sizes = {
applications = 12; applications = 12;
desktop = 10; desktop = 10;
terminal = 15; terminal = 15;
}; };
} }

3
home/programs/mpd.nix
View file

@ -3,8 +3,7 @@
pkgs, pkgs,
config, config,
... ...
}: }: let
let
terminal = config.programs.terminal; terminal = config.programs.terminal;
termcmd = "${terminal}/bin/${terminal.pname}"; termcmd = "${terminal}/bin/${terminal.pname}";
host = "alpine"; host = "alpine";

8
nixos/services/musnix.nix
View file

@ -1,4 +1,10 @@
{ inputs, user, pkgs, lib, ... }: { {
inputs,
user,
pkgs,
lib,
...
}: {
imports = [inputs.musnix.nixosModules.musnix]; imports = [inputs.musnix.nixosModules.musnix];
users.users.${user}.extraGroups = ["audio"]; users.users.${user}.extraGroups = ["audio"];
musnix = { musnix = {