sstent/vmimages
1
0
Fork 0
mirror of https://github.com/sstent/vmimages.git synced 2025-12-06 06:01:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "testig HM as module - try 2"

Browse Source 
This reverts commit 14bcd17915.
This commit is contained in:
sstent
2023-10-19 12:41:59 +00:00
parent 4c7d2c971e
commit d920e3c9d3
5 changed files with 43 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
flake.nix
View File

@@ -121,20 +121,6 @@
specialArgs = { inherit inputs outputs lib; hostName = "StuPC";}; specialArgs = { inherit inputs outputs lib; hostName = "StuPC";};
modules = [ modules = [
./hosts/StuPC-WSL ./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;
}
{
}
]; ];
}; };

55
home-manager/global.nix
View File

@@ -1,10 +1,11 @@
{ inputs, lib, pkgs, config, outputs, ... }: { inputs, lib, pkgs, config, outputs, ... }:
{ {
# imports = [ imports = [
# "${inputs.vscode-server}/modules/vscode-server/home.nix" # ./beets.nix
# ]; # ./keybase.nix
# ++ (builtins.attrValues outputs.homeManagerModules); "${inputs.vscode-server}/modules/vscode-server/home.nix"
] ++ (builtins.attrValues outputs.homeManagerModules);
@@ -30,35 +31,35 @@
description = "Path to the Secrets storage"; description = "Path to the Secrets storage";
}; };
# config = { config = {
# nixpkgs = { nixpkgs = {
# overlays = builtins.attrValues outputs.overlays; overlays = builtins.attrValues outputs.overlays;
# config = { config = {
# allowUnfree = true; allowUnfree = true;
# allowUnfreePredicate = (_: true); allowUnfreePredicate = (_: true);
# }; };
# }; };
# nix = { nix = {
# package = lib.mkDefault pkgs.nix; package = lib.mkDefault pkgs.nix;
# settings = { settings = {
# experimental-features = [ "nix-command" "flakes" "repl-flake" ]; experimental-features = [ "nix-command" "flakes" "repl-flake" ];
# warn-dirty = false; warn-dirty = false;
# }; };
# }; };
##VSCode ##VSCode
# services.vscode-server.enable = true; services.vscode-server.enable = true;
# services.vscode-server.enableFHS = true; services.vscode-server.enableFHS = true;
# services.vscode-server.nodejsPackage = pkgs.nodejs-18_x; services.vscode-server.nodejsPackage = pkgs.nodejs-18_x;
# programs = { programs = {
# home-manager.enable = true; home-manager.enable = true;
# git.enable = true; git.enable = true;
# }; };
# }; };
} }

10
home-manager/users/sstent/default.nix
View File

@@ -68,11 +68,11 @@
# deploy-rs # deploy-rs
]; ];
# custom = { custom = {
# ssh-proxy.enable = false; ssh-proxy.enable = false;
# beets.enable = true; beets.enable = true;
# keybase.enable = true; keybase.enable = true;
# }; };
# home.file.".mrconfig".source = config.lib.file.mkOutOfStoreSymlink "${config._secrets}/mrconfig"; # home.file.".mrconfig".source = config.lib.file.mkOutOfStoreSymlink "${config._secrets}/mrconfig";
programs = { programs = {

4
hosts/StuPC-WSL/default.nix
View File

@@ -3,7 +3,7 @@
imports = [ imports = [
../common.nix ../common.nix
../user-sstent.nix ../user-sstent.nix
inputs.nixos-wsl.nixosModules.wsl inputs.nixos-wsl.nixosModules.wsl
]; ];
# system.stateVersion = "22.11"; # system.stateVersion = "22.11";
@@ -12,7 +12,7 @@
custom = { custom = {
mullvad.enable = true; mullvad.enable = true;
mnt_public.enable = true; mnt_public.enable = true;
syncthing.enable = false; syncthing.enable = true;
wsl.enable = true; wsl.enable = true;
}; };

17
hosts/common.nix
View File

@@ -2,7 +2,7 @@
{ lib, inputs, outputs, pkgs, config, ... }: { lib, inputs, outputs, pkgs, config, ... }:
{ {
imports = [ imports = [
# inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
]++ (builtins.attrValues outputs.nixosModules); ]++ (builtins.attrValues outputs.nixosModules);
@@ -38,14 +38,13 @@ config = {
}; };
# home-manager = { home-manager = {
# useUserPackages = true; useUserPackages = true;
# extraSpecialArgs = { inherit inputs outputs; }; extraSpecialArgs = { inherit inputs outputs; };
# sharedModules = [ sharedModules = [
# inputs.sops-nix.homeManagerModules.sops inputs.sops-nix.homeManagerModules.sops
# ]; ];
};
# };
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
programs.fuse.userAllowOther = true; programs.fuse.userAllowOther = true;