diff options
| -rw-r--r-- | configuration/work/default.nix (renamed from hosts/work.nix) | 22 | ||||
| -rw-r--r-- | configuration/work/hardware-configuration.nix (renamed from hosts/hardware-configuration/work.nix) | 0 | ||||
| -rw-r--r-- | flake.nix | 6 |
3 files changed, 13 insertions, 15 deletions
diff --git a/hosts/work.nix b/configuration/work/default.nix index 9256d09..ebb26f5 100644 --- a/hosts/work.nix +++ b/configuration/work/default.nix @@ -1,17 +1,17 @@ { config, pkgs, inputs, ... }: { - imports = [ ./hardware-configuration/work.nix ]; + imports = [ ./hardware-configuration.nix ]; - age.secrets.ghostnet-cert.file = ../secrets/ghostnet-cert.age; - age.secrets.ghostnet-key.file = ../secrets/ghostnet-key.age; - age.secrets.ghostnet-ca.file = ../secrets/ghostnet-ca.age; - age.secrets.ghostnet-tls-auth.file = ../secrets/ghostnet-tls-auth.age; - age.secrets.ghostnet-auth-user-pass.file = ../secrets/ghostnet-auth-user-pass.age; + age.secrets.ghostnet-cert.file = ../../secrets/ghostnet-cert.age; + age.secrets.ghostnet-key.file = ../../secrets/ghostnet-key.age; + age.secrets.ghostnet-ca.file = ../../secrets/ghostnet-ca.age; + age.secrets.ghostnet-tls-auth.file = ../../secrets/ghostnet-tls-auth.age; + age.secrets.ghostnet-auth-user-pass.file = ../../secrets/ghostnet-auth-user-pass.age; - age.secrets.systems-cert.file = ../secrets/systems-cert.age; - age.secrets.systems-key.file = ../secrets/systems-key.age; - age.secrets.systems-ca.file = ../secrets/systems-ca.age; - age.secrets.systems-tls-auth.file = ../secrets/systems-tls-auth.age; + age.secrets.systems-cert.file = ../../secrets/systems-cert.age; + age.secrets.systems-key.file = ../../secrets/systems-key.age; + age.secrets.systems-ca.file = ../../secrets/systems-ca.age; + age.secrets.systems-tls-auth.file = ../../secrets/systems-tls-auth.age; environment.systemPackages = with pkgs; [ slack @@ -145,7 +145,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.jras = import ../home-manager/entrypoints/work.nix; + home-manager.users.jras = import ../../home-manager/entrypoints/work.nix; home-manager.extraSpecialArgs = { inherit inputs; monitor-names = ["eDP-1" "HDMI-A-1" "DP-10"]; }; system.stateVersion = "24.05"; # Do NOT change before reading configuration.nix diff --git a/hosts/hardware-configuration/work.nix b/configuration/work/hardware-configuration.nix index 9c8c4b1..9c8c4b1 100644 --- a/hosts/hardware-configuration/work.nix +++ b/configuration/work/hardware-configuration.nix @@ -45,13 +45,14 @@ system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ - ./hosts/work.nix update-systemd-resolved.nixosModules.update-systemd-resolved { environment.systemPackages = [ agenix.packages."x86_64-linux".default ]; } home-manager.nixosModules.home-manager agenix.nixosModules.default + + ./configuration/work ./config/shared.nix { @@ -64,9 +65,6 @@ nixosConfigurations.tarrel = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - # config = { - # allowUnfree = true; - # }; specialArgs = { inherit inputs; }; modules = [ ./hosts/tarrel.nix |