From b942c9b014fd9ee8ffe1ddb818daa1f6228f6ebb Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Fri, 2 Dec 2022 10:00:47 +1000 Subject: [PATCH 01/12] nixos: upgraded to 22.11 --- nix/sources.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index f79a0fc..f87703a 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -68,16 +68,16 @@ "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { - "branch": "nixos-22.05", + "branch": "nixos-22.11", "builtin": false, "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to", "homepage": "https://github.com/NixOS/nixpkgs", "owner": "NixOS", "repo": "nixpkgs", - "rev": "695b3515251873e0a7e2021add4bba643c56cde3", - "sha256": "0hhn6li42s8awkpnc375zlzh3zk8lfsvg50mb03iq88lywbaikjg", + "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", + "sha256": "1n524a44p2kprk65zx2v6793kmxjpz1qm1ilxk82vq0vg0c5jy32", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/695b3515251873e0a7e2021add4bba643c56cde3.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/596a8e828c5dfa504f91918d0fa4152db3ab5502.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgsUnstable": { From ea6a04641f6d136ce051aedbcb90e9e39c05724f Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Fri, 2 Dec 2022 10:04:25 +1000 Subject: [PATCH 02/12] nix: renamed nix.trustedUsers --- profiles/host_common.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/profiles/host_common.nix b/profiles/host_common.nix index 7e371d1..8b268e0 100644 --- a/profiles/host_common.nix +++ b/profiles/host_common.nix @@ -71,7 +71,7 @@ show-trace = true # Enable --show-trace by default for nix builders-use-substitutes = true # Set builders to use caches ''; - trustedUsers = ["craige"]; + settings.trusted-users = ["craige"]; }; networking = {enableIPv6 = true;}; @@ -89,9 +89,11 @@ bat # cat clone with syntax highlighting & Git integration dnsutils # Bind DNS utilities fd # A simple, fast and user-friendly alternative to find - (if config.services.xserver.enable - then gitAndTools.gitFull - else git) # Distributed version control system + ( + if config.services.xserver.enable + then gitAndTools.gitFull + else git + ) # Distributed version control system htop # interactive process viewer hwinfo # Hardware detection tool killall # kill processes by name From 0fe09a61d898249acc8e56d32d90210a712082e8 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Fri, 2 Dec 2022 10:13:54 +1000 Subject: [PATCH 03/12] nix: renamed nix.autoOptimiseStore --- profiles/host_common.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/profiles/host_common.nix b/profiles/host_common.nix index 8b268e0..250f50d 100644 --- a/profiles/host_common.nix +++ b/profiles/host_common.nix @@ -66,12 +66,14 @@ dates = "weekly"; options = "--delete-older-than 90d"; }; - autoOptimiseStore = true; extraOptions = '' show-trace = true # Enable --show-trace by default for nix builders-use-substitutes = true # Set builders to use caches ''; - settings.trusted-users = ["craige"]; + settings = { + trusted-users = ["craige"]; + auto-optimise-store = true; + }; }; networking = {enableIPv6 = true;}; From 5a4d36f7797843301356bdee7312086558d9a198 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Fri, 2 Dec 2022 10:17:28 +1000 Subject: [PATCH 04/12] nix: renamed nix.maxJobs --- hardware/purism_librem_15.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardware/purism_librem_15.nix b/hardware/purism_librem_15.nix index c76147e..2246766 100644 --- a/hardware/purism_librem_15.nix +++ b/hardware/purism_librem_15.nix @@ -37,5 +37,5 @@ swapDevices = [{device = "/dev/disk/by-uuid/ac308d76-cc12-4a73-83ee-64a2ad07b91e";}]; - nix.maxJobs = lib.mkDefault 4; + nix.settings.max-jobs = lib.mkDefault 4; } From 7325058aa891c5ec715691469d366f514f182383 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Fri, 2 Dec 2022 10:31:02 +1000 Subject: [PATCH 05/12] minecraft: replaced polymc with prismlauncher --- profiles/minecraftClient.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/minecraftClient.nix b/profiles/minecraftClient.nix index f159129..4cce05c 100644 --- a/profiles/minecraftClient.nix +++ b/profiles/minecraftClient.nix @@ -11,6 +11,6 @@ environment.systemPackages = with pkgs; [ jre # Required by Minecraft (via polymc) minecraft # Official launcher for Minecraft - polymc # A free, open source launcher for Minecraft + prismlauncher # A free, open source launcher for Minecraft ]; } From e7a17927333f630f293f3b1628f640130dae9952 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Fri, 2 Dec 2022 10:34:40 +1000 Subject: [PATCH 06/12] termonad: renamed package to termonad --- hosts/dionach.nix | 1 - profiles/desktopCraige.nix | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/dionach.nix b/hosts/dionach.nix index f3020ee..f8ceb00 100644 --- a/hosts/dionach.nix +++ b/hosts/dionach.nix @@ -129,7 +129,6 @@ tcpdump # tcpdump tectonic tdesktop # Telegram Desktop messaging app - termonad-with-packages texlive.combined.scheme-full tmate # Instant Terminal Sharing tpm-tools diff --git a/profiles/desktopCraige.nix b/profiles/desktopCraige.nix index 762a469..fcf183b 100644 --- a/profiles/desktopCraige.nix +++ b/profiles/desktopCraige.nix @@ -17,6 +17,7 @@ gopass # password file manager shared-mime-info # A database of common MIME types sweethome3d.application # design and visualise homes + termonad # Terminal emulator configurable in Haskell yt-dlp # Command-line tool to download videos whalebird # Mastodon, Pleroma and Misskey client ]; From d45ccf089fef0844fad005f3084491ea8db5bda7 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Fri, 2 Dec 2022 10:38:15 +1000 Subject: [PATCH 07/12] golang: removed deprecated vgo2nix --- hosts/dionach.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/dionach.nix b/hosts/dionach.nix index f8ceb00..9db424c 100644 --- a/hosts/dionach.nix +++ b/hosts/dionach.nix @@ -138,7 +138,6 @@ unrar unzip vcsh - vgo2nix # Required for packaging Golang applications wget wesnoth # Turn-based strategy game xorg.xev From 577d7589ec8d2ab41d1d9dc2e2a563e4b7af401c Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Fri, 9 Dec 2022 08:16:28 +1000 Subject: [PATCH 08/12] cryptpad: removed upstream in nixpkgs --- hosts/cuallaidh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/cuallaidh.nix b/hosts/cuallaidh.nix index 137ce2c..344dac6 100644 --- a/hosts/cuallaidh.nix +++ b/hosts/cuallaidh.nix @@ -9,7 +9,7 @@ ../modules/tmate-ssh-server.nix ../networks/linode.nix ../profiles/coturn.nix - ../profiles/cryptpad.nix + #../profiles/cryptpad.nix ../profiles/gitea.nix #../profiles/hydra.nix ../profiles/iog.nix From 2a6e22b3b7d96b847005b3ac76ba9ea57ab26371 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Fri, 9 Dec 2022 09:11:14 +1000 Subject: [PATCH 09/12] nextcloud: upgraded to v25 --- profiles/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/nextcloud.nix b/profiles/nextcloud.nix index f70c847..9ebead7 100644 --- a/profiles/nextcloud.nix +++ b/profiles/nextcloud.nix @@ -27,7 +27,7 @@ enable = true; # Run regular auto update of all apps installed startAt = "01:00:00"; # When to run the update }; - package = pkgs.nextcloud24; + package = pkgs.nextcloud25; }; systemd = { From 5e8399b5bfd4b40f44e679ebcaee9f344e9edd63 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Fri, 9 Dec 2022 09:25:46 +1000 Subject: [PATCH 10/12] nextcloud: upgraded to SSL v3 --- profiles/nextcloud.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/profiles/nextcloud.nix b/profiles/nextcloud.nix index 9ebead7..0fffe87 100644 --- a/profiles/nextcloud.nix +++ b/profiles/nextcloud.nix @@ -27,6 +27,7 @@ enable = true; # Run regular auto update of all apps installed startAt = "01:00:00"; # When to run the update }; + enableBrokenCiphersForSSE = false; # force upgrade to SSL v3 package = pkgs.nextcloud25; }; From f1f5fed00c9f7f68c8fd86d4bdda8473473b5931 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Fri, 9 Dec 2022 09:27:50 +1000 Subject: [PATCH 11/12] nix: renamed to max-jobs --- hardware/eeepc701.nix | 2 +- hardware/lenovo_x201.nix | 2 +- hardware/lenovo_yoga7i.nix | 2 +- hardware/linode_vm-encrypted.nix | 2 +- hardware/linode_vm.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hardware/eeepc701.nix b/hardware/eeepc701.nix index 4499bee..7779fb7 100644 --- a/hardware/eeepc701.nix +++ b/hardware/eeepc701.nix @@ -64,5 +64,5 @@ swapDevices = [{device = "/dev/disk/by-label/swap";}]; networking.wireless.enable = true; # Enable wireless via wpa_supplicant. - nix.maxJobs = lib.mkDefault 1; + nix.settings.max-jobs = lib.mkDefault 1; } diff --git a/hardware/lenovo_x201.nix b/hardware/lenovo_x201.nix index 568634e..47dbb30 100644 --- a/hardware/lenovo_x201.nix +++ b/hardware/lenovo_x201.nix @@ -20,7 +20,7 @@ swapDevices = [{device = "/dev/disk/by-label/swap";}]; hardware.opengl.extraPackages = with pkgs; [vaapiIntel]; - nix.maxJobs = lib.mkDefault 4; + nix.settings.max-jobs = lib.mkDefault 4; services.thinkfan = { enable = true; diff --git a/hardware/lenovo_yoga7i.nix b/hardware/lenovo_yoga7i.nix index f4ab5df..391b83a 100644 --- a/hardware/lenovo_yoga7i.nix +++ b/hardware/lenovo_yoga7i.nix @@ -39,5 +39,5 @@ ]; hardware.opengl.extraPackages = with pkgs; [vaapiIntel]; - nix.maxJobs = lib.mkDefault 4; + nix.settings.max-jobs = lib.mkDefault 4; } diff --git a/hardware/linode_vm-encrypted.nix b/hardware/linode_vm-encrypted.nix index 59ca698..dc2e84b 100644 --- a/hardware/linode_vm-encrypted.nix +++ b/hardware/linode_vm-encrypted.nix @@ -50,5 +50,5 @@ swapDevices = [{device = "/dev/disk/by-label/swap";}]; - nix.maxJobs = lib.mkDefault 8; + nix.settings.max-jobs = lib.mkDefault 8; } diff --git a/hardware/linode_vm.nix b/hardware/linode_vm.nix index f8eb01e..fbf8e02 100644 --- a/hardware/linode_vm.nix +++ b/hardware/linode_vm.nix @@ -35,5 +35,5 @@ swapDevices = [{device = "/dev/sdb";}]; - nix.maxJobs = lib.mkDefault 4; + nix.settings.max-jobs = lib.mkDefault 4; } From 649fba826fc5a2e5feec9b8d4652357d2a36109e Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Fri, 23 Dec 2022 03:06:34 +1000 Subject: [PATCH 12/12] matrix: update LC_CTYPE to C.UTF-8 --- profiles/matrix.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/profiles/matrix.nix b/profiles/matrix.nix index eb62190..16727af 100644 --- a/profiles/matrix.nix +++ b/profiles/matrix.nix @@ -9,8 +9,8 @@ i18n = { extraLocaleSettings = { - LC_COLLATE = "C"; # Ensure correct locale for postgres - LC_CTYPE = "C"; # Ensure correct locale for postgres + LC_COLLATE = "C.UTF-8"; # Ensure correct locale for postgres + LC_CTYPE = "C.UTF-8"; # Ensure correct locale for postgres }; }; @@ -141,8 +141,8 @@ CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse'; CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse" TEMPLATE template0 - LC_COLLATE = "C" - LC_CTYPE = "C"; + LC_COLLATE = "C.UTF-8" + LC_CTYPE = "C.UTF-8"; ''; }; };