opdavies/nix-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move WSL from standalone Home Manager to NixOS

Browse source
This commit is contained in:
Oliver Davies 2024-12-30 15:41:43 +00:00
parent d1e0abf4c5
commit c5afed5767
10 changed files with 324 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

118
nix/hosts/PW05CH3L/configuration.nix Normal file
View file

@ -0,0 +1,118 @@
{
headless ? false,
hostname,
inputs,
outputs,
pkgs,
self,
system,
username,
...
}:
{
home-manager = {
extraSpecialArgs = {
inherit
hostname
inputs
outputs
headless
self
system
username
;
};
useGlobalPkgs = true;
useUserPackages = true;
users."${username}" = import "${self}/nix/home/${username}";
};
nixpkgs = {
config = {
allowUnfree = true;
};
overlays = [
outputs.overlays.additions
outputs.overlays.modifications
outputs.overlays.stable-packages
];
};
nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
# # Enable networking
# networking.networkmanager.enable = true;
# Set your time zone.
time.timeZone = "Europe/London";
# Select internationalisation properties.
i18n.defaultLocale = "en_GB.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_GB.UTF-8";
LC_IDENTIFICATION = "en_GB.UTF-8";
LC_MEASUREMENT = "en_GB.UTF-8";
LC_MONETARY = "en_GB.UTF-8";
LC_NAME = "en_GB.UTF-8";
LC_NUMERIC = "en_GB.UTF-8";
LC_PAPER = "en_GB.UTF-8";
LC_TELEPHONE = "en_GB.UTF-8";
LC_TIME = "en_GB.UTF-8";
};
# Configure console keymap
console.keyMap = "uk";
users.users.${username} = {
description = "Oliver Davies";
isNormalUser = true;
extraGroups = [
"docker"
"media"
"networkmanager"
"wheel"
];
packages = with pkgs; [ ];
};
security.sudo.wheelNeedsPassword = false;
environment.systemPackages =
with pkgs;
[
]
++ pkgs.lib.optionals (!headless) [
];
system.stateVersion = "22.11";
nix = {
extraOptions = ''
trusted-users = root ${username}
'';
gc = {
automatic = true;
dates = "daily";
options = "--delete-older-than 7d";
};
optimise.automatic = true;
settings = {
auto-optimise-store = true;
experimental-features = [
"nix-command"
"flakes"
];
warn-dirty = false;
};
};
}

14
nix/hosts/PW05CH3L/default.nix Normal file
View file

@ -0,0 +1,14 @@
{ username, ... }:
{
imports = [
../common
./configuration.nix
];
wsl = {
enable = true;
defaultUser = username;
};
}

1
nix/hosts/lemp11/default.nix
View file

@ -7,6 +7,7 @@
};
desktop = {
autorandr.enable = true;
gaming.enable = true;
peek.enable = true;
};

1
nix/hosts/t490/default.nix
View file

@ -7,6 +7,7 @@
features = {
desktop = {
autorandr.enable = true;
gaming.enable = true;
i3.enable = true;
peek.enable = true;

75
nix/modules/nixos/autorandr.nix
View file

@ -1,75 +0,0 @@
{ config, ... }:
{
services.autorandr = {
enable = true;
profiles =
let
hosts = {
lemp11 = {
internal = {
fingerprint = "00ffffffffffff000dae081400000000251d0104a51f117802ee95a3544c99260f505400000001010101010101010101010101010101363680a0703820403020350035ad1000001a000000fe004e3134304843472d4551310a20000000fe00434d4e0a202020202020202020000000fe004e3134304843472d4551310a200084";
name = "eDP-1";
};
desktop.name = "HDMI-1";
};
nixedo = {
internal = {
fingerprint = "00ffffffffffff000dae081400000000251d0104a51f117802ee95a3544c99260f505400000001010101010101010101010101010101363680a0703820403020350035ad1000001a000000fe004e3134304843472d4551310a20000000fe00434d4e0a202020202020202020000000fe004e3134304843472d4551310a200084";
name = "eDP-1";
};
desktop.name = "HDMI-1";
};
t490 = {
internal = {
fingerprint = "00ffffffffffff0030e4fa0500000000001c0104a51f117802aa95955e598e271b5054000000010101010101010101010101010101012e3680a070381f403020350035ae1000001ab62c80f4703816403020350035ae1000001a000000fe004c4720446973706c61790a2020000000fe004c503134305746412d53504432004d";
name = "eDP-1";
};
desktop.name = "HDMI-2";
};
};
host = hosts."${config.networking.hostName}";
in
{
default = {
fingerprint = {
"${host.internal.name}" = host.internal.fingerprint;
};
config = {
"${host.internal.name}" = {
enable = true;
mode = "1920x1080";
};
};
};
desktop = {
config = {
"${host.internal.name}".enable = false;
"${host.desktop.name}" = {
enable = true;
mode = "2560x1440";
primary = true;
rate = "59.95";
};
};
fingerprint = {
"${host.internal.name}" = host.internal.fingerprint;
"${host.desktop.name}" =
"00ffffffffffff004c2d1710424e58432b1f0103803f24782ac8b5ad50449e250f5054bfef80714f810081c081809500a9c0b300010108e80030f2705a80b0588a0078682100001e000000fd00324b1e873c000a202020202020000000fc004c5532385235350a2020202020000000ff0048345a524130303132380a20200183020335f04961120313041f10605f2309070783010000e305c0006b030c002000b83c2000200167d85dc401788003e20f81e3060501023a801871382d40582c450078682100001e023a80d072382d40102c458078682100001e04740030f2705a80b0588a0078682100001e565e00a0a0a029503020350078682100001a000049";
};
};
};
};
}

1
nix/modules/nixos/default.nix
View file

@ -1,6 +1,5 @@
{
imports = [
./autorandr.nix
./features/cli
./features/desktop
./features/gaming.nix

81
nix/modules/nixos/features/desktop/autorandr.nix Normal file
View file

@ -0,0 +1,81 @@
{ config, lib, ... }:
with lib;
{
options.features.desktop.autorandr.enable = mkEnableOption "Enable autorandr";
config = mkIf config.features.desktop.autorandr.enable {
services.autorandr = {
enable = true;
profiles =
let
hosts = {
lemp11 = {
internal = {
fingerprint = "00ffffffffffff000dae081400000000251d0104a51f117802ee95a3544c99260f505400000001010101010101010101010101010101363680a0703820403020350035ad1000001a000000fe004e3134304843472d4551310a20000000fe00434d4e0a202020202020202020000000fe004e3134304843472d4551310a200084";
name = "eDP-1";
};
desktop.name = "HDMI-1";
};
nixedo = {
internal = {
fingerprint = "00ffffffffffff000dae081400000000251d0104a51f117802ee95a3544c99260f505400000001010101010101010101010101010101363680a0703820403020350035ad1000001a000000fe004e3134304843472d4551310a20000000fe00434d4e0a202020202020202020000000fe004e3134304843472d4551310a200084";
name = "eDP-1";
};
desktop.name = "HDMI-1";
};
t490 = {
internal = {
fingerprint = "00ffffffffffff0030e4fa0500000000001c0104a51f117802aa95955e598e271b5054000000010101010101010101010101010101012e3680a070381f403020350035ae1000001ab62c80f4703816403020350035ae1000001a000000fe004c4720446973706c61790a2020000000fe004c503134305746412d53504432004d";
name = "eDP-1";
};
desktop.name = "HDMI-2";
};
};
host = hosts."${config.networking.hostName}";
in
{
default = {
fingerprint = {
"${host.internal.name}" = host.internal.fingerprint;
};
config = {
"${host.internal.name}" = {
enable = true;
mode = "1920x1080";
};
};
};
desktop = {
config = {
"${host.internal.name}".enable = false;
"${host.desktop.name}" = {
enable = true;
mode = "2560x1440";
primary = true;
rate = "59.95";
};
};
fingerprint = {
"${host.internal.name}" = host.internal.fingerprint;
"${host.desktop.name}" =
"00ffffffffffff004c2d1710424e58432b1f0103803f24782ac8b5ad50449e250f5054bfef80714f810081c081809500a9c0b300010108e80030f2705a80b0588a0078682100001e000000fd00324b1e873c000a202020202020000000fc004c5532385235350a2020202020000000ff0048345a524130303132380a20200183020335f04961120313041f10605f2309070783010000e305c0006b030c002000b83c2000200167d85dc401788003e20f81e3060501023a801871382d40582c450078682100001e023a80d072382d40102c458078682100001e04740030f2705a80b0588a0078682100001e565e00a0a0a029503020350078682100001a000049";
};
};
};
};
};
}

1
nix/modules/nixos/features/desktop/default.nix
View file

@ -1,5 +1,6 @@
{
imports = [
./autorandr.nix
./peek.nix
./screenkey.nix
];