Merge branch 'master' of https://code.steph.tools/steph/os
This commit is contained in:
commit
91f2529253
@ -7,7 +7,6 @@
|
||||
{
|
||||
imports =
|
||||
[
|
||||
./hardware-configuration.nix
|
||||
./kakoune.nix
|
||||
];
|
||||
|
||||
@ -18,12 +17,7 @@
|
||||
'';
|
||||
};
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
||||
|
||||
networking.hostName = "iota"; # Define your hostname.
|
||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||
|
||||
# Configure network proxy if necessary
|
||||
@ -239,7 +233,7 @@ $NEW_PROMPT_COMMAND"
|
||||
toupper = "tr [:lower:] [:upper:]";
|
||||
tolower = "tr [:upper:] [:lower:]";
|
||||
rebuild = ''
|
||||
sudo sh -c "cd $HOME/.local/os && nixos-rebuild switch --flake .#iota --use-remote-sudo"
|
||||
sudo sh -c "cd $HOME/.local/os && nixos-rebuild switch --flake .# --use-remote-sudo"
|
||||
'';
|
||||
};
|
||||
programs.bash.sessionVariables = {
|
||||
|
16
flake.nix
16
flake.nix
@ -15,7 +15,21 @@
|
||||
modules = [
|
||||
home.nixosModules.home-manager
|
||||
{
|
||||
imports = [./configuration.nix];
|
||||
imports = [
|
||||
./configuration.nix
|
||||
./hardware-configuration/iota.nix
|
||||
];
|
||||
}];
|
||||
};
|
||||
nixosConfigurations.tau = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
home.nixosModules.home-manager
|
||||
{
|
||||
imports = [
|
||||
./configuration.nix
|
||||
./hardware-configuration/tau.nix
|
||||
];
|
||||
}];
|
||||
};
|
||||
|
||||
|
@ -33,7 +33,13 @@
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
|
||||
networking.hostName = "iota"; # Define your hostname.
|
||||
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
||||
}
|
47
hardware-configuration/tau.nix
Normal file
47
hardware-configuration/tau.nix
Normal file
@ -0,0 +1,47 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/36d680ca-bdd7-47d2-8975-b1382688fc8e";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot/efi" =
|
||||
{ device = "/dev/disk/by-uuid/C1EF-2008";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/492b45b0-24e1-451e-b90f-a2741f1e5e86"; }
|
||||
];
|
||||
|
||||
# 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.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wwp0s20f0u6i12.useDHCP = lib.mkDefault true;
|
||||
networking.hostName = "tau"; # Define your hostname.
|
||||
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
||||
}
|
Loading…
Reference in New Issue
Block a user