diff --git a/nixos-configurations/pc/default.nix b/nixos-configurations/pc/default.nix index 6f283c4..29989f4 100644 --- a/nixos-configurations/pc/default.nix +++ b/nixos-configurations/pc/default.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, ... }: +{ pkgs, inputs, lib, ... }: { imports = [ @@ -30,9 +30,9 @@ enable = true; package = pkgs.postgresql_15; ensureDatabases = [ "dcbot" "todos" ]; - authentication = pkgs.lib.mkOverride 10 '' - #type database DBuser auth-method - local all all trust + authentication = lib.mkForce '' + local all all trust + host all all ::1/128 trust ''; }; }; diff --git a/nixos-configurations/server/default.nix b/nixos-configurations/server/default.nix index c62a1f9..8d03734 100644 --- a/nixos-configurations/server/default.nix +++ b/nixos-configurations/server/default.nix @@ -60,15 +60,11 @@ openFirewall = true; whitelist = { thilo_ho = "4e4d744d-7748-46bc-add8-b3e8ca3b4cf5"; - PegasusIsHere = "24155f74-eb04-4f45-a743-f2b7eb71c6a2"; - BakaZaps = "1888532c-6df7-4514-b96a-99ed4e7684f2"; - Liaxswan = "ccbf3468-a6b4-4d7b-9837-5a2451deca79"; }; serverProperties = { difficulty = 3; max-players = 10; motd = "Thilo's SMP"; - white-list = false; }; }; nginx = { diff --git a/nixos-configurations/shared-desktop.nix b/nixos-configurations/shared-desktop.nix index 1cecfdc..8872693 100644 --- a/nixos-configurations/shared-desktop.nix +++ b/nixos-configurations/shared-desktop.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pkgs, ... }: { services = { @@ -16,6 +16,10 @@ }; printing.enable = true; resolved.enable = true; + mullvad-vpn = { + enable = true; + package = pkgs.mullvad-vpn; + }; }; programs = { @@ -30,6 +34,9 @@ hardware.pulseaudio.enable = false; + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; + home-manager.users.thiloho = { pkgs, lib, config, ... }: { programs = { firefox = { @@ -56,6 +63,8 @@ "nix.enableLanguageServer" = true; "nix.serverPath" = "nil"; "window.titleBarStyle" = "custom"; + "editor.indentSize" = 2; + "editor.tabSize" = 2; }; }; git = { @@ -83,7 +92,6 @@ neofetch godot_4 backblaze-b2 - postgrest ]; }; };