moved nixos folder to main folder.

This commit is contained in:
Ingolf Wagner 2024-06-07 22:56:52 +02:00
parent c66025b32c
commit 3ded20e880
Signed by: palo
GPG key ID: 76BF5F1928B9618B
274 changed files with 17 additions and 17 deletions

View file

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

View file

@ -155,14 +155,14 @@
tasksh = taskshell.packages.${system}.tasksh;
overviewer = overviewer.packages.${system}.overviewer;
})
(import ./nixos/pkgs)
(import ./pkgs)
];
};
specialArgs = {
inherit private_assets;
assets = ./nixos/assets;
assets = ./assets;
factsGenerator = clan-fact-generators.lib { inherit pkgs; };
clanLib = import ./nixos/lib/clanlib.nix { inherit (pkgs) lib; machineDir = ./machines; };
clanLib = import ./lib/clanlib.nix { inherit (pkgs) lib; machineDir = ./machines; };
};
};
@ -178,7 +178,7 @@
clanCore.facts.secretStore = "password-store";
imports = modules ++ defaultModules ++ [
./nixos/machines/${name}/configuration.nix
./machines/${name}/configuration.nix
# clan core configuration
({ pkgs, lib, ... }: {
imports = [
@ -210,7 +210,7 @@
({ config, ... }: {
users.users.root.openssh.authorizedKeys.keyFiles = [
# master key
./nixos/assets/mrvandalo_rsa.pub
./assets/mrvandalo_rsa.pub
# backup key
"${config.clanCore.clanDir}/machines/chungus/facts/ssh.syncoid.id_ed25519.pub"
"${config.clanCore.clanDir}/machines/chungus/facts/ssh.rbackup.id_ed25519.pub"
@ -245,7 +245,7 @@
stylixModules = { pkgs, config, ... }: {
imports = [ stylix.nixosModules.stylix ];
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml";
stylix.image = ./nixos/assets/wallpaper.png;
stylix.image = ./assets/wallpaper.png;
stylix.fonts = {
serif = {
package = pkgs.ubuntu_font_family;
@ -278,7 +278,7 @@
];
home-manager.extraSpecialArgs = {
inherit private_assets;
assets = ./nixos/assets;
assets = ./assets;
};
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
@ -318,8 +318,8 @@
stylixModules
{ home-manager.users.mainUser.gui.enable = true; }
{
home-manager.users.mainUser = import ./nixos/homes/tina;
home-manager.users.root = import ./nixos/homes/root;
home-manager.users.mainUser = import ./homes/tina;
home-manager.users.root = import ./homes/root;
}
# todo : strange overrides, this should be an option kinda an be changed on another level (the homes/<name> folders or something)
({ lib, ... }: {
@ -347,8 +347,8 @@
stylixModules
{ home-manager.users.mainUser.gui.enable = true; }
{
home-manager.users.mainUser = import ./nixos/homes/palo;
home-manager.users.root = import ./nixos/homes/root;
home-manager.users.mainUser = import ./homes/palo;
home-manager.users.root = import ./homes/root;
}
{
clanCore.machineDescription = "Laptop";
@ -366,8 +366,8 @@
private_assets.nixosModules.yubikey
{ home-manager.users.mainUser.gui.enable = true; }
{
home-manager.users.mainUser = import ./nixos/homes/palo;
home-manager.users.root = import ./nixos/homes/root;
home-manager.users.mainUser = import ./homes/palo;
home-manager.users.root = import ./homes/root;
}
{
clanCore.machineDescription = "Laptop";
@ -390,8 +390,8 @@
retiolum.nixosModules.retiolum
private_assets.nixosModules.chungus
{
home-manager.users.mainUser = import ./nixos/homes/palo;
home-manager.users.root = import ./nixos/homes/root;
home-manager.users.mainUser = import ./homes/palo;
home-manager.users.root = import ./homes/root;
}
{
clanCore.machineDescription = "Home Server";
@ -415,8 +415,8 @@
systemd.enableEmergencyMode = false;
}
{
home-manager.users.mainUser = import ./nixos/homes/palo;
home-manager.users.root = import ./nixos/homes/root;
home-manager.users.mainUser = import ./homes/palo;
home-manager.users.root = import ./homes/root;
}
{
clanCore.machineDescription = "Internet Server";

Some files were not shown because too many files have changed in this diff Show more