diff --git a/flake.nix b/flake.nix index 9db179b..c19e492 100644 --- a/flake.nix +++ b/flake.nix @@ -67,6 +67,8 @@ inherit inputs; }; modules = [ + inputs.catppuccin.nixosModules.catppuccin + # lil hack to not use --impure when rebuilding nixos >:3 "/etc/nixos/hardware-configuration.nix" diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index 4ce45a1..9daafa4 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -1,11 +1,15 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { imports = [ ./modules/atproto-pds.nix + ../../modules/nixos/bootloader.nix + ../../modules/nixos/network.nix + ../../modules/nixos/hardware.nix + ../../modules/nixos/nixpkgs.nix ]; - services.openssh.enable = true; + services.openssh.enable = lib.mkForce true; users.users.ocbwoy3 = { initialPassword = "thisisapassword42069!"; # not the type passwords i use @@ -19,7 +23,7 @@ enable = true; allowedTCPPorts = [ 22 443 8080 25565 ]; allowedUDPPorts = [ ]; - } + }; catppuccin = { enable = true; diff --git a/hosts/server/modules/atproto-pds.nix b/hosts/server/modules/atproto-pds.nix index e821637..b97595e 100644 --- a/hosts/server/modules/atproto-pds.nix +++ b/hosts/server/modules/atproto-pds.nix @@ -12,14 +12,14 @@ environmentFiles = [ "/private/atproto-pds.env" ]; settings = { PDS_CRAWLERS = "https://bsky.network"; - LOG_ENABLED = true; + LOG_ENABLED = "true"; PDS_HOSTNAME = "pds.darktru.win"; PDS_VERSION = "I'm an ATProto PDS!"; PDS_DID_PLC_URL = "https://plc.directory"; PDS_CONTACT_EMAIL_ADDRESS = "ocbwoy3@ocbwoy3.dev"; PDS_PRIVACY_POLICY_URL = "https://ocbwoy3.dev"; PDS_TERMS_OF_SERVICE_URL = "https://discord.gg/cQDvPtv3Dt"; - PDS_ACCEPTING_REPO_IMPORTS = true; + PDS_ACCEPTING_REPO_IMPORTS = "true"; }; }; diff --git a/modules/nixos/hardware.nix b/modules/nixos/hardware.nix index c517326..af81e42 100644 --- a/modules/nixos/hardware.nix +++ b/modules/nixos/hardware.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { @@ -45,6 +45,6 @@ # systemd.services."getty@tty5".enable = false; # systemd.services."getty@tty6".enable = false; - system.stateVersion = "24.11"; + system.stateVersion = lib.mkDefault "24.11"; }