From d920e3c9d36e0d8d2803bb079dee0fc53b807647 Mon Sep 17 00:00:00 2001
From: sstent <stuart.stent@gmail.com>
Date: Thu, 19 Oct 2023 12:41:59 +0000
Subject: [PATCH] Revert "testig HM as module - try 2"

This reverts commit 14bcd1791530624de911e250c1033327a4bd6a1f.
---
 flake.nix                             | 14 -------
 home-manager/global.nix               | 55 ++++++++++++++-------------
 home-manager/users/sstent/default.nix | 10 ++---
 hosts/StuPC-WSL/default.nix           |  4 +-
 hosts/common.nix                      | 17 ++++-----
 5 files changed, 43 insertions(+), 57 deletions(-)

diff --git a/flake.nix b/flake.nix
index 85e6889..fcb8537 100644
--- a/flake.nix
+++ b/flake.nix
@@ -121,20 +121,6 @@
           specialArgs = { inherit  inputs outputs lib; hostName = "StuPC";};
           modules = [
             ./hosts/StuPC-WSL
-            home-manager.nixosModules.home-manager
-            {
-              home-manager.sharedModules = [
-                inputs.sops-nix.homeManagerModules.sops
-              ];
-              home-manager.useGlobalPkgs = true;
-              home-manager.users.sstent = import ./home-manager/users/sstent;      
-
-            }
-
-            {
-
-          }
-
           ];
         };
       
diff --git a/home-manager/global.nix b/home-manager/global.nix
index cd8f6cb..a12c6eb 100644
--- a/home-manager/global.nix
+++ b/home-manager/global.nix
@@ -1,10 +1,11 @@
 { inputs, lib, pkgs, config, outputs, ... }:
 {
 
-  # imports = [
-  #   "${inputs.vscode-server}/modules/vscode-server/home.nix"
-  # ]; 
-  # ++ (builtins.attrValues outputs.homeManagerModules);
+  imports = [
+    # ./beets.nix
+    # ./keybase.nix
+    "${inputs.vscode-server}/modules/vscode-server/home.nix"
+  ] ++ (builtins.attrValues outputs.homeManagerModules);
 
 
 
@@ -30,35 +31,35 @@
     description = "Path to the Secrets storage";
   };
 
-# config = {
+config = {
 
 
 
-  # nixpkgs = {
-  #   overlays = builtins.attrValues outputs.overlays;
-  #   config = {
-  #     allowUnfree = true;
-  #     allowUnfreePredicate = (_: true);
-  #   };
-  # };
+  nixpkgs = {
+    overlays = builtins.attrValues outputs.overlays;
+    config = {
+      allowUnfree = true;
+      allowUnfreePredicate = (_: true);
+    };
+  };
 
-  # nix = {
-  #   package = lib.mkDefault pkgs.nix;
-  #   settings = {
-  #     experimental-features = [ "nix-command" "flakes" "repl-flake" ];
-  #     warn-dirty = false;
-  #   };
-  # };
+  nix = {
+    package = lib.mkDefault pkgs.nix;
+    settings = {
+      experimental-features = [ "nix-command" "flakes" "repl-flake" ];
+      warn-dirty = false;
+    };
+  };
 
 ##VSCode
-  # services.vscode-server.enable = true;
-  # services.vscode-server.enableFHS = true;
-  # services.vscode-server.nodejsPackage = pkgs.nodejs-18_x;
+  services.vscode-server.enable = true;
+  services.vscode-server.enableFHS = true;
+  services.vscode-server.nodejsPackage = pkgs.nodejs-18_x;
 
 
-#   programs = {
-#     home-manager.enable = true;
-#     git.enable = true;
-#   };
-# };  
+  programs = {
+    home-manager.enable = true;
+    git.enable = true;
+  };
+};  
 }
diff --git a/home-manager/users/sstent/default.nix b/home-manager/users/sstent/default.nix
index 8bb5eb8..9deb941 100644
--- a/home-manager/users/sstent/default.nix
+++ b/home-manager/users/sstent/default.nix
@@ -68,11 +68,11 @@
     # deploy-rs
   ];
 
-  # custom = {
-  #   ssh-proxy.enable = false;
-  #   beets.enable = true;
-  #   keybase.enable = true;
-  # };
+  custom = {
+    ssh-proxy.enable = false;
+    beets.enable = true;
+    keybase.enable = true;
+  };
 
   # home.file.".mrconfig".source = config.lib.file.mkOutOfStoreSymlink "${config._secrets}/mrconfig";
   programs = {
diff --git a/hosts/StuPC-WSL/default.nix b/hosts/StuPC-WSL/default.nix
index c5451ae..3a79441 100644
--- a/hosts/StuPC-WSL/default.nix
+++ b/hosts/StuPC-WSL/default.nix
@@ -3,7 +3,7 @@
   imports = [
     ../common.nix
     ../user-sstent.nix
-    inputs.nixos-wsl.nixosModules.wsl
+      inputs.nixos-wsl.nixosModules.wsl
   ];
 
   # system.stateVersion = "22.11";
@@ -12,7 +12,7 @@
   custom = {
     mullvad.enable = true;
     mnt_public.enable = true;
-    syncthing.enable = false;
+    syncthing.enable = true;
     wsl.enable = true;
   };
 
diff --git a/hosts/common.nix b/hosts/common.nix
index 5d92eb4..26d08a0 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -2,7 +2,7 @@
 { lib, inputs, outputs, pkgs, config, ... }:
 {
   imports = [
-    # inputs.home-manager.nixosModules.home-manager
+    inputs.home-manager.nixosModules.home-manager
     inputs.sops-nix.nixosModules.sops
    ]++ (builtins.attrValues outputs.nixosModules);
 
@@ -38,14 +38,13 @@ config = {
 };
 
 
-  # home-manager = {
-  #   useUserPackages = true;
-  #   extraSpecialArgs = { inherit inputs outputs; };
-  #             sharedModules = [
-  #               inputs.sops-nix.homeManagerModules.sops
-  #             ];
-    
-  # };
+  home-manager = {
+    useUserPackages = true;
+    extraSpecialArgs = { inherit inputs outputs; };
+              sharedModules = [
+                inputs.sops-nix.homeManagerModules.sops
+              ];
+  };
 
   nixpkgs.config.allowUnfree = true;
    programs.fuse.userAllowOther = true;