From 6336a40ff449f0b1737cc67b93f86f6221c46119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 30 Nov 2023 21:22:10 +0000 Subject: [PATCH] upgrade to 23.11 --- flake.lock | 70 +++++++------- flake.nix | 4 +- nixos/boxes/vpsfree1/mastodon.nix | 11 +-- nixos/common-hardware.nix | 2 +- nixos/common.nix | 2 +- nixos/gui/vscode/home.nix | 12 --- nixos/libvirt.nix | 2 +- nixos/syncthing.nix | 154 +++++++++++++++--------------- nixos/vim/home.nix | 4 +- 9 files changed, 120 insertions(+), 141 deletions(-) diff --git a/flake.lock b/flake.lock index b02b2eb4..8de9fcef 100644 --- a/flake.lock +++ b/flake.lock @@ -81,11 +81,11 @@ ] }, "locked": { - "lastModified": 1699781810, - "narHash": "sha256-LD+PIUbm1yQmQmGIbSsc/PB1dtJtGqXFgxRc1C7LlfQ=", + "lastModified": 1700927249, + "narHash": "sha256-iqmIWiEng890/ru7ZBf4nUezFPyRm2fjRTvuwwxqk2o=", "owner": "nix-community", "repo": "disko", - "rev": "2d7d77878c5d70f66f3d676ff66708d8d4f9d7df", + "rev": "3cb78c93e6a02f494aaf6aeb37481c27a2e2ee22", "type": "github" }, "original": { @@ -227,11 +227,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1700918851, - "narHash": "sha256-EN6pwfcLtOb8yFtPBqsdqKDkbbvZGT8NL8B0xcaufUo=", + "lastModified": 1701223272, + "narHash": "sha256-LK+xBFZgi1tbhVErtHFHBmF71x84amnxNmmL/cTKjo4=", "owner": "helix-editor", "repo": "helix", - "rev": "8c68074fa6d2e3771bbc1a7f80bc9b422a787da4", + "rev": "0c81ef73e17a3d45cd6240fd5933ad99b3a60d01", "type": "github" }, "original": { @@ -248,16 +248,16 @@ ] }, "locked": { - "lastModified": 1700392168, - "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=", + "lastModified": 1700814205, + "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=", "owner": "nix-community", "repo": "home-manager", - "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e", + "rev": "aeb2232d7a32530d3448318790534d196bf9427a", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -273,11 +273,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1699423608, - "narHash": "sha256-WEVUgivm5DCziwZqiXRPeoD3FQTXW38ExKrZjvMveqE=", + "lastModified": 1701225372, + "narHash": "sha256-QSiFeEmTzAIIiCtUaMesu7wi7bvfHuFzPMQpOKMt4Lo=", "owner": "oxalica", "repo": "nil", - "rev": "5607d429016d6f9a72843b07127fad23ea9d661f", + "rev": "0031eb4343fd4672742fd6ff839da9b4f5120646", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1700559156, - "narHash": "sha256-gL4epO/qf+wo30JjC3g+b5Bs8UrpxzkhNBBsUYxpw2g=", + "lastModified": 1701250978, + "narHash": "sha256-ohu3cz4edjpGxs2qUTgbs0WrnewOX4crnUJNEB6Jox4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c3abafb01cd7045dba522af29b625bd1e170c2fb", + "rev": "8772491ed75f150f02552c60694e1beff9f46013", "type": "github" }, "original": { @@ -305,11 +305,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1700923089, - "narHash": "sha256-KX7khf7wnO7gvNuljZZPhiLSOgDoVD5Nr0CZIDrIZL8=", + "lastModified": 1701368325, + "narHash": "sha256-3OqZyi2EdopJxpxwrySPyCTuCvfBY4oXTLVgQ4B6qDg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6f4084a53c808662fbbcdbe9c7bc78e7a07d8e8f", + "rev": "3934dbde4f4a0e266825348bc4ad1bdd00a8d6a3", "type": "github" }, "original": { @@ -321,11 +321,11 @@ }, "nixpkgs-nixos-unstable": { "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "lastModified": 1701068326, + "narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", + "rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c", "type": "github" }, "original": { @@ -337,11 +337,11 @@ }, "nixpkgs-rust-analyzer": { "locked": { - "lastModified": 1700923089, - "narHash": "sha256-KX7khf7wnO7gvNuljZZPhiLSOgDoVD5Nr0CZIDrIZL8=", + "lastModified": 1701368325, + "narHash": "sha256-3OqZyi2EdopJxpxwrySPyCTuCvfBY4oXTLVgQ4B6qDg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6f4084a53c808662fbbcdbe9c7bc78e7a07d8e8f", + "rev": "3934dbde4f4a0e266825348bc4ad1bdd00a8d6a3", "type": "github" }, "original": { @@ -353,27 +353,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1700851152, - "narHash": "sha256-3PWITNJZyA3jz5IGREJRfSykM6xSLmD8u5A3WpBCyDM=", + "lastModified": 1701263465, + "narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1216a5ba22a93a4a3a3bfdb4bff0f4727c576fcc", + "rev": "50aa30a13c4ab5e7ba282da460a3e3d44e9d0eb3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1700919861, - "narHash": "sha256-F/jUXU3AkwrFiI3nGhw0kFTdwmsG4hUEGgEOAnZSukI=", + "lastModified": 1701366548, + "narHash": "sha256-+cItrtt7Tfd9SM9aQ3lCZWahfxVzWpH5bVgRyz5QDnw=", "owner": "nix-community", "repo": "NUR", - "rev": "2f972e33b2323c947f9cbf6538b552d5d9205dc7", + "rev": "d16468a8fc6ea13c030349f293e5958adc0e4a54", "type": "github" }, "original": { @@ -481,11 +481,11 @@ ] }, "locked": { - "lastModified": 1700362823, - "narHash": "sha256-/H7XgvrYM0IbkpWkcdfkOH0XyBM5ewSWT1UtaLvOgKY=", + "lastModified": 1701127353, + "narHash": "sha256-qVNX0wOl0b7+I35aRu78xUphOyELh+mtUp1KBx89K1Q=", "owner": "Mic92", "repo": "sops-nix", - "rev": "49a87c6c827ccd21c225531e30745a9a6464775c", + "rev": "b1edbf5c0464b4cced90a3ba6f999e671f0af631", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 57507f00..7a867bbb 100644 --- a/flake.nix +++ b/flake.nix @@ -233,7 +233,7 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-23.05"; + ref = "nixos-23.11"; }; nixpkgs-rust-analyzer = { @@ -273,7 +273,7 @@ type = "github"; owner = "nix-community"; repo = "home-manager"; - ref = "release-23.05"; + ref = "release-23.11"; inputs.nixpkgs.follows = "nixpkgs-stable"; }; diff --git a/nixos/boxes/vpsfree1/mastodon.nix b/nixos/boxes/vpsfree1/mastodon.nix index 598379d9..b2a6d87b 100644 --- a/nixos/boxes/vpsfree1/mastodon.nix +++ b/nixos/boxes/vpsfree1/mastodon.nix @@ -8,7 +8,6 @@ newestPackages = inputs.nixpkgs-master.legacyPackages.${pkgs.system}; package = newestPackages.mastodon; domain = "peninsula.industries"; - streamingPort = 55000; webPort = 55001; postgresPort = 5432; path = "/var/lib/mastodon/"; @@ -55,10 +54,6 @@ in { proxyPass = "http://127.0.0.1:" + toString webPort; proxyWebsockets = true; }; - locations."/api/v1/streaming/" = { - proxyPass = "http://127.0.0.1:" + toString streamingPort; - proxyWebsockets = true; - }; }; }; }; @@ -96,10 +91,6 @@ in { containers.mastodon = { autoStart = true; forwardPorts = [ - { - containerPort = streamingPort; - hostPort = streamingPort; - } { containerPort = webPort; hostPort = webPort; @@ -153,6 +144,7 @@ in { user = systemUserName; group = systemGroupName; mediaAutoRemove.enable = false; + streamingProcesses = 2; smtp = { host = "smtp.eu.mailgun.org"; port = 465; @@ -171,7 +163,6 @@ in { AUTHORIZED_FETCH = "true"; DISALLOW_UNAUTHENTICATED_API_ACCESS = "true"; }; - inherit streamingPort; inherit webPort; configureNginx = false; enableUnixSocket = false; diff --git a/nixos/common-hardware.nix b/nixos/common-hardware.nix index 6089b4b0..cf932877 100644 --- a/nixos/common-hardware.nix +++ b/nixos/common-hardware.nix @@ -43,7 +43,7 @@ hardware.bluetooth = { enable = true; - package = pkgs.bluezFull; + package = pkgs.bluez; settings = {General = {Enable = "Source,Sink,Media,Socket";};}; }; diff --git a/nixos/common.nix b/nixos/common.nix index a65bc614..71fccce3 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -89,7 +89,7 @@ in { defaultFonts.monospace = ["BerkeleyMono Nerd Font"]; }; - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ inconsolata (fetchzip { url = "file://" + ./fonts/berkeley.tar.xz; diff --git a/nixos/gui/vscode/home.nix b/nixos/gui/vscode/home.nix index 1ca51735..55165f65 100644 --- a/nixos/gui/vscode/home.nix +++ b/nixos/gui/vscode/home.nix @@ -72,18 +72,6 @@ version = "0.6.0"; sha256 = "sha256-yk7buEyQIw6aiUizAm+sgalWxUibIuP9crhyBaOjC2E="; } - { - publisher = "ms-vscode"; - name = "cpptools"; - version = "1.18.1"; - sha256 = "sha256-TRIEdlJI1QQMV6I9CFBjlw9ZfKvUJrmE2YoO/InX39E="; - } - { - publisher = "ms-vscode"; - name = "cpptools-extension-pack"; - version = "1.3.0"; - sha256 = "sha256-rHST7CYCVins3fqXC+FYiS5Xgcjmi7QW7M4yFrUR04U="; - } { publisher = "tiehuis"; name = "zig"; diff --git a/nixos/libvirt.nix b/nixos/libvirt.nix index 35b873c3..ea85001c 100644 --- a/nixos/libvirt.nix +++ b/nixos/libvirt.nix @@ -10,7 +10,7 @@ users.extraUsers.cyryl.extraGroups = ["kvm"]; environment.systemPackages = with pkgs; [ - virtmanager + virt-manager qemu swtpm virt-viewer diff --git a/nixos/syncthing.nix b/nixos/syncthing.nix index 3b43e9d6..8707abf1 100644 --- a/nixos/syncthing.nix +++ b/nixos/syncthing.nix @@ -15,85 +15,85 @@ in { package = inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".syncthing; overrideDevices = false; - devices = { - "OnePlus9" = { - id = "2UVDAHX-IWQEBLF-6VOYLWO-MYQBMO2-62QPM76-CFYPPZW-CWVIBZF-JEUS4QZ"; + settings = { + devices = { + "OnePlus9" = { + id = "2UVDAHX-IWQEBLF-6VOYLWO-MYQBMO2-62QPM76-CFYPPZW-CWVIBZF-JEUS4QZ"; + }; + "skinnyv" = { + id = "SUNR6EL-UBSLEE6-CZOSGIL-D527FQG-BXL2PMA-ISEQHMV-2CXKKPD-U7GERQB"; + }; + "foryog" = { + id = "Q4AA3LA-QIMMBNK-QWKW2AL-5SRGBU3-RYWD5EH-GKMVXRT-XVYFU3R-UYAAMAH"; + }; + "hagath" = { + id = "SXQA3TX-3G5T4CQ-3SX42KJ-UEBZWF7-RL66ORF-DVV6ROT-PYTE6QV-EARKMQU"; + }; + "thinky" = { + id = "G6SYM4M-32SHELZ-E4IDW3L-3MAOZ54-N7FB5BD-ZNUFXYW-2JVV6GB-LQHNRAF"; + }; + "mama" = { + id = "AKHXOY5-P6JA42Z-JIPAU7O-NQ7XDYZ-QAFGYD2-MMKCCJA-S7A77HJ-TRAGAA4"; + }; + "janusz" = { + id = "66JO6BS-R2WBYDP-J2TW3LZ-MSMCE6O-EDIC7OK-YUVE4TF-BOSA34Y-AWE56AN"; + }; + "danuta" = { + id = "X4V4GXR-VE6U5IZ-XTWETRL-U42DEMS-5ANDTT7-N5OUSYT-NOPYZGW-MSPLEQR"; + }; }; - "skinnyv" = { - id = "SUNR6EL-UBSLEE6-CZOSGIL-D527FQG-BXL2PMA-ISEQHMV-2CXKKPD-U7GERQB"; + folders = { + "/home/cyryl/vaults" = { + id = "vaults"; + label = "vaults"; + devices = workstations_plus_phone ++ ["hagath"]; + }; + "/home/cyryl/Documents" = { + id = "documents"; + label = "documents"; + devices = workstations_plus_phone ++ ["hagath"]; + }; + "/home/cyryl/camera" = { + id = "camera"; + label = "camera"; + devices = workstations_plus_phone; + }; + "/home/cyryl/ISOs" = { + id = "isos"; + label = "ISOs"; + devices = workstations; + }; + "/home/cyryl/rpg" = { + id = "rpg"; + label = "rpg"; + devices = workstations; + }; + "/home/cyryl/Music" = { + id = "music"; + label = "music"; + devices = workstations; + }; + "/home/cyryl/Photos" = { + id = "photos"; + label = "photos"; + devices = workstations ++ ["hagath"]; + }; + "/home/cyryl/gopro" = { + id = "gopro"; + label = "gopro"; + devices = workstations; + }; + "/home/cyryl/Videos" = { + id = "videos"; + label = "videos"; + devices = workstations ++ ["hagath"]; + }; + "/home/cyryl/rodzice_sync" = { + id = "rodzice"; + label = "rodzice"; + devices = workstations ++ ["hagath" "mama" "janusz" "danuta"]; + }; }; - "foryog" = { - id = "Q4AA3LA-QIMMBNK-QWKW2AL-5SRGBU3-RYWD5EH-GKMVXRT-XVYFU3R-UYAAMAH"; - }; - "hagath" = { - id = "SXQA3TX-3G5T4CQ-3SX42KJ-UEBZWF7-RL66ORF-DVV6ROT-PYTE6QV-EARKMQU"; - }; - "thinky" = { - id = "G6SYM4M-32SHELZ-E4IDW3L-3MAOZ54-N7FB5BD-ZNUFXYW-2JVV6GB-LQHNRAF"; - }; - "mama" = { - id = "AKHXOY5-P6JA42Z-JIPAU7O-NQ7XDYZ-QAFGYD2-MMKCCJA-S7A77HJ-TRAGAA4"; - }; - "janusz" = { - id = "66JO6BS-R2WBYDP-J2TW3LZ-MSMCE6O-EDIC7OK-YUVE4TF-BOSA34Y-AWE56AN"; - }; - "danuta" = { - id = "X4V4GXR-VE6U5IZ-XTWETRL-U42DEMS-5ANDTT7-N5OUSYT-NOPYZGW-MSPLEQR"; - }; - }; - folders = { - "/home/cyryl/vaults" = { - id = "vaults"; - label = "vaults"; - devices = workstations_plus_phone ++ ["hagath"]; - }; - "/home/cyryl/Documents" = { - id = "documents"; - label = "documents"; - devices = workstations_plus_phone ++ ["hagath"]; - }; - "/home/cyryl/camera" = { - id = "camera"; - label = "camera"; - devices = workstations_plus_phone; - }; - "/home/cyryl/ISOs" = { - id = "isos"; - label = "ISOs"; - devices = workstations; - }; - "/home/cyryl/rpg" = { - id = "rpg"; - label = "rpg"; - devices = workstations; - }; - "/home/cyryl/Music" = { - id = "music"; - label = "music"; - devices = workstations; - }; - "/home/cyryl/Photos" = { - id = "photos"; - label = "photos"; - devices = workstations ++ ["hagath"]; - }; - "/home/cyryl/gopro" = { - id = "gopro"; - label = "gopro"; - devices = workstations; - }; - "/home/cyryl/Videos" = { - id = "videos"; - label = "videos"; - devices = workstations ++ ["hagath"]; - }; - "/home/cyryl/rodzice_sync" = { - id = "rodzice"; - label = "rodzice"; - devices = workstations ++ ["hagath" "mama" "janusz" "danuta"]; - }; - }; - extraOptions = { options = { listenAddresses = [ "tcp://${config.networking.hostName}.raptor-carp.ts.net:22000" diff --git a/nixos/vim/home.nix b/nixos/vim/home.nix index 629ffc06..c6ce06ab 100644 --- a/nixos/vim/home.nix +++ b/nixos/vim/home.nix @@ -56,7 +56,7 @@ in { plugins = with pkgs; with pkgs.vimPlugins; [ - (vimUtils.buildVimPluginFrom2Nix rec { + (vimUtils.buildVimPlugin rec { pname = "vim-tada"; version = "2022-04-22"; src = fetchFromGitHub { @@ -66,7 +66,7 @@ in { sha256 = "sha256-9kvLbzrVjtBTjbXmhJ7JTggXgFvGVF7sc2YiVW9fUGY="; }; }) - (vimUtils.buildVimPluginFrom2Nix rec { + (vimUtils.buildVimPlugin rec { pname = "srht.vim"; version = "2022-01-04"; src = fetchFromSourcehut {