diff --git a/home/cli.nix b/home/cli.nix index 44777d0..4da6676 100644 --- a/home/cli.nix +++ b/home/cli.nix @@ -7,8 +7,6 @@ let fullName = "Alexander Kobjolke"; mail = "me@failco.de"; }; - - myEza = if builtins.hasAttr "eza" pkgs then "eza" else "exa"; in { imports = [ # shell config @@ -128,7 +126,7 @@ in { }; # better ls with icons and stuff, maybe also try lsd - ${myEza} = { + eza = { enable = true; icons = true; enableAliases = true; diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix index abdb103..391c744 100644 --- a/hosts/thrall/default.nix +++ b/hosts/thrall/default.nix @@ -9,7 +9,6 @@ let in { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ../../modules/upgrade-pg-cluster.nix ]; nix.package = pkgs.nixUnstable; @@ -99,11 +98,6 @@ in { publicKey = "NG9y+0RMDTjiG65yC4Z0ymJ0G5fe1mOhl4GyC3xAh1k="; allowedIPs = [ "10.0.0.3/32" ]; } - { - # homematic - publicKey = "slqWgVksOCav0bASxupaFGqfr6vajxDRNIlZYocONQ4="; - allowedIPs = [ "10.0.0.4/32" ]; - } ]; }; }; @@ -209,11 +203,6 @@ in { extraConfig = '' add_header X-Frame-Options 'SAMEORIGIN'; ''; - - locations."/photo-groove" = { - proxyPass = "http://127.0.0.1:8000/"; - proxyWebsockets = true; - }; }; "www.jakalx.net" = { @@ -389,7 +378,6 @@ in { virusScanning = true; }; - services.postgresql = { package = pkgs.postgresql_15; }; services.roundcube = { enable = true; hostName = "mail.failco.de"; diff --git a/modules/upgrade-pg-cluster.nix b/modules/upgrade-pg-cluster.nix deleted file mode 100644 index 89feedb..0000000 --- a/modules/upgrade-pg-cluster.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ config, pkgs, ... }: -{ - environment.systemPackages = [ - (let - # XXX specify the postgresql package you'd like to upgrade to. - # Do not forget to list the extensions you need. - newPostgres = pkgs.postgresql_15.withPackages (pp: [ - # pp.plv8 - ]); - in pkgs.writeScriptBin "upgrade-pg-cluster" '' - set -eux - # XXX it's perhaps advisable to stop all services that depend on postgresql - systemctl stop postgresql - - export NEWDATA="/var/lib/postgresql/${newPostgres.psqlSchema}" - - export NEWBIN="${newPostgres}/bin" - - export OLDDATA="${config.services.postgresql.dataDir}" - export OLDBIN="${config.services.postgresql.package}/bin" - - install -d -m 0700 -o postgres -g postgres "$NEWDATA" - cd "$NEWDATA" - sudo -u postgres $NEWBIN/initdb -D "$NEWDATA" - - sudo -u postgres $NEWBIN/pg_upgrade \ - --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \ - --old-bindir $OLDBIN --new-bindir $NEWBIN \ - "$@" - '') - ]; -}