diff --git a/configuration.nix b/configuration.nix index 3f48408..e8f1590 100644 --- a/configuration.nix +++ b/configuration.nix @@ -42,6 +42,8 @@ ./system-modules/users.nix ./system-modules/virtualisation.nix ./system-modules/ydotool.nix + + ./system-modules/simple-postgres.nix ] ++ (if hyper.isServer then [ ./system-modules/nx2site.nix ./system-modules/hugo.nix diff --git a/git-crypt/secrets.nix b/git-crypt/secrets.nix index 96d8af2..286fdf6 100644 Binary files a/git-crypt/secrets.nix and b/git-crypt/secrets.nix differ diff --git a/home-modules/chatterino.nix b/home-modules/chatterino.nix index b989a5b..b1617b3 100644 --- a/home-modules/chatterino.nix +++ b/home-modules/chatterino.nix @@ -51,7 +51,7 @@ in { home = { packages = with pkgs; [ - chatterino2 + unstable.chatterino2 streamlink # mpv ]; diff --git a/home-modules/pkgs-list/programs.nix b/home-modules/pkgs-list/programs.nix index 9d1d0b4..b19da0e 100644 --- a/home-modules/pkgs-list/programs.nix +++ b/home-modules/pkgs-list/programs.nix @@ -14,6 +14,7 @@ latest.antigravity element-desktop obsidian + fontforge-gtk zoom-us inkscape audacity diff --git a/system-modules/dm.nix b/system-modules/dm.nix index 6146bd2..a9d0f18 100644 --- a/system-modules/dm.nix +++ b/system-modules/dm.nix @@ -18,7 +18,8 @@ package = pkgs.ly; settings = with rice.color; let h = rice.lib.nohash; in { allow_empty_password = false; - animation = "matrix"; + # animation = "matrix"; + animation = "gameoflife"; animation_timeout_sec = 0; # forever asterisk = "*"; auth_fails = 10; diff --git a/system-modules/simple-postgres.nix b/system-modules/simple-postgres.nix new file mode 100644 index 0000000..3eb4670 --- /dev/null +++ b/system-modules/simple-postgres.nix @@ -0,0 +1,31 @@ +{ pkgs, ... }@all: with all; { + services.postgresql = { + enable = false; + ensureUsers = [{ + name = "nxcaldav"; + ensureDBOwnership = true; + }]; + package = pkgs.postgresql_16; # https://stackoverflow.com/questions/51688193/how-to-upgrade-postgresql-in-nixos + + dataDir = "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}"; # default + enableJIT = false; # default + initdbArgs = []; # default + checkConfig = true; # default + enableTCPIP = false; + # # extraPlugins = + initialScript = null; # default + authentication = lib.mkForce '' + # TYPE DATABASE USER ADDRESS METHOD + local all all trust + host all all 127.0.0.1/32 trust #scram-sha-256 + host all all ::1/128 trust #scram-sha-256 + ''; + settings = { + port = 5432; # default + listen_addresses = lib.mkForce "127.0.0.1"; + log_line_prefix = "[%p] "; # default + shared_preload_libraries = [ ]; # default + }; + ensureDatabases = [ "nxcaldav" ]; + }; +}