From 0ba501917e5f757eee561bf9f7bf6a2a85d99dc1 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 6 Feb 2026 09:42:40 +0100 Subject: bump --- _sources/generated.json | 46 +++++------ _sources/generated.nix | 46 +++++------ accounts/gkleen@sif/default.nix | 1 - flake.lock | 127 ++++++++++++++++++++---------- hosts/sif/hw.nix | 2 - hosts/vidhar/default.nix | 3 + modules/i18n.nix | 156 ------------------------------------- system-profiles/core/default.nix | 3 + system-profiles/default-locale.nix | 36 +++++---- user-profiles/zsh/default.nix | 4 + 10 files changed, 161 insertions(+), 263 deletions(-) delete mode 100644 modules/i18n.nix diff --git a/_sources/generated.json b/_sources/generated.json index b46b647d..eb30b232 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -193,12 +193,12 @@ "name": null, "owner": "hoyon", "repo": "mpv-mpris", - "rev": "1.1", - "sha256": "sha256-vZIO6ILatIWa9nJYOp4AMKwvaZLahqYWRLMDOizyBI0=", + "rev": "1.2", + "sha256": "sha256-Q2kNaXZtI6U+x2f00x5CiHZq4o64xFTNC/3W4IiP0+4=", "sparseCheckout": [], "type": "github" }, - "version": "1.1" + "version": "1.2" }, "mpv-reload": { "cargoLock": null, @@ -270,11 +270,11 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-rmMU/OTOh7zId+zwQCXHt2SJyBAtLNfCOZhDyrkBKjw=", + "sha256": "sha256-xvxF4mPgzcZO6j616FqozL8ObuMRuqKu87TtiPkHa+0=", "type": "url", - "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/2.0.89/netboot.xyz.efi" + "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.0/netboot.xyz.efi" }, - "version": "2.0.89" + "version": "3.0.0" }, "netbootxyz-lkrn": { "cargoLock": null, @@ -285,15 +285,15 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-y0yibC3UeJUHslFBeMPVm2yEwxQqvL7/+BYMD5xDMm4=", + "sha256": "sha256-950XOaf3g4OPi6W8ELl0P/0TZ8fLfXbjb9WsEfhVswY=", "type": "url", - "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/2.0.89/netboot.xyz.lkrn" + "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.0/netboot.xyz.lkrn" }, - "version": "2.0.89" + "version": "3.0.0" }, "nix-output-monitor": { "cargoLock": null, - "date": "2025-12-17", + "date": "2026-01-30", "extract": null, "name": "nix-output-monitor", "passthru": null, @@ -303,13 +303,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "9a32f32f807a4f7bc97d95606465243f293650fe", - "sha256": "sha256-04ME0a3MUH/Y306dFWgOOCghzwcadTDpqJFkhLonIrw=", + "rev": "e7270cb61b9228de4362f39b7400d6c61a5eb419", + "sha256": "sha256-eJ6O+Lxzn//+u4Q76cuAvTvqLkBNgA0E8UtGNn+E9Tc=", "sparseCheckout": [], "type": "git", "url": "https://code.maralorn.de/maralorn/nix-output-monitor.git" }, - "version": "9a32f32f807a4f7bc97d95606465243f293650fe" + "version": "e7270cb61b9228de4362f39b7400d6c61a5eb419" }, "postfix-mta-sts-resolver": { "cargoLock": null, @@ -375,7 +375,7 @@ }, "quickshell": { "cargoLock": null, - "date": "2025-12-25", + "date": "2026-01-28", "extract": null, "name": "quickshell", "passthru": null, @@ -385,13 +385,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff", - "sha256": "sha256-O2aMFdDUYJazFrlwL7aSIHbUSEm3ADVZjmf41uBJfHs=", + "rev": "1e4d804e7f3fa7465811030e8da2bf10d544426a", + "sha256": "sha256-WW00FaBiUmQyxvSbefvgxIjwf/WmRrEGBbwMHvW/7uQ=", "sparseCheckout": [], "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell.git" }, - "version": "41828c4180fb921df7992a5405f5ff05d2ac2fff" + "version": "1e4d804e7f3fa7465811030e8da2bf10d544426a" }, "scutiger": { "cargoLock": null, @@ -511,12 +511,12 @@ "name": null, "owner": "yt-dlp", "repo": "yt-dlp", - "rev": "2025.12.08", - "sha256": "sha256-y06MDP+CrlHGrell9hcLOGlHp/gU2OOxs7can4hbj+g=", + "rev": "2026.02.04", + "sha256": "sha256-KXnz/ocHBftenDUkCiFoBRBxi6yWt0fNuRX+vKFWDQw=", "sparseCheckout": [], "type": "github" }, - "version": "2025.12.08" + "version": "2026.02.04" }, "yt-dlp-ejs": { "cargoLock": null, @@ -532,11 +532,11 @@ "name": null, "owner": "yt-dlp", "repo": "ejs", - "rev": "0.3.2", - "sha256": "sha256-o6qf4rfj42mCyvCBb+wyJmZKg3Q+ojsqbCcBfIJnTPg=", + "rev": "0.4.0", + "sha256": "sha256-/qq069SD7ESg+7pK4PC1EGLLI8zqjWUse7cArN4YuXE=", "sparseCheckout": [], "type": "github" }, - "version": "0.3.2" + "version": "0.4.0" } } \ No newline at end of file diff --git a/_sources/generated.nix b/_sources/generated.nix index 8785e857..fbd6e998 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -118,13 +118,13 @@ }; mpv-mpris = { pname = "mpv-mpris"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "hoyon"; repo = "mpv-mpris"; - rev = "1.1"; + rev = "1.2"; fetchSubmodules = false; - sha256 = "sha256-vZIO6ILatIWa9nJYOp4AMKwvaZLahqYWRLMDOizyBI0="; + sha256 = "sha256-Q2kNaXZtI6U+x2f00x5CiHZq4o64xFTNC/3W4IiP0+4="; }; }; mpv-reload = { @@ -169,33 +169,33 @@ }; netbootxyz-efi = { pname = "netbootxyz-efi"; - version = "2.0.89"; + version = "3.0.0"; src = fetchurl { - url = "https://github.com/netbootxyz/netboot.xyz/releases/download/2.0.89/netboot.xyz.efi"; - sha256 = "sha256-rmMU/OTOh7zId+zwQCXHt2SJyBAtLNfCOZhDyrkBKjw="; + url = "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.0/netboot.xyz.efi"; + sha256 = "sha256-xvxF4mPgzcZO6j616FqozL8ObuMRuqKu87TtiPkHa+0="; }; }; netbootxyz-lkrn = { pname = "netbootxyz-lkrn"; - version = "2.0.89"; + version = "3.0.0"; src = fetchurl { - url = "https://github.com/netbootxyz/netboot.xyz/releases/download/2.0.89/netboot.xyz.lkrn"; - sha256 = "sha256-y0yibC3UeJUHslFBeMPVm2yEwxQqvL7/+BYMD5xDMm4="; + url = "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.0/netboot.xyz.lkrn"; + sha256 = "sha256-950XOaf3g4OPi6W8ELl0P/0TZ8fLfXbjb9WsEfhVswY="; }; }; nix-output-monitor = { pname = "nix-output-monitor"; - version = "9a32f32f807a4f7bc97d95606465243f293650fe"; + version = "e7270cb61b9228de4362f39b7400d6c61a5eb419"; src = fetchgit { url = "https://code.maralorn.de/maralorn/nix-output-monitor.git"; - rev = "9a32f32f807a4f7bc97d95606465243f293650fe"; + rev = "e7270cb61b9228de4362f39b7400d6c61a5eb419"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-04ME0a3MUH/Y306dFWgOOCghzwcadTDpqJFkhLonIrw="; + sha256 = "sha256-eJ6O+Lxzn//+u4Q76cuAvTvqLkBNgA0E8UtGNn+E9Tc="; }; - date = "2025-12-17"; + date = "2026-01-30"; }; postfix-mta-sts-resolver = { pname = "postfix-mta-sts-resolver"; @@ -237,17 +237,17 @@ }; quickshell = { pname = "quickshell"; - version = "41828c4180fb921df7992a5405f5ff05d2ac2fff"; + version = "1e4d804e7f3fa7465811030e8da2bf10d544426a"; src = fetchgit { url = "https://git.outfoxxed.me/quickshell/quickshell.git"; - rev = "41828c4180fb921df7992a5405f5ff05d2ac2fff"; + rev = "1e4d804e7f3fa7465811030e8da2bf10d544426a"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-O2aMFdDUYJazFrlwL7aSIHbUSEm3ADVZjmf41uBJfHs="; + sha256 = "sha256-WW00FaBiUmQyxvSbefvgxIjwf/WmRrEGBbwMHvW/7uQ="; }; - date = "2025-12-25"; + date = "2026-01-28"; }; scutiger = { pname = "scutiger"; @@ -313,24 +313,24 @@ }; yt-dlp = { pname = "yt-dlp"; - version = "2025.12.08"; + version = "2026.02.04"; src = fetchFromGitHub { owner = "yt-dlp"; repo = "yt-dlp"; - rev = "2025.12.08"; + rev = "2026.02.04"; fetchSubmodules = false; - sha256 = "sha256-y06MDP+CrlHGrell9hcLOGlHp/gU2OOxs7can4hbj+g="; + sha256 = "sha256-KXnz/ocHBftenDUkCiFoBRBxi6yWt0fNuRX+vKFWDQw="; }; }; yt-dlp-ejs = { pname = "yt-dlp-ejs"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "yt-dlp"; repo = "ejs"; - rev = "0.3.2"; + rev = "0.4.0"; fetchSubmodules = false; - sha256 = "sha256-o6qf4rfj42mCyvCBb+wyJmZKg3Q+ojsqbCcBfIJnTPg="; + sha256 = "sha256-/qq069SD7ESg+7pK4PC1EGLLI8zqjWUse7cArN4YuXE="; }; }; } diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix index a6bf0803..047ed71e 100644 --- a/accounts/gkleen@sif/default.nix +++ b/accounts/gkleen@sif/default.nix @@ -75,7 +75,6 @@ in { ./shell ./synadm flakeInputs.nix-index-database.homeModules.nix-index - flakeInputs.impermanence.nixosModules.home-manager.impermanence ]; home.stateVersion = "20.09"; diff --git a/flake.lock b/flake.lock index 3c79fa80..1583147c 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1766051518, - "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=", + "lastModified": 1770019181, + "narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=", "owner": "serokell", "repo": "deploy-rs", - "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa", + "rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171", "type": "github" }, "original": { @@ -140,11 +140,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1766661267, - "narHash": "sha256-QN1r/zNqvXHwWqlRAnRtFf4CQwIOJx58PtdExIzAw94=", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f275e157c50c3a9a682b4c9b4aa4db7a4cd3b5f2", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { @@ -441,13 +441,38 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "impermanence", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1768598210, + "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "impermanence": { + "inputs": { + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_2" + }, "locked": { - "lastModified": 1737831083, - "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", + "lastModified": 1769548169, + "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=", "owner": "nix-community", "repo": "impermanence", - "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", + "rev": "7b1d382faf603b6d264f58627330f9faa5cba149", "type": "github" }, "original": { @@ -507,11 +532,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1766765523, - "narHash": "sha256-DCk3GKdKZNjpvNuDy9ZVfVwCy3tlm96/UZnYkJO7N44=", + "lastModified": 1770271466, + "narHash": "sha256-Pyc3p/V7ruQplnU31r+umLSNlSGwOOoHzhWfzfLmiiw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a3e638c75d07de759421e6f34bd69c3f9a0a3567", + "rev": "76e1d271485b00a5d98aeb1dd76408594741c039", "type": "github" }, "original": { @@ -541,11 +566,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1765177104, - "narHash": "sha256-HNaSNHkEJ4OOpdmmEMV4TVHna7XRcn8P9fXI9zkbd/Y=", + "lastModified": 1770366183, + "narHash": "sha256-kqllrO92WQEjqEOoxHxt2L64NwUhbRKoKdBijbK9qnM=", "owner": "gkleen", "repo": "niri", - "rev": "edd17b4816d9daf49f2ccf0354cef26e5473249c", + "rev": "eb22080cfd1fe7e60e860934c3ac087cd175ec2a", "type": "github" }, "original": { @@ -583,11 +608,11 @@ ] }, "locked": { - "lastModified": 1765267181, - "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", + "lastModified": 1770315571, + "narHash": "sha256-hy0gcAgAcxrnSWKGuNO+Ob0x6jQ2xkR6hoaR0qJBHYs=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", + "rev": "2684bb8080a6f2ca5f9d494de5ef875bc1c4ecdb", "type": "github" }, "original": { @@ -640,11 +665,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1766568855, - "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=", + "lastModified": 1769302137, + "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80", + "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", "type": "github" }, "original": { @@ -765,11 +790,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1766736597, - "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=", + "lastModified": 1770136044, + "narHash": "sha256-tlFqNG/uzz2++aAmn4v8J0vAkV3z7XngeIIB3rM3650=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852", + "rev": "e576e3c9cf9bad747afcddd9e34f51d18c855b4e", "type": "github" }, "original": { @@ -813,21 +838,37 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1767778871, - "narHash": "sha256-cqHgM4TcEnXVTnr+eOxsB0Zz7Ae7vYplaOe9ARHGbGg=", - "owner": "gkleen", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "09cd8d0cd10ab814611d894c919ec30b7f83d911", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { + "locked": { + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1681303793, "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", @@ -972,7 +1013,7 @@ "flake-compat": "flake-compat_5", "flake-utils": "flake-utils_2", "gitignore": "gitignore_4", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { @@ -1077,11 +1118,11 @@ ] }, "locked": { - "lastModified": 1764134915, - "narHash": "sha256-xaKvtPx6YAnA3HQVp5LwyYG1MaN4LLehpQI8xEdBvBY=", + "lastModified": 1769936401, + "narHash": "sha256-kwCOegKLZJM9v/e/7cqwg1p/YjjTAukKPqmxKnAZRgA=", "owner": "pyproject-nix", "repo": "pyproject.nix", - "rev": "2c8df1383b32e5443c921f61224b198a2282a657", + "rev": "b0d513eeeebed6d45b4f2e874f9afba2021f7812", "type": "github" }, "original": { @@ -1107,7 +1148,7 @@ "nix-monitored": "nix-monitored", "nixVirt": "nixVirt", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-eostre": "nixpkgs-eostre", "nixpkgs-pgbackrest": "nixpkgs-pgbackrest", "nixpkgs-stable": "nixpkgs-stable_3", @@ -1148,11 +1189,11 @@ ] }, "locked": { - "lastModified": 1766289575, - "narHash": "sha256-BOKCwOQQIP4p9z8DasT5r+qjri3x7sPCOq+FTjY8Z+o=", + "lastModified": 1770145881, + "narHash": "sha256-ktjWTq+D5MTXQcL9N6cDZXUf9kX8JBLLBLT0ZyOTSYY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9836912e37aef546029e48c8749834735a6b9dad", + "rev": "17eea6f3816ba6568b8c81db8a4e6ca438b30b7c", "type": "github" }, "original": { @@ -1223,11 +1264,11 @@ ] }, "locked": { - "lastModified": 1766021660, - "narHash": "sha256-UUfz7qWB1Rb2KjGVCimt//Jncv3TgJwffPqbzqpkmgY=", + "lastModified": 1770331927, + "narHash": "sha256-jlOvO++uvne/lTgWqdI4VhTV5OpVWi70ZDVBlT6vGSs=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "19fa99be3409f55ec05e823c66c9769df7a8dd17", + "rev": "5b43a934e15b23bfba6c408cba1c570eccf80080", "type": "github" }, "original": { @@ -1256,11 +1297,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1766429945, - "narHash": "sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd+XoTkzqF7E=", + "lastModified": 1770167989, + "narHash": "sha256-rE2WTxKHe3KMG/Zr5YUNeKHkZfWwSFl7yJXrOKnunHg=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0dde7ca1d3a8e8c5082533d76084e2aa02bef70e", + "rev": "0947c4685f6237d4f8045482ce0c62feab40b6c4", "type": "github" }, "original": { diff --git a/hosts/sif/hw.nix b/hosts/sif/hw.nix index e567c37d..12268d74 100644 --- a/hosts/sif/hw.nix +++ b/hosts/sif/hw.nix @@ -16,8 +16,6 @@ fsType = "bcachefs"; neededForBoot = true; }; - "/var/lib/sops-nix".neededForBoot = true; - "/var/lib/systemd".neededForBoot = true; }; swapDevices = [ { label = "swap"; } diff --git a/hosts/vidhar/default.nix b/hosts/vidhar/default.nix index b799ee5f..9639cbd3 100644 --- a/hosts/vidhar/default.nix +++ b/hosts/vidhar/default.nix @@ -14,6 +14,9 @@ with lib; config = { nixpkgs = { system = "x86_64-linux"; + externalConfig.allowUnfreePackages = [ + "changedetection-io" + ]; }; networking.hostId = "1e7ddd78"; diff --git a/modules/i18n.nix b/modules/i18n.nix deleted file mode 100644 index f84e8b64..00000000 --- a/modules/i18n.nix +++ /dev/null @@ -1,156 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - aggregatedLocales = - (builtins.map - (l: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") - ( - [ config.i18n.defaultLocale ] - ++ (lib.optionals (builtins.isList config.i18n.extraLocales) config.i18n.extraLocales) - ++ (lib.attrValues (lib.filterAttrs (n: _v: lib.hasPrefix "LC_" n) config.i18n.extraLocaleSettings)) - ) - ) - ++ (lib.optional (builtins.isString config.i18n.extraLocales) config.i18n.extraLocales); -in -{ - disabledModules = [ "config/i18n.nix" ]; - - ###### interface - - options = { - - i18n = { - glibcLocales = lib.mkOption { - type = lib.types.path; - default = pkgs.glibcLocales.override { - allLocales = lib.any (x: x == "all") config.i18n.supportedLocales; - locales = config.i18n.supportedLocales; - }; - defaultText = lib.literalExpression '' - pkgs.glibcLocales.override { - allLocales = lib.any (x: x == "all") config.i18n.supportedLocales; - locales = config.i18n.supportedLocales; - } - ''; - example = lib.literalExpression "pkgs.glibcLocales"; - description = '' - Customized pkg.glibcLocales package. - - Changing this option can disable handling of i18n.defaultLocale - and supportedLocale. - ''; - }; - - defaultLocale = lib.mkOption { - type = lib.types.str; - default = "en_US.UTF-8"; - example = "nl_NL.UTF-8"; - description = '' - The default locale. It determines the language for program - messages, the format for dates and times, sort order, and so on. - It also determines the character set, such as UTF-8. - ''; - }; - - extraLocales = lib.mkOption { - type = lib.types.either (lib.types.listOf lib.types.str) (lib.types.enum [ "all" ]); - default = [ ]; - example = [ "nl_NL.UTF-8" ]; - description = '' - Additional locales that the system should support, besides the ones - configured with {option}`i18n.defaultLocale` and - {option}`i18n.extraLocaleSettings`. - Set this to `"all"` to install all available locales. - ''; - }; - - extraLocaleSettings = lib.mkOption { - type = lib.types.attrsOf lib.types.str; - default = { }; - example = { - LC_MESSAGES = "en_US.UTF-8"; - LC_TIME = "de_DE.UTF-8"; - }; - description = '' - A set of additional system-wide locale settings other than - `LANG` which can be configured with - {option}`i18n.defaultLocale`. - ''; - }; - - supportedLocales = lib.mkOption { - type = lib.types.listOf lib.types.str; - visible = false; - default = lib.unique ( - [ - "C.UTF-8/UTF-8" - "en_US.UTF-8/UTF-8" - ] - ++ aggregatedLocales - ); - example = [ - "en_US.UTF-8/UTF-8" - "nl_NL.UTF-8/UTF-8" - "nl_NL/ISO-8859-1" - ]; - description = '' - List of locales that the system should support. The value - `"all"` means that all locales supported by - Glibc will be installed. A full list of supported locales - can be found at . - ''; - }; - - }; - - }; - - ###### implementation - - config = { - warnings = - lib.optional - ( - !( - (lib.subtractLists config.i18n.supportedLocales aggregatedLocales) == [ ] - || lib.any (x: x == "all") config.i18n.supportedLocales - ) - ) - '' - `i18n.supportedLocales` is deprecated in favor of `i18n.extraLocales`, - and it seems you are using `i18n.supportedLocales` and forgot to - include some locales specified in `i18n.defaultLocale`, - `i18n.extraLocales` or `i18n.extraLocaleSettings`. - - If you're trying to install additional locales not specified in - `i18n.defaultLocale` or `i18n.extraLocaleSettings`, consider adding - only those locales to `i18n.extraLocales`. - ''; - - environment.systemPackages = - # We increase the priority a little, so that plain glibc in systemPackages can't win. - lib.optional (config.i18n.supportedLocales != [ ]) (lib.setPrio (-1) config.i18n.glibcLocales); - - environment.sessionVariables = { - LANG = config.i18n.defaultLocale; - LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; - } // config.i18n.extraLocaleSettings; - - systemd.globalEnvironment = lib.mkIf (config.i18n.supportedLocales != [ ]) { - LOCALE_ARCHIVE = "${config.i18n.glibcLocales}/lib/locale/locale-archive"; - }; - - # ‘/etc/locale.conf’ is used by systemd. - environment.etc."locale.conf".source = pkgs.writeText "locale.conf" '' - LANG=${config.i18n.defaultLocale} - ${lib.concatStringsSep "\n" ( - lib.mapAttrsToList (n: v: "${n}=${v}") config.i18n.extraLocaleSettings - )} - ''; - - }; -} diff --git a/system-profiles/core/default.nix b/system-profiles/core/default.nix index 258dd32d..58d2fe7c 100644 --- a/system-profiles/core/default.nix +++ b/system-profiles/core/default.nix @@ -62,6 +62,9 @@ in { rhs = optCall rhs_ { inherit pkgs; }; in recursiveUpdate lhs rhs // + optionalAttrs (lhs ? allowUnfreePackages) { + allowUnfreePackages = lhs.allowUnfreePackages ++ (attrByPath [ "allowUnfreePackages" ] [ ] rhs); + } // optionalAttrs (lhs ? packageOverrides) { packageOverrides = pkgs: optCall lhs.packageOverrides pkgs // diff --git a/system-profiles/default-locale.nix b/system-profiles/default-locale.nix index 60d338cb..68bc4240 100644 --- a/system-profiles/default-locale.nix +++ b/system-profiles/default-locale.nix @@ -1,23 +1,29 @@ -{ lib, options, ... }: - -with lib; +{ pkgs, lib, options, config, ... }: { - config = foldr recursiveUpdate {} ([ + config = lib.foldr lib.recursiveUpdate {} ([ { i18n = { - defaultLocale = "en_DK.UTF-8"; - extraLocaleSettings = { - "TIME_STYLE" = "long-iso"; - }; - }; - console.keyMap = mkDefault "dvorak-programmer"; + defaultLocale = "en_SE.UTF-8"; - time.timeZone = mkDefault "Europe/Berlin"; + glibcLocales = + (pkgs.glibcLocales.override { + allLocales = false; + locales = config.i18n.supportedLocales; + }).overrideAttrs (_: { + postUnpack = '' + cp ${pkgs.fetchurl { + url = "https://gist.githubusercontent.com/bmaupin/d64368e78cd359d309685fecbe2baf23/raw/e933a0fc2e727aa640f4a1cb1f699622876940fc/en_SE"; + hash = "sha256-ArXL+rMDVWI4Mmcw8xoRlZFXhEeSQL0tLJf5pKEOx3s="; + }} $sourceRoot/localedata/locales/en_SE + echo 'en_SE.UTF-8/UTF-8 \' >> $sourceRoot/localedata/SUPPORTED + ''; + }); + }; } - ] ++ (optional (options ? i18n.extraLocales) { - i18n.extraLocales = [ "C.UTF-8" "en_US.UTF-8" "en_DK.UTF-8" ]; - }) ++ (optional (!(options ? i18n.extraLocales)) { - i18n.supportedLocales = [ "C.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" "en_DK.UTF-8/UTF-8" ]; + ] ++ (lib.optional (options ? i18n.extraLocales) { + i18n.extraLocales = [ "C.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" ]; + }) ++ (lib.optional (!(options ? i18n.extraLocales)) { + i18n.supportedLocales = [ "C.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" ]; })); } diff --git a/user-profiles/zsh/default.nix b/user-profiles/zsh/default.nix index 944d10ff..eb9f7aa9 100644 --- a/user-profiles/zsh/default.nix +++ b/user-profiles/zsh/default.nix @@ -1,6 +1,10 @@ { userName, pkgs, customUtils, lib, config, ... }: { config = { + nixpkgs.externalConfig.allowUnfreePackages = [ + "zsh-abbr" + ]; + home-manager.users.${userName} = let sysConfig = config; in { config, ... }: { config = { programs.zsh = { -- cgit v1.2.3