Big refactor, need to test still
This commit is contained in:
Lillian-Violet
parent
6f2c936913
commit
81460a2b8f
|
|
@ -65,7 +65,7 @@
|
||||||
specialArgs = {inherit inputs outputs;};
|
specialArgs = {inherit inputs outputs;};
|
||||||
modules = [
|
modules = [
|
||||||
# > Our main nixos configuration file <
|
# > Our main nixos configuration file <
|
||||||
./nixos/EDI/configuration.nix
|
./nixos/hosts/EDI/configuration.nix
|
||||||
sops-nix.nixosModules.sops
|
sops-nix.nixosModules.sops
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
@ -76,7 +76,7 @@
|
||||||
specialArgs = {inherit inputs outputs;};
|
specialArgs = {inherit inputs outputs;};
|
||||||
modules = [
|
modules = [
|
||||||
# > Our main nixos configuration file <
|
# > Our main nixos configuration file <
|
||||||
./nixos/GLaDOS/configuration.nix
|
./nixos/hosts/GLaDOS/configuration.nix
|
||||||
sops-nix.nixosModules.sops
|
sops-nix.nixosModules.sops
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
@ -87,7 +87,7 @@
|
||||||
specialArgs = {inherit inputs outputs;};
|
specialArgs = {inherit inputs outputs;};
|
||||||
modules = [
|
modules = [
|
||||||
# > Our main nixos configuration file <
|
# > Our main nixos configuration file <
|
||||||
./nixos/queen/configuration.nix
|
./nixos/hosts/queen/configuration.nix
|
||||||
sops-nix.nixosModules.sops
|
sops-nix.nixosModules.sops
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
@ -98,7 +98,7 @@
|
||||||
specialArgs = {inherit inputs outputs;};
|
specialArgs = {inherit inputs outputs;};
|
||||||
modules = [
|
modules = [
|
||||||
# > Our main nixos configuration file <
|
# > Our main nixos configuration file <
|
||||||
./nixos/shodan/configuration.nix
|
./nixos/hosts/shodan/configuration.nix
|
||||||
sops-nix.nixosModules.sops
|
sops-nix.nixosModules.sops
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
# You can also split up your configuration and import pieces of it here:
|
# You can also split up your configuration and import pieces of it here:
|
||||||
# ./nvim.nix
|
# ./nvim.nix
|
||||||
./program-configs/zsh.nix
|
./package-configs/zsh.nix
|
||||||
];
|
];
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
# You can add overlays here
|
# You can add overlays here
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
|
|
||||||
# You can also split up your configuration and import pieces of it here:
|
# You can also split up your configuration and import pieces of it here:
|
||||||
# ./nvim.nix
|
# ./nvim.nix
|
||||||
./desktop-shared.nix
|
../../desktop/configuration.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
|
|
||||||
# You can also split up your configuration and import pieces of it here:
|
# You can also split up your configuration and import pieces of it here:
|
||||||
# ./nvim.nix
|
# ./nvim.nix
|
||||||
./desktop-shared.nix
|
../../desktop/configuration.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
|
|
||||||
# You can also split up your configuration and import pieces of it here:
|
# You can also split up your configuration and import pieces of it here:
|
||||||
# ./nvim.nix
|
# ./nvim.nix
|
||||||
./program-configs/zsh.nix
|
./package-configs/zsh.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
|
|
@ -16,13 +16,14 @@
|
||||||
# You can also split up your configuration and import pieces of it here:
|
# You can also split up your configuration and import pieces of it here:
|
||||||
# ./nvim.nix
|
# ./nvim.nix
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
./postgres.nix
|
../../package-configs/akkoma/configuration.nix
|
||||||
./nextcloud.nix
|
../../package-configs/gitea/configuration.nix
|
||||||
./mail-server.nix
|
../../package-configs/gotosocial/configuration.nix
|
||||||
./webmail.nix
|
../../package-configs/mail-server/configuration.nix
|
||||||
./gotosocial.nix
|
../../package-configs/nextcloud/configuration.nix
|
||||||
../upgrade/postgresql.nix
|
../../package-configs/postgres/configuration.nix
|
||||||
./akkoma.nix
|
../../package-configs/postgres/upgrade.nix
|
||||||
|
../../package-configs/roundcube/configuration.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.tmp.cleanOnBoot = true;
|
boot.tmp.cleanOnBoot = true;
|
||||||
|
|
@ -56,7 +57,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
#Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys
|
#Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys
|
||||||
sops.defaultSopsFile = ../../secrets/queen-Lillian.yaml;
|
sops.defaultSopsFile = ./secrets/sops.yaml;
|
||||||
sops.age.keyFile = ./keys.txt;
|
sops.age.keyFile = ./keys.txt;
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
Loading…
Reference in a new issue