new flake

home-manager/default.nix

@@ -1,25 +1,25 @@
 {
-  inputs,
-  outputs,
   lib,
-  config,
   pkgs,
+  config,
   hostName,
   ...
 }: {
-  imports = [
-    ../../global.nix
-  ];
+#  imports = [
+    #./global.nix
+    #"../modules/vscode-server/home.nix"
+
+ # ];
   home.username = "sstent";
   home.homeDirectory = "/home/sstent";
   home.stateVersion = "23.05";
 
   sops = {
     age.sshKeyPaths = ["/home/sstent/.ssh/id_ed25519"];
-    defaultSopsFile = "${config._secretstore}/user-secrets.yaml";
+    defaultSopsFile = ../secrets/user-secrets.yaml;
     secrets = {
       mrconfig = {
-        sopsFile = "${config._secretstore}/user_dotfiles/mrconfig";
+        sopsFile = ../secrets/user_dotfiles/mrconfig;
         format = "binary";
         path = "${config.home.homeDirectory}/.mrconfig";
       };
@@ -28,6 +28,25 @@
 
   # home.file."/home/sstent/.config/beets/test".source = config.lib.file.mkOutOfStoreSymlink /run/user/1000/secrets/test;
 
+
+  imports =
+    [
+      # ./beets.nix
+      # ./keybase.nix
+    ];
+    # ++ (builtins.attrValues outputs.homeManagerModules);
+
+  ###dotfiles path variable
+
+    ##VSCode
+    #services.vscode-server.enable = true;
+    #services.vscode-server.enableFHS = true;
+    #services.vscode-server.nodejsPackage = pkgs.nodejs-18_x;
+
+  #programs.git.enable = true;
+
+
+
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
   home.packages = with pkgs; [
@@ -40,7 +59,7 @@
     pyinfra
     sshpass
     nmap
-    nomad_1_4
+    nomad
     consul
     terraform
     wget
@@ -57,11 +76,11 @@
     gnumake
   ];
 
-  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 = {

home-manager/global.nix

@@ -1,9 +1,9 @@
 {
-  inputs,
+  #inputs,
   lib,
   pkgs,
   config,
-  outputs,
+  #outputs,
   ...
 }: {
   imports =
@@ -11,8 +11,8 @@
       # ./beets.nix
       # ./keybase.nix
       "${inputs.vscode-server}/modules/vscode-server/home.nix"
-    ]
-    ++ (builtins.attrValues outputs.homeManagerModules);
+    ];
+    # ++ (builtins.attrValues outputs.homeManagerModules);
 
   ###dotfiles path variable
   options._dotfiles = lib.mkOption {
@@ -36,21 +36,21 @@
   };
 
   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;