Compare commits
6 Commits
11b0bf7522
...
66e7dab5aa
Author | SHA1 | Date | |
---|---|---|---|
66e7dab5aa | |||
a6fc984ceb | |||
10c26f143d | |||
f2dcc81256 | |||
49d65b9cb4 | |||
25ecb1c367 |
@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
config = {
|
config = {
|
||||||
console = {
|
console = {
|
||||||
font = "Lat2-Terminus16";
|
font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
|
||||||
keyMap = lib.mkDefault "us";
|
keyMap = lib.mkDefault "us";
|
||||||
useXkbConfig = true;
|
useXkbConfig = true;
|
||||||
};
|
};
|
||||||
|
@ -4,8 +4,7 @@
|
|||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}: {
|
||||||
{
|
|
||||||
options.snowflake.core.nix = {
|
options.snowflake.core.nix = {
|
||||||
enable = lib.mkEnableOption "Enable core nix configuration";
|
enable = lib.mkEnableOption "Enable core nix configuration";
|
||||||
};
|
};
|
||||||
@ -22,13 +21,16 @@
|
|||||||
|
|
||||||
# Add each flake input as a registry to make nix3 commands
|
# Add each flake input as a registry to make nix3 commands
|
||||||
# consistent with nix flakes.
|
# consistent with nix flakes.
|
||||||
registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
|
registry = lib.mapAttrs (_: value: {flake = value;}) inputs;
|
||||||
|
|
||||||
# Add inputs to system's legacy channels.
|
# Add inputs to system's legacy channels.
|
||||||
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
|
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
|
||||||
|
|
||||||
# Use the latest, unstable version of nix.
|
# Use the latest, unstable version of nix.
|
||||||
package = pkgs.nixVersions.git;
|
package = pkgs.nixVersions.nix_2_23;
|
||||||
|
# TODO: switch back to nix git. Current version has a security issue that allows
|
||||||
|
# remote code execution.
|
||||||
|
# package = pkgs.nixVersions.git;
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
# Accept flake configuration without prompting.
|
# Accept flake configuration without prompting.
|
||||||
@ -65,8 +67,8 @@
|
|||||||
warn-dirty = false;
|
warn-dirty = false;
|
||||||
|
|
||||||
# Add cache substituters to allow fetching cached builds.
|
# Add cache substituters to allow fetching cached builds.
|
||||||
trusted-substituters = [ "https://nix-community.cachix.org" ];
|
trusted-substituters = ["https://nix-community.cachix.org"];
|
||||||
trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ];
|
trusted-public-keys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -14,7 +14,6 @@
|
|||||||
|
|
||||||
xserver = {
|
xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
videoDrivers = ["intel"];
|
|
||||||
};
|
};
|
||||||
displayManager.sddm = {
|
displayManager.sddm = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
_: _self: super: let
|
_: _self: super: let
|
||||||
version = "0.28.8";
|
version = "0.29.4";
|
||||||
in {
|
in {
|
||||||
netbird = super.netbird.override {
|
netbird = super.netbird.override {
|
||||||
buildGoModule = args:
|
buildGoModule = args:
|
||||||
super.buildGoModule (
|
super.buildGo123Module (
|
||||||
args
|
args
|
||||||
// {
|
// {
|
||||||
inherit version;
|
inherit version;
|
||||||
@ -11,9 +11,9 @@ in {
|
|||||||
owner = "netbirdio";
|
owner = "netbirdio";
|
||||||
repo = "netbird";
|
repo = "netbird";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-DfY8CVBHgE/kLALKNzSgmUxM0flWLesU0XAgVsHHLKc=";
|
hash = "sha256-W71CE83r/RcPdBjzfT+FSh72UcKcTmIuagkrC1eaeNk=";
|
||||||
};
|
};
|
||||||
vendorHash = "sha256-CqknRMijAkWRLXCcIjRBX2wB64+RivD/mXq28TqzNjg=";
|
vendorHash = "sha256-CD34U+Z8bUKN0Z4nxIVC+mYDp71Q8q1bmUypRDGgb3U=";
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-s"
|
"-s"
|
||||||
"-w"
|
"-w"
|
||||||
|
@ -6,8 +6,13 @@
|
|||||||
}: {
|
}: {
|
||||||
imports = [./hardware.nix];
|
imports = [./hardware.nix];
|
||||||
|
|
||||||
|
chaotic.mesa-git.enable = true;
|
||||||
|
|
||||||
hardware.cpu.intel.updateMicrocode = true;
|
hardware.cpu.intel.updateMicrocode = true;
|
||||||
hardware.enableRedistributableFirmware = true;
|
hardware.enableRedistributableFirmware = true;
|
||||||
|
hardware.graphics.extraPackages = with pkgs; [
|
||||||
|
mesa_git.opencl
|
||||||
|
];
|
||||||
|
|
||||||
networking.hostName = "thonkpad";
|
networking.hostName = "thonkpad";
|
||||||
networking.interfaces.wlan0.useDHCP = lib.mkDefault false;
|
networking.interfaces.wlan0.useDHCP = lib.mkDefault false;
|
||||||
@ -37,7 +42,6 @@
|
|||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
easyeffects
|
easyeffects
|
||||||
glibc
|
glibc
|
||||||
logseq
|
|
||||||
obsidian
|
obsidian
|
||||||
piper
|
piper
|
||||||
# terraform
|
# terraform
|
||||||
|
@ -1,4 +1,8 @@
|
|||||||
_: {
|
{
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
boot = {
|
boot = {
|
||||||
initrd = {
|
initrd = {
|
||||||
availableKernelModules = [
|
availableKernelModules = [
|
||||||
@ -9,20 +13,21 @@ _: {
|
|||||||
"sd_mod"
|
"sd_mod"
|
||||||
];
|
];
|
||||||
luks.devices."cryptroot".device = "/dev/disk/by-uuid/9de352ea-128f-4d56-a720-36d81dfd9b92";
|
luks.devices."cryptroot".device = "/dev/disk/by-uuid/9de352ea-128f-4d56-a720-36d81dfd9b92";
|
||||||
|
luks.devices."cryptroot".bypassWorkqueues = true;
|
||||||
};
|
};
|
||||||
kernelModules = [
|
kernelModules = [
|
||||||
"kvm-intel"
|
"kvm-intel"
|
||||||
"thinkpad_acpi"
|
"iwlwifi"
|
||||||
# "iwlwifi"
|
|
||||||
"xe"
|
"xe"
|
||||||
];
|
];
|
||||||
|
kernelPackages = lib.mkDefault pkgs.linuxPackages_testing;
|
||||||
kernelParams = [
|
kernelParams = [
|
||||||
"quiet"
|
# NixOS produces many wakeups per second, which is bad for battery life.
|
||||||
"xe.force_probe=7d55"
|
# This disables the timer tick on the last 7 cores.
|
||||||
|
"nohz_full=14-21"
|
||||||
"i915.force_probe=!7d55"
|
"i915.force_probe=!7d55"
|
||||||
|
"xe.force_probe=7d55"
|
||||||
# "resume_offset=2465529"
|
# "resume_offset=2465529"
|
||||||
"intel_pstate=active"
|
|
||||||
"thinkpad_acpi.fan_control=1"
|
|
||||||
];
|
];
|
||||||
# resumeDevice = "/dev/disk/by-uuid/870fde90-a91a-4554-8b1c-d5702c789f4d";
|
# resumeDevice = "/dev/disk/by-uuid/870fde90-a91a-4554-8b1c-d5702c789f4d";
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user