From cef48a3a23b75d5cfb945912bd6609e8212b0d14 Mon Sep 17 00:00:00 2001 From: Jasper Ras Date: Thu, 14 Nov 2024 19:51:14 +0100 Subject: Move around stuff --- flake.nix | 45 ++++----------------------------------------- 1 file changed, 4 insertions(+), 41 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index dac90a8..8c4742b 100644 --- a/flake.nix +++ b/flake.nix @@ -9,8 +9,6 @@ hyprland.url = "github:hyprwm/Hyprland"; utils.url = "github:gytis-ivaskevicius/flake-utils-plus"; agenix.url = "github:ryantm/agenix"; - - zen-browser.url = "github:MarceColl/zen-browser-flake"; }; outputs = { self, nixpkgs, utils, home-manager, helix, hyprland, agenix, ... }@inputs: @@ -22,47 +20,12 @@ hostDefaults.modules = [ home-manager.nixosModules.home-manager agenix.nixosModules.default - { - environment.systemPackages = [ - agenix.packages."x86_64-linux".default - ]; - 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; - } - ./config/shared.nix - ]; - - hosts.work.modules = [ - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.jras = import ./home-manager/entrypoints/personal.nix; - - home-manager.extraSpecialArgs = { inherit inputs; primary-monitor = "eDP-1"; }; - } - ./hosts/work.nix + ./config/shared.nix + ./config/agenix.nix ]; - hosts.tarrel.modules = [ - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.jras = import ./home-manager/entrypoints/personal.nix; - - home-manager.extraSpecialArgs = { inherit inputs; primary-monitor = "DP-2"; }; - } - - ./hosts/tarrel.nix - ]; + hosts.work.modules = [./hosts/work.nix]; + hosts.tarrel.modules = [./hosts/tarrel.nix]; }; } -- cgit v1.2.3