bchmnn/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: cleanup code

Browse source
This commit is contained in:
Jacob Bachmann 2024-01-17 18:53:33 +01:00
parent c25eda0f26
commit 2effb840d8
Signed by: bchmnn
GPG key ID: 732A612DAD28067D
7 changed files with 10 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hosts/T430/default.nix
View file

@ -2,13 +2,13 @@
imports = [ ./hardware.nix ]; imports = [ ./hardware.nix ];
networking.hostName = "T430"; # Define your hostname. networking.hostName = "T430";
bchmnn = { bchmnn = {
gui = { gui = {
enable = true; enable = true;
flavour = [ "sway" "i3" ]; flavour = [ "sway" ];
}; };
nvidia.enable = false; nvidia.enable = false;
audio.enable = true; audio.enable = true;
@ -18,7 +18,7 @@
devenv.enable = true; devenv.enable = true;
virtualisation.enable = true; virtualisation.enable = true;
games.enable = true; games.enable = false;
}; };

12
hosts/T430/hardware.nix
View file

@ -7,9 +7,12 @@
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.kernelParams = [ "resume_offset=533760" ]; boot.kernelParams = [ "resume_offset=533760" ];
boot.resumeDevice = "/dev/disk/by-label/ROOT"; boot.resumeDevice = "/dev/disk/by-label/ROOT";
boot.initrd.luks.devices."cryptlvm".device = "/dev/disk/by-uuid/b7a904b2-cceb-47fc-832a-701e386a95db";
fileSystems."/" = fileSystems."/" =
{ {
@ -18,8 +21,6 @@
options = [ "subvol=@" ]; options = [ "subvol=@" ];
}; };
boot.initrd.luks.devices."cryptlvm".device = "/dev/disk/by-uuid/b7a904b2-cceb-47fc-832a-701e386a95db";
fileSystems."/home" = fileSystems."/home" =
{ {
device = "/dev/disk/by-label/ROOT"; device = "/dev/disk/by-label/ROOT";
@ -51,14 +52,7 @@
device = "/swap/swapfile"; device = "/swap/swapfile";
}]; }];
# 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.useDHCP = lib.mkDefault true;
# networking.interfaces.enp0s25.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp3s0.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.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

2
hosts/W530/default.nix
View file

@ -2,7 +2,7 @@
imports = [ ./hardware.nix ]; imports = [ ./hardware.nix ];
networking.hostName = "W530"; # Define your hostname. networking.hostName = "W530";
bchmnn = { bchmnn = {

6
hosts/W530/hardware.nix
View file

@ -10,9 +10,12 @@
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ]; boot.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.kernelParams = [ "resume_offset=9364344" ]; boot.kernelParams = [ "resume_offset=9364344" ];
boot.resumeDevice = "/dev/disk/by-uuid/2e6bd7f5-74f0-4047-a0ab-5679b877a9fe"; boot.resumeDevice = "/dev/disk/by-uuid/2e6bd7f5-74f0-4047-a0ab-5679b877a9fe";
boot.initrd.luks.devices."cryptlvm".device = "/dev/disk/by-uuid/d04a2c58-4116-45d6-aa6e-2002556e6d22";
fileSystems."/" = fileSystems."/" =
{ {
@ -21,8 +24,6 @@
options = [ "subvol=@" "compress=zstd" "noatime" ]; options = [ "subvol=@" "compress=zstd" "noatime" ];
}; };
boot.initrd.luks.devices."cryptlvm".device = "/dev/disk/by-uuid/d04a2c58-4116-45d6-aa6e-2002556e6d22";
fileSystems."/home" = fileSystems."/home" =
{ {
device = "/dev/disk/by-uuid/2e6bd7f5-74f0-4047-a0ab-5679b877a9fe"; device = "/dev/disk/by-uuid/2e6bd7f5-74f0-4047-a0ab-5679b877a9fe";
@ -83,7 +84,6 @@
}]; }];
networking.useDHCP = lib.mkDefault true; networking.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.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

5
modules/boot.nix
View file

@ -1,5 +0,0 @@
{ ... }: {
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
}

12
modules/sddm.nix
View file

@ -1,12 +0,0 @@
{ lib, config, ... }: with config.bchmnn; lib.mkIf (gui.enable && lib.elem "i3" gui.flavour) {
/*
services.xserver.displayManager.sddm = {
enable = true;
wayland.enable = true;
};
programs.sway.enable = true;
*/
}

12
modules/xorg.nix
View file

@ -1,12 +0,0 @@
{ lib, config, ... }: with config.bchmnn; lib.mkIf (gui.enable && lib.elem "i3" gui.flavour) {
environment.pathsToLink = [ "/libexec" ]; # links /libexec from derivations to /run/current-system/sw
services.xserver = {
enable = true;
displayManager.startx.enable = true;
libinput.enable = true;
};
}