recombine laptop+pc config

common/nix/settings.nix

@@ -1,10 +1,10 @@
-{ pkgs, inputs, ... }:
 {
-  imports = [
-    inputs.lix-module.nixosModules.default
-  ];
-
+  pkgs,
+  inputs,
+  ...
+}: {
   nix = {
+    package = pkgs.lixPackageSets.git.lix;
     settings = {
       experimental-features = [
         "nix-command"
@@ -20,7 +20,7 @@
     optimise.automatic = true;
   };
 
-  system.nixos.tags = [ "fatcock-xxl" ];
+  system.nixos.tags = ["fatcock-xxl"];
 
   hjem = {
     clobberByDefault = true;

common/nix/tools.nix

@@ -8,8 +8,8 @@
   environment.systemPackages = getPkgs {
     inherit (pkgs)
       nixfmt-rfc-style
+      nil
       ;
-    inherit (inputs.nil.packages.${pkgs.system}) nil;
   };
   imports = [
     inputs.nix-index-database.nixosModules.nix-index