moritz/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

refactor: use nixpkgs hostSystem

Browse source
This commit is contained in:
Moritz Böhme 2023-10-26 09:16:25 +02:00
parent 89991861ed
commit 8285cdceff
3 changed files with 26 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

14
hosts/nixos-work/default.nix
View file

@ -11,6 +11,8 @@
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
nixpkgs.hostPlatform = "x86_64-linux";
my.profiles = { my.profiles = {
desktop.enable = true; desktop.enable = true;
work.enable = true; work.enable = true;
@ -50,12 +52,14 @@
keyMap = "de"; keyMap = "de";
}; };
services.xserver = {
# Configure keymap in X11 # Configure keymap in X11
services.xserver.layout = "de"; layout = "de";
services.xserver.xkbOptions = "caps:escape"; # map caps to escape. # map caps to escape.
xkbOptions = "caps:escape";
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).
services.xserver.libinput.enable = true; libinput.enable = true;
};
# Define a user account. Don't forget to set a password with ‘passwd’. # Define a user account. Don't forget to set a password with ‘passwd’.
users.users.moritz = { users.users.moritz = {
@ -107,6 +111,4 @@
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "22.05"; # Did you read the comment? system.stateVersion = "22.05"; # Did you read the comment?
} }

39
hosts/nixos-work/hardware-configuration.nix
View file

@ -9,53 +9,46 @@
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot = {
boot.initrd.kernelModules = [ ]; initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.kernelModules = [ "kvm-intel" ]; initrd.kernelModules = [ ];
boot.extraModulePackages = [ ]; kernelModules = [ "kvm-intel" ];
extraModulePackages = [ ];
};
fileSystems."/" = fileSystems = {
{ "/" = {
device = "/dev/disk/by-uuid/23782fe8-86f7-4aa1-afc1-6586443d0d3e"; device = "/dev/disk/by-uuid/23782fe8-86f7-4aa1-afc1-6586443d0d3e";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@" "compress=zstd" "noatime" ]; options = [ "subvol=@" "compress=zstd" "noatime" ];
}; };
"/home" = {
boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/1958da8c-d506-49a6-b983-dc8477d25b7c";
fileSystems."/home" =
{
device = "/dev/disk/by-uuid/23782fe8-86f7-4aa1-afc1-6586443d0d3e"; device = "/dev/disk/by-uuid/23782fe8-86f7-4aa1-afc1-6586443d0d3e";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@home" "compress=zstd" "noatime" ]; options = [ "subvol=@home" "compress=zstd" "noatime" ];
}; };
"/swap" = {
fileSystems."/swap" =
{
device = "/dev/disk/by-uuid/23782fe8-86f7-4aa1-afc1-6586443d0d3e"; device = "/dev/disk/by-uuid/23782fe8-86f7-4aa1-afc1-6586443d0d3e";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@swap" "compress=zstd" "noatime" ]; options = [ "subvol=@swap" "compress=zstd" "noatime" ];
}; };
"/nix" = {
fileSystems."/nix" =
{
device = "/dev/disk/by-uuid/23782fe8-86f7-4aa1-afc1-6586443d0d3e"; device = "/dev/disk/by-uuid/23782fe8-86f7-4aa1-afc1-6586443d0d3e";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@nix" "compress=zstd" "noatime" ]; options = [ "subvol=@nix" "compress=zstd" "noatime" ];
}; };
"/var/log" = {
fileSystems."/var/log" =
{
device = "/dev/disk/by-uuid/23782fe8-86f7-4aa1-afc1-6586443d0d3e"; device = "/dev/disk/by-uuid/23782fe8-86f7-4aa1-afc1-6586443d0d3e";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@log" "compress=zstd" "noatime" ]; options = [ "subvol=@log" "compress=zstd" "noatime" ];
}; };
"/boot" = {
fileSystems."/boot" =
{
device = "/dev/disk/by-uuid/8EFC-70D8"; device = "/dev/disk/by-uuid/8EFC-70D8";
fsType = "vfat"; fsType = "vfat";
}; };
};
boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/1958da8c-d506-49a6-b983-dc8477d25b7c";
swapDevices = [{ swapDevices = [{
device = "/swap/swapfile"; device = "/swap/swapfile";

1
hosts/nixos-work/system.nix
View file

@ -1 +0,0 @@
"x86_64-linux"