Bun/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update all hosts to better formatting

Browse source
This commit is contained in:
Bun 2025-04-17 10:51:55 -04:00
parent 531176d415
commit c2ae238ae3
31 changed files with 227 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

28
flake.lock generated
View file

@ -5,12 +5,12 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1742939360,
"narHash": "sha256-6NWHD5Z8B/lrfMvqdhD9S+xjXezQBeSfVT+B9lyx8y0=",
"rev": "c9d2d5c61a37f2217e9241ccfa6c394ed2f3e52b",
"revCount": 133,
"lastModified": 1744818303,
"narHash": "sha256-9KSzECGoi5WJfw6LW5aCx/BQWocC9zh2ulQK/AigW8E=",
"rev": "a8d868fab40b51eba89d2a6c857f9dd9c6e05518",
"revCount": 136,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/edolstra/blender-bin/1.0.13/0195cf49-4aef-74e4-beb0-6c24b890d0ad/source.tar.gz?rev=c9d2d5c61a37f2217e9241ccfa6c394ed2f3e52b&revCount=133"
"url": "https://api.flakehub.com/f/pinned/edolstra/blender-bin/1.0.14/01963f48-25e8-7e82-bc88-446c6fb49e67/source.tar.gz?rev=a8d868fab40b51eba89d2a6c857f9dd9c6e05518&revCount=136"
},
"original": {
"type": "tarball",
@ -229,11 +229,11 @@
]
},
"locked": {
"lastModified": 1744117652,
"narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=",
"lastModified": 1744743431,
"narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f",
"rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
"type": "github"
},
"original": {
@ -316,11 +316,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1744595997,
"narHash": "sha256-iHomd0X27UxJdkjcb2nij3GM9MdG+JJf28zW8xjNQl0=",
"lastModified": 1744855005,
"narHash": "sha256-pKTjh8Re/IzMdiceeoCN+dMMSl0NogmG2OdVxxZqpgg=",
"owner": "Infinidoge",
"repo": "nix-minecraft",
"rev": "5ee04b89fedbb41eb6056030284ffdd15439a744",
"rev": "34a4c1e1d96af67f73e449b2225764491a633ea7",
"type": "github"
},
"original": {
@ -400,11 +400,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1744602858,
"narHash": "sha256-j94Uygs1zqK5MrzAkbqTH+9r6J7vPn6fUL8Dv8+hBCA=",
"lastModified": 1744892030,
"narHash": "sha256-jcIXcgvY3KkHIifG2SshvmLaxbH4b7rjydhvX8StgGE=",
"owner": "nix-community",
"repo": "NUR",
"rev": "8fe101f5587e97fdb80201b31e4ab50565d6fcee",
"rev": "4ad14df91d7987b4d160f7d6a9b38ab839728770",
"type": "github"
},
"original": {

1
flake.nix
View file

@ -65,7 +65,6 @@
tower = mkNix [ ./hosts/tower ]; # Main Desktop
envy = mkNix [ ./hosts/envy ]; # HP Convertable
pear = mkNix [ ./hosts/pear ]; # MacBook Pro
intuos = mkNix [ ./hosts/intuos ]; # Wacom Intuos Tablet
redmond = mkNix [ ./hosts/redmond ]; # Lenovo Dual-Boot

11
hosts/envy/filesystems/default.nix
View file

@ -5,12 +5,19 @@
"/persist/storage" = {
device = "/dev/disk/by-uuid/135281e2-72ec-4c00-91e8-9897a32c02ce";
fsType = "btrfs";
options = [ "nosuid" "nodev" "nofail" "x-gvfs-show" ];
options = [
"nofail"
"nosuid"
];
};
"/persist/home/${config.sysusers.main}/.local/share/Steam" = {
device = "/dev/disk/by-uuid/135281e2-72ec-4c00-91e8-9897a32c02ce";
fsType = "btrfs";
options = [ "subvol=Steam" "nosuid" "nodev" "nofail" "x-gvfs-show" ];
options = [
"nofail"
"nosuid"
"subvol=Steam"
];
};
};
}

9
hosts/envy/hardware/default.nix
View file

@ -2,8 +2,13 @@
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "sr_mod" ];
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.initrd = {
availableKernelModules = [
"xhci_pci"
"sr_mod"
];
kernelModules = [ "dm-snapshot" ];
};
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

37
hosts/intuos/filesystems/default.nix
View file

@ -1,13 +1,32 @@
{ config, ... }:
{
fileSystems."/home/${config.sysusers.main}/Network/Midas" = {
device = "11.0.0.1:/";
fsType = "nfs4";
options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
};
fileSystems."/home/${config.sysusers.main}/Network/Kitty" = {
device = "10.2.0.1:/";
fsType = "nfs4";
options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
fileSystems = {
"/home/${config.sysusers.main}/Network/Midas" = {
device = "10.2.0.1:/storage";
fsType = "nfs4";
options = [
"noauto"
"soft"
"x-systemd.automount"
];
};
"/home/${config.sysusers.main}/Network/Kitty" = {
device = "10.2.0.2:/storage/bun";
fsType = "nfs4";
options = [
"noauto"
"soft"
"x-systemd.automount"
];
"/home/${config.sysusers.main}/Network/Prophet" = {
device = "mx.nixfox.ca:/storage";
fsType = "nfs4";
options = [
"noauto"
"soft"
"x-systemd.automount"
];
};
};
};
}

16
hosts/intuos/hardware/default.nix
View file

@ -2,9 +2,19 @@
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ "kvm-intel" ];
boot = {
initrd = {
availableKernelModules = [
"xhci_pci"
"ehci_pci"
"ahci"
"sd_mod"
"rtsx_pci_sdmmc"
];
kernelModules = [ "dm-snapshot" ];
};
kernelModules = [ "kvm-intel" ];
};
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

11
hosts/kitty/filesystems/default.nix
View file

@ -4,12 +4,19 @@
"/persist/storage" = {
device = "/dev/disk/by-uuid/edd3e293-1aff-4fc0-96fa-4e17d6cccfca";
fsType = "btrfs";
options = [ "nosuid" "nodev" "nofail" "x-gvfs-show" ];
options = [
"nofail"
"nosuid"
];
};
"/home/${config.sysusers.main}/Network/Midas" = {
device = "11.0.0.1:/storage";
fsType = "nfs4";
options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
options = [
"x-systemd.automount"
"noauto"
"soft"
];
};
};
}

11
hosts/kitty/hardware/default.nix
View file

@ -1,8 +1,13 @@
{ config, lib, ... }:
{
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "usbhid" ];
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ "kvm-intel" ];
boot.initrd = {
availableKernelModules = [
"ahci"
"ehci_pci"
"xhci_pci"
];
kernelModules = [ "dm-snapshot" ];
};
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

9
hosts/kitty/network/default.nix
View file

@ -1,6 +1,15 @@
{ ... }:
{
networking = {
interfaces."eno1".ipv4.addresses = [{
address = "10.2.0.2";
prefixLength = 8;
}];
defaultGateway = {
address = "10.1.0.1";
interface = "eno1";
};
vlans.internal = {
id=100;
interface="eno1";

12
hosts/midas/filesystems/default.nix
View file

@ -5,12 +5,20 @@
device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325";
fsType = "btrfs";
neededForBoot = true;
options = [ "subvol=persist" "compress=zstd" "noatime" ];
options = [
"compress=zstd"
"noatime"
"subvol=persist"
];
};
"/kitty" = {
device = "11.0.0.2:/storage/bun";
fsType = "nfs4";
options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
options = [
"noauto"
"soft"
"x-systemd.automount"
];
};
};
}

11
hosts/midas/hardware/default.nix
View file

@ -1,7 +1,14 @@
{ config, lib, ... }:
{
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.initrd = {
availableKernelModules = [
"ahci"
"nvme"
"sd_mod"
"xhci_pci"
];
kernelModules = [ "dm-snapshot" ];
};
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

8
hosts/pear/boot/default.nix
View file

@ -1,8 +0,0 @@
{ pkgs, ... }:
{
boot = {
kernelPackages = pkgs.linuxPackages_latest;
loader.systemd-boot.enable = true;
plymouth.enable = true;
};
}

22
hosts/pear/default.nix
View file

@ -1,22 +0,0 @@
{ config, lib, ... }:
{
imports = [
./boot
./disko
./hardware
./network
./services
./users
../../modules/system
];
networking = {
hostName = "pear";
wireless.enable = true;
};
system = {
desktop.enable = true;
stateVersion = "24.11";
};
}

93
hosts/pear/disko/default.nix
View file

@ -1,93 +0,0 @@
{ config, disko, ... }:
{
imports = [ disko.nixosModules.disko ];
disko.devices = {
disk = {
"${config.networking.hostName}" = {
type = "disk";
device = "/dev/nvme0n1";
content = {
type = "gpt";
partitions = {
boot = {
size = "1M";
type = "EF02";
};
ESP = {
size = "2G";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [ "umask=0077" ];
};
};
luks = {
size = "100%";
content = {
type = "luks";
name = "${config.networking.hostName}-disk";
settings.allowDiscards = true;
passwordFile = "/tmp/secret.key";
content = {
type = "lvm_pv";
vg = "${config.networking.hostName}";
};
};
};
};
};
};
};
lvm_vg = {
"${config.networking.hostName}" = {
type = "lvm_vg";
lvs = {
root = {
size = "100%";
content = {
type = "btrfs";
extraArgs = [ "-f" ];
subvolumes = {
"/root" = {
mountpoint = "/";
mountOptions = [ "compress=zstd" "noatime" "ssd" ];
};
"/prev" = {
mountpoint = "/prev";
mountOptions = [ "compress=zstd" "noatime" "ssd" ];
};
"/nix" = {
mountpoint = "/nix";
mountOptions = [ "compress=zstd" "noatime" "ssd" ];
};
# Impermanence
"/persist" = {
mountpoint = "/persist";
mountOptions = [ "compress=zstd" "noatime" "ssd" ];
};
"/persist/.snapshots" = { };
"/persist/home" = { };
"/persist/home/.snapshots" = { };
};
};
};
swap = {
size = "4G";
content = {
type = "swap";
discardPolicy = "both";
};
};
};
};
};
};
# Needed for impermanence
fileSystems."/persist".neededForBoot = true;
}

14
hosts/pear/hardware/default.nix
View file

@ -1,14 +0,0 @@
{ config, lib, modulesPath, ... }:
{
imports = [
(modulesPath + "/hardware/network/broadcom-43xx.nix")
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ "dm-snapshot" "atkbd" "applespi" "intel_lpss_pci" "spi_pxa2xx_platform" ];
boot.kernelModules = [ "kvm-intel" ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

1
hosts/pear/id_ed25519.pub
View file

@ -1 +0,0 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKdjgz+N6uAhMwX/1f9AcgELphPS/dIUoPuLiqeOv5Or

16
hosts/pear/services/default.nix
View file

@ -1,16 +0,0 @@
{ config, ... }:
{
services.globalprotect.enable = true;
virtualisation = {
libvirtd.enable = true;
vmware.host.enable = true;
};
nixpkgs.allowUnfreePackages = [ "vmware-workstation" ];
environment.persistence."/persist".directories = [
"/home/${config.sysusers.main}/vmware"
"/home/${config.sysusers.main}/.vmware"
];
}

4
hosts/pear/users/default.nix
View file

@ -1,4 +0,0 @@
{ ... }:
{
imports = [ ./main ];
}

9
hosts/pear/users/main/default.nix
View file

@ -1,9 +0,0 @@
{ config, lib, ... }:
{
home-manager.users."${config.sysusers.main}".home = {
desktop.enable = true;
remote-desktop.enable = true;
school.enable = true;
stateVersion = lib.mkForce config.system.stateVersion;
};
}

4
hosts/prophet/filesystems/default.nix
View file

@ -3,5 +3,9 @@
fileSystems."/persist/storage" = {
device = "/dev/disk/by-uuid/ef465845-cc56-4db5-9260-8ae515eb025e";
fsType = "btrfs";
options = [
"nofail"
"nosuid"
];
};
}

9
hosts/prophet/hardware/default.nix
View file

@ -1,7 +1,12 @@
{ lib, ... }:
{
boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_scsi" ];
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.initrd = {
availableKernelModules = [
"xhci_pci"
"virtio_scsi"
];
kernelModules = [ "dm-snapshot" ];
};
nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
}

5
hosts/redmond/filesystems/default.nix
View file

@ -3,6 +3,9 @@
fileSystems."/mnt/Windrive" = {
device = "/dev/disk/by-uuid/582C6B802C6B57D0";
fsType = "ntfs";
options = [ "nosuid" "nodev" ];
options = [
"nodev"
"nosuid"
];
};
}

18
hosts/redmond/hardware/default.nix
View file

@ -2,9 +2,21 @@
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "ehci_pci" "sd_mod" "sr_mod" "sdhci_pci" "rtsx_usb_sdmmc" ];
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ "kvm-amd" ];
boot = {
initrd = {
availableKernelModules = [
"ahci"
"ehci_pci"
"rtsx_usb_sdmmc"
"sd_mod"
"sdhci_pci"
"sr_mod"
"xhci_pci"
];
kernelModules = [ "dm-snapshot" ];
};
kernelModules = [ "kvm-amd" ];
};
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

21
hosts/tower/disko/default.nix
View file

@ -54,21 +54,34 @@
subvolumes = {
"/root" = {
mountpoint = "/";
mountOptions = [ "compress=zstd" "noatime" "ssd" ];
mountOptions = [
"noexec"
"compress=zstd"
"ssd"
];
};
"/prev" = {
mountpoint = "/prev";
mountOptions = [ "compress=zstd" "noatime" "ssd" "noexec" ];
mountOptions = [
"compress=zstd"
"ssd"
];
};
"/nix" = {
mountpoint = "/nix";
mountOptions = [ "compress=zstd" "noatime" "ssd" ];
mountOptions = [
"compress=zstd"
"ssd"
];
};
# Impermanence
"/persist" = {
mountpoint = "/persist";
mountOptions = [ "compress=zstd" "noatime" "ssd" ];
mountOptions = [
"compress=zstd"
"ssd"
];
};
"/persist/.snapshots" = { };
"/persist/home" = { };

45
hosts/tower/filesystems/default.nix
View file

@ -5,46 +5,75 @@
"/mnt/Linux1" = {
device = "/dev/disk/by-uuid/b2901f8c-ffda-4b88-bb63-a9ea0c96ccb4";
fsType = "ext4";
options = [ "nosuid" "nodev" "nofail" "x-gvfs-show" ];
options = [
"nofail"
"nosuid"
];
};
"/mnt/Linux2" = {
device = "/dev/disk/by-uuid/f08e4f38-162c-402f-ba2a-5925151b78bf";
fsType = "ext4";
options = [ "nosuid" "nodev" "nofail" "x-gvfs-show" ];
options = [
"nofail"
"nosuid"
];
};
"/mnt/Linux3" = {
device = "/dev/disk/by-uuid/e7bc75bd-c371-4b28-b212-7be9b1fad339";
fsType = "ext4";
options = [ "nosuid" "nodev" "nofail" "x-gvfs-show" ];
options = [
"nofail"
"nosuid"
];
};
# Bulk storage mounts
"/persist/var/lib/libvirt" = {
device = "/dev/disk/by-uuid/abf78669-de2a-4afa-8e62-604f4e4cb355";
fsType = "btrfs";
options = [ "subvol=libvirt" "nosuid" "nodev" "nofail" ];
options = [
"nofail"
"nosuid"
"subvol=libvirt"
];
};
"/persist/home/${config.sysusers.main}/VMs" = {
device = "/dev/disk/by-uuid/abf78669-de2a-4afa-8e62-604f4e4cb355";
fsType = "btrfs";
options = [ "subvol=images" "nosuid" "nodev" "nofail" ];
options = [
"nofail"
"nosuid"
"subvol=images"
];
};
# Network mounts
"/home/${config.sysusers.main}/Network/Midas" = {
device = "11.0.0.1:/storage";
fsType = "nfs4";
options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
options = [
"noauto"
"soft"
"x-systemd.automount"
];
};
"/home/${config.sysusers.main}/Network/Kitty" = {
device = "11.0.0.2:/storage/bun";
fsType = "nfs4";
options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
options = [
"noauto"
"soft"
"x-systemd.automount"
];
};
"/home/${config.sysusers.main}/Network/Prophet" = {
device = "mx.nixfox.ca:/storage";
fsType = "nfs4";
options = [ "x-systemd.automount" "noauto" "soft" "_netdev" ];
options = [
"noauto"
"soft"
"x-systemd.automount"
];
};
};
}

16
hosts/tower/hardware/default.nix
View file

@ -2,9 +2,19 @@
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ "kvm-amd" ];
boot = {
initrd = {
availableKernelModules = [
"ahci"
"nvme"
"sd_mod"
"usbhid"
"xhci_pci"
];
kernelModules = [ "dm-snapshot" ];
};
kernelModules = [ "kvm-amd" ];
};
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

12
hosts/tower/network/default.nix
View file

@ -1,7 +1,15 @@
{ ... }:
{
networking = {
firewall.allowedUDPPorts = [ 27015 ];
interfaces."enp42s0".ipv4.addresses = [{
address = "10.2.0.100";
prefixLength = 8;
}];
defaultGateway = {
address = "10.1.0.1";
interface = "enp42s0";
};
vlans.internal = {
id=100;
interface="enp42s0";
@ -10,5 +18,7 @@
address = "11.0.0.100";
prefixLength = 8;
}];
firewall.allowedUDPPorts = [ 27015 ];
};
}

2
modules/home/programs/gui/librewolf/default.nix
View file

@ -79,7 +79,7 @@
}
];
}];
definedAliases = [ "@pkgs" ];
definedAliases = [ "@p" ];
};
"MyNixOS" = {
urls = [{

2
modules/home/programs/misc/gaming/emulators/default.nix
View file

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:
{
home.packages = with pkgs; lib.mkIf config.home.gaming.enable [
dolphin-emu
dolphin-emu-beta
cemu
ryujinx
lime3ds

2
modules/home/programs/misc/gaming/launchers/default.nix
View file

@ -4,7 +4,7 @@
heroic
prismlauncher
steam
steam-run
steam-run-free
];
nixpkgs.allowUnfreePackages = [

1
modules/system/users/main/default.nix
View file

@ -15,7 +15,6 @@
../../../../hosts/tower/id_ed25519.pub
../../../../hosts/envy/id_ed25519.pub
../../../../hosts/pear/id_ed25519.pub
../../../../hosts/intuos/id_ed25519.pub
../../../../hosts/redmond/id_ed25519.pub