From 1e4fd788ed6f49ad9b9bd82d3593e45d83a6525a Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Wed, 5 Jun 2024 01:00:27 +0200
Subject: [PATCH] modularize nix version choice

---
 configs/thilo-laptop/home.nix     |  6 ++++++
 configs/thilo-pc/home.nix         | 17 +++++++++++++++--
 configs/wsl/home.nix              |  6 ++++++
 home-manager/modules/machine.nix  |  4 ++++
 home-manager/modules/packages.nix |  3 +--
 5 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/configs/thilo-laptop/home.nix b/configs/thilo-laptop/home.nix
index 35d3481..c97f9da 100644
--- a/configs/thilo-laptop/home.nix
+++ b/configs/thilo-laptop/home.nix
@@ -21,6 +21,12 @@
       home.sessionVariables = {
         LD_LIBRARY_PATH = "${pkgs.libGL}/lib";
       };
+
+      nix = {
+        package = pkgs.nixVersions.latest;
+      };
+
+      home.packages = with pkgs; [ pkgs.nixVersions.latest ];
     };
   };
 }
diff --git a/configs/thilo-pc/home.nix b/configs/thilo-pc/home.nix
index e9ca8fe..02cadf6 100644
--- a/configs/thilo-pc/home.nix
+++ b/configs/thilo-pc/home.nix
@@ -1,4 +1,9 @@
-{ inputs, pkgs, ... }:
+{
+  inputs,
+  pkgs,
+  config,
+  ...
+}:
 
 {
   home-manager = {
@@ -16,6 +21,7 @@
         isGnome = false;
         noiseSuppression.enable = true;
         isGraphical = true;
+        nixVersion = pkgs.lix;
       };
 
       /*
@@ -30,7 +36,14 @@
         LD_LIBRARY_PATH = "${pkgs.libGL}/lib";
       };
 
-      home.packages = with pkgs; [ libsForQt5.discover ];
+      nix = {
+        package = pkgs.lix;
+      };
+
+      home.packages = with pkgs; [
+        pkgs.lix
+        libsForQt5.discover
+      ];
     };
   };
 }
diff --git a/configs/wsl/home.nix b/configs/wsl/home.nix
index 3625100..733ea97 100644
--- a/configs/wsl/home.nix
+++ b/configs/wsl/home.nix
@@ -12,4 +12,10 @@
   };
 
   nixpkgs.config.allowUnfree = true;
+
+  nix = {
+    package = pkgs.nixVersions.latest;
+  };
+
+  home.packages = with pkgs; [ pkgs.nixVersions.latest ];
 }
diff --git a/home-manager/modules/machine.nix b/home-manager/modules/machine.nix
index 70c15ab..da5e01a 100644
--- a/home-manager/modules/machine.nix
+++ b/home-manager/modules/machine.nix
@@ -60,6 +60,10 @@ with lib;
         default = false;
         description = "Whether to enable noise suppression or not";
       };
+      nixVersion = mkOption {
+        type = types.package;
+        default = pkgs.nixVersions.latest;
+      };
     };
     nixGLPrefix = lib.mkOption {
       type = lib.types.str;
diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix
index 8f8f248..ba24fd3 100644
--- a/home-manager/modules/packages.nix
+++ b/home-manager/modules/packages.nix
@@ -24,7 +24,6 @@ in
     home.packages =
       with pkgs;
       [
-        pkgs.nixVersions.latest # because remotely invoked updates are fun ;)
         up
         htop
         rustc
@@ -52,7 +51,7 @@ in
         (pkgs.writeShellScriptBin "yt-dlp-audio" (builtins.readFile ./../scripts/yt-dlp-audio.sh))
         (pkgs.writeShellScriptBin "nix-shell-init" (builtins.readFile ./../scripts/nix-shell-init.sh))
         (pkgs.writeShellScriptBin "http-server" ''
-          ${pkgs.caddy}/bin/caddy file-server --listen :2345
+          ${pkgs.caddy}/bin/caddy file-server --listen :2345z
         '')
         (pkgs.writeShellScriptBin "nix-build-default" ''
           nix-build -E 'with import <nixpkgs> { }; callPackage ./default.nix { }'