diff --git a/flake.nix b/flake.nix index 62f63e7..a587bfe 100644 --- a/flake.nix +++ b/flake.nix @@ -42,7 +42,7 @@ outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }@inputs: }; modules = [ - ./modules + #./modules ./hosts/${hostName} @@ -52,6 +52,9 @@ outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }@inputs: home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.sstent = import ./home-manager; + home-manager.sharedModules = [ + inputs.sops-nix.homeManagerModules.sops + ]; } ]; }; diff --git a/hosts/StuPC-WSL/default.nix b/hosts/StuPC-WSL/default.nix index 7d02204..e051f51 100644 --- a/hosts/StuPC-WSL/default.nix +++ b/hosts/StuPC-WSL/default.nix @@ -19,10 +19,5 @@ nixpkgs.hostPlatform.system = "x86_64-linux"; networking.hostName = "StuPC-WSL"; services.openssh.enable = true; - custom = { - mullvad.enable = true; - mnt_public.enable = true; - syncthing.enable = true; - wsl.enable = true; - }; + } diff --git a/hosts/common.nix b/hosts/common.nix index 9c8ea37..e7d5ce8 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -16,7 +16,7 @@ system.stateVersion = "23.05"; sops = { - defaultSopsFile = "${config._secretstore}/host-secrets.yaml"; + defaultSopsFile = ../secrets/host-secrets.yaml; age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"]; }; @@ -36,9 +36,9 @@ networking.search = ["node.dc1.consul" "service.dc1.consul"]; ##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; #services.envfs.enable = true;