c2vi/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made hosts/main.nix so that i can also use it on the hpm-laptop.nix...

Browse Source
This commit is contained in:
Sebastian Moser
2023-10-31 13:57:21 +00:00
parent fef4f8e219
commit 30fe098ee9
5 changed files with 82 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/programs/bash.nix
View File

@@ -259,7 +259,7 @@
function nixre(){ function nixre(){
if [ "$1" == "boot" ] if [ "$1" == "boot" ]
then then
nix build ~/work/config#nixosConfigurations.c2vi-main.config.system.build.toplevel --impure ''${@:2} nix build github:c2vi/nixos#nixosConfigurations.c2vi-main.config.system.build.toplevel --impure ''${@:2}
sudo ./result/bin/switch-to-configuration boot sudo ./result/bin/switch-to-configuration boot
rm ./result rm ./result
else else

11
flake.nix
View File

@@ -43,6 +43,17 @@
specialArgs = { inherit inputs confDir workDir secretsDir persistentDir self; }; specialArgs = { inherit inputs confDir workDir secretsDir persistentDir self; };
modules = [ modules = [
./hosts/main.nix ./hosts/main.nix
./hardware/my-hp-laptop.nix
];
};
"c2vi-hpm" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs confDir workDir secretsDir persistentDir self; };
modules = [
./hosts/main.nix
./hardware/hpm-laptop.nix
]; ];
}; };

7
hardware/hpm-laptop.nix
View File

@@ -23,6 +23,13 @@
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/tmp" = {
fsType = "tmpfs";
device = "tmpfs";
options = [ "nosuid" "nodev" "relatime" "size=14G" ];
};
swapDevices = [ swapDevices = [
{ device = "/dev/disk/by-uuid/418bf0d8-e548-45d5-802a-53de72707ebc"; } { device = "/dev/disk/by-uuid/418bf0d8-e548-45d5-802a-53de72707ebc"; }
]; ];

84
hardware/my-hp-laptop.nix
View File

@@ -4,36 +4,70 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = imports = [
[ (modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "uas" "sd_mod" "sdhci_pci" ]; # Setup keyfile
boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.initrd.secrets = {
boot.kernelModules = [ "kvm-intel" ]; "/crypto_keyfile.bin" = null;
boot.extraModulePackages = [ ]; };
fileSystems."/" = fileSystems."/home/me/work" = {
{ device = "/dev/disk/by-uuid/356c7b23-71ab-4a01-b700-adbb672bec3e"; #label = "work";
fsType = "btrfs"; device = "/dev/disk/by-uuid/fd3c6393-b6fd-4065-baf9-5690eb6ebbed";
}; fsType = "btrfs";
neededForBoot = false;
};
fileSystems."/boot" = # Use the GRUB 2 boot loader.
{ device = "/dev/disk/by-uuid/2588-2509"; boot.loader.grub = {
enable = true;
version = 2;
device = "nodev";
efiSupport = true;
extraConfig = ''
set timeout=1
'';
};
boot.loader.efi.canTouchEfiVariables = true;
boot.initrd.luks.devices = {
root = {
#name = "root";
device = "/dev/disk/by-uuid/142d2d21-2998-4eb7-9853-ab6554ba061f";
preLVM = true;
allowDiscards = true;
};
};
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "uas" "sd_mod" "sdhci_pci" ];
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-uuid/356c7b23-71ab-4a01-b700-adbb672bec3e";
fsType = "btrfs";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/2588-2509";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ ]; swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # 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 # (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 # 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.enp1s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

50
hosts/main.nix
View File

@@ -17,62 +17,20 @@
imports = [ imports = [
../mods/battery_monitor.nix ../mods/battery_monitor.nix
../mods/my-nixpkgs-overlay.nix ../mods/my-nixpkgs-overlay.nix
../hardware/my-hp-laptop.nix
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
../users/me/home.nix ../users/me/home.nix
]; ];
#home-manager.users.me = import ../users/me/home.nix; #home-manager.users.me = import ../users/me/home.nix;
# Setup keyfile
boot.initrd.secrets = {
"/crypto_keyfile.bin" = null;
};
fileSystems."/home/me/work" = {
#label = "work";
device = "/dev/disk/by-uuid/fd3c6393-b6fd-4065-baf9-5690eb6ebbed";
fsType = "btrfs";
neededForBoot = false;
};
# Use the GRUB 2 boot loader.
boot.loader.grub = {
enable = true;
version = 2;
device = "nodev";
efiSupport = true;
extraConfig = ''
set timeout=1
'';
};
boot.loader.efi.canTouchEfiVariables = true;
boot.initrd.luks.devices = {
root = {
#name = "root";
device = "/dev/disk/by-uuid/142d2d21-2998-4eb7-9853-ab6554ba061f";
preLVM = true;
allowDiscards = true;
};
};
############################# MISC ############################# ############################# MISC #############################
# misc # misc
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
"electron-24.8.6" "electron-24.8.6"
]; ];
fileSystems."/tmp" = {
fsType = "tmpfs";
device = "tmpfs";
options = [ "nosuid" "nodev" "relatime" "size=14G" ];
};
security.polkit.enable = true; security.polkit.enable = true;
networking.firewall.enable = true; networking.firewall.enable = true;