thiago/nix-conf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: add flake.lock back and update host configs

Browse source 
- Added `flake.lock` to pin dependencies (nixpkgs, home-manager, nixvim, flake-utils, etc.)
- Cleaned up `.gitignore`: stop ignoring `*.lock`
- Removed unused `flake-utils.inputs.nixpkgs.follows`
- Nixstation host:
  - Removed `keychron.nix`, Wacom tablet config, and redundant session variables
  - Simplified GDM/GNOME configuration and XKB layout
  - Commented out virtualisation setup
- Common NVIDIA host config:
  - Added explicit kernel modules, parameters, blacklists, and kernel version
  - Ensured GNOME + GDM configuration present
  - Updated NVIDIA driver settings and CUDA support
This commit is contained in:
Thiago Sposito 2025-08-25 14:49:52 -03:00
parent b41147d8e1
commit ea25b5b515
6 changed files with 243 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

69
hosts/Nixstation/default.nix
View file

@ -2,10 +2,8 @@
, ...
}:
{
imports = [
../common/default.nix
../common/keychron.nix
../common/network.nix
../common/nvidia/default.nix
./hardware-configuration.nix
@ -15,32 +13,6 @@
loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true;
};
environment.etc."libwacom/intuos4-4x6.tablet".text = ''
# Wacom
# Intuos4 Small
[Device]
Name=Wacom Intuos4 4x6
DeviceMatch=usb:056a:00b8
Class=Intuos4
Width=6
Height=4
Layout=intuos4-4x6.svg
IntegratedIn=
Styli=0x802;0x804;0x806;0x80a;0x80c;0x902;0x90a;0x100802;0x100804;0x10080a;0x10080c;0x100902;0x10090a;0x120802;0x140802;0x14080a;0x160802;0x16080a;
[Features]
Reversible=true
Stylus=true
Ring=true
Buttons=7
StatusLEDs=Ring
[Buttons]
Left=A;B;C;D;E;F;G
Ring=A
RingNumModes=4
'';
environment = {
systemPackages = with pkgs; [
act
@ -57,14 +29,8 @@
NIXOS_HOST = "nixstation";
NIXOS_DE = "wayland";
};
sessionVariables = {
NIXOS_OZONE_WL = "1";
XDG_SESSION_TYPE = "wayland";
QT_QPA_PLATFORM = "wayland";
GDK_BACKEND = "wayland";
};
};
hardware = {
sane.enable = true;
graphics.enable = true;
@ -115,15 +81,15 @@
security.rtkit.enable = true;
services = {
xserver = {
enable = true;
desktopManager.gnome.enable = true;
displayManager.gdm = {
enable = true;
wayland = true;
xkb = {
layout = "us";
variant = "alt-intl";
};
displayManager.defaultSession = "gnome";
};
desktopManager.gnome.enable = true;
displayManager.gdm.enable = true;
displayManager.gdm.wayland = true;
displayManager.defaultSession = "gnome";
udev.packages = [ pkgs.libwacom ];
avahi = {
enable = true;
@ -178,16 +144,15 @@
};
system.stateVersion = "25.11"; # keep it!
time.timeZone = "America/Sao_Paulo";
virtualisation = {
vmware.host.enable = false;
spiceUSBRedirection.enable = true;
libvirtd = {
enable = true;
qemu.ovmf.enable = true;
qemu.package = pkgs.qemu_full;
};
};
# virtualisation = {
# vmware.host.enable = false;
# spiceUSBRedirection.enable = true;
# libvirtd = {
# enable = true;
# qemu.ovmf.enable = true;
# # qemu.package = pkgs.qemu_full;
# };
# };
zramSwap = {
enable = true;

43
hosts/Nixstation/hardware-configuration.nix
View file

@ -11,13 +11,14 @@
boot = {
initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"ehci_pci"
"nvme"
"usbhid"
"usb_storage"
"sd_mod"
"ahci"
"usb_storage"
"usbhid"
"sd_mod"
"xhci_pci"
];
kernelParams = [ "amd_pstate=active" ];
initrd.kernelModules = [ ];
@ -25,27 +26,22 @@
extraModulePackages = [ ];
};
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/df74093a-637d-41a5-8c6a-2bf2dccc1506";
fsType = "btrfs";
options = [ "subvol=@" ];
};
fileSystems."/" =
{ device = "/dev/disk/by-uuid/07c4d31f-e1cd-4a02-8b3f-8c2bd2e0ce8d";
fsType = "btrfs";
options = [ "subvol=@" ];
};
"/boot" = {
device = "/dev/disk/by-uuid/E9BA-D1A3";
fsType = "vfat";
options = [
"fmask=0022"
"dmask=0022"
];
};
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/07c4d31f-e1cd-4a02-8b3f-8c2bd2e0ce8d";
fsType = "btrfs";
options = [ "subvol=@home" ];
};
"/mnt/hdd0" = {
device = "/dev/disk/by-uuid/940353dd-5774-4577-aba3-516d3f9c404d";
fsType = "btrfs";
options = [ "defaults" ];
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/D2EA-469F";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices = [ ];
@ -61,5 +57,4 @@
};
services.blueman.enable = true;
}