From e342ff35ebf5656e4bda45aeef125dabd16be50c Mon Sep 17 00:00:00 2001
From: Leonora Tindall <nora@nora.codes>
Date: Sat, 25 Feb 2023 08:16:02 -0600
Subject: [PATCH] Import home-manager and packages using channels

---
 README.md                           | 6 ++----
 common/common.nix                   | 4 +++-
 common/default.nix                  | 9 +--------
 external/home-manager               | 1 -
 external/nixos-hardware             | 1 -
 hosts/crimespoon/configuration.nix  | 1 +
 hosts/felonyspork/configuration.nix | 1 +
 ops/home/network.nix                | 4 ++++
 8 files changed, 12 insertions(+), 15 deletions(-)
 delete mode 160000 external/home-manager
 delete mode 160000 external/nixos-hardware

diff --git a/README.md b/README.md
index ff1c98c..ed913dc 100644
--- a/README.md
+++ b/README.md
@@ -8,10 +8,8 @@ On the depoyment host, I use nix channels, and set:
 
 ```
 $ nix-channel --list
-nixos https://nixos.org/channels/nixos-22.05
-
-$ echo $NIX_PATH
-nixpkgs=nix/var/nix/profiles/per-user/nora/channels/nixos/
+home-manager https://github.com/nix-community/home-manager/archive/release-22.11.tar.gz
+nixpkgs https://nixos.org/channels/nixos-22.11
 ```
 
 ## Layout
diff --git a/common/common.nix b/common/common.nix
index d0301ca..41bc3db 100644
--- a/common/common.nix
+++ b/common/common.nix
@@ -4,9 +4,11 @@
 {
   imports = [
     ./users
+    <home-manager/nixos>
+    #../external/home-manager/nixos
   ];
 
-  system.autoUpgrade.channel = "https://nixos.org/channels/nixos-22.05";
+  system.autoUpgrade.channel = "https://nixos.org/channels/nixos-22.11";
 
   boot.cleanTmpDir = true;
 
diff --git a/common/default.nix b/common/default.nix
index a72032f..143282f 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -1,10 +1,3 @@
 # inputs to this NixOS module. We don't use any here
 # so we can ignore them all.
-{ ... }:
-
-{
-  imports = [
-    ./common.nix
-    ../external/home-manager/nixos
-  ];
-}
+{ ... }:{}
diff --git a/external/home-manager b/external/home-manager
deleted file mode 160000
index 6d9d929..0000000
--- a/external/home-manager
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6d9d9294d09b5e88df65f8c6651efb8a4d7d2476
diff --git a/external/nixos-hardware b/external/nixos-hardware
deleted file mode 160000
index 9886a06..0000000
--- a/external/nixos-hardware
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9886a06e4745edb31587d0e9481ad82d35f0d593
diff --git a/hosts/crimespoon/configuration.nix b/hosts/crimespoon/configuration.nix
index 8da4196..f0a7e9b 100644
--- a/hosts/crimespoon/configuration.nix
+++ b/hosts/crimespoon/configuration.nix
@@ -9,6 +9,7 @@
     [
       ./hardware-configuration.nix
       ./home.nix
+      ../../common/common.nix
       ../../common/fragments/avahi.nix
       ../../common/fragments/unifi.nix
       ../../common/fragments/grafana.nix
diff --git a/hosts/felonyspork/configuration.nix b/hosts/felonyspork/configuration.nix
index 6a9481e..f1cde1a 100644
--- a/hosts/felonyspork/configuration.nix
+++ b/hosts/felonyspork/configuration.nix
@@ -9,6 +9,7 @@
     [
       ./hardware-configuration.nix
       ./home.nix
+      ../../common/common.nix
       ../../common/fragments/avahi.nix
       ../../common/fragments/syncthing.nix
       ../../common/fragments/mosh.nix
diff --git a/ops/home/network.nix b/ops/home/network.nix
index dcc74a9..f8b9f6f 100644
--- a/ops/home/network.nix
+++ b/ops/home/network.nix
@@ -1,6 +1,10 @@
 {
   network = {
     description = "Home network";
+    nixConfig = {
+      "auto-optimize-store" = "true";
+      "warn-dirty" = "true";
+    };
   };
 
   "felonyspork" = { config, pkgs, lib, ... }: {