Simplifying

This commit is contained in:
2026-02-26 23:27:43 +00:00
parent eb5b621962
commit e847828109
13 changed files with 99 additions and 140 deletions

View File

@@ -1,15 +0,0 @@
{
inputs,
lib,
config,
pkgs,
...
}: {
imports = [
./hardware-configuration.nix
./modules
];
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
system.stateVersion = "25.11";
}

View File

@@ -1,48 +0,0 @@
# nix --extra-experimental-features "nix-command flakes" run github:nix-community/disko -- --mode disko ./disko.nix
{
disko.devices = {
disk = {
stationette = {
type = "disk";
device = "/dev/sda"; # Check this with lsblk
content = {
type = "gpt";
partitions = {
ESP = {
size = "512M";
type = "EFOO";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
};
};
root = {
size = "100%";
type = "btfs";
extraArgs = [ "-f" ]; # Force overwrite
subvolumes = {
"/root" = {
mountpoint = "/";
mountOptions = [ "compress=zstd" "noatime" ];
};
"/nix" = {
mountpoint = "/nix";
mountOptions = [ "compress=zstd" "noatime" ];
};
"/persist" = {
mountpoint = "/persist";
mountOptions = [ "compress=zstd" "noatime" ];
};
"/swap" = {
mountpoint = "/.swapvol";
swap.swapfile.size = "8G";
};
};
};
};
};
};
};
};
}

View File

@@ -1,31 +0,0 @@
# 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 =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/c425db8f-455a-4fec-8a24-72cd670640cb";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/038B-4974";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
swapDevices = [ ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View File

@@ -1,34 +0,0 @@
{ config, pkgs, lib, ... }:
{
boot = {
loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
initrd.postDeviceCommands = lib.mkAfter ''
mkdir /btrfs_tmp
mount /dev/disk/by-label/NIXOS /btrfs_tmp
if [[ -e /btrfs_tmp/root ]]; then
mkdir -p /btrfs_tmp/old_roots
timestamp=$(dat +%Y-%m-%d_%H-%M-%S)
mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp"
fi
delete_subvolume_recursively() {
IFS=$'\n'
for i in $(btrfs subvolume list -o "$1" | cut -f 9 -d ' '); do
delete_subvolume_recursively "/btrfs_tmp/$i"
done
btrfs subvolume delete "$1"
}
for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do
delete_subvolume_recursively "$i"
done
btrfs subvolume create /btrfs_tmp/root
umount /btrfs_tmp
'';
};
}

View File

@@ -1,11 +0,0 @@
{ ... }:
{
imports = [
./boot.nix
./networking.nix
./packages.nix
./programs.nix
./users.nix
];
}

View File

@@ -1,14 +0,0 @@
{
environment.persistence."/persist" = {
hideMounts = true;
directories = [
"/var/log"
"/var/lib/bluetooth"
"/var/lib/networkmanager"
"/etc/ssh"
];
files = [
"/etc/machine-id"
]
};
}

View File

@@ -1,8 +0,0 @@
{ config, pkgs, ... }:
{
networking = {
hostName = "stationette";
networkmanager.enable = true;
};
}

View File

@@ -1,37 +0,0 @@
{ config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
bat
highlight
btop
eza
fzf
git
gnumake
neofetch
neovim
ripgrep
tldr
unzip
openssl
wget
zip
zoxide
jq
lazygit
lazysql
less
mlocate
tree
tmux
tmuxinator
wget
zenity
gum
yazi
rsync
p7zip
impala
];
}

View File

@@ -1,9 +0,0 @@
{ config, pkgs, ... }:
{
programs = {
zsh = {
enable = true;
};
};
}

View File

@@ -1,13 +0,0 @@
{ config, pkgs, ... }:
{
users.users.chris = {
isNormalUser = true;
shell = pkgs.zsh;
extraGroups = [
"chris"
"wheel"
"networkmanager"
];
};
}

View File

@@ -1,34 +0,0 @@
{ pkgs, ... }:
{
# Ensure NFS support is installed
environment.systemPackages = [ pkgs.nfs-utils ];
fileSystems = {
"/home/chris/Stardust" = {
device = "192.168.2.158:/mnt/tower/stardust/chris/files";
fsType = "nfs4";
options = [
"defaults"
"x-systemd.mount-timeout=5"
"user"
"exec"
"x-systemd.automount" # Mounts on access
"noauto" # Doesn't block boot if server is down
];
};
"/home/chris/Foundry" = {
device = "192.168.2.158:/mnt/tower/foundry/Data";
fsType = "nfs4";
options = [
"defaults"
"x-systemd.mount-timeout=5"
"user"
"exec"
"x-systemd.automount"
"noauto"
];
};
};
}