Modify like, basically everything idk, probably a lot of secrets and url names and colmena and whatnot

This commit is contained in:
Bun 2025-06-20 20:20:48 -04:00
parent 0ab856b18e
commit b3ba7481d8
107 changed files with 437 additions and 696 deletions

View file

@ -2,10 +2,6 @@
{
boot = {
kernelPackages = pkgs.linuxPackages_hardened;
kernelParams = [
"amdgpu.si_support=1"
"radeon.si_support=0"
];
loader.systemd-boot.enable = true;
loader.limine.enable = true;
};
}

View file

@ -12,9 +12,11 @@
stateVersion = "25.05";
};
deployment.targetHost = "5dd:9cd7:f286:e2c7:4c3b:c2e1:7832:97a3";
deployment.targetHost = "53a:2092:12ff:889c:2e1f:1d79:f05a:cadd";
networking.hostId = "0917a5c1";
services.nfs.server.enable = true;
virtualisation.libvirtd.enable = true;
}

View file

@ -1,16 +1,15 @@
{ config, disko, ... }:
{ config, name, ... }:
{
imports = [ disko.nixosModules.disko ];
disko.devices = {
disk = {
"${config.networking.hostName}" = {
"${name}" = {
type = "disk";
device = "/dev/sda";
content = {
type = "gpt";
partitions = {
boot = {
priority = 1;
size = "1M";
type = "EF02";
};
@ -28,7 +27,7 @@
size = "100%";
content = {
type = "lvm_pv";
vg = "${config.networking.hostName}";
vg = "${name}";
};
};
};
@ -37,7 +36,7 @@
};
lvm_vg = {
"${config.networking.hostName}" = {
"${name}" = {
type = "lvm_vg";
lvs = {
root = {

View file

@ -10,7 +10,5 @@
"subvol=storage"
];
};
"detritus".enable = false;
};
}

View file

@ -1,11 +0,0 @@
{ pkgs, ... }:
{
boot = {
kernelPackages = pkgs.linuxPackages_hardened;
kernelParams = [
"amdgpu.si_support=1"
"radeon.si_support=0"
];
loader.grub.enable = true;
};
}

View file

@ -1,20 +0,0 @@
{ ... }:
{
imports = [
./boot
./disko
./filesystems
./hardware
];
system = {
nixos.tags = [ "server" ];
stateVersion = "25.05";
};
deployment.targetHost = "570:3651:7f2:c26b:bccd:725b:be00:8a18";
networking.hostId = "447645a9";
services.nfs.server.enable = true;
}

View file

@ -1,100 +0,0 @@
{ config, disko, ... }:
{
imports = [ disko.nixosModules.disko ];
disko.devices = {
disk = {
"${config.networking.hostName}" = {
type = "disk";
device = "/dev/sda";
content = {
type = "gpt";
partitions = {
boot = {
size = "1M";
type = "EF02";
};
ESP = {
size = "2G";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [ "umask=0077" ];
};
};
main = {
size = "100%";
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"
"ssd"
];
};
"/prev" = {
mountpoint = "/prev";
mountOptions = [
"compress=zstd"
"noexec"
"ssd"
];
};
"/nix" = {
mountpoint = "/nix";
mountOptions = [
"compress=zstd"
"ssd"
];
};
# Impermanence
"/persist" = {
mountpoint = "/persist";
mountOptions = [
"compress=zstd"
"ssd"
];
};
"/persist/.snapshots" = { };
"/persist/home" = { };
"/persist/home/.snapshots" = { };
};
};
};
swap = {
size = "8G";
content = {
type = "swap";
discardPolicy = "both";
};
};
};
};
};
};
# Needed for impermanence
fileSystems."/persist".neededForBoot = true;
}

View file

@ -1,16 +0,0 @@
{ ... }:
{
fileSystems = {
"/persist/storage" = {
device = "/dev/disk/by-uuid/5c3c533b-1c70-4411-854a-37fa794fc17c";
fsType = "btrfs";
options = [
"nofail"
"nosuid"
"subvol=storage"
];
};
"elder".enable = false;
};
}

View file

@ -1,23 +0,0 @@
{ modulesPath, ... }:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot = {
initrd = {
availableKernelModules = [
"ahci"
"ehci_pci"
"sd_mod"
"sr_mod"
"uhci_hcd"
"usbhid"
];
kernelModules = [ "dm-snapshot" ];
};
kernelModules = [ "kvm-intel" ];
};
hardware.cpu.intel.updateMicrocode = true;
nixpkgs.hostPlatform = "x86_64-linux";
}

View file

@ -1,8 +1,11 @@
{ pkgs, ... }:
{ lib, pkgs, ... }:
{
boot = {
kernelPackages = pkgs.linuxPackages_latest;
loader.grub.enable = true;
kernelPackages = pkgs.linuxPackages;
loader.limine = {
enable = true;
biosDevice = lib.mkForce "/dev/disk/by-id/ata-XSTAR_SSD_64GB_XSFA2011000462";
};
plymouth.enable = true;
};
}

View file

@ -2,10 +2,9 @@
{
imports = [
./boot
./disko
./filesystems
./hardware
./services
./root
./user
];
@ -14,5 +13,5 @@
stateVersion = "25.05";
};
deployment.targetHost = "";
deployment.targetHost = "409:b2b1:966c:b13:6d67:2d6b:45e2:f048";
}

View file

@ -1,106 +0,0 @@
{ config, disko, ... }:
{
imports = [ disko.nixosModules.disko ];
disko.devices = {
disk = {
"${config.networking.hostName}" = {
type = "disk";
device = "/dev/sda";
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"
"ssd"
];
};
"/prev" = {
mountpoint = "/prev";
mountOptions = [
"compress=zstd"
"noexec"
"ssd"
];
};
"/nix" = {
mountpoint = "/nix";
mountOptions = [
"compress=zstd"
"ssd"
];
};
# Impermanence
"/persist" = {
mountpoint = "/persist";
mountOptions = [
"compress=zstd"
"ssd"
];
};
"/persist/.snapshots" = { };
"/persist/home" = { };
"/persist/home/.snapshots" = { };
};
};
};
swap = {
size = "8G";
content = {
type = "swap";
discardPolicy = "both";
};
};
};
};
};
};
# Needed for impermanence
fileSystems."/persist".neededForBoot = true;
}

View file

@ -2,7 +2,7 @@
{
fileSystems = {
"/persist/storage" = {
device = "/dev/disk/by-uuid/d0d6783f-ad51-4d85-b8a9-3374f6460ef6";
device = "/dev/disk/by-uuid/3d6f81f2-7fa5-40a2-85bb-56f4cab63773";
fsType = "btrfs";
options = [
"nofail"

View file

@ -1,22 +1,35 @@
{ modulesPath, ... }:
{ config, modulesPath, ... }:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot = {
initrd = {
availableKernelModules = [
"ahci"
"ehci_pci"
"ahci"
"xhci_pci"
"usb_storage"
"sd_mod"
"sr_mod"
"xhci_pci"
];
kernelModules = [ "dm-snapshot" ];
};
kernelModules = [ "kvm-intel" ];
};
hardware.cpu.intel.updateMicrocode = true;
services.xserver.videoDrivers = [ "nvidia" ];
hardware = {
cpu.intel.updateMicrocode = true;
nvidia = {
package = config.boot.kernelPackages.nvidiaPackages.legacy_390;
prime = {
sync.enable = true;
intelBusId = "PCI:0:2:0";
nvidiaBusId = "PCI:1:0:0";
};
};
};
nixpkgs.hostPlatform = "x86_64-linux";
}

View file

@ -0,0 +1,54 @@
{ config, name, ... }:
{
boot.initrd.luks.devices."${name}-disk".device = "/dev/disk/by-uuid/0fc43c11-c382-4e37-812b-8866b1b20e68";
fileSystems = {
"/boot" = {
device = "/dev/disk/by-uuid/FA96-EF11";
fsType = "vfat";
options = [ "umask=0077" ];
};
"/" = {
device = "/dev/disk/by-uuid/bbaf733b-14af-417b-b1c8-2f0534995483";
fsType = "btrfs";
options = [
"compress=zstd"
"ssd"
"subvol=root"
];
};
"/prev" = {
device = "/dev/disk/by-uuid/bbaf733b-14af-417b-b1c8-2f0534995483";
fsType = "btrfs";
options = [
"compress=zstd"
"noexec"
"ssd"
"subvol=prev"
];
};
"/nix" = {
device = "/dev/disk/by-uuid/bbaf733b-14af-417b-b1c8-2f0534995483";
fsType = "btrfs";
options = [
"compress=zstd"
"ssd"
"subvol=nix"
];
};
"/persist" = {
device = "/dev/disk/by-uuid/bbaf733b-14af-417b-b1c8-2f0534995483";
fsType = "btrfs";
neededForBoot = true;
options = [
"compress=zstd"
"ssd"
"subvol=persist"
];
};
};
swapDevices = [ { device = "/dev/disk/by-uuid/93ac8c5c-c947-4b45-a12a-146e87398517"; } ];
}

View file

@ -1,11 +0,0 @@
{ lib, ... }:
{
networking.useNetworkd = lib.mkForce false;
services.globalprotect.enable = true;
virtualisation = {
libvirtd.enable = true;
vmware.host.enable = true;
};
}

View file

@ -1,8 +1,7 @@
{ config, ... }:
{ config, lib, ... }:
{
home-manager.users."${config.vars.mainUser}".home = {
guifull.enable = true;
school.enable = true;
enableNixpkgsReleaseCheck = false;
home-manager.users."${config.vars.mainUser}" = {
home.guifull.enable = true;
wayland.windowManager.sway.extraSessionCommands = lib.mkForce "";
};
}

View file

@ -2,7 +2,7 @@
{
boot = {
kernelPackages = pkgs.linuxPackages_6_14;
loader.systemd-boot.enable = true;
loader.limine.enable = true;
plymouth.enable = true;
};
}

View file

@ -1,16 +1,15 @@
{ config, disko, ... }:
{ config, name, ... }:
{
imports = [ disko.nixosModules.disko ];
disko.devices = {
disk = {
"${config.networking.hostName}" = {
"${name}" = {
type = "disk";
device = "/dev/sda";
content = {
type = "gpt";
partitions = {
boot = {
priority = 1;
size = "1M";
type = "EF02";
};
@ -28,12 +27,12 @@
size = "100%";
content = {
type = "luks";
name = "${config.networking.hostName}-disk";
name = "${name}-disk";
settings.allowDiscards = true;
passwordFile = "/tmp/secret.key";
content = {
type = "lvm_pv";
vg = "${config.networking.hostName}";
vg = "${name}";
};
};
};
@ -43,7 +42,7 @@
};
lvm_vg = {
"${config.networking.hostName}" = {
"${name}" = {
type = "lvm_vg";
lvs = {
root = {

View file

@ -1,16 +1,15 @@
{ config, disko, ... }:
{ config, name, ... }:
{
imports = [ disko.nixosModules.disko ];
disko.devices = {
disk = {
"${config.networking.hostName}" = {
"${name}" = {
type = "disk";
device = "/dev/sda";
content = {
type = "gpt";
partitions = {
boot = {
priority = 1;
size = "1M";
type = "EF02";
};
@ -28,12 +27,12 @@
size = "100%";
content = {
type = "luks";
name = "${config.networking.hostName}-disk";
name = "${name}-disk";
settings.allowDiscards = true;
passwordFile = "/tmp/secret.key";
content = {
type = "lvm_pv";
vg = "${config.networking.hostName}";
vg = "${name}";
};
};
};
@ -43,7 +42,7 @@
};
lvm_vg = {
"${config.networking.hostName}" = {
"${name}" = {
type = "lvm_vg";
lvs = {
root = {

View file

@ -2,7 +2,7 @@
{
boot = {
kernelPackages = pkgsStable.linuxPackages_6_14;
loader.systemd-boot.enable = true;
loader.limine.enable = true;
plymouth.enable = true;
};
}

View file

@ -17,5 +17,5 @@
deployment.targetHost = "5ce:969c:40d1:9575:f5e:591d:c377:a20b";
#jovian.steam.enable = true;
jovian.steam.enable = true;
}

View file

@ -1,16 +1,15 @@
{ config, disko, ... }:
{ config, name, ... }:
{
imports = [ disko.nixosModules.disko ];
disko.devices = {
disk = {
"${config.networking.hostName}" = {
"${name}" = {
type = "disk";
device = "/dev/nvme0n1";
content = {
type = "gpt";
partitions = {
boot = {
priority = 1;
size = "1M";
type = "EF02";
};
@ -28,7 +27,7 @@
size = "100%";
content = {
type = "lvm_pv";
vg = "${config.networking.hostName}";
vg = "${name}";
};
};
};
@ -37,7 +36,7 @@
};
lvm_vg = {
"${config.networking.hostName}" = {
"${name}" = {
type = "lvm_vg";
lvs = {
root = {

View file

@ -1,9 +1,6 @@
{ config, lib, pkgs, jovian, ... }:
{
imports = [
./gnome
jovian.nixosModules.default
];
imports = [ ./desktop ];
config = lib.mkIf config.jovian.steam.enable {
jovian = {
@ -21,23 +18,31 @@
};
};
boot = {
kernelPackages = lib.mkForce pkgs.linuxPackages_jovian;
kernelParams = [ "amd_pstate=active" ];
};
# Evil kernel
boot.kernelPackages = lib.mkForce pkgs.linuxPackages_jovian;
programs.steam.extest.enable = true;
hardware.xone.enable = true;
# Use networkmanager for ui compatibility
networking = {
networkmanager.enable = true;
wireless.enable = lib.mkForce false;
};
# Disable conflicting services
services = {
keyd.enable = lib.mkForce false;
tlp.enable = lib.mkForce false;
};
hardware.xone.enable = true;
networking = {
networkmanager.enable = true;
wireless.enable = lib.mkForce false;
# Disable network filesystems
fileSystems = {
"midas".enable = false;
"kitty".enable = false;
"detritus".enable = false;
"prophet".enable = false;
};
environment.persistence."/persist".directories = [

View file

@ -2,6 +2,6 @@
{
boot = {
kernelPackages = pkgs.linuxPackages_hardened;
loader.systemd-boot.enable = true;
loader.limine.enable = true;
};
}

View file

@ -1,16 +1,15 @@
{ config, disko, ... }:
{ config, name, ... }:
{
imports = [ disko.nixosModules.disko ];
disko.devices = {
disk = {
"${config.networking.hostName}" = {
"${name}" = {
type = "disk";
device = "/dev/sda";
device = "/dev/disk/by-id/ata-KINGSTON_SA400S37120G_50026B7783DBB232";
content = {
type = "gpt";
partitions = {
boot = {
priority = 1;
size = "1M";
type = "EF02";
};
@ -28,7 +27,7 @@
size = "100%";
content = {
type = "lvm_pv";
vg = "${config.networking.hostName}";
vg = "${name}";
};
};
};
@ -37,7 +36,7 @@
};
lvm_vg = {
"${config.networking.hostName}" = {
"${name}" = {
type = "lvm_vg";
lvs = {
root = {

View file

@ -9,7 +9,5 @@
"nosuid"
];
};
"kitty".enable = false;
};
}

View file

@ -1,16 +1,15 @@
{ config, disko, ... }:
{ config, name, ... }:
{
imports = [ disko.nixosModules.disko ];
disko.devices = {
disk = {
"${config.networking.hostName}" = {
"${name}" = {
type = "disk";
device = "/dev/nvme0n1";
device = "/dev/disk/by-id/nvme-eui.00080d03001365cc";
content = {
type = "gpt";
partitions = {
boot = {
priority = 1;
size = "1M";
type = "EF02";
};
@ -28,12 +27,12 @@
size = "100%";
content = {
type = "luks";
name = "${config.networking.hostName}-disk";
name = "${name}-disk";
settings.allowDiscards = true;
passwordFile = "/tmp/secret.key";
content = {
type = "lvm_pv";
vg = "${config.networking.hostName}";
vg = "${name}";
};
};
};
@ -43,7 +42,7 @@
};
lvm_vg = {
"${config.networking.hostName}" = {
"${name}" = {
type = "lvm_vg";
lvs = {
root = {

View file

@ -10,7 +10,5 @@
"subvol=persist"
];
};
"midas".enable = false;
};
}

View file

@ -5,6 +5,7 @@
services = {
cloudflare-dyndns.enable = true;
forgejo.enable = true;
hedgedoc.enable = true;
icecast.enable = true;
jellyfin.enable = true;
mastodon.enable = true;

View file

@ -3,6 +3,6 @@
boot = {
binfmt.emulatedSystems = [ "x86_64-linux" ];
kernelPackages = pkgs.linuxPackages_hardened;
loader.systemd-boot.enable = true;
loader.limine.enable = true;
};
}

View file

@ -1,16 +1,15 @@
{ config, disko, ... }:
{ config, name, ... }:
{
imports = [ disko.nixosModules.disko ];
disko.devices = {
disk = {
"${config.networking.hostName}" = {
"${name}" = {
type = "disk";
device = "/dev/nvme0n1";
device = "/dev/disk/by-id/scsi-3609c958403f14cd29ff94a5a2e405cc2";
content = {
type = "gpt";
partitions = {
boot = {
priority = 1;
size = "1M";
type = "EF02";
};
@ -28,7 +27,7 @@
size = "100%";
content = {
type = "lvm_pv";
vg = "${config.networking.hostName}";
vg = "${name}";
};
};
};
@ -37,7 +36,7 @@
};
lvm_vg = {
"${config.networking.hostName}" = {
"${name}" = {
type = "lvm_vg";
lvs = {
root = {

View file

@ -9,7 +9,5 @@
"nosuid"
];
};
"prophet".enable = false;
};
}

View file

@ -15,7 +15,5 @@
deployment.targetHost = "4e4:535:9d47:f367:becd:6557:458d:5b1b";
services.xserver.videoDrivers = [ "nvidia" ];
virtualisation.libvirtd.enable = true;
}

View file

@ -1,16 +1,15 @@
{ config, disko, ... }:
{ config, name, ... }:
{
imports = [ disko.nixosModules.disko ];
disko.devices = {
disk = {
"${config.networking.hostName}" = {
"${name}" = {
type = "disk";
device = "/dev/nvme0n1";
device = "/dev/disk/by-id/nvme-INTEL_SSDPEKNU512GZ_BTKA20550TKC512A";
content = {
type = "gpt";
partitions = {
boot = {
priority = 1;
size = "1M";
type = "EF02";
};
@ -28,12 +27,12 @@
size = "100%";
content = {
type = "luks";
name = "${config.networking.hostName}-disk";
name = "${name}-disk";
settings.allowDiscards = true;
passwordFile = "/tmp/secret.key";
content = {
type = "lvm_pv";
vg = "${config.networking.hostName}";
vg = "${name}";
};
};
};
@ -43,7 +42,7 @@
};
lvm_vg = {
"${config.networking.hostName}" = {
"${name}" = {
type = "lvm_vg";
lvs = {
root = {

View file

@ -3,24 +3,32 @@
fileSystems = {
# Games and such
"/mnt/Linux1" = {
device = "/dev/disk/by-uuid/b2901f8c-ffda-4b88-bb63-a9ea0c96ccb4";
fsType = "ext4";
device = "/dev/disk/by-label/Linux1";
fsType = "btrfs";
options = [
"nofail"
"nosuid"
];
};
"/mnt/Linux2" = {
device = "/dev/disk/by-uuid/f08e4f38-162c-402f-ba2a-5925151b78bf";
fsType = "ext4";
device = "/dev/disk/by-label/Linux2";
fsType = "btrfs";
options = [
"nofail"
"nosuid"
];
};
"/mnt/Linux3" = {
device = "/dev/disk/by-uuid/e7bc75bd-c371-4b28-b212-7be9b1fad339";
fsType = "ext4";
device = "/dev/disk/by-label/Linux3";
fsType = "btrfs";
options = [
"nofail"
"nosuid"
];
};
"/mnt/Linux4" = {
device = "/dev/disk/by-label/Linux4";
fsType = "btrfs";
options = [
"nofail"
"nosuid"

View file

@ -16,6 +16,8 @@
kernelModules = [ "kvm-amd" ];
};
services.xserver.videoDrivers = [ "nvidia" ];
hardware.cpu.amd.updateMicrocode = true;
nixpkgs.hostPlatform = "x86_64-linux";

View file

@ -1,7 +1,4 @@
{ config, lib, ... }:
{ config, ... }:
{
home-manager.users."${config.vars.mainUser}" = {
home.guifull.enable = true;
services.swayidle.enable = lib.mkForce false;
};
home-manager.users."${config.vars.mainUser}".home.guifull.enable = true;
}