From 39ea029d3dc9de23db376c4600e243537c9668eb Mon Sep 17 00:00:00 2001 From: Steph Date: Wed, 27 Nov 2024 11:11:13 +0100 Subject: [PATCH 01/13] fonts --- home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home.nix b/home.nix index d6c6078..2e10e77 100644 --- a/home.nix +++ b/home.nix @@ -19,6 +19,7 @@ overlays = [ inputs.nur.overlay ]; }; + fonts.fontconfig.enable = true; home.packages = with pkgs; [ bat bottom From f733dd0755631e1426e8c6bd9b9a59d829886e5c Mon Sep 17 00:00:00 2001 From: Steph Date: Wed, 27 Nov 2024 13:14:12 +0100 Subject: [PATCH 02/13] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nur': 'github:nix-community/NUR/d86e9111e430021c7c6cabae6694f5f01ad3cdd6?narHash=sha256-IFgIx4quZa0DdToA5qmwMFfuha3gEAhrCSRzPHehdgE%3D' (2024-11-27) → 'github:nix-community/NUR/31a30f0862fd8b5f88a6597382bb09197356b19e?narHash=sha256-x3NlO2qzuobU9BrynzydX7X9oskJpysv7BI7DJ5cVSE%3D' (2024-11-27) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 638b0fd..c35b680 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1732161788, - "narHash": "sha256-ilkOtBbv5onnMOYnLWVpBd6bZHP3xwzagccBk1mW/z4=", + "lastModified": 1732680201, + "narHash": "sha256-3PA+AlonG9xzJrT1NvnD0Id2dBvIVNrSijVwlIinzNo=", "owner": "rycee", "repo": "nur-expressions", - "rev": "3071fc96bc39e58df1c6d48e8008c96f09a00b42", + "rev": "77e347b8897e917e99bf2929a7178d8caa6fd473", "type": "gitlab" }, "original": { @@ -41,11 +41,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1730674701, - "narHash": "sha256-lf9MQs8+NUvQd8b5t+7c4kLqUQixGO9WwWcLa1XYuiQ=", + "lastModified": 1732670982, + "narHash": "sha256-EF4Gf9Pkd+4XNwt5aNRKXIOyZ/MDSQV0P903VG4gf9w=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "823756d8ddd21cfd3a24a87dad402e490e0eb5ee", + "rev": "bce650b80c6651ec110a8da928466f8483b7d62f", "type": "github" }, "original": { @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1732025103, - "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", + "lastModified": 1732482255, + "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "owner": "nix-community", "repo": "home-manager", - "rev": "a46e702093a5c46e192243edbd977d5749e7f294", + "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "type": "github" }, "original": { @@ -147,11 +147,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1731385712, - "narHash": "sha256-hcPGb+Voh1N+SD3XuwgcwDMA6W/lGkXLCnd3mttoLoA=", + "lastModified": 1732514568, + "narHash": "sha256-F5MVwtPeOC14O/Foq7DimjA7nqMaeIKehA7Oj5CGWew=", "owner": "hraban", "repo": "mac-app-util", - "rev": "9ef4d1c14dab18a95691602bf541cd091fdcc2e3", + "rev": "ded87083092186c7b8e30fbfe944c726540a007c", "type": "github" }, "original": { @@ -165,11 +165,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1732016537, - "narHash": "sha256-XwXUK+meYnlhdQz2TVE4Wv+tsx1CkdGbDPt1tRzCNH4=", + "lastModified": 1732603785, + "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "61cee20168a3ebb71a9efd70a55adebaadfbe4d4", + "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a", "type": "github" }, "original": { @@ -209,11 +209,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { @@ -225,11 +225,11 @@ }, "nur": { "locked": { - "lastModified": 1732218405, - "narHash": "sha256-+aw2RvxAoGc5FgnQSpLlt+QNcnRPFfp4/Vts7cfo6rE=", + "lastModified": 1732704680, + "narHash": "sha256-x3NlO2qzuobU9BrynzydX7X9oskJpysv7BI7DJ5cVSE=", "owner": "nix-community", "repo": "NUR", - "rev": "e256ca80ae399c3eea5e0cbe47f9a641877286c5", + "rev": "31a30f0862fd8b5f88a6597382bb09197356b19e", "type": "github" }, "original": { From eb76503a8881911c2d2f7c2482c67da2433282da Mon Sep 17 00:00:00 2001 From: Steph Date: Thu, 28 Nov 2024 15:10:50 +0100 Subject: [PATCH 03/13] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'firefox-addons': 'gitlab:rycee/nur-expressions/77e347b8897e917e99bf2929a7178d8caa6fd473?dir=pkgs/firefox-addons&narHash=sha256-3PA%2BAlonG9xzJrT1NvnD0Id2dBvIVNrSijVwlIinzNo%3D' (2024-11-27) → 'gitlab:rycee/nur-expressions/ac70253fea187562c44006f32ad2b480997e0866?dir=pkgs/firefox-addons&narHash=sha256-bx%2BljzcUpVOKqu6k/HJGvij8x/sdFYkehGP8oPVqqRY%3D' (2024-11-28) • Updated input 'firefox-gnome-theme': 'github:rafaelmardojai/firefox-gnome-theme/bce650b80c6651ec110a8da928466f8483b7d62f?narHash=sha256-EF4Gf9Pkd%2B4XNwt5aNRKXIOyZ/MDSQV0P903VG4gf9w%3D' (2024-11-27) → 'github:rafaelmardojai/firefox-gnome-theme/ef6ac4285eaac6053338a6240bc615902a839493?narHash=sha256-k7v5PE6OcqMkC/u7aokwcxKDmTKM%2BejiZGCsH9MK0s0%3D' (2024-11-28) • Updated input 'home': 'github:nix-community/home-manager/a9953635d7f34e7358d5189751110f87e3ac17da?narHash=sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A%3D' (2024-11-24) → 'github:nix-community/home-manager/2f7739d01080feb4549524e8f6927669b61c6ee3?narHash=sha256-6TrknJ8CpvSSF4gviQSeD%2Bwyj3siRcMvdBKhOXkEMKU%3D' (2024-11-28) • Updated input 'nur': 'github:nix-community/NUR/31a30f0862fd8b5f88a6597382bb09197356b19e?narHash=sha256-x3NlO2qzuobU9BrynzydX7X9oskJpysv7BI7DJ5cVSE%3D' (2024-11-27) → 'github:nix-community/NUR/b297e0d5de898f0cf484838beeee86129c4806ed?narHash=sha256-3l73okmBOoizZm2WTpkIT5I7TMASV3uYCIDke%2BNs6Fc%3D' (2024-11-28) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index c35b680..3f561c2 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1732680201, - "narHash": "sha256-3PA+AlonG9xzJrT1NvnD0Id2dBvIVNrSijVwlIinzNo=", + "lastModified": 1732790791, + "narHash": "sha256-bx+ljzcUpVOKqu6k/HJGvij8x/sdFYkehGP8oPVqqRY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "77e347b8897e917e99bf2929a7178d8caa6fd473", + "rev": "ac70253fea187562c44006f32ad2b480997e0866", "type": "gitlab" }, "original": { @@ -41,11 +41,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1732670982, - "narHash": "sha256-EF4Gf9Pkd+4XNwt5aNRKXIOyZ/MDSQV0P903VG4gf9w=", + "lastModified": 1732798888, + "narHash": "sha256-k7v5PE6OcqMkC/u7aokwcxKDmTKM+ejiZGCsH9MK0s0=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "bce650b80c6651ec110a8da928466f8483b7d62f", + "rev": "ef6ac4285eaac6053338a6240bc615902a839493", "type": "github" }, "original": { @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1732482255, - "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", + "lastModified": 1732793095, + "narHash": "sha256-6TrknJ8CpvSSF4gviQSeD+wyj3siRcMvdBKhOXkEMKU=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", + "rev": "2f7739d01080feb4549524e8f6927669b61c6ee3", "type": "github" }, "original": { @@ -225,11 +225,11 @@ }, "nur": { "locked": { - "lastModified": 1732704680, - "narHash": "sha256-x3NlO2qzuobU9BrynzydX7X9oskJpysv7BI7DJ5cVSE=", + "lastModified": 1732799324, + "narHash": "sha256-3l73okmBOoizZm2WTpkIT5I7TMASV3uYCIDke+Ns6Fc=", "owner": "nix-community", "repo": "NUR", - "rev": "31a30f0862fd8b5f88a6597382bb09197356b19e", + "rev": "b297e0d5de898f0cf484838beeee86129c4806ed", "type": "github" }, "original": { From 9d386a6cbd528c96635ac757019c35b0a58989a2 Mon Sep 17 00:00:00 2001 From: Steph Date: Fri, 29 Nov 2024 09:35:02 +0100 Subject: [PATCH 04/13] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'firefox-addons': 'gitlab:rycee/nur-expressions/ac70253fea187562c44006f32ad2b480997e0866?dir=pkgs/firefox-addons&narHash=sha256-bx%2BljzcUpVOKqu6k/HJGvij8x/sdFYkehGP8oPVqqRY%3D' (2024-11-28) → 'gitlab:rycee/nur-expressions/0c855b6e0c58aef81f66c52f987f4c5ce8d48af0?dir=pkgs/firefox-addons&narHash=sha256-0LD4nyz/Z2bDNjVj6p8O85uGtOmDCC9PdX5hh8Z3rSM%3D' (2024-11-29) • Updated input 'nur': 'github:nix-community/NUR/b297e0d5de898f0cf484838beeee86129c4806ed?narHash=sha256-3l73okmBOoizZm2WTpkIT5I7TMASV3uYCIDke%2BNs6Fc%3D' (2024-11-28) → 'github:nix-community/NUR/a267c5a3551066e54a38ce4e6add06d3a9379f67?narHash=sha256-2EwSaDKvVErzm4/dnMwWkg4m/WpUZMPnhdozk%2BakwPM%3D' (2024-11-29) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 3f561c2..c539c8b 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1732790791, - "narHash": "sha256-bx+ljzcUpVOKqu6k/HJGvij8x/sdFYkehGP8oPVqqRY=", + "lastModified": 1732852996, + "narHash": "sha256-0LD4nyz/Z2bDNjVj6p8O85uGtOmDCC9PdX5hh8Z3rSM=", "owner": "rycee", "repo": "nur-expressions", - "rev": "ac70253fea187562c44006f32ad2b480997e0866", + "rev": "0c855b6e0c58aef81f66c52f987f4c5ce8d48af0", "type": "gitlab" }, "original": { @@ -225,11 +225,11 @@ }, "nur": { "locked": { - "lastModified": 1732799324, - "narHash": "sha256-3l73okmBOoizZm2WTpkIT5I7TMASV3uYCIDke+Ns6Fc=", + "lastModified": 1732868068, + "narHash": "sha256-2EwSaDKvVErzm4/dnMwWkg4m/WpUZMPnhdozk+akwPM=", "owner": "nix-community", "repo": "NUR", - "rev": "b297e0d5de898f0cf484838beeee86129c4806ed", + "rev": "a267c5a3551066e54a38ce4e6add06d3a9379f67", "type": "github" }, "original": { From 27f436c12a955aa13fa0fc53fe0e0bd8a4d45cbc Mon Sep 17 00:00:00 2001 From: Steph Date: Fri, 29 Nov 2024 09:55:38 +0100 Subject: [PATCH 05/13] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'firefox-gnome-theme': 'github:rafaelmardojai/firefox-gnome-theme/ef6ac4285eaac6053338a6240bc615902a839493?narHash=sha256-k7v5PE6OcqMkC/u7aokwcxKDmTKM%2BejiZGCsH9MK0s0%3D' (2024-11-28) → 'github:rafaelmardojai/firefox-gnome-theme/823756d8ddd21cfd3a24a87dad402e490e0eb5ee?narHash=sha256-lf9MQs8%2BNUvQd8b5t%2B7c4kLqUQixGO9WwWcLa1XYuiQ%3D' (2024-11-03) • Updated input 'nur': 'github:nix-community/NUR/a267c5a3551066e54a38ce4e6add06d3a9379f67?narHash=sha256-2EwSaDKvVErzm4/dnMwWkg4m/WpUZMPnhdozk%2BakwPM%3D' (2024-11-29) → 'github:nix-community/NUR/164a37ce9a45328751172ffb22a414ed49b622ae?narHash=sha256-oO15nVM9sv8kBXjHbWbn%2Bf1ATcCJ3ekKc6YawMxrbyY%3D' (2024-11-29) --- flake.lock | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index c539c8b..0d86a5d 100644 --- a/flake.lock +++ b/flake.lock @@ -41,15 +41,16 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1732798888, - "narHash": "sha256-k7v5PE6OcqMkC/u7aokwcxKDmTKM+ejiZGCsH9MK0s0=", + "lastModified": 1730674701, + "narHash": "sha256-lf9MQs8+NUvQd8b5t+7c4kLqUQixGO9WwWcLa1XYuiQ=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "ef6ac4285eaac6053338a6240bc615902a839493", + "rev": "823756d8ddd21cfd3a24a87dad402e490e0eb5ee", "type": "github" }, "original": { "owner": "rafaelmardojai", + "ref": "v132", "repo": "firefox-gnome-theme", "type": "github" } @@ -225,11 +226,11 @@ }, "nur": { "locked": { - "lastModified": 1732868068, - "narHash": "sha256-2EwSaDKvVErzm4/dnMwWkg4m/WpUZMPnhdozk+akwPM=", + "lastModified": 1732870150, + "narHash": "sha256-oO15nVM9sv8kBXjHbWbn+f1ATcCJ3ekKc6YawMxrbyY=", "owner": "nix-community", "repo": "NUR", - "rev": "a267c5a3551066e54a38ce4e6add06d3a9379f67", + "rev": "164a37ce9a45328751172ffb22a414ed49b622ae", "type": "github" }, "original": { From a330048d86718881f3fdcf2054e4cc64b2ef6049 Mon Sep 17 00:00:00 2001 From: Steph Date: Fri, 29 Nov 2024 11:36:24 +0100 Subject: [PATCH 06/13] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nur': 'github:nix-community/NUR/164a37ce9a45328751172ffb22a414ed49b622ae?narHash=sha256-oO15nVM9sv8kBXjHbWbn%2Bf1ATcCJ3ekKc6YawMxrbyY%3D' (2024-11-29) → 'github:nix-community/NUR/eb9b0fc8588c0d3b4936d8b508ef1f16c740c254?narHash=sha256-lSJICNRVy6u7VdRYWxhBhD60JgP1TcodkmmFwGgKwO4%3D' (2024-11-29) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 0d86a5d..d0cb111 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ }, "nur": { "locked": { - "lastModified": 1732870150, - "narHash": "sha256-oO15nVM9sv8kBXjHbWbn+f1ATcCJ3ekKc6YawMxrbyY=", + "lastModified": 1732873747, + "narHash": "sha256-lSJICNRVy6u7VdRYWxhBhD60JgP1TcodkmmFwGgKwO4=", "owner": "nix-community", "repo": "NUR", - "rev": "164a37ce9a45328751172ffb22a414ed49b622ae", + "rev": "eb9b0fc8588c0d3b4936d8b508ef1f16c740c254", "type": "github" }, "original": { From 70a8cdb7b3d6d1c6e1157c36331a2dfdb3c6d4b8 Mon Sep 17 00:00:00 2001 From: Steph Date: Fri, 29 Nov 2024 11:53:03 +0100 Subject: [PATCH 07/13] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nur': 'github:nix-community/NUR/eb9b0fc8588c0d3b4936d8b508ef1f16c740c254?narHash=sha256-lSJICNRVy6u7VdRYWxhBhD60JgP1TcodkmmFwGgKwO4%3D' (2024-11-29) → 'github:nix-community/NUR/c5bfbd142cb0d4aee8e8222934cf4c305548d4ac?narHash=sha256-ZDOlikQLTOnKek5J2bHItv0tWS6c1kdcLzVMseGd2rI%3D' (2024-11-29) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d0cb111..adfbac6 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ }, "nur": { "locked": { - "lastModified": 1732873747, - "narHash": "sha256-lSJICNRVy6u7VdRYWxhBhD60JgP1TcodkmmFwGgKwO4=", + "lastModified": 1732877422, + "narHash": "sha256-ZDOlikQLTOnKek5J2bHItv0tWS6c1kdcLzVMseGd2rI=", "owner": "nix-community", "repo": "NUR", - "rev": "eb9b0fc8588c0d3b4936d8b508ef1f16c740c254", + "rev": "c5bfbd142cb0d4aee8e8222934cf4c305548d4ac", "type": "github" }, "original": { From 861db980c07e83cf93ce211d1034490b7433b051 Mon Sep 17 00:00:00 2001 From: Steph Date: Sun, 1 Dec 2024 11:40:35 +0100 Subject: [PATCH 08/13] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'firefox-addons': 'gitlab:rycee/nur-expressions/0c855b6e0c58aef81f66c52f987f4c5ce8d48af0?dir=pkgs/firefox-addons&narHash=sha256-0LD4nyz/Z2bDNjVj6p8O85uGtOmDCC9PdX5hh8Z3rSM%3D' (2024-11-29) → 'gitlab:rycee/nur-expressions/7b8d9feb25606cccb5c93f405c7f9796698d756e?dir=pkgs/firefox-addons&narHash=sha256-j1EDQmFyRD0uVT3Bo3SrON4rCfyQMGJPIG3Vay3EVHk%3D' (2024-12-01) • Updated input 'home': 'github:nix-community/home-manager/2f7739d01080feb4549524e8f6927669b61c6ee3?narHash=sha256-6TrknJ8CpvSSF4gviQSeD%2Bwyj3siRcMvdBKhOXkEMKU%3D' (2024-11-28) → 'github:nix-community/home-manager/8eeda281e70cbadabb7f0095c5f34e354e85f307?narHash=sha256-UUACIrku5m2ENNr2opNY9dwZ3tHxHMI6yUhkUhM3v4E%3D' (2024-12-01) • Updated input 'mac-app-util': 'github:hraban/mac-app-util/ded87083092186c7b8e30fbfe944c726540a007c?narHash=sha256-F5MVwtPeOC14O/Foq7DimjA7nqMaeIKehA7Oj5CGWew%3D' (2024-11-25) → 'github:hraban/mac-app-util/548672d0cb661ce11d08ee8bde92b87d2a75c872?narHash=sha256-1fxvJZUznwrmEtYqpPuWi2tPcL9kj6v7p1J7ZZncAPE%3D' (2024-11-29) • Updated input 'mac-app-util/cl-nix-lite': 'github:hraban/cl-nix-lite/cc920bfb0a6402d3871f470c98d65266126973e4?narHash=sha256-hnZEsDInTcsVSL5LBGDAZegAxVLBus/wiJh%2BsNM15zU%3D' (2024-06-09) → 'github:hraban/cl-nix-lite/31cfe6275c341eb3120a99f4b1c8516c49a29d87?narHash=sha256-Grqqg%2BxuicANB85j0gNEXxi9SBKY7bzGeTuyi95eGcY%3D' (2024-10-06) • Updated input 'mac-app-util/flake-compat': 'github:hraban/flake-compat/6025bade1336a36014639bc3f67eacc853dab78f?narHash=sha256-40to80AEIyKCQI0xMKCeF5ePoIKTYgjVVCZeu4CnTxM%3D' (2023-10-20) → 'github:hraban/flake-compat/e5b16676185cb7548581c852f51ce7f3a49bba5e?narHash=sha256-kFCUWettiFHDIqxCWWQ9qY8pVh%2BLj%2BXL0Giyy/kdomg%3D' (2024-11-03) • Updated input 'mac-app-util/flake-utils': 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a?narHash=sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ%3D' (2024-03-11) → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b?narHash=sha256-l0KFg5HjrsfsO/JpG%2Br7fRrqm12kzFHyUHqHCVpMMbI%3D' (2024-11-13) • Updated input 'mac-app-util/flake-utils/systems': 'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e?narHash=sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768%3D' (2023-04-09) → follows 'mac-app-util/systems' • Updated input 'mac-app-util/nixpkgs': 'github:NixOS/nixpkgs/cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9?narHash=sha256-c83Y9t815Wa34khrux81j8K8ET94ESmCuwORSKm2bQY%3D' (2024-06-08) → 'github:NixOS/nixpkgs/af51545ec9a44eadf3fe3547610a5cdd882bc34e?narHash=sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS%2Bs3NVclJw7YC43w%3D' (2024-11-26) • Added input 'mac-app-util/systems': 'github:nix-systems/default-darwin/2235d7e6cc29ae99878133c95e9fe5e157661ffb?narHash=sha256-ozenz5bFe1UUqOn7f60HRmgc01BgTGIKZ4Xl%2BHbocGQ%3D' (2023-07-14) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/6ab87b7c84d4ee873e937108c4ff80c015a40c7a?narHash=sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8%3D' (2024-11-26) → 'github:LnL7/nix-darwin/e30a3622b606dffc622305b4bbe1cfe37e78fa40?narHash=sha256-fQUKxgxAEHlL5bevRkdsQB7sSpAMhlvxf7Zw0KK8QIg%3D' (2024-12-01) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/4633a7c72337ea8fd23a4f2ba3972865e3ec685d?narHash=sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0%3D' (2024-11-25) → 'github:nixos/nixpkgs/970e93b9f82e2a0f3675757eb0bfc73297cc6370?narHash=sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE%3D' (2024-11-28) • Updated input 'nur': 'github:nix-community/NUR/c5bfbd142cb0d4aee8e8222934cf4c305548d4ac?narHash=sha256-ZDOlikQLTOnKek5J2bHItv0tWS6c1kdcLzVMseGd2rI%3D' (2024-11-29) → 'github:nix-community/NUR/58c7a1f186e7d2bf80705cd56deab9f29c8a3fef?narHash=sha256-rWNbe6wKl5dq/TmdGGRlnYx5%2BIvuVO8VkA7SJPZ6FAI%3D' (2024-12-01) --- flake.lock | 80 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index adfbac6..dc0ef98 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "cl-nix-lite": { "locked": { - "lastModified": 1717972076, - "narHash": "sha256-hnZEsDInTcsVSL5LBGDAZegAxVLBus/wiJh+sNM15zU=", + "lastModified": 1728174978, + "narHash": "sha256-Grqqg+xuicANB85j0gNEXxi9SBKY7bzGeTuyi95eGcY=", "owner": "hraban", "repo": "cl-nix-lite", - "rev": "cc920bfb0a6402d3871f470c98d65266126973e4", + "rev": "31cfe6275c341eb3120a99f4b1c8516c49a29d87", "type": "github" }, "original": { @@ -24,11 +24,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1732852996, - "narHash": "sha256-0LD4nyz/Z2bDNjVj6p8O85uGtOmDCC9PdX5hh8Z3rSM=", + "lastModified": 1733044294, + "narHash": "sha256-j1EDQmFyRD0uVT3Bo3SrON4rCfyQMGJPIG3Vay3EVHk=", "owner": "rycee", "repo": "nur-expressions", - "rev": "0c855b6e0c58aef81f66c52f987f4c5ce8d48af0", + "rev": "7b8d9feb25606cccb5c93f405c7f9796698d756e", "type": "gitlab" }, "original": { @@ -74,11 +74,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1697816753, - "narHash": "sha256-40to80AEIyKCQI0xMKCeF5ePoIKTYgjVVCZeu4CnTxM=", + "lastModified": 1730663653, + "narHash": "sha256-kFCUWettiFHDIqxCWWQ9qY8pVh+Lj+XL0Giyy/kdomg=", "owner": "hraban", "repo": "flake-compat", - "rev": "6025bade1336a36014639bc3f67eacc853dab78f", + "rev": "e5b16676185cb7548581c852f51ce7f3a49bba5e", "type": "github" }, "original": { @@ -105,14 +105,17 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems" + "systems": [ + "mac-app-util", + "systems" + ] }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -127,11 +130,11 @@ ] }, "locked": { - "lastModified": 1732793095, - "narHash": "sha256-6TrknJ8CpvSSF4gviQSeD+wyj3siRcMvdBKhOXkEMKU=", + "lastModified": 1733043896, + "narHash": "sha256-UUACIrku5m2ENNr2opNY9dwZ3tHxHMI6yUhkUhM3v4E=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f7739d01080feb4549524e8f6927669b61c6ee3", + "rev": "8eeda281e70cbadabb7f0095c5f34e354e85f307", "type": "github" }, "original": { @@ -145,14 +148,15 @@ "cl-nix-lite": "cl-nix-lite", "flake-compat": "flake-compat", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "systems": "systems" }, "locked": { - "lastModified": 1732514568, - "narHash": "sha256-F5MVwtPeOC14O/Foq7DimjA7nqMaeIKehA7Oj5CGWew=", + "lastModified": 1732920695, + "narHash": "sha256-1fxvJZUznwrmEtYqpPuWi2tPcL9kj6v7p1J7ZZncAPE=", "owner": "hraban", "repo": "mac-app-util", - "rev": "ded87083092186c7b8e30fbfe944c726540a007c", + "rev": "548672d0cb661ce11d08ee8bde92b87d2a75c872", "type": "github" }, "original": { @@ -166,11 +170,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1732603785, - "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=", + "lastModified": 1733047432, + "narHash": "sha256-fQUKxgxAEHlL5bevRkdsQB7sSpAMhlvxf7Zw0KK8QIg=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a", + "rev": "e30a3622b606dffc622305b4bbe1cfe37e78fa40", "type": "github" }, "original": { @@ -180,17 +184,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717868076, - "narHash": "sha256-c83Y9t815Wa34khrux81j8K8ET94ESmCuwORSKm2bQY=", + "lastModified": 1732617236, + "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9", + "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9", + "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", "type": "github" } }, @@ -210,11 +214,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1732837521, + "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "type": "github" }, "original": { @@ -226,11 +230,11 @@ }, "nur": { "locked": { - "lastModified": 1732877422, - "narHash": "sha256-ZDOlikQLTOnKek5J2bHItv0tWS6c1kdcLzVMseGd2rI=", + "lastModified": 1733044696, + "narHash": "sha256-rWNbe6wKl5dq/TmdGGRlnYx5+IvuVO8VkA7SJPZ6FAI=", "owner": "nix-community", "repo": "NUR", - "rev": "c5bfbd142cb0d4aee8e8222934cf4c305548d4ac", + "rev": "58c7a1f186e7d2bf80705cd56deab9f29c8a3fef", "type": "github" }, "original": { @@ -253,16 +257,16 @@ }, "systems": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347925, + "narHash": "sha256-ozenz5bFe1UUqOn7f60HRmgc01BgTGIKZ4Xl+HbocGQ=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-darwin", + "rev": "2235d7e6cc29ae99878133c95e9fe5e157661ffb", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-darwin", "type": "github" } } From 4ee9b7d2f89eda1ca2de72d77287a8db8f7c5ea6 Mon Sep 17 00:00:00 2001 From: Steph Date: Sun, 1 Dec 2024 11:53:06 +0100 Subject: [PATCH 09/13] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'firefox-macos-theme': 'github:AdamXweb/WhiteSurFirefoxThemeMacOS/4665c5b6e03127597c7cf99d91b676c9d1fca95d?narHash=sha256-8YGR0HuMcxGQBDlhP%2BkUriYDOpP7geHvGc%2BsEu167Dk%3D' (2024-10-27) → 'github:AdamXweb/WhiteSurFirefoxThemeMacOS/d63cd9a4195b6459f3024fd5742f322a6c271a3d?narHash=sha256-Duy0Opo8mCageU%2BiswWcX0xccwfR8C6od2YtCPk75vo%3D' (2024-12-01) • Updated input 'home': 'github:nix-community/home-manager/8eeda281e70cbadabb7f0095c5f34e354e85f307?narHash=sha256-UUACIrku5m2ENNr2opNY9dwZ3tHxHMI6yUhkUhM3v4E%3D' (2024-12-01) → 'github:nix-community/home-manager/4964f3c6fc17ae4578e762d3dc86b10fe890860e?narHash=sha256-n8AldXJRNVMm2UZ6yN0HwVxlARY2Cm/uhdOw76tQ0OI%3D' (2024-12-01) • Updated input 'nur': 'github:nix-community/NUR/58c7a1f186e7d2bf80705cd56deab9f29c8a3fef?narHash=sha256-rWNbe6wKl5dq/TmdGGRlnYx5%2BIvuVO8VkA7SJPZ6FAI%3D' (2024-12-01) → 'github:nix-community/NUR/386f8bff4355bbe685e2f063a6e6e82666477665?narHash=sha256-T1e6xF%2Bvoeco1NCU41m8%2BIESi9YOV/hKylI8tr/k8nw%3D' (2024-12-01) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index dc0ef98..f0ac7fd 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ "firefox-macos-theme": { "flake": false, "locked": { - "lastModified": 1729993006, - "narHash": "sha256-8YGR0HuMcxGQBDlhP+kUriYDOpP7geHvGc+sEu167Dk=", + "lastModified": 1733049744, + "narHash": "sha256-Duy0Opo8mCageU+iswWcX0xccwfR8C6od2YtCPk75vo=", "owner": "AdamXweb", "repo": "WhiteSurFirefoxThemeMacOS", - "rev": "4665c5b6e03127597c7cf99d91b676c9d1fca95d", + "rev": "d63cd9a4195b6459f3024fd5742f322a6c271a3d", "type": "github" }, "original": { @@ -130,11 +130,11 @@ ] }, "locked": { - "lastModified": 1733043896, - "narHash": "sha256-UUACIrku5m2ENNr2opNY9dwZ3tHxHMI6yUhkUhM3v4E=", + "lastModified": 1733045511, + "narHash": "sha256-n8AldXJRNVMm2UZ6yN0HwVxlARY2Cm/uhdOw76tQ0OI=", "owner": "nix-community", "repo": "home-manager", - "rev": "8eeda281e70cbadabb7f0095c5f34e354e85f307", + "rev": "4964f3c6fc17ae4578e762d3dc86b10fe890860e", "type": "github" }, "original": { @@ -230,11 +230,11 @@ }, "nur": { "locked": { - "lastModified": 1733044696, - "narHash": "sha256-rWNbe6wKl5dq/TmdGGRlnYx5+IvuVO8VkA7SJPZ6FAI=", + "lastModified": 1733050076, + "narHash": "sha256-T1e6xF+voeco1NCU41m8+IESi9YOV/hKylI8tr/k8nw=", "owner": "nix-community", "repo": "NUR", - "rev": "58c7a1f186e7d2bf80705cd56deab9f29c8a3fef", + "rev": "386f8bff4355bbe685e2f063a6e6e82666477665", "type": "github" }, "original": { From 522ffe07a8ecf101dbe63a395fbabfbdc60f252f Mon Sep 17 00:00:00 2001 From: Steph Date: Sun, 1 Dec 2024 17:07:10 +0100 Subject: [PATCH 10/13] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'firefox-macos-theme': 'github:AdamXweb/WhiteSurFirefoxThemeMacOS/d63cd9a4195b6459f3024fd5742f322a6c271a3d?narHash=sha256-Duy0Opo8mCageU%2BiswWcX0xccwfR8C6od2YtCPk75vo%3D' (2024-12-01) → 'github:AdamXweb/WhiteSurFirefoxThemeMacOS/e84b1b0c08f9c2dce1db9cfe671a93c0cb8ff18d?narHash=sha256-km21Dvr%2Bnfl54orbVqa7rtu%2BevTVO3FBlLtr2NQ3yYc%3D' (2024-12-01) • Updated input 'nur': 'github:nix-community/NUR/386f8bff4355bbe685e2f063a6e6e82666477665?narHash=sha256-T1e6xF%2Bvoeco1NCU41m8%2BIESi9YOV/hKylI8tr/k8nw%3D' (2024-12-01) → 'github:nix-community/NUR/7d4007f69a37be43cbdd420d8d0659f8ae70fcbf?narHash=sha256-CIPizxtr5Pk5pnncKtcf0I214IZGVDrbmZjlyVNKQi8%3D' (2024-12-01) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index f0ac7fd..e11d27e 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ "firefox-macos-theme": { "flake": false, "locked": { - "lastModified": 1733049744, - "narHash": "sha256-Duy0Opo8mCageU+iswWcX0xccwfR8C6od2YtCPk75vo=", + "lastModified": 1733051267, + "narHash": "sha256-km21Dvr+nfl54orbVqa7rtu+evTVO3FBlLtr2NQ3yYc=", "owner": "AdamXweb", "repo": "WhiteSurFirefoxThemeMacOS", - "rev": "d63cd9a4195b6459f3024fd5742f322a6c271a3d", + "rev": "e84b1b0c08f9c2dce1db9cfe671a93c0cb8ff18d", "type": "github" }, "original": { @@ -230,11 +230,11 @@ }, "nur": { "locked": { - "lastModified": 1733050076, - "narHash": "sha256-T1e6xF+voeco1NCU41m8+IESi9YOV/hKylI8tr/k8nw=", + "lastModified": 1733065597, + "narHash": "sha256-CIPizxtr5Pk5pnncKtcf0I214IZGVDrbmZjlyVNKQi8=", "owner": "nix-community", "repo": "NUR", - "rev": "386f8bff4355bbe685e2f063a6e6e82666477665", + "rev": "7d4007f69a37be43cbdd420d8d0659f8ae70fcbf", "type": "github" }, "original": { From fd242cf43ea6ce1fd38421808ab77fb0cdad78fa Mon Sep 17 00:00:00 2001 From: Steph Date: Sun, 1 Dec 2024 17:10:37 +0100 Subject: [PATCH 11/13] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Added input 'nixpkgs-2405': 'github:nixos/nixpkgs/7e1ca67996afd8233d9033edd26e442836cc2ad6?narHash=sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4%3D' (2024-12-01) --- flake.lock | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/flake.lock b/flake.lock index e11d27e..0f268ad 100644 --- a/flake.lock +++ b/flake.lock @@ -198,6 +198,22 @@ "type": "github" } }, + "nixpkgs-2405": { + "locked": { + "lastModified": 1733016324, + "narHash": "sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7e1ca67996afd8233d9033edd26e442836cc2ad6", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1718149104, @@ -252,6 +268,7 @@ "mac-app-util": "mac-app-util", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_3", + "nixpkgs-2405": "nixpkgs-2405", "nur": "nur" } }, From 0eb34021ac7a8371fccd930c8a8de04b21aac8a8 Mon Sep 17 00:00:00 2001 From: Steph Date: Tue, 3 Dec 2024 10:08:48 +0100 Subject: [PATCH 12/13] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'firefox-addons': 'gitlab:rycee/nur-expressions/7b8d9feb25606cccb5c93f405c7f9796698d756e?dir=pkgs/firefox-addons&narHash=sha256-j1EDQmFyRD0uVT3Bo3SrON4rCfyQMGJPIG3Vay3EVHk%3D' (2024-12-01) → 'gitlab:rycee/nur-expressions/51d5446f359b67d5b6fdf45a145391c4d8679b3e?dir=pkgs/firefox-addons&narHash=sha256-7n66bpxbXkwBow1VSVHQe%2BrEW%2B8zPyawmDJ7Rd0uHNI%3D' (2024-12-03) • Updated input 'firefox-gnome-theme': 'github:rafaelmardojai/firefox-gnome-theme/823756d8ddd21cfd3a24a87dad402e490e0eb5ee?narHash=sha256-lf9MQs8%2BNUvQd8b5t%2B7c4kLqUQixGO9WwWcLa1XYuiQ%3D' (2024-11-03) → 'github:rafaelmardojai/firefox-gnome-theme/ef6ac4285eaac6053338a6240bc615902a839493?narHash=sha256-k7v5PE6OcqMkC/u7aokwcxKDmTKM%2BejiZGCsH9MK0s0%3D' (2024-11-28) • Updated input 'home': 'github:nix-community/home-manager/4964f3c6fc17ae4578e762d3dc86b10fe890860e?narHash=sha256-n8AldXJRNVMm2UZ6yN0HwVxlARY2Cm/uhdOw76tQ0OI%3D' (2024-12-01) → 'github:nix-community/home-manager/bf23fe41082aa0289c209169302afd3397092f22?narHash=sha256-zFOtOaqjzZfPMsm1mwu98syv3y%2BjziAq5DfWygaMtLg%3D' (2024-12-02) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/e30a3622b606dffc622305b4bbe1cfe37e78fa40?narHash=sha256-fQUKxgxAEHlL5bevRkdsQB7sSpAMhlvxf7Zw0KK8QIg%3D' (2024-12-01) → 'github:LnL7/nix-darwin/c6b65d946097baf3915dd51373251de98199280d?narHash=sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s%2BvG6ENM%3D' (2024-12-02) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/970e93b9f82e2a0f3675757eb0bfc73297cc6370?narHash=sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE%3D' (2024-11-28) → 'github:nixos/nixpkgs/ac35b104800bff9028425fec3b6e8a41de2bbfff?narHash=sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE%2Bcrk%3D' (2024-12-01) • Updated input 'nur': 'github:nix-community/NUR/7d4007f69a37be43cbdd420d8d0659f8ae70fcbf?narHash=sha256-CIPizxtr5Pk5pnncKtcf0I214IZGVDrbmZjlyVNKQi8%3D' (2024-12-01) → 'github:nix-community/NUR/251d756a74e67bda25d89327b01a3da19dddabae?narHash=sha256-RIlhnKlObJ1sEdzBP6Nuy4jLUiQnmWWXVsRHRbv6SzY%3D' (2024-12-03) --- flake.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 0f268ad..0aa3a10 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1733044294, - "narHash": "sha256-j1EDQmFyRD0uVT3Bo3SrON4rCfyQMGJPIG3Vay3EVHk=", + "lastModified": 1733198595, + "narHash": "sha256-7n66bpxbXkwBow1VSVHQe+rEW+8zPyawmDJ7Rd0uHNI=", "owner": "rycee", "repo": "nur-expressions", - "rev": "7b8d9feb25606cccb5c93f405c7f9796698d756e", + "rev": "51d5446f359b67d5b6fdf45a145391c4d8679b3e", "type": "gitlab" }, "original": { @@ -41,16 +41,16 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1730674701, - "narHash": "sha256-lf9MQs8+NUvQd8b5t+7c4kLqUQixGO9WwWcLa1XYuiQ=", + "lastModified": 1732798888, + "narHash": "sha256-k7v5PE6OcqMkC/u7aokwcxKDmTKM+ejiZGCsH9MK0s0=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "823756d8ddd21cfd3a24a87dad402e490e0eb5ee", + "rev": "ef6ac4285eaac6053338a6240bc615902a839493", "type": "github" }, "original": { "owner": "rafaelmardojai", - "ref": "v132", + "ref": "v133", "repo": "firefox-gnome-theme", "type": "github" } @@ -130,11 +130,11 @@ ] }, "locked": { - "lastModified": 1733045511, - "narHash": "sha256-n8AldXJRNVMm2UZ6yN0HwVxlARY2Cm/uhdOw76tQ0OI=", + "lastModified": 1733175814, + "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", "owner": "nix-community", "repo": "home-manager", - "rev": "4964f3c6fc17ae4578e762d3dc86b10fe890860e", + "rev": "bf23fe41082aa0289c209169302afd3397092f22", "type": "github" }, "original": { @@ -170,11 +170,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1733047432, - "narHash": "sha256-fQUKxgxAEHlL5bevRkdsQB7sSpAMhlvxf7Zw0KK8QIg=", + "lastModified": 1733105089, + "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "e30a3622b606dffc622305b4bbe1cfe37e78fa40", + "rev": "c6b65d946097baf3915dd51373251de98199280d", "type": "github" }, "original": { @@ -230,11 +230,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1732837521, - "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", + "lastModified": 1733015953, + "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", + "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", "type": "github" }, "original": { @@ -246,11 +246,11 @@ }, "nur": { "locked": { - "lastModified": 1733065597, - "narHash": "sha256-CIPizxtr5Pk5pnncKtcf0I214IZGVDrbmZjlyVNKQi8=", + "lastModified": 1733215745, + "narHash": "sha256-RIlhnKlObJ1sEdzBP6Nuy4jLUiQnmWWXVsRHRbv6SzY=", "owner": "nix-community", "repo": "NUR", - "rev": "7d4007f69a37be43cbdd420d8d0659f8ae70fcbf", + "rev": "251d756a74e67bda25d89327b01a3da19dddabae", "type": "github" }, "original": { From 91b17f861ab48ebc2d029706a433d2dc24c0f26a Mon Sep 17 00:00:00 2001 From: Steph Date: Tue, 3 Dec 2024 10:13:54 +0100 Subject: [PATCH 13/13] yes --- flake.nix | 5 +++-- home.nix | 8 +++++++- nixos.nix | 10 +++++----- platforms/linux/home.nix | 2 +- programs/bash.nix | 13 ++++++++++--- programs/firefox.nix | 4 +++- 6 files changed, 29 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index c70b851..6d12f63 100644 --- a/flake.nix +++ b/flake.nix @@ -3,11 +3,12 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-2405.url = "github:nixos/nixpkgs/nixos-24.05"; home.url = "github:nix-community/home-manager"; home.inputs.nixpkgs.follows = "nixpkgs"; - firefox-gnome-theme = { url = "github:rafaelmardojai/firefox-gnome-theme"; flake = false; }; + firefox-gnome-theme = { url = "github:rafaelmardojai/firefox-gnome-theme/v133"; flake = false; }; firefox-macos-theme = {url = "github:AdamXweb/WhiteSurFirefoxThemeMacOS"; flake = false; }; firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -15,7 +16,7 @@ mac-app-util.url = "github:hraban/mac-app-util"; }; - outputs = { self, nixpkgs, home, firefox-gnome-theme, firefox-addons, nur, nix-darwin, firefox-macos-theme, mac-app-util }@inputs: { + outputs = { self, nixpkgs, home, firefox-gnome-theme, firefox-addons, nur, nix-darwin, firefox-macos-theme, mac-app-util, nixpkgs-2405 }@inputs: { nixosConfigurations.iota = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ diff --git a/home.nix b/home.nix index 48d36d4..3165a63 100644 --- a/home.nix +++ b/home.nix @@ -45,9 +45,15 @@ zip coreutils zotero + ollama + inputs.nixpkgs-2405.legacyPackages.${system}.signal-desktop-beta + # fonts - (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; }) + nerd-fonts.fira-code + nerd-fonts.fira-mono + nerd-fonts.droid-sans-mono + borg-sans-mono noto-fonts noto-fonts-cjk-sans noto-fonts-emoji diff --git a/nixos.nix b/nixos.nix index 7cbea58..3375842 100644 --- a/nixos.nix +++ b/nixos.nix @@ -7,7 +7,7 @@ ]; nix = { - package = pkgs.nixFlakes; + package = pkgs.nixVersions.stable; extraOptions = '' experimental-features = nix-command flakes ''; @@ -16,6 +16,7 @@ networking.networkmanager.enable = true; + services.wg-netmanager.enable = true; time.timeZone = "Europe/Amsterdam"; @@ -47,7 +48,6 @@ services.printing.enable = true; - sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { @@ -91,7 +91,7 @@ udev usbutils - gnome.gnome-tweaks + gnome-tweaks gnomeExtensions.tray-icons-reloaded gnomeExtensions.clipboard-history @@ -101,11 +101,11 @@ aspell aspellDicts.en aspellDicts.nl - gnome.networkmanager-openvpn + networkmanager-openvpn ]; services.udev.packages = with pkgs; [ - gnome.gnome-settings-daemon + gnome-settings-daemon android-udev-rules ]; services.fprintd.enable = true; diff --git a/platforms/linux/home.nix b/platforms/linux/home.nix index c8a228b..2f1ffc8 100644 --- a/platforms/linux/home.nix +++ b/platforms/linux/home.nix @@ -85,4 +85,4 @@ "picture-uri" = "${config.home.homeDirectory}/.background-image"; }; }; -} \ No newline at end of file +} diff --git a/programs/bash.nix b/programs/bash.nix index 992dd66..24b7e3f 100644 --- a/programs/bash.nix +++ b/programs/bash.nix @@ -44,13 +44,20 @@ free = "free -h"; toupper = "tr [:lower:] [:upper:]"; tolower = "tr [:upper:] [:lower:]"; - rebuild = if (os == "linux") then '' - nixos-rebuild switch --flake "path:$HOME/.local/os#" --use-remote-sudo + rebuild = if (os == "linux") then '' + cd $HOME/.local/os && + nix flake update --commit-lock-file + nixos-rebuild switch --flake "path:$HOME/.local/os#" --use-remote-sudo && + cd - '' else '' - home-manager switch + cd $HOME/.local/os && + nix flake update --commit-lock-file + home-manager switch && + cd - ''; ":r" = "!!"; ":wq" = "exit"; + vim = "hx"; }; programs.bash.sessionVariables = { NIX_SHELL_PRESERVE_PROMPT = 1; diff --git a/programs/firefox.nix b/programs/firefox.nix index b04351a..797cf0d 100644 --- a/programs/firefox.nix +++ b/programs/firefox.nix @@ -48,6 +48,7 @@ consent-o-matic sponsorblock multi-account-containers + privacy-redirect ] ++ (if (os == "darwin") then [ onepassword-password-manager ] else [ @@ -55,6 +56,7 @@ h264ify fediact tampermonkey + laboratory-by-mozilla ]); search = { default = "DuckDuckGo"; @@ -92,4 +94,4 @@ } ]; } -] \ No newline at end of file +]