From f9326b19ab22dcc2f97697c2075b3cd02b782176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Tue, 6 Jun 2023 19:59:27 +0200 Subject: [PATCH] feat: upgrade to 23.05 --- configs/default.nix | 2 +- configs/packages.nix | 6 ++--- configs/sshd.nix | 6 +++-- configs/telegram-bots/default.nix | 6 ++--- flake.lock | 19 +++++++-------- flake.nix | 5 ++-- lib/i3status-rust.nix | 28 ++++++++++------------ systems/ful/configuration.nix | 2 +- systems/makanek/gitea.nix | 2 +- systems/makanek/hardware-configuration.nix | 1 - systems/makanek/nextcloud.nix | 2 +- systems/zaatar/configuration.nix | 2 +- systems/zaatar/moodle-dl-meinhark.nix | 2 +- 13 files changed, 38 insertions(+), 45 deletions(-) diff --git a/configs/default.nix b/configs/default.nix index 86dd3ff..bf64840 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -31,7 +31,7 @@ in { }; } { - boot.cleanTmpDir = true; + boot.tmp.cleanOnBoot = true; boot.loader.timeout = 1; } { diff --git a/configs/packages.nix b/configs/packages.nix index 48db64c..0f1740e 100644 --- a/configs/packages.nix +++ b/configs/packages.nix @@ -124,7 +124,7 @@ in { electrum inkscape astrolog - unstablePackages.obsidian + obsidian anki-bin # flashcards jbofihe # lojbanic software zoom-us # video conferencing @@ -261,9 +261,9 @@ in { libreoffice # gnumeric dia - unstablePackages.pandoc + pandoc niveumPackages.man-pandoc - unstablePackages.typst + typst # proselint asciidoctor wordnet diff --git a/configs/sshd.nix b/configs/sshd.nix index 8bc71bb..e0ce554 100644 --- a/configs/sshd.nix +++ b/configs/sshd.nix @@ -11,8 +11,10 @@ in { services.openssh = { enable = true; ports = [sshPort]; - passwordAuthentication = false; - forwardX11 = true; + settings = { + PasswordAuthentication = false; + X11Forwarding = true; + }; }; users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys pkgs; diff --git a/configs/telegram-bots/default.nix b/configs/telegram-bots/default.nix index 3521eb4..e0a5431 100644 --- a/configs/telegram-bots/default.nix +++ b/configs/telegram-bots/default.nix @@ -57,7 +57,7 @@ in { wantedBy = ["multi-user.target"]; description = "Telegram reverse bot"; path = [pkgs.ffmpeg]; - enable = true; + enable = false; script = '' TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${telebots}/bin/telegram-reverse ''; @@ -69,7 +69,7 @@ in { systemd.services.telegram-betacode = { wantedBy = ["multi-user.target"]; description = "Telegram beta code bot"; - enable = true; + enable = false; script = '' TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${telebots}/bin/telegram-betacode ''; @@ -80,7 +80,7 @@ in { systemd.services.telegram-proverb = { wantedBy = ["multi-user.target"]; description = "Telegram proverb bot"; - enable = true; + enable = false; script = '' TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${telebots}/bin/telegram-proverb ''; diff --git a/flake.lock b/flake.lock index 34a2961..8a3839d 100644 --- a/flake.lock +++ b/flake.lock @@ -84,22 +84,19 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": [ - "flake-utils" ] }, "locked": { - "lastModified": 1681092193, - "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", + "lastModified": 1685599623, + "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", + "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.11", + "ref": "release-23.05", "repo": "home-manager", "type": "github" } @@ -178,16 +175,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1684398685, - "narHash": "sha256-TRE62m91iZ5ArVMgA+uj22Yda8JoQuuhc9uwZ+NoX+0=", + "lastModified": 1685865905, + "narHash": "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "628d4bb6e9f4f0c30cfd9b23d3c1cdcec9d3cb5c", + "rev": "e7603eba51f2c7820c0a182c6bbb351181caa8e7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 19119a3..ba86d8a 100644 --- a/flake.nix +++ b/flake.nix @@ -4,11 +4,11 @@ inputs = { agenix.url = "github:ryantm/agenix"; flake-utils.url = "github:numtide/flake-utils"; - home-manager.url = "github:nix-community/home-manager/release-22.11"; + home-manager.url = "github:nix-community/home-manager/release-23.05"; menstruation-backend.url = "github:kmein/menstruation.rs"; menstruation-telegram.url = "github:kmein/menstruation-telegram"; nixinate.url = "github:matthewcroughan/nixinate"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/master"; nur.url = "github:nix-community/NUR"; @@ -24,7 +24,6 @@ agenix.inputs.nixpkgs.follows = "nixpkgs"; agenix.inputs.home-manager.follows = "home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.inputs.utils.follows = "flake-utils"; menstruation-backend.inputs.flake-utils.follows = "flake-utils"; menstruation-backend.inputs.nixpkgs.follows = "nixpkgs"; menstruation-backend.inputs.rust-overlay.follows = "rust-overlay"; diff --git a/lib/i3status-rust.nix b/lib/i3status-rust.nix index 07fecbc..533d47e 100644 --- a/lib/i3status-rust.nix +++ b/lib/i3status-rust.nix @@ -13,7 +13,7 @@ ''; in { theme = { - name = "plain"; + theme = "plain"; overrides = { critical_fg = colours.red.bright; good_fg = colours.green.bright; @@ -30,15 +30,14 @@ in { separator_fg = colours.black.bright; }; }; - icons.name = "awesome6"; - icons.overrides.rss = ""; + icons.icons = "awesome6"; icons.overrides.vpn = ""; icons.overrides.irc = ""; block = [ { block = "weather"; autolocate = true; - format = "{location}: {temp}C"; + format = "$icon $location: $temp"; service = { name = "openweathermap"; city_id = "2950159"; @@ -73,12 +72,6 @@ in { info = ["total"]; warning = ["mention" "review_requested" "team_mention" "manual" "invitation" "assign" "subscribed"]; } - { - block = "custom"; - interval = 10; - command = "newsboat-unread-count"; - json = true; - } { block = "custom"; interval = 10; @@ -153,6 +146,12 @@ in { json = true; hide_when_empty = true; } + { + block = "service_status"; + service = "hu-vpn"; + active_format = "^icon_vpn"; + inactive_format = ""; + } { block = "custom"; interval = 5; @@ -168,7 +167,7 @@ in { { block = "net"; device = wirelessInterface; - format = "{ssid} {signal_strength}"; + format = "$icon $ssid $signal_strength"; } { block = "battery"; @@ -176,17 +175,14 @@ in { } { block = "sound"; - on_click = "pavucontrol"; } { block = "disk_space"; - format = "{icon} {available}"; + format = "$icon $available"; } { block = "memory"; - display_type = "memory"; - format_mem = "{mem_used;G}"; - clickable = false; + format = "$icon $mem_used.eng(prefix:G)"; } {block = "load";} { diff --git a/systems/ful/configuration.nix b/systems/ful/configuration.nix index 7cf9e17..297563e 100644 --- a/systems/ful/configuration.nix +++ b/systems/ful/configuration.nix @@ -93,5 +93,5 @@ in { environment.systemPackages = [pkgs.vim pkgs.git pkgs.tmux pkgs.python3]; # since 22.05 timeout fails? - systemd.services.systemd-networkd-wait-online.enable = false; + # systemd.services.systemd-networkd-wait-online.enable = false; } diff --git a/systems/makanek/gitea.nix b/systems/makanek/gitea.nix index f08fac1..1b45cb8 100644 --- a/systems/makanek/gitea.nix +++ b/systems/makanek/gitea.nix @@ -4,9 +4,9 @@ let in { services.gitea = { enable = true; - rootUrl = domain; appName = "code.kmein.de"; settings = { + server.ROOT_URL = domain; server.SSH_PORT = sshPort; service.DISABLE_REGISTRATION = true; }; diff --git a/systems/makanek/hardware-configuration.nix b/systems/makanek/hardware-configuration.nix index 85068ad..ad132fc 100644 --- a/systems/makanek/hardware-configuration.nix +++ b/systems/makanek/hardware-configuration.nix @@ -16,7 +16,6 @@ extraModulePackages = []; loader.grub = { enable = true; - version = 2; devices = ["/dev/sda"]; configurationLimit = 3; }; diff --git a/systems/makanek/nextcloud.nix b/systems/makanek/nextcloud.nix index 6874ebb..b581419 100644 --- a/systems/makanek/nextcloud.nix +++ b/systems/makanek/nextcloud.nix @@ -23,7 +23,7 @@ in { services.nextcloud = { enable = true; - package = pkgs.nextcloud25; + package = pkgs.nextcloud26; https = true; enableBrokenCiphersForSSE = false; diff --git a/systems/zaatar/configuration.nix b/systems/zaatar/configuration.nix index 278fefe..b833f06 100644 --- a/systems/zaatar/configuration.nix +++ b/systems/zaatar/configuration.nix @@ -81,7 +81,7 @@ in { ]; # since 22.05 timeout fails? - systemd.services.systemd-networkd-wait-online.enable = false; + # systemd.services.systemd-networkd-wait-online.enable = false; networking = { hostName = "zaatar"; diff --git a/systems/zaatar/moodle-dl-meinhark.nix b/systems/zaatar/moodle-dl-meinhark.nix index 174b4d7..a3b3a17 100644 --- a/systems/zaatar/moodle-dl-meinhark.nix +++ b/systems/zaatar/moodle-dl-meinhark.nix @@ -7,7 +7,7 @@ moodle-dl-package = pkgs.moodle-dl.overrideAttrs (old: old // { - patches = [../../packages/moodle-dl/telegram-format.patch]; + # patches = [../../packages/moodle-dl/telegram-format.patch]; TODO? }); in { age.secrets = {