From 08feacf22469d39564ab6e5ecaad63d3278a95f6 Mon Sep 17 00:00:00 2001 From: Renovate Date: Sat, 19 Oct 2024 08:05:17 +0000 Subject: [PATCH 1/4] Lock file maintenance --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 8a057149..34293301 100644 --- a/flake.lock +++ b/flake.lock @@ -159,11 +159,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1729193803, - "narHash": "sha256-67agAdAhZwTUWJF2/pXgLbH5fORQHJimxI+AB/9Mkoo=", + "lastModified": 1729233248, + "narHash": "sha256-tC9hlqcZPw9HGgtLpBXp++6dt8DHahyXnw0qzCDYius=", "ref": "refs/heads/main", - "rev": "87b068064beec3a22ad8fa6d402c1241a4344d33", - "revCount": 373, + "rev": "4eecbcbfe0815f260e930a408bb2f7d62c68c451", + "revCount": 376, "type": "git", "url": "https://git.chir.rs/chir.rs/chir.rs" }, @@ -465,11 +465,11 @@ ] }, "locked": { - "lastModified": 1729174520, - "narHash": "sha256-QxCAdgQdeIOaCiE0Sr23s9lD0+T1b/wuz5pSiGwNrCQ=", + "lastModified": 1729321271, + "narHash": "sha256-sSDfM5ulUlrjUVeohBjItAfvLREZdxence0PxEDohqI=", "owner": "nix-community", "repo": "home-manager", - "rev": "e78cbb20276f09c1802e62d2f77fc93ec32da268", + "rev": "802b3cb2d45ad66619ea8ad19b280baa460556d2", "type": "github" }, "original": { @@ -607,11 +607,11 @@ ] }, "locked": { - "lastModified": 1729199869, - "narHash": "sha256-buAN+K/8zIPo6dmb984BNOzZzQlK9TBdKPYLbdwWWGM=", + "lastModified": 1729296222, + "narHash": "sha256-fwJyGrkTemR1SwkAPXfxlY0RYCxy34NedmR35amytCc=", "ref": "refs/heads/main", - "rev": "52b64662a4924741e465b9caed6b2b4f8539aced", - "revCount": 16346, + "rev": "60578b4d7d0dfc296c61cae963b6b2763422788e", + "revCount": 16362, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -696,11 +696,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1729215603, - "narHash": "sha256-v4fB1nH+pDATpt6Jq/nk+lU2I6Zn3LRF1s4gNPAvZko=", + "lastModified": 1729301900, + "narHash": "sha256-NZ0GGy0OMCVzEsdaqLnefGtXsUnjgoCI2pleIvAUvfI=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "79f0e311a18bfda913093b4388b24ab380d632d6", + "rev": "5646c9455e9edf9ef59998fc79b82c5d5818ce77", "type": "github" }, "original": { @@ -889,11 +889,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1729231104, - "narHash": "sha256-bRfk5ns1kp+D9/ngAYm5RhT9f/egXkfL1Xhd5j0c0W8=", + "lastModified": 1729320241, + "narHash": "sha256-tryBeO/cHpW99CBLbPaM7t6n3wTeqEB6Pb6H3UmowKM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac76a342a8e881cfae21716a9ef0668422882837", + "rev": "46127d1789f6b54a1487b24dc7acd856d46652c7", "type": "github" }, "original": { @@ -1011,11 +1011,11 @@ ] }, "locked": { - "lastModified": 1729218602, - "narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=", + "lastModified": 1729304879, + "narHash": "sha256-H7KGGJUU9BcDNnfXiATBGgs6FJKWQdfftNJS+/v2aMU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94", + "rev": "b259ef799b5ac014604da71ecd92d4a52603ed2d", "type": "github" }, "original": { @@ -1114,11 +1114,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1729201498, - "narHash": "sha256-i/yDOHQbgf/D1iWpBZF5oqoXbCBddu81S8p+ekRzHso=", + "lastModified": 1729310349, + "narHash": "sha256-RlJJC3DY1pecYJExMnm3eMcaSavVXLnd4LuxnVnxPEk=", "ref": "refs/heads/main", - "rev": "c714ae8692d5e518d2cc4bdef9c4b94cf1be3aab", - "revCount": 794, + "rev": "9de54d877cf60d5a08729e526075dbd99eb5af93", + "revCount": 795, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/" From 03eb9d26b464d13fefd797cc1413a926abc78efa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sat, 19 Oct 2024 21:18:03 +0200 Subject: [PATCH 2/4] =?UTF-8?q?noto-fonts-cjk=20=E2=86=92=20noto-fonts-cjk?= =?UTF-8?q?-sans?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/desktop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/desktop.nix b/config/desktop.nix index 5199f5ae..4b35a89e 100644 --- a/config/desktop.nix +++ b/config/desktop.nix @@ -47,7 +47,7 @@ in { fira-code-symbols font-awesome noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji noto-fonts-extra (nerdfonts.override {fonts = ["FiraCode" "DroidSansMono" "Noto"];}) From 4812cdae17bbfc47a26e31c0488383fb8b51f3f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sat, 19 Oct 2024 21:46:38 +0200 Subject: [PATCH 3/4] fix --- config/workarounds/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/workarounds/default.nix b/config/workarounds/default.nix index fffbd0ec..c1838163 100644 --- a/config/workarounds/default.nix +++ b/config/workarounds/default.nix @@ -5,5 +5,8 @@ }: { nixpkgs.overlays = [ self.overlays.${system} + (self: super: { + utillinux = super.util-linux; + }) ]; } From a9abbcfedbef463bc98f7324f44a7a2aa25237da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sun, 20 Oct 2024 07:06:44 +0200 Subject: [PATCH 4/4] ??? --- flake.lock | 83 +++++++++++++++++++++++++++++++----------------------- flake.nix | 2 +- 2 files changed, 49 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 34293301..1c552c3e 100644 --- a/flake.lock +++ b/flake.lock @@ -67,9 +67,7 @@ "flake-parts": [ "flake-parts" ], - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1728796349, @@ -465,11 +463,11 @@ ] }, "locked": { - "lastModified": 1729321271, - "narHash": "sha256-sSDfM5ulUlrjUVeohBjItAfvLREZdxence0PxEDohqI=", + "lastModified": 1729321331, + "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=", "owner": "nix-community", "repo": "home-manager", - "rev": "802b3cb2d45ad66619ea8ad19b280baa460556d2", + "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68", "type": "github" }, "original": { @@ -482,7 +480,7 @@ "inputs": { "lix": "lix", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1728321752, @@ -607,11 +605,11 @@ ] }, "locked": { - "lastModified": 1729296222, - "narHash": "sha256-fwJyGrkTemR1SwkAPXfxlY0RYCxy34NedmR35amytCc=", + "lastModified": 1729367266, + "narHash": "sha256-2MMOfmsdggnzNeJ3KseUYZfSFoV7AOacB8sKXC6OqmE=", "ref": "refs/heads/main", - "rev": "60578b4d7d0dfc296c61cae963b6b2763422788e", - "revCount": 16362, + "rev": "0ff8f9132552e03497b07e1e5c068660a7a04515", + "revCount": 16365, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -696,11 +694,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1729301900, - "narHash": "sha256-NZ0GGy0OMCVzEsdaqLnefGtXsUnjgoCI2pleIvAUvfI=", + "lastModified": 1729388819, + "narHash": "sha256-Csa4LUgQWdUBQKj1bv8kKu3qFCOmnDWHAawWateCmls=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "5646c9455e9edf9ef59998fc79b82c5d5818ce77", + "rev": "177e270423839dedb9721b43c757a5f849b1e9f8", "type": "github" }, "original": { @@ -757,11 +755,11 @@ ] }, "locked": { - "lastModified": 1724996935, - "narHash": "sha256-njRK9vvZ1JJsP8oV2OgkBrpJhgQezI03S7gzskCcHos=", + "lastModified": 1729339656, + "narHash": "sha256-smV7HQ/OqZeRguQxNjsb3uQDwm0p6zKDbSDbPCav/oY=", "owner": "nlewo", "repo": "nix2container", - "rev": "fa6bb0a1159f55d071ba99331355955ae30b3401", + "rev": "cc96df7c3747c61c584d757cfc083922b4f4b33e", "type": "github" }, "original": { @@ -772,11 +770,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728729581, - "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", + "lastModified": 1729333370, + "narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", + "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb", "type": "github" }, "original": { @@ -872,6 +870,21 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1728768054, + "narHash": "sha256-eDVWVreO1e1CN5V1Oq0aI449ESEyJcu7OtZeZ2zZ434=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b1ea4a36d6f1bb62734bce3483994df69910e6d9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1728193676, "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", @@ -887,13 +900,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1729320241, - "narHash": "sha256-tryBeO/cHpW99CBLbPaM7t6n3wTeqEB6Pb6H3UmowKM=", + "lastModified": 1729399009, + "narHash": "sha256-mZXm1ka9mKh5L9Cu3rDvSwu0SEclA4tRcINI2SrIl1I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46127d1789f6b54a1487b24dc7acd856d46652c7", + "rev": "67f803dcf82ebe958a53fcfa7c1edb276558c3f6", "type": "github" }, "original": { @@ -996,7 +1009,7 @@ "nix2container": "nix2container_2", "nixos-hardware": "nixos-hardware", "nixos-vscode-server": "nixos-vscode-server", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "pre-commit-hooks": "pre-commit-hooks_2", "riscv-overlay": "riscv-overlay", "rust-overlay": "rust-overlay", @@ -1011,11 +1024,11 @@ ] }, "locked": { - "lastModified": 1729304879, - "narHash": "sha256-H7KGGJUU9BcDNnfXiATBGgs6FJKWQdfftNJS+/v2aMU=", + "lastModified": 1729391507, + "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b259ef799b5ac014604da71ecd92d4a52603ed2d", + "rev": "784981a9feeba406de38c1c9a3decf966d853cca", "type": "github" }, "original": { @@ -1034,11 +1047,11 @@ ] }, "locked": { - "lastModified": 1728345710, - "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "lastModified": 1729394972, + "narHash": "sha256-fADlzOzcSaGsrO+THUZ8SgckMMc7bMQftztKFCLVcFI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", + "rev": "c504fd7ac946d7a1b17944d73b261ca0a0b226a5", "type": "github" }, "original": { @@ -1114,11 +1127,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1729310349, - "narHash": "sha256-RlJJC3DY1pecYJExMnm3eMcaSavVXLnd4LuxnVnxPEk=", + "lastModified": 1729381279, + "narHash": "sha256-hlDGWvDjqvVlfGRcL+IcLEQOKgJf9QCxGb70tJuv0NQ=", "ref": "refs/heads/main", - "rev": "9de54d877cf60d5a08729e526075dbd99eb5af93", - "revCount": 795, + "rev": "51db53069883dce0624f6c6df1adbb2c3ba5728f", + "revCount": 809, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/" diff --git a/flake.nix b/flake.nix index 9d194a9c..630f9f4f 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,7 @@ rec { inputs.devshell.follows = "devshell"; inputs.flake-compat.follows = "flake-compat"; inputs.flake-parts.follows = "flake-parts"; - inputs.nixpkgs.follows = "nixpkgs"; + #inputs.nixpkgs.follows = "nixpkgs"; }; attic = { url = "github:DarkKirb/attic";