ooks/ooknet
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(ooksdesk): swap ooksdesk to new hardware

Browse source
This commit is contained in:
ooks-io 2024-04-12 02:29:11 +12:00
parent b833116942
commit 0c5694c4c0
6 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
home/user/ooks/ooksdesk/default.nix
View file

@ -7,7 +7,7 @@
activeProfiles = ["base" "hyprland" "productivity" "gaming"]; activeProfiles = ["base" "hyprland" "productivity" "gaming"];
theme = "minimal"; theme.minimal.enable = true;
home.sessionVariables.HN = "ooksdesk"; home.sessionVariables.HN = "ooksdesk";
@ -21,7 +21,5 @@
workspace = "1"; workspace = "1";
primary = true; primary = true;
}]; }];
colorscheme = inputs.nix-colors.colorSchemes.gruvbox-material-dark-soft;
} }

7
system/hosts/ooksdesk/default.nix
View file

@ -6,12 +6,17 @@
../../profiles ../../profiles
]; ];
activeProfiles = ["base" "nvidia" "mediaServer" "gaming"]; activeProfiles = ["base" "gaming"];
systemModules.user = { systemModules.user = {
ooks.enable = true; ooks.enable = true;
shell.fish.enable = true; shell.fish.enable = true;
}; };
systemModules.hardware = {
cpu.type = "amd";
gpu.type = "amd";
};
networking = { networking = {
hostName = "ooksdesk"; hostName = "ooksdesk";

21
system/hosts/ooksdesk/hardware-configuration.nix
View file

@ -8,39 +8,39 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "uas" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/68e9e662-69af-47cd-85ad-c44025a6d214"; { device = "/dev/disk/by-uuid/629a7421-24a0-45e6-87af-031574d9d46d";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=root" ]; options = [ "subvol=root" ];
}; };
boot.initrd.luks.devices."cryptnix".device = "/dev/disk/by-uuid/18ed0a3c-8ae6-42c2-8ae5-f1b07a2649f5"; boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/b5d09a8b-54a9-4f72-828c-5cceea2ec287";
fileSystems."/nix" = fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/68e9e662-69af-47cd-85ad-c44025a6d214"; { device = "/dev/disk/by-uuid/629a7421-24a0-45e6-87af-031574d9d46d";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=nix" ]; options = [ "subvol=nix" ];
}; };
fileSystems."/persist" = fileSystems."/persist" =
{ device = "/dev/disk/by-uuid/68e9e662-69af-47cd-85ad-c44025a6d214"; { device = "/dev/disk/by-uuid/629a7421-24a0-45e6-87af-031574d9d46d";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=persist" ]; options = [ "subvol=persist" ];
}; };
fileSystems."/swap" = fileSystems."/swap" =
{ device = "/dev/disk/by-uuid/68e9e662-69af-47cd-85ad-c44025a6d214"; { device = "/dev/disk/by-uuid/629a7421-24a0-45e6-87af-031574d9d46d";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=swap" ]; options = [ "subvol=swap" ];
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/6575-A86A"; { device = "/dev/disk/by-uuid/1D01-7040";
fsType = "vfat"; fsType = "vfat";
}; };
@ -51,9 +51,8 @@
# still possible to use this option, but it's recommended to use it in conjunction # 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`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp8s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

11
system/modules/default.nix
View file

@ -8,13 +8,12 @@
./programs ./programs
./user ./user
./displayManager ./displayManager
./networking.nix ./networking
./locale.nix ./locale
./virtualisation.nix ./virtualisation
./pipewire.nix ./security
./security.nix
./services ./services
./ssh.nix ./audio
]; ];

2
system/modules/hardware/gpu/amd/default.nix
View file

@ -13,7 +13,7 @@ in
vulkan-tools vulkan-tools
vulkan-loader vulkan-loader
vulkan-extension-layer vulkan-extension-layer
vulkan-validation-layer vulkan-validation-layers
amdvlk amdvlk
mesa mesa
]; ];

1
system/profiles/base/default.nix
View file

@ -30,7 +30,6 @@ in
bootloader.systemd.enable = true; bootloader.systemd.enable = true;
programs.gnomeServices.enable = true; programs.gnomeServices.enable = true;
displayManager.tuigreet.enable = true; displayManager.tuigreet.enable = true;
openssh.enable = true;
hardware.ssd.enable = true; hardware.ssd.enable = true;
services.system76Scheduler.enable = true; services.system76Scheduler.enable = true;
}; };