From 6840fd8748b570faabfe054835c5d3edb56f471d Mon Sep 17 00:00:00 2001 From: stuebinm Date: Fri, 24 Mar 2023 03:20:04 +0100 Subject: update inputs also remove some old stuff. also deduplicate the erlangs on my akkoma. also remove chromium, since for some reason hydra hasn't built it yet and I'm not fancying compiling it myself. also remove the whole sshd mosh stuff for the chat, since that broke tmux-on-login. --- chaski/services/chat.nix | 10 +--------- flake.lock | 34 +++++++++++++++++----------------- flora/configuration.nix | 2 +- flora/services/akkoma.nix | 9 +++++++++ flora/services/blog.nix | 2 +- home/packages.nix | 4 ++-- home/unstable.nix | 6 ------ ilex/configuration.nix | 2 +- 8 files changed, 32 insertions(+), 37 deletions(-) diff --git a/chaski/services/chat.nix b/chaski/services/chat.nix index 0771e19..df3f4bb 100644 --- a/chaski/services/chat.nix +++ b/chaski/services/chat.nix @@ -25,15 +25,7 @@ services.openssh = { extraConfig = '' Match user chat - ForceCommand ${pkgs.writeScript "logon-weechat" '' - #!${pkgs.fish}/bin/fish - if test -n "$SSH_ORIGINAL_COMMAND" - # allow mosh to start its server - exec fish -c "$SSH_ORIGINAL_COMMAND" - else - tmux attach || tmux -c weechat - end - ''} + ForceCommand tmux attach || tmux ''; }; users.users.chat.openssh.authorizedKeys.keys = [ diff --git a/flake.lock b/flake.lock index 220d149..9c91a7f 100644 --- a/flake.lock +++ b/flake.lock @@ -93,7 +93,7 @@ "feeds": { "flake": false, "locked": { - "lastModified": 1678308254, + "lastModified": 1678322038, "narHash": "sha256-r3ynxLo+nqpxq+ZNmVcMwIhfVCldNxEgVkLm66uw79U=", "path": "/home/stuebinm/org/nonpublic.nix", "type": "path" @@ -190,11 +190,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1676257154, - "narHash": "sha256-eW3jymNLpdxS5fkp9NWKyNtgL0Gqtgg1vCTofKXDF1g=", + "lastModified": 1679067101, + "narHash": "sha256-tMI1inGT9u4KWQml0w30dhWqQPlth1e9K/68sfDkEQA=", "owner": "nix-community", "repo": "home-manager", - "rev": "2cb27c79117a2a75ff3416c3199a2dc57af6a527", + "rev": "9154cd519a8942728038819682d6b3ff33f321bb", "type": "github" }, "original": { @@ -253,11 +253,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1676790509, - "narHash": "sha256-W9uWAWokgS8US8rJf79qBLS2M+ZgIscfoz+KsNE7VGQ=", + "lastModified": 1679553901, + "narHash": "sha256-OhmJc18XNIj0wVC4ZoPnCVoY3SGfcPxaeKJOz1WHo5M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1291d0d020a200c7ce3c48e96090bfa4890a475", + "rev": "09ad6a72359f6aff0f96ce8e4d1ec2d1271ad15d", "type": "github" }, "original": { @@ -269,11 +269,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1676895851, - "narHash": "sha256-xdhBKw2el790G+88tZYpRWlP9VjQC9OLR5Jx84VPe08=", + "lastModified": 1679606640, + "narHash": "sha256-4HYpAJWJXchvre4QtC+1jgHuH3V53xd6IR441sTRLmY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e19f25b587f15871d26442cfa1abe4418a815d7d", + "rev": "d8a57493bd45a6be6c80d79bb6b0b194005176e7", "type": "github" }, "original": { @@ -344,11 +344,11 @@ ] }, "locked": { - "lastModified": 1679451618, - "narHash": "sha256-gWFYRgmeT+8xDYHK4HSuCY9Pi7mSxC+2illHrmDkG7A=", + "lastModified": 1679537973, + "narHash": "sha256-R6borgcKeyMIjjPeeYsfo+mT8UdS+OwwbhhStdCfEjg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a89d328ca7d106c3fdbbd072b6c7088ab5b798a3", + "rev": "fbc7ae3f14d32e78c0e8d7865f865cc28a46b232", "type": "github" }, "original": { @@ -400,11 +400,11 @@ "tracktrain": { "flake": false, "locked": { - "lastModified": 1677192006, - "narHash": "sha256-yKT01corVrYGKerZxkRcVLWDzUj2QVNCF5cGmccje3A=", + "lastModified": 1678972003, + "narHash": "sha256-LcygaLOmX4YPn2mh312Jw3ZpFu7T/4w2+SyqgSl5Qlw=", "ref": "main", - "rev": "99463395ee9497256b794f4ad2c94b490ca5d0fd", - "revCount": 83, + "rev": "bd81153b3be98e6c8d514b2bfdd731637d821414", + "revCount": 86, "type": "git", "url": "https://stuebinm.eu/git/tracktrain" }, diff --git a/flora/configuration.nix b/flora/configuration.nix index c04f240..3eaaa08 100644 --- a/flora/configuration.nix +++ b/flora/configuration.nix @@ -9,7 +9,7 @@ #./services/picarones.nix ./services/dockerhub.nix ./services/blog.nix - ./services/znc.nix + # ./services/znc.nix ./services/mail.nix ./services/trainspotter.nix ]; diff --git a/flora/services/akkoma.nix b/flora/services/akkoma.nix index efc693e..98cfb7b 100644 --- a/flora/services/akkoma.nix +++ b/flora/services/akkoma.nix @@ -6,6 +6,7 @@ let inherit system; overlays = [ (self: super: rec { beamPackages = super.beam.packagesWith super.erlang_nox; + elixir = beamPackages.elixir_1_13; }) ]; }; staticDir = "/var/lib/akkoma/static"; @@ -31,6 +32,14 @@ in ("${inputs.nixpkgs-unstable}/nixos/modules/services/web-apps/akkoma.nix") ]; + # the pleroma_ctl wrapper uses pkgs.elixir, which without this is not the same + # as akkoma's elixir + nixpkgs.overlays = [ + (self: super: { + elixir = unstable.beamPackages.elixir_1_13; + }) + ]; + system.stateVersion = "22.11"; services.akkoma = { diff --git a/flora/services/blog.nix b/flora/services/blog.nix index e78152f..e8335b1 100644 --- a/flora/services/blog.nix +++ b/flora/services/blog.nix @@ -4,7 +4,7 @@ let lux = pkgs.stdenv.mkDerivation { name = "gtfs-mdbooks"; src = pkgs.fetchgit { - url = "https://stuebinm.eu/git/lux"; + url = "https://stuebinm.eu/git/forks/lux"; rev = "refs/heads/master"; sha256 = "sha256-L2y5SEGOaoWl+jQGP3TmpQQLojjkRAjiRjbwhGKOg14="; }; diff --git a/home/packages.nix b/home/packages.nix index 78c6b4c..ccbc3d4 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -10,8 +10,8 @@ in emacs-all-the-icons-fonts nerdfonts # internet apps & clients - firefox keepassxc chromium mumble lynx - openconnect matterhorn tdesktop monolith gomuks + firefox keepassxc mumble lynx thunderbird + openconnect matterhorn tdesktop monolith # graphics & audio audacity blender darktable kdenlive moc ffmpeg-full gimp-with-plugins inkscape krita meshlab pavucontrol moc diff --git a/home/unstable.nix b/home/unstable.nix index fc22c80..cf34be8 100644 --- a/home/unstable.nix +++ b/home/unstable.nix @@ -5,12 +5,6 @@ with import inputs.nixpkgs-unstable {inherit system; }; home.packages = [ dino nyxt - zulip-term - carp - foliate - elixir_1_12 - elixir_ls - thunderbird (stdenv.mkDerivation { name = "signal-wayland"; src = signal-desktop; diff --git a/ilex/configuration.nix b/ilex/configuration.nix index ec1f856..462cc3f 100644 --- a/ilex/configuration.nix +++ b/ilex/configuration.nix @@ -12,7 +12,7 @@ networking.firewall.allowedTCPPorts = [ 5000 ]; - boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_1; + boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_2; hardware.opengl.driSupport32Bit = true; # Use the systemd-boot EFI boot loader. -- cgit v1.2.3