Revert "testig HM as module - try 2"

This reverts commit 14bcd17915.
This commit is contained in:
2023-10-19 12:41:59 +00:00
parent 4c7d2c971e
commit d920e3c9d3
5 changed files with 43 additions and 57 deletions

View File

@@ -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;
}
{
}
];
};

View File

@@ -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;
};
};
}

View File

@@ -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 = {

View File

@@ -12,7 +12,7 @@
custom = {
mullvad.enable = true;
mnt_public.enable = true;
syncthing.enable = false;
syncthing.enable = true;
wsl.enable = true;
};

View File

@@ -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;