From eba5baba4cc6de471c5e1636221e59667ecc1536 Mon Sep 17 00:00:00 2001 From: fleaz Date: Mon, 15 Jul 2024 18:39:42 +0200 Subject: [PATCH] roles: Drop k40 and virtualbox. Add lix --- modules/lix.nix | 16 ++++++++++++++++ roles/all.nix | 5 ++++- roles/laptop.nix | 1 - 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 modules/lix.nix diff --git a/modules/lix.nix b/modules/lix.nix new file mode 100644 index 0000000..1c0bf80 --- /dev/null +++ b/modules/lix.nix @@ -0,0 +1,16 @@ +let + module = fetchTarball { + name = "source"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz"; + sha256 = "sha256-64lB/NO6AQ6z6EDCemPSYZWX/Qc6Rt04cPia5T5v01g="; + }; + lixSrc = fetchTarball { + name = "source"; + url = "https://git.lix.systems/lix-project/lix/archive/2.90.0-rc1.tar.gz"; + sha256 = "sha256-WY7BGnu5PnbK4O8cKKv9kvxwzZIGbIQUQLGPHFXitI0="; + }; + # This is the core of the code you need; it is an exercise to the + # reader to write the sources in a nicer way, or by using npins or + # similar pinning tools. +in +import "${module}/module.nix" { lix = lixSrc; } diff --git a/roles/all.nix b/roles/all.nix index 2c4f8db..d456d69 100644 --- a/roles/all.nix +++ b/roles/all.nix @@ -16,7 +16,6 @@ in ../modules/ssh.nix ../modules/steam.nix ../modules/via.nix - ../modules/virtualbox.nix ../modules/borgbackup.nix ../modules/udisks2.nix ../modules/samba.nix @@ -24,6 +23,7 @@ in ../modules/sway.nix ../modules/nixld.nix ../modules/fwupd.nix + ../modules/lix.nix ../secrets/remote-builder.nix ../users/fleaz.nix @@ -60,6 +60,9 @@ in # Look mum, I'm using all the new shiny stuff! nix.settings.experimental-features = [ "nix-command" "flakes" ]; + # Enable proprietary firmware + hardware.enableAllFirmware = true; + # TMP networking.firewall = { allowedTCPPorts = [ 3000 ]; diff --git a/roles/laptop.nix b/roles/laptop.nix index 307bd2d..26ecc91 100644 --- a/roles/laptop.nix +++ b/roles/laptop.nix @@ -5,7 +5,6 @@ ../modules/networkmanager.nix ../modules/tlp.nix ../modules/sus-then-hib.nix - ../modules/k40.nix ]; }