Move Vanguard packages from home.packages to environment.systemPackages

Restructure the other machine specific files for style consistency,
no actual changes otherwise
This commit is contained in:
Evie Litherland-Smith 2025-02-08 06:32:03 +00:00
parent 7095b8e149
commit dea57f6db7
4 changed files with 60 additions and 62 deletions

View file

@ -18,11 +18,6 @@
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
home-manager.users.${username} = {
imports = [ ./home/emacs/default.nix ];
services.emacs.enable = false;
home.stateVersion = "23.05";
};
system = {
stateVersion = "23.05";
autoUpgrade = {
@ -41,4 +36,9 @@
users.mutableUsers = false;
hardware.bluetooth.enable = true;
networking.nameservers = lib.mkForce [ "0.0.0.0" ];
home-manager.users.${username} = {
imports = [ ./home/emacs/default.nix ];
services.emacs.enable = false;
home.stateVersion = "23.05";
};
}

View file

@ -4,13 +4,6 @@
./laptop.nix
./work.nix
];
home-manager.users.${username} = {
home.stateVersion = "23.05";
wayland.windowManager.hyprland.settings.monitor = [
"eDP-1,preferred,auto,1.25"
"desc:Dell Inc. DELL P3223QE CCG8YN3,preferred,auto-left,1.5"
];
};
boot.initrd = {
secrets = {
"/crypto_keyfile.bin" = null;
@ -28,4 +21,11 @@
systemPackages = with pkgs; [ openfortivpn ];
};
services.hardware.bolt.enable = true;
home-manager.users.${username} = {
home.stateVersion = "23.05";
wayland.windowManager.hyprland.settings.monitor = [
"eDP-1,preferred,auto,1.25"
"desc:Dell Inc. DELL P3223QE CCG8YN3,preferred,auto-left,1.5"
];
};
}

View file

@ -1,10 +1,10 @@
{ username, ... }:
{
imports = [ ./laptop.nix ];
networking.wg-quick.interfaces.wg0.configFile = "/etc/wireguard/gb-mnc-wg-001.conf";
system.stateVersion = "23.05";
home-manager.users.${username} = {
home.stateVersion = "23.05";
wayland.windowManager.hyprland.settings.monitor = [ "eDP-1,preferred,auto,1.25" ];
};
networking.wg-quick.interfaces.wg0.configFile = "/etc/wireguard/gb-mnc-wg-001.conf";
system.stateVersion = "23.05";
}

View file

@ -9,33 +9,54 @@
./desktop.nix
./steam.nix
];
boot = {
kernel.sysctl = {
"vm.max_map_count" = 16777216;
"fs.file-max" = 524288;
};
extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
extraModprobeConfig = ''
options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
'';
};
hardware = {
amdgpu = {
initrd.enable = true;
opencl.enable = true;
};
graphics = {
enable = true;
enable32Bit = true;
};
};
environment.systemPackages = with pkgs; [
helvum
prusa-slicer
blender
freecad
openscad
kicad-small
wineWowPackages.waylandFull
winetricks
lutris
prismlauncher
(retroarch.override {
cores = with libretro; [
mupen64plus
dolphin
mgba
citra
pcsx2
ppsspp
];
})
];
services.hardware.openrgb.enable = true;
networking.wg-quick.interfaces.wg0.configFile = "/etc/wireguard/gb-mnc-wg-001.conf";
system.stateVersion = "23.05";
home-manager.users.${username} = {
imports = [ ./home/swww/default.nix ];
home = {
stateVersion = "23.05";
packages = with pkgs; [
helvum
prusa-slicer
blender
freecad
openscad
kicad-small
wineWowPackages.waylandFull
winetricks
lutris
prismlauncher
(retroarch.override {
cores = with libretro; [
mupen64plus
dolphin
mgba
citra
pcsx2
ppsspp
];
})
];
};
home.stateVersion = "23.05";
programs = {
btop.package = pkgs.btop-rocm;
obs-studio = {
@ -66,27 +87,4 @@
];
};
};
boot = {
kernel.sysctl = {
"vm.max_map_count" = 16777216;
"fs.file-max" = 524288;
};
extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
extraModprobeConfig = ''
options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
'';
};
hardware = {
amdgpu = {
initrd.enable = true;
opencl.enable = true;
};
graphics = {
enable = true;
enable32Bit = true;
};
};
services.hardware.openrgb.enable = true;
networking.wg-quick.interfaces.wg0.configFile = "/etc/wireguard/gb-mnc-wg-001.conf";
system.stateVersion = "23.05";
}