Compare commits

...

2 commits

Author SHA1 Message Date
bfbc64b611 oh wow it's actually functional now
and so fast

vroom vrooom
2025-12-16 21:18:31 +00:00
d4c499fce1 dam hardware configuration is hard 2025-12-16 17:55:19 +01:00
8 changed files with 91 additions and 61 deletions

View file

@ -1,56 +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 = [
"nvme"
"xhci_pci"
"ahci"
"usbhid"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-uuid/a26cdc8b-abc9-47cf-ad33-c81e56e56d22";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/C9B2-7254";
fsType = "vfat";
options = [
"fmask=0077"
"dmask=0077"
];
};
swapDevices = [
{ device = "/dev/disk/by-uuid/24ecde92-b41b-4e41-8ebc-950d321db477"; }
];
# 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
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp42s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View file

@ -2,6 +2,7 @@
config, config,
lib, lib,
pkgs, pkgs,
modulesPath,
... ...
}: }:
@ -9,4 +10,41 @@
networking = { networking = {
hostName = "marty-latitude"; hostName = "marty-latitude";
}; };
# PREVIOUSLY HARDWARE-CONFIGURATION.NIX
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/757b8bfc-0b5d-4ec1-9ab7-7876848ae411";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/C8A8-A568";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/a1838708-fb00-4ecb-8010-432d06182591"; }
];
# 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
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

View file

@ -6,7 +6,7 @@
}: }:
let let
enable_vscode = enable_vscodium =
if config.networking.hostName == "marty-pc" then if config.networking.hostName == "marty-pc" then
true true
else if config.networking.hostName == "marty-latitude" then else if config.networking.hostName == "marty-latitude" then
@ -19,9 +19,9 @@ in
{ {
programs.vscode = { programs.vscode = {
enable = enable_vscode; enable = enable_vscodium;
package = pkgs.vscodium; package = pkgs.vscodium;
defaultEditor = enable_vscode; defaultEditor = enable_vscodium;
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
catppuccin.catppuccin-vsc catppuccin.catppuccin-vsc
catppuccin.catppuccin-vsc-icons catppuccin.catppuccin-vsc-icons

View file

@ -9,5 +9,7 @@
imports = [ imports = [
./boot.nix ./boot.nix
./shell.nix ./shell.nix
./terminal.nix
./networking.nix
]; ];
} }

31
system/networking.nix Normal file
View file

@ -0,0 +1,31 @@
{ config, pkgs, ... }:
{
networking = {
networkmanager.enable = true;
firewall = {
enable = true;
allowedUDPPorts = [ config.services.tailscale.port ];
trustedInterfaces = [ "tailscale0" ];
};
};
hardware = {
bluetooth = {
enable = true;
powerOnBoot = true;
settings = {
General = {
Experimental = true;
};
};
};
};
}

View file

@ -5,6 +5,11 @@
systemPackages = with pkgs; [ systemPackages = with pkgs; [
fish fish
coreutils coreutils
] ];
} };
programs = {
fish = {
enable = true;
};
};
} }

10
system/terminal.nix Normal file
View file

@ -0,0 +1,10 @@
{ config, pkgs, ... }:
{
environment = {
systemPackages = with pkgs; [
kitty
rofi
];
};
}