diff --git a/flake.nix b/flake.nix index 75cc1c3..96356e5 100644 --- a/flake.nix +++ b/flake.nix @@ -39,30 +39,25 @@ ]; }; - # nixosConfigurations.nixos-server = nixpkgs.lib.nixosSystem { - # #specialArgs = {inherit inputs;}; - # inherit system; - # modules = [ - # ./config/common.nix - # ./hosts/server/hardware.nix - # ./hosts/server/settings.nix - # { - # environment.systemPackages = [ agenix.packages.x86_64-linux.default ]; - # } - # home-manager.nixosModules.home-manager - # { - # home-manager.useGlobalPkgs = true; - # home-manager.useUserPackages = true; - # home-manager.users.admin = { - # imports = [ - # ./home/common.nix - # ./home/podman.nix - # agenix.homeManagerModules.default - # ]; - # }; - # } - # ]; - # }; + nixosConfigurations.nixos-server = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs;}; + modules = [ + ./config/common.nix + ./hosts/server/hardware.nix + ./hosts/server/settings.nix + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.admin = { + imports = [ + ./home/common.nix + ./home/podman.nix + ]; + }; + } + ]; + }; }; } diff --git a/hosts/server/settings.nix b/hosts/server/settings.nix index 9e9240e..7457ebd 100644 --- a/hosts/server/settings.nix +++ b/hosts/server/settings.nix @@ -2,15 +2,6 @@ { - # age.secrets = { - # "restic/environmentFile".file = ../../secrets/restic/environmentFile.age; - # "restic/repositoryFile".file = ../../secrets/restic/repositoryFile.age; - # "restic/passwordFile".file = ../../secrets/restic/passwordFile.age; - # "zfs/pool.key".file = ../../secrets/zfs/pool.key.age; - # }; - - age.identityPaths = [ "${config.users.users.admin.home}/.ssh/id_ed25519" ]; - boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; #boot.loader.limine.biosDevice = "/dev/vda"; @@ -217,9 +208,6 @@ systemd.services.podman-network-vlan50 = { services.samba = { enable = true; openFirewall = true; - extraConfig = '' - server min protocol = SMB2 - ''; settings = { global = { "server min protocol" = "SMB2_10";