From 37eec13b2044d021b033f3f3f4d3111ee214dc41 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Fri, 15 Nov 2024 22:45:06 +0100 Subject: [PATCH 01/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/60bb110917844d354f3c18e05450606a435d2d10?narHash=sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs%3D' (2024-11-10) → 'github:nix-community/home-manager/1d0862ee2d7c6f6cd720d6f32213fa425004be10?narHash=sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM%3D' (2024-11-14) • Updated input 'nix-alien': 'github:thiagokokada/nix-alien/3d6cd128d04a4df25584a3b23b9298a07661dbf6?narHash=sha256-v5GnrRqFRAmtfDbWxYKkaQsinz7EyAmFlUVDwH9MPTo%3D' (2024-10-15) → 'github:thiagokokada/nix-alien/97fe58a8ac15663b1ecdebd84d2187eb71f8532d?narHash=sha256-ZszfGYOrwol3MGFpttahldT%2BUOfqXckk6XwZrUyHLxE%3D' (2024-11-15) • Updated input 'nix-alien/flake-utils': 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a?narHash=sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ%3D' (2024-09-17) → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b?narHash=sha256-l0KFg5HjrsfsO/JpG%2Br7fRrqm12kzFHyUHqHCVpMMbI%3D' (2024-11-13) • Updated input 'nix-alien/nix-filter': 'github:numtide/nix-filter/3342559a24e85fc164b295c3444e8a139924675b?narHash=sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj%2BrL8sRQsSM%3D' (2024-03-11) → 'github:numtide/nix-filter/f7653272fd234696ae94229839a99b73c9ab7de0?narHash=sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms%3D' (2024-11-13) • Updated input 'nix-alien/nix-index-database': 'github:nix-community/nix-index-database/5c54c33aa04df5dd4b0984b7eb861d1981009b22?narHash=sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y%3D' (2024-10-13) → 'github:nix-community/nix-index-database/40d882b55e89add1ded379cc99edaab24983d6d9?narHash=sha256-FvksinoI2Y6kuwH%2BcKBu1oDA8uPGfoRqgtQV6O8GDc4%3D' (2024-11-14) • Updated input 'nix-alien/nixpkgs': 'github:NixOS/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7?narHash=sha256-9UTxR8eukdg%2BXZeHgxW5hQA9fIKHsKCdOIUycTryeVw%3D' (2024-10-09) → 'github:NixOS/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c?narHash=sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY%2B/Z96ZcLpooIbuEI%3D' (2024-11-11) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/896019f04b22ce5db4c0ee4f89978694f44345c3?narHash=sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0%3D' (2024-11-10) → 'github:nix-community/nix-index-database/40d882b55e89add1ded379cc99edaab24983d6d9?narHash=sha256-FvksinoI2Y6kuwH%2BcKBu1oDA8uPGfoRqgtQV6O8GDc4%3D' (2024-11-14) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/76612b17c0ce71689921ca12d9ffdc9c23ce40b2?narHash=sha256-IigrKK3vYRpUu%2BHEjPL/phrfh7Ox881er1UEsZvw9Q4%3D' (2024-11-09) → 'github:NixOS/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c?narHash=sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY%2B/Z96ZcLpooIbuEI%3D' (2024-11-11) --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index ae3d1b6..48a1dbe 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1731235328, - "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", + "lastModified": 1731604581, + "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", "owner": "nix-community", "repo": "home-manager", - "rev": "60bb110917844d354f3c18e05450606a435d2d10", + "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", "type": "github" }, "original": { @@ -157,11 +157,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1728984726, - "narHash": "sha256-v5GnrRqFRAmtfDbWxYKkaQsinz7EyAmFlUVDwH9MPTo=", + "lastModified": 1731668526, + "narHash": "sha256-ZszfGYOrwol3MGFpttahldT+UOfqXckk6XwZrUyHLxE=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "3d6cd128d04a4df25584a3b23b9298a07661dbf6", + "rev": "97fe58a8ac15663b1ecdebd84d2187eb71f8532d", "type": "github" }, "original": { @@ -172,11 +172,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", + "lastModified": 1731533336, + "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", "owner": "numtide", "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", + "rev": "f7653272fd234696ae94229839a99b73c9ab7de0", "type": "github" }, "original": { @@ -193,11 +193,11 @@ ] }, "locked": { - "lastModified": 1728790083, - "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=", + "lastModified": 1731593150, + "narHash": "sha256-FvksinoI2Y6kuwH+cKBu1oDA8uPGfoRqgtQV6O8GDc4=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22", + "rev": "40d882b55e89add1ded379cc99edaab24983d6d9", "type": "github" }, "original": { @@ -213,11 +213,11 @@ ] }, "locked": { - "lastModified": 1731209121, - "narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=", + "lastModified": 1731593150, + "narHash": "sha256-FvksinoI2Y6kuwH+cKBu1oDA8uPGfoRqgtQV6O8GDc4=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "896019f04b22ce5db4c0ee4f89978694f44345c3", + "rev": "40d882b55e89add1ded379cc99edaab24983d6d9", "type": "github" }, "original": { @@ -249,11 +249,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", "type": "github" }, "original": { @@ -286,11 +286,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", "type": "github" }, "original": { From c74a8f7d1379c76429d004262f40f729404b31ab Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Sun, 17 Nov 2024 14:50:50 +0100 Subject: [PATCH 02/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/1d0862ee2d7c6f6cd720d6f32213fa425004be10?narHash=sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM%3D' (2024-11-14) → 'github:nix-community/home-manager/5056a1cf0ce7c2a08ab50713b6c4af77975f6111?narHash=sha256-icDDuYwJ0avTMZTxe1qyU/Baht5JOqw4pb5mWpR%2BhT0%3D' (2024-11-17) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/40d882b55e89add1ded379cc99edaab24983d6d9?narHash=sha256-FvksinoI2Y6kuwH%2BcKBu1oDA8uPGfoRqgtQV6O8GDc4%3D' (2024-11-14) → 'github:nix-community/nix-index-database/bdba246946fb079b87b4cada4df9b1cdf1c06132?narHash=sha256-l9ryrx1Twh08a%2BgxrMGM9O/aZKEimZfa6sZVyPCImgI%3D' (2024-11-17) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c?narHash=sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY%2B/Z96ZcLpooIbuEI%3D' (2024-11-11) → 'github:NixOS/nixpkgs/5e4fbfb6b3de1aa2872b76d49fafc942626e2add?narHash=sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg%3D' (2024-11-15) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 48a1dbe..8a31f76 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1731604581, - "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", + "lastModified": 1731832479, + "narHash": "sha256-icDDuYwJ0avTMZTxe1qyU/Baht5JOqw4pb5mWpR+hT0=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", + "rev": "5056a1cf0ce7c2a08ab50713b6c4af77975f6111", "type": "github" }, "original": { @@ -213,11 +213,11 @@ ] }, "locked": { - "lastModified": 1731593150, - "narHash": "sha256-FvksinoI2Y6kuwH+cKBu1oDA8uPGfoRqgtQV6O8GDc4=", + "lastModified": 1731814505, + "narHash": "sha256-l9ryrx1Twh08a+gxrMGM9O/aZKEimZfa6sZVyPCImgI=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "40d882b55e89add1ded379cc99edaab24983d6d9", + "rev": "bdba246946fb079b87b4cada4df9b1cdf1c06132", "type": "github" }, "original": { @@ -286,11 +286,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { From 4cb63622d8cee4fea1e87f2c07bacb9165d5d58d Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Mon, 18 Nov 2024 02:17:32 +0100 Subject: [PATCH 03/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/5056a1cf0ce7c2a08ab50713b6c4af77975f6111?narHash=sha256-icDDuYwJ0avTMZTxe1qyU/Baht5JOqw4pb5mWpR%2BhT0%3D' (2024-11-17) → 'github:nix-community/home-manager/f3a2ff69586f3a54b461526e5702b1a2f81e740a?narHash=sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8%3D' (2024-11-17) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8a31f76..7d9a524 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1731832479, - "narHash": "sha256-icDDuYwJ0avTMZTxe1qyU/Baht5JOqw4pb5mWpR+hT0=", + "lastModified": 1731887066, + "narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=", "owner": "nix-community", "repo": "home-manager", - "rev": "5056a1cf0ce7c2a08ab50713b6c4af77975f6111", + "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a", "type": "github" }, "original": { From 593e97139c33fde4ccb3cb037f90f4d4ebbbe8da Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Tue, 19 Nov 2024 13:51:16 +0100 Subject: [PATCH 04/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/f3a2ff69586f3a54b461526e5702b1a2f81e740a?narHash=sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8%3D' (2024-11-17) → 'github:nix-community/home-manager/a42fa14b53ceab66274a21da480c9f8e06204173?narHash=sha256-%2BhTCwETOE9N8voTAaF%2BIzdUZz28Ws3LDpH90FWADrEE%3D' (2024-11-18) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 7d9a524..957e672 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1731887066, - "narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=", + "lastModified": 1731968878, + "narHash": "sha256-+hTCwETOE9N8voTAaF+IzdUZz28Ws3LDpH90FWADrEE=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a", + "rev": "a42fa14b53ceab66274a21da480c9f8e06204173", "type": "github" }, "original": { From 8b7402ccc0fd96f073577304f780a02bfbeb54e7 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Wed, 20 Nov 2024 14:30:36 +0100 Subject: [PATCH 05/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/a42fa14b53ceab66274a21da480c9f8e06204173?narHash=sha256-%2BhTCwETOE9N8voTAaF%2BIzdUZz28Ws3LDpH90FWADrEE%3D' (2024-11-18) → 'github:nix-community/home-manager/a46e702093a5c46e192243edbd977d5749e7f294?narHash=sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo%3D' (2024-11-19) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 957e672..c982b70 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1731968878, - "narHash": "sha256-+hTCwETOE9N8voTAaF+IzdUZz28Ws3LDpH90FWADrEE=", + "lastModified": 1732025103, + "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "a42fa14b53ceab66274a21da480c9f8e06204173", + "rev": "a46e702093a5c46e192243edbd977d5749e7f294", "type": "github" }, "original": { From f770435a6f00439e58e1469d92e70d229d1d0e71 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Thu, 21 Nov 2024 00:13:26 +0100 Subject: [PATCH 06/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5e4fbfb6b3de1aa2872b76d49fafc942626e2add?narHash=sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg%3D' (2024-11-15) → 'github:NixOS/nixpkgs/23e89b7da85c3640bbc2173fe04f4bd114342367?narHash=sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w%3D' (2024-11-19) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index c982b70..5b962ce 100644 --- a/flake.lock +++ b/flake.lock @@ -286,11 +286,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { From 4d24cde57581092eef596293f81df158f3da4bdd Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Fri, 22 Nov 2024 23:33:34 +0100 Subject: [PATCH 07/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/a46e702093a5c46e192243edbd977d5749e7f294?narHash=sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo%3D' (2024-11-19) → 'github:nix-community/home-manager/8cf9cb2ee78aa129e5b8220135a511a2be254c0c?narHash=sha256-5Umjb5AdtxV5jSJd5jxoCckh5mlg%2BFBQDsyAilu637g%3D' (2024-11-22) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 5b962ce..0690f05 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1732025103, - "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", + "lastModified": 1732303962, + "narHash": "sha256-5Umjb5AdtxV5jSJd5jxoCckh5mlg+FBQDsyAilu637g=", "owner": "nix-community", "repo": "home-manager", - "rev": "a46e702093a5c46e192243edbd977d5749e7f294", + "rev": "8cf9cb2ee78aa129e5b8220135a511a2be254c0c", "type": "github" }, "original": { From 0d7fd5a54d3986dbc9fa96432eb9c23dce08bdc5 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Sat, 23 Nov 2024 23:26:29 +0100 Subject: [PATCH 08/32] add fpga stuff --- home-manager/modules/packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix index 54b460f..870187d 100644 --- a/home-manager/modules/packages.nix +++ b/home-manager/modules/packages.nix @@ -88,6 +88,12 @@ in nix-output-monitor nodePackages.pnpm npm-check-updates + + # FPGA stuff + yosys + nextpnr + icestorm + icebreaker ] ++ ( if (!config.machine.isGeneric) then From e0ac5d5f2ef64002f1c5ffeba7301cef5b0a1ee3 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Sun, 24 Nov 2024 00:12:21 +0100 Subject: [PATCH 09/32] change git remote and add flatpak bootstrap --- bootstrap.sh | 7 +- scripts/flatpak-bootstrap/flatpaks-plasma.txt | 64 +++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 scripts/flatpak-bootstrap/flatpaks-plasma.txt diff --git a/bootstrap.sh b/bootstrap.sh index afd0086..95d7974 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -21,4 +21,9 @@ fi # Install home-manager cd $HOME/.config/home-manager -nix run .#homeConfigurations.$USER@$(hostname).activationPackage \ No newline at end of file +git remote set-url origin git@github.com:thilobillerbeck/dotfiles.git +nix run .#homeConfigurations.$USER@$(hostname).activationPackage + +if [[ "$XDG_CURRENT_DESKTOP" == "KDE" || "$KDE_FULL_SESSION" == "true" ]]; then + xargs flatpak install -y < $HOME/.config/home-manager/scripts/flatpak-bootstrap/flatpaks-plasma.txt +fi \ No newline at end of file diff --git a/scripts/flatpak-bootstrap/flatpaks-plasma.txt b/scripts/flatpak-bootstrap/flatpaks-plasma.txt new file mode 100644 index 0000000..32a29b3 --- /dev/null +++ b/scripts/flatpak-bootstrap/flatpaks-plasma.txt @@ -0,0 +1,64 @@ +com.brave.Browser +com.github.mtkennerly.ludusavi +com.github.tchx84.Flatseal +com.github.wwmm.easyeffects +com.heroicgameslauncher.hgl +com.mastermindzh.tidal-hifi +com.nextcloud.desktopclient.nextcloud +com.spotify.Client +com.usebottles.bottles +com.valvesoftware.Steam +com.vysp3r.ProtonPlus +com.vysp3r.RetroPlus +dev.deedles.Trayscale +dev.vencord.Vesktop +im.nheko.Nheko +info.mumble.Mumble +io.anytype.anytype +io.appflowy.AppFlowy +io.github.dimtpap.coppwr +io.github.dvlv.boxbuddyrs +io.github.flattool.Warehouse +io.github.zen_browser.zen +io.gpt4all.gpt4all +io.missioncenter.MissionCenter +io.ossia.score +io.podman_desktop.PodmanDesktop +it.fabiodistasio.AntaresSQL +it.mijorus.gearlever +md.obsidian.Obsidian +net.ankiweb.Anki +net.lutris.Lutris +net.retrodeck.retrodeck +org.ardour.Ardour +org.audacityteam.Audacity +org.fedoraproject.MediaWriter +org.filezillaproject.Filezilla +org.fkoehler.KTailctl +org.freac.freac +org.gnome.Boxes +org.gnome.DejaDup +org.gnome.World.PikaBackup +org.godotengine.Godot +org.inkscape.Inkscape +org.kde.filelight +org.kde.gwenview +org.kde.haruna +org.kde.kcalc +org.kde.kclock +org.kde.kdenlive +org.kde.kontact +org.kde.kweather +org.kde.okular +org.libreoffice.LibreOffice +org.mixxx.Mixxx +org.mozilla.Thunderbird +org.mozilla.firefox +org.musescore.MuseScore +org.onlyoffice.desktopeditors +org.raspberrypi.rpi-imager +org.rncbc.qpwgraph +org.signal.Signal +org.telegram.desktop +org.zotero.Zotero +page.kramo.Cartridges From 97c56d8a2941b1c59e46f1c23452b5c7fd235a2c Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Sun, 24 Nov 2024 01:54:31 +0100 Subject: [PATCH 10/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/8cf9cb2ee78aa129e5b8220135a511a2be254c0c?narHash=sha256-5Umjb5AdtxV5jSJd5jxoCckh5mlg%2BFBQDsyAilu637g%3D' (2024-11-22) → 'github:nix-community/home-manager/92fef254a9071fa41a13908281284e6a62b9c92e?narHash=sha256-2jaf/zkug22hzlldm1PKdKJLVKgdjVXbf47SF%2B5mroU%3D' (2024-11-23) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 0690f05..0c18728 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1732303962, - "narHash": "sha256-5Umjb5AdtxV5jSJd5jxoCckh5mlg+FBQDsyAilu637g=", + "lastModified": 1732397793, + "narHash": "sha256-2jaf/zkug22hzlldm1PKdKJLVKgdjVXbf47SF+5mroU=", "owner": "nix-community", "repo": "home-manager", - "rev": "8cf9cb2ee78aa129e5b8220135a511a2be254c0c", + "rev": "92fef254a9071fa41a13908281284e6a62b9c92e", "type": "github" }, "original": { From 01e7a46cee0b32e8ffca42c3af57c27bed559974 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Sun, 24 Nov 2024 11:51:59 +0100 Subject: [PATCH 11/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/92fef254a9071fa41a13908281284e6a62b9c92e?narHash=sha256-2jaf/zkug22hzlldm1PKdKJLVKgdjVXbf47SF%2B5mroU%3D' (2024-11-23) → 'github:nix-community/home-manager/67cd4814a247fd0fe97171acb90659f7e304bcb8?narHash=sha256-u6JOOVlnGe8fMekW0BgaHuuZwbJp4ixQaMA5BEvRoDA%3D' (2024-11-24) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/bdba246946fb079b87b4cada4df9b1cdf1c06132?narHash=sha256-l9ryrx1Twh08a%2BgxrMGM9O/aZKEimZfa6sZVyPCImgI%3D' (2024-11-17) → 'github:nix-community/nix-index-database/0ef970b7021e0ee9ab93437d0e28296e86669b03?narHash=sha256-TjuKScXbj4Ddr0L%2BkEOLFaYOhzbS/k/EFL543wkjN5E%3D' (2024-11-24) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0c18728..da83be7 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1732397793, - "narHash": "sha256-2jaf/zkug22hzlldm1PKdKJLVKgdjVXbf47SF+5mroU=", + "lastModified": 1732420764, + "narHash": "sha256-u6JOOVlnGe8fMekW0BgaHuuZwbJp4ixQaMA5BEvRoDA=", "owner": "nix-community", "repo": "home-manager", - "rev": "92fef254a9071fa41a13908281284e6a62b9c92e", + "rev": "67cd4814a247fd0fe97171acb90659f7e304bcb8", "type": "github" }, "original": { @@ -213,11 +213,11 @@ ] }, "locked": { - "lastModified": 1731814505, - "narHash": "sha256-l9ryrx1Twh08a+gxrMGM9O/aZKEimZfa6sZVyPCImgI=", + "lastModified": 1732419467, + "narHash": "sha256-TjuKScXbj4Ddr0L+kEOLFaYOhzbS/k/EFL543wkjN5E=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "bdba246946fb079b87b4cada4df9b1cdf1c06132", + "rev": "0ef970b7021e0ee9ab93437d0e28296e86669b03", "type": "github" }, "original": { From b6845ab81297d9cf07ff31d3bc7a4f5971529a3a Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Mon, 25 Nov 2024 00:53:04 +0100 Subject: [PATCH 12/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/67cd4814a247fd0fe97171acb90659f7e304bcb8?narHash=sha256-u6JOOVlnGe8fMekW0BgaHuuZwbJp4ixQaMA5BEvRoDA%3D' (2024-11-24) → 'github:nix-community/home-manager/a9953635d7f34e7358d5189751110f87e3ac17da?narHash=sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A%3D' (2024-11-24) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/0ef970b7021e0ee9ab93437d0e28296e86669b03?narHash=sha256-TjuKScXbj4Ddr0L%2BkEOLFaYOhzbS/k/EFL543wkjN5E%3D' (2024-11-24) → 'github:nix-community/nix-index-database/bedc30c64442579943c1c6e7579db263d810884f?narHash=sha256-3SMxtkXlmzPmF4NXCt6lLF2IkdyAmO824PlScUKVhB0%3D' (2024-11-24) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index da83be7..ef4aa7a 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1732420764, - "narHash": "sha256-u6JOOVlnGe8fMekW0BgaHuuZwbJp4ixQaMA5BEvRoDA=", + "lastModified": 1732482255, + "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "owner": "nix-community", "repo": "home-manager", - "rev": "67cd4814a247fd0fe97171acb90659f7e304bcb8", + "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "type": "github" }, "original": { @@ -213,11 +213,11 @@ ] }, "locked": { - "lastModified": 1732419467, - "narHash": "sha256-TjuKScXbj4Ddr0L+kEOLFaYOhzbS/k/EFL543wkjN5E=", + "lastModified": 1732461762, + "narHash": "sha256-3SMxtkXlmzPmF4NXCt6lLF2IkdyAmO824PlScUKVhB0=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "0ef970b7021e0ee9ab93437d0e28296e86669b03", + "rev": "bedc30c64442579943c1c6e7579db263d810884f", "type": "github" }, "original": { From a3ce519c641ec72b4f539facf0be47c4d997d773 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Tue, 26 Nov 2024 01:52:05 +0100 Subject: [PATCH 13/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/bedc30c64442579943c1c6e7579db263d810884f?narHash=sha256-3SMxtkXlmzPmF4NXCt6lLF2IkdyAmO824PlScUKVhB0%3D' (2024-11-24) → 'github:nix-community/nix-index-database/f4a5ca5771ba9ca31ad24a62c8d511a405303436?narHash=sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q%3D' (2024-11-25) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index ef4aa7a..4b120ed 100644 --- a/flake.lock +++ b/flake.lock @@ -213,11 +213,11 @@ ] }, "locked": { - "lastModified": 1732461762, - "narHash": "sha256-3SMxtkXlmzPmF4NXCt6lLF2IkdyAmO824PlScUKVhB0=", + "lastModified": 1732519917, + "narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "bedc30c64442579943c1c6e7579db263d810884f", + "rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436", "type": "github" }, "original": { From c677ef03b8b3c36ad48b7b34f28ae125f1dd32b6 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Thu, 28 Nov 2024 01:44:47 +0100 Subject: [PATCH 14/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/23e89b7da85c3640bbc2173fe04f4bd114342367?narHash=sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w%3D' (2024-11-19) → 'github:NixOS/nixpkgs/4633a7c72337ea8fd23a4f2ba3972865e3ec685d?narHash=sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0%3D' (2024-11-25) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 4b120ed..a2ed1db 100644 --- a/flake.lock +++ b/flake.lock @@ -286,11 +286,11 @@ }, "nixpkgs_2": { "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": { From 9d818d3a70fd8caf76af3d519b63bd64a008d1da Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Thu, 28 Nov 2024 13:46:59 +0100 Subject: [PATCH 15/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': '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) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a2ed1db..3ab994f 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,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": { From 9b10cbb7e461fbe8e1139610f5c962ee10db5097 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Sat, 30 Nov 2024 00:44:57 +0100 Subject: [PATCH 16/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/2f7739d01080feb4549524e8f6927669b61c6ee3?narHash=sha256-6TrknJ8CpvSSF4gviQSeD%2Bwyj3siRcMvdBKhOXkEMKU%3D' (2024-11-28) → 'github:nix-community/home-manager/819f682269f4e002884702b87e445c82840c68f2?narHash=sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB%2BXG6Q%3D' (2024-11-29) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 3ab994f..8aa1865 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1732793095, - "narHash": "sha256-6TrknJ8CpvSSF4gviQSeD+wyj3siRcMvdBKhOXkEMKU=", + "lastModified": 1732884235, + "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f7739d01080feb4549524e8f6927669b61c6ee3", + "rev": "819f682269f4e002884702b87e445c82840c68f2", "type": "github" }, "original": { From aa424c2705ef8e0d8743154f8ff5e6812e411f5f Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Sun, 1 Dec 2024 15:05:57 +0100 Subject: [PATCH 17/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/819f682269f4e002884702b87e445c82840c68f2?narHash=sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB%2BXG6Q%3D' (2024-11-29) → 'github:nix-community/home-manager/4964f3c6fc17ae4578e762d3dc86b10fe890860e?narHash=sha256-n8AldXJRNVMm2UZ6yN0HwVxlARY2Cm/uhdOw76tQ0OI%3D' (2024-12-01) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/f4a5ca5771ba9ca31ad24a62c8d511a405303436?narHash=sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q%3D' (2024-11-25) → 'github:nix-community/nix-index-database/6e0b7f81367069589a480b91603a10bcf71f3103?narHash=sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE%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 'nixpkgs-update': 'github:ryantm/nixpkgs-update/525c2e488ad26cd46878fd93337521bf42e598a9?narHash=sha256-rGp0I9m3/nDV70nRXvdCv2QiAGPOaRm92rISXDxNUJM%3D' (2024-10-31) → 'github:ryantm/nixpkgs-update/dffb2930904b08ca8d226594b543cbae150b5f67?narHash=sha256-DY1Aq%2BpAU/n0loBjCRfeSbEG/ji2M%2BmrEkcEnsN/AHk%3D' (2024-11-30) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 8aa1865..50ad293 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1732884235, - "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", + "lastModified": 1733045511, + "narHash": "sha256-n8AldXJRNVMm2UZ6yN0HwVxlARY2Cm/uhdOw76tQ0OI=", "owner": "nix-community", "repo": "home-manager", - "rev": "819f682269f4e002884702b87e445c82840c68f2", + "rev": "4964f3c6fc17ae4578e762d3dc86b10fe890860e", "type": "github" }, "original": { @@ -213,11 +213,11 @@ ] }, "locked": { - "lastModified": 1732519917, - "narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=", + "lastModified": 1733024876, + "narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436", + "rev": "6e0b7f81367069589a480b91603a10bcf71f3103", "type": "github" }, "original": { @@ -271,11 +271,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1730338630, - "narHash": "sha256-rGp0I9m3/nDV70nRXvdCv2QiAGPOaRm92rISXDxNUJM=", + "lastModified": 1732958734, + "narHash": "sha256-DY1Aq+pAU/n0loBjCRfeSbEG/ji2M+mrEkcEnsN/AHk=", "owner": "ryantm", "repo": "nixpkgs-update", - "rev": "525c2e488ad26cd46878fd93337521bf42e598a9", + "rev": "dffb2930904b08ca8d226594b543cbae150b5f67", "type": "github" }, "original": { @@ -286,11 +286,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1732837521, + "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "type": "github" }, "original": { From 75e2ff1b2c01e6f98ff181bb20af430cd7b887f3 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Sun, 1 Dec 2024 22:31:05 +0100 Subject: [PATCH 18/32] exclude nix from topgrade, change nerdfont handling --- home-manager/modules/packages.nix | 10 +++------- home-manager/programs/topgrade.nix | 1 + 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix index 870187d..27c4494 100644 --- a/home-manager/modules/packages.nix +++ b/home-manager/modules/packages.nix @@ -78,13 +78,9 @@ in unrar inputs.w17.packages.x86_64-linux.default aichat - (pkgs.nerdfonts.override { - fonts = [ - "JetBrainsMono" - "FiraCode" - "FiraMono" - ]; - }) + nerd-fonts.jetbrains-mono + nerd-fonts.fira-code + nerd-fonts.fira-mono nix-output-monitor nodePackages.pnpm npm-check-updates diff --git a/home-manager/programs/topgrade.nix b/home-manager/programs/topgrade.nix index a57b6f5..66ccace 100644 --- a/home-manager/programs/topgrade.nix +++ b/home-manager/programs/topgrade.nix @@ -22,6 +22,7 @@ in "bun" "tldr" "flutter" + "nix" ]; }; git.repos = [ configPath ]; From b7465ee037f7c3b7efc7ac06cf9ee2d6af08e343 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Sun, 1 Dec 2024 22:31:49 +0100 Subject: [PATCH 19/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/4964f3c6fc17ae4578e762d3dc86b10fe890860e?narHash=sha256-n8AldXJRNVMm2UZ6yN0HwVxlARY2Cm/uhdOw76tQ0OI%3D' (2024-12-01) → 'github:nix-community/home-manager/c1fee8d4a60b89cae12b288ba9dbc608ff298163?narHash=sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ%2BGN0r8%3D' (2024-12-01) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 50ad293..69cfefe 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1733045511, - "narHash": "sha256-n8AldXJRNVMm2UZ6yN0HwVxlARY2Cm/uhdOw76tQ0OI=", + "lastModified": 1733085484, + "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", "owner": "nix-community", "repo": "home-manager", - "rev": "4964f3c6fc17ae4578e762d3dc86b10fe890860e", + "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", "type": "github" }, "original": { From fe3ceceb58b9522556942bc88c06e41d9a4fab6c Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Mon, 2 Dec 2024 03:04:04 +0100 Subject: [PATCH 20/32] fix kitty --- home-manager/programs/kitty.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/programs/kitty.nix b/home-manager/programs/kitty.nix index ac567ea..1132920 100644 --- a/home-manager/programs/kitty.nix +++ b/home-manager/programs/kitty.nix @@ -12,7 +12,7 @@ in enable = true; package = (nixGL pkgs.kitty); font = { - name = "JetbrainsMono NFM"; + name = "JetBrainsMono"; size = 14; }; themeFile = "Dracula"; From 5cfdae0809c30c86c8c79b5d4c4d8b76f8428ab6 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Tue, 3 Dec 2024 02:40:32 +0100 Subject: [PATCH 21/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/c1fee8d4a60b89cae12b288ba9dbc608ff298163?narHash=sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ%2BGN0r8%3D' (2024-12-01) → 'github:nix-community/home-manager/bf23fe41082aa0289c209169302afd3397092f22?narHash=sha256-zFOtOaqjzZfPMsm1mwu98syv3y%2BjziAq5DfWygaMtLg%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) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 69cfefe..38c65cc 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1733085484, - "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", + "lastModified": 1733175814, + "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", + "rev": "bf23fe41082aa0289c209169302afd3397092f22", "type": "github" }, "original": { @@ -286,11 +286,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732837521, - "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", + "lastModified": 1733015953, + "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", + "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", "type": "github" }, "original": { From 5d2c71064f7dd4e5b565f820a23d03078007592f Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Wed, 4 Dec 2024 13:34:01 +0100 Subject: [PATCH 22/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/bf23fe41082aa0289c209169302afd3397092f22?narHash=sha256-zFOtOaqjzZfPMsm1mwu98syv3y%2BjziAq5DfWygaMtLg%3D' (2024-12-02) → 'github:nix-community/home-manager/6c3a7a0b72c19ec994b85c57a1712d177bd809b2?narHash=sha256-o6wNhr1ONxMuBJUGC9v0hEjFdv5rN6XzHJEL/rQJLjA%3D' (2024-12-04) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/ac35b104800bff9028425fec3b6e8a41de2bbfff?narHash=sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE%2Bcrk%3D' (2024-12-01) → 'github:NixOS/nixpkgs/55d15ad12a74eb7d4646254e13638ad0c4128776?narHash=sha256-M1%2BuCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo%3D' (2024-12-03) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 38c65cc..689bd8c 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1733175814, - "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", + "lastModified": 1733304249, + "narHash": "sha256-o6wNhr1ONxMuBJUGC9v0hEjFdv5rN6XzHJEL/rQJLjA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf23fe41082aa0289c209169302afd3397092f22", + "rev": "6c3a7a0b72c19ec994b85c57a1712d177bd809b2", "type": "github" }, "original": { @@ -286,11 +286,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733015953, - "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { From 27470279679942080450069e08591a7e03d0b963 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Thu, 5 Dec 2024 00:34:29 +0100 Subject: [PATCH 23/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/6c3a7a0b72c19ec994b85c57a1712d177bd809b2?narHash=sha256-o6wNhr1ONxMuBJUGC9v0hEjFdv5rN6XzHJEL/rQJLjA%3D' (2024-12-04) → 'github:nix-community/home-manager/0daaded612b0e6eaed0a63fc9d0778d8f05940fe?narHash=sha256-foZG2PLwumxYZkpXq7ajHDhuQlXaUeKfOpFfQpMviLM%3D' (2024-12-04) • Updated input 'nixpkgs-update': 'github:ryantm/nixpkgs-update/dffb2930904b08ca8d226594b543cbae150b5f67?narHash=sha256-DY1Aq%2BpAU/n0loBjCRfeSbEG/ji2M%2BmrEkcEnsN/AHk%3D' (2024-11-30) → 'github:ryantm/nixpkgs-update/c56a31e6dd4149ab5fc334c40267f23aff22745b?narHash=sha256-QGjqvF6YtgOI6qXx5bJVMjX%2Bqxa26MQp1OczUCF9LnE%3D' (2024-12-04) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 689bd8c..d0a8820 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1733304249, - "narHash": "sha256-o6wNhr1ONxMuBJUGC9v0hEjFdv5rN6XzHJEL/rQJLjA=", + "lastModified": 1733354384, + "narHash": "sha256-foZG2PLwumxYZkpXq7ajHDhuQlXaUeKfOpFfQpMviLM=", "owner": "nix-community", "repo": "home-manager", - "rev": "6c3a7a0b72c19ec994b85c57a1712d177bd809b2", + "rev": "0daaded612b0e6eaed0a63fc9d0778d8f05940fe", "type": "github" }, "original": { @@ -271,11 +271,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1732958734, - "narHash": "sha256-DY1Aq+pAU/n0loBjCRfeSbEG/ji2M+mrEkcEnsN/AHk=", + "lastModified": 1733352485, + "narHash": "sha256-QGjqvF6YtgOI6qXx5bJVMjX+qxa26MQp1OczUCF9LnE=", "owner": "ryantm", "repo": "nixpkgs-update", - "rev": "dffb2930904b08ca8d226594b543cbae150b5f67", + "rev": "c56a31e6dd4149ab5fc334c40267f23aff22745b", "type": "github" }, "original": { From b7b83cf85c6d98b846365dccd906f46b029a6d9e Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Thu, 5 Dec 2024 13:54:15 +0100 Subject: [PATCH 24/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/0daaded612b0e6eaed0a63fc9d0778d8f05940fe?narHash=sha256-foZG2PLwumxYZkpXq7ajHDhuQlXaUeKfOpFfQpMviLM%3D' (2024-12-04) → 'github:nix-community/home-manager/65912bc6841cf420eb8c0a20e03df7cbbff5963f?narHash=sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag%3D' (2024-12-05) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d0a8820..474b1dc 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1733354384, - "narHash": "sha256-foZG2PLwumxYZkpXq7ajHDhuQlXaUeKfOpFfQpMviLM=", + "lastModified": 1733389730, + "narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=", "owner": "nix-community", "repo": "home-manager", - "rev": "0daaded612b0e6eaed0a63fc9d0778d8f05940fe", + "rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f", "type": "github" }, "original": { From c47a0eac608c266945ab6b380855393d6d4e9302 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Fri, 6 Dec 2024 14:15:28 +0100 Subject: [PATCH 25/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/65912bc6841cf420eb8c0a20e03df7cbbff5963f?narHash=sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag%3D' (2024-12-05) → 'github:nix-community/home-manager/d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a?narHash=sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc%3D' (2024-12-06) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/55d15ad12a74eb7d4646254e13638ad0c4128776?narHash=sha256-M1%2BuCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo%3D' (2024-12-03) → 'github:NixOS/nixpkgs/d0797a04b81caeae77bcff10a9dde78bc17f5661?narHash=sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG%2BcBns%3D' (2024-12-05) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 474b1dc..905858a 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1733389730, - "narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { @@ -286,11 +286,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { From b840b7ae3a2161011869248991d7037bc1d28a86 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Mon, 9 Dec 2024 02:28:12 +0100 Subject: [PATCH 26/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/6e0b7f81367069589a480b91603a10bcf71f3103?narHash=sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE%3D' (2024-12-01) → 'github:nix-community/nix-index-database/f1e477a7dd11e27e7f98b646349cd66bbabf2fb8?narHash=sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU%3D' (2024-12-08) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/d0797a04b81caeae77bcff10a9dde78bc17f5661?narHash=sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG%2BcBns%3D' (2024-12-05) → 'github:NixOS/nixpkgs/22c3f2cf41a0e70184334a958e6b124fb0ce3e01?narHash=sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY%3D' (2024-12-07) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 905858a..cff5221 100644 --- a/flake.lock +++ b/flake.lock @@ -213,11 +213,11 @@ ] }, "locked": { - "lastModified": 1733024876, - "narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=", + "lastModified": 1733629314, + "narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "6e0b7f81367069589a480b91603a10bcf71f3103", + "rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8", "type": "github" }, "original": { @@ -286,11 +286,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", "type": "github" }, "original": { From 24a9ededc49dbd1acd49c39565d0263131aac115 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Tue, 10 Dec 2024 23:36:11 +0100 Subject: [PATCH 27/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a?narHash=sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc%3D' (2024-12-06) → 'github:nix-community/home-manager/8772bae58c0a1390727aaf13802debfa29757d67?narHash=sha256-qFWxVV48wwiyvrAbGeSbZ5LAOv1Kv/lvDtibOhuc1/o%3D' (2024-12-10) • Updated input 'nix-alien': 'github:thiagokokada/nix-alien/97fe58a8ac15663b1ecdebd84d2187eb71f8532d?narHash=sha256-ZszfGYOrwol3MGFpttahldT%2BUOfqXckk6XwZrUyHLxE%3D' (2024-11-15) → 'github:thiagokokada/nix-alien/dc5b882f131eceb37d381292c62ab5c0c0112b7b?narHash=sha256-7Dag5567gNpEOwcPTUCuT9jR5shxInnsJVUwzbh611k%3D' (2024-12-10) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/22c3f2cf41a0e70184334a958e6b124fb0ce3e01?narHash=sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY%3D' (2024-12-07) → 'github:NixOS/nixpkgs/a73246e2eef4c6ed172979932bc80e1404ba2d56?narHash=sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU%3D' (2024-12-09) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index cff5221..442ad5f 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1733484277, - "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "lastModified": 1733869277, + "narHash": "sha256-qFWxVV48wwiyvrAbGeSbZ5LAOv1Kv/lvDtibOhuc1/o=", "owner": "nix-community", "repo": "home-manager", - "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "rev": "8772bae58c0a1390727aaf13802debfa29757d67", "type": "github" }, "original": { @@ -157,11 +157,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1731668526, - "narHash": "sha256-ZszfGYOrwol3MGFpttahldT+UOfqXckk6XwZrUyHLxE=", + "lastModified": 1733838574, + "narHash": "sha256-7Dag5567gNpEOwcPTUCuT9jR5shxInnsJVUwzbh611k=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "97fe58a8ac15663b1ecdebd84d2187eb71f8532d", + "rev": "dc5b882f131eceb37d381292c62ab5c0c0112b7b", "type": "github" }, "original": { @@ -286,11 +286,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733581040, - "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { From 6fa5399be46d595f936cb2736196e63ec4af3c7e Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Thu, 12 Dec 2024 23:28:12 +0100 Subject: [PATCH 28/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'dagger': 'github:dagger/nix/9852fdddcdcb52841275ffb6a39fa1524d538d5a?narHash=sha256-A0xTZedeIwMceV86/BB3b6GgS%2BDVoqQwxywDgH68x7s%3D' (2024-11-08) → 'github:dagger/nix/8f7e40ca59ad9f85d6dfe3de623fed9adf0d5bec?narHash=sha256-KqdRX%2BIGfD4PsPNu/0Uqda3JHBqqcY0LSt3dayY8voM%3D' (2024-12-12) • Updated input 'home-manager': 'github:nix-community/home-manager/8772bae58c0a1390727aaf13802debfa29757d67?narHash=sha256-qFWxVV48wwiyvrAbGeSbZ5LAOv1Kv/lvDtibOhuc1/o%3D' (2024-12-10) → 'github:nix-community/home-manager/e526fd2b1a40e4ca0b5e07e87b8c960281c67412?narHash=sha256-ENSfIRpZUGyr2quTJCESzppcR9i0N2iUrenGxcr9Mj0%3D' (2024-12-12) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 442ad5f..205f9cc 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1731102567, - "narHash": "sha256-A0xTZedeIwMceV86/BB3b6GgS+DVoqQwxywDgH68x7s=", + "lastModified": 1734036866, + "narHash": "sha256-KqdRX+IGfD4PsPNu/0Uqda3JHBqqcY0LSt3dayY8voM=", "owner": "dagger", "repo": "nix", - "rev": "9852fdddcdcb52841275ffb6a39fa1524d538d5a", + "rev": "8f7e40ca59ad9f85d6dfe3de623fed9adf0d5bec", "type": "github" }, "original": { @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1733869277, - "narHash": "sha256-qFWxVV48wwiyvrAbGeSbZ5LAOv1Kv/lvDtibOhuc1/o=", + "lastModified": 1734037113, + "narHash": "sha256-ENSfIRpZUGyr2quTJCESzppcR9i0N2iUrenGxcr9Mj0=", "owner": "nix-community", "repo": "home-manager", - "rev": "8772bae58c0a1390727aaf13802debfa29757d67", + "rev": "e526fd2b1a40e4ca0b5e07e87b8c960281c67412", "type": "github" }, "original": { From 22ee8f12246a5cb4ab4a558f19702946ddf95122 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Sat, 14 Dec 2024 02:36:20 +0100 Subject: [PATCH 29/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/e526fd2b1a40e4ca0b5e07e87b8c960281c67412?narHash=sha256-ENSfIRpZUGyr2quTJCESzppcR9i0N2iUrenGxcr9Mj0%3D' (2024-12-12) → 'github:nix-community/home-manager/66c5d8b62818ec4c1edb3e941f55ef78df8141a8?narHash=sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4%3D' (2024-12-13) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/a73246e2eef4c6ed172979932bc80e1404ba2d56?narHash=sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU%3D' (2024-12-09) → 'github:NixOS/nixpkgs/5d67ea6b4b63378b9c13be21e2ec9d1afc921713?narHash=sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g%3D' (2024-12-11) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 205f9cc..2708611 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1734037113, - "narHash": "sha256-ENSfIRpZUGyr2quTJCESzppcR9i0N2iUrenGxcr9Mj0=", + "lastModified": 1734093295, + "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", "owner": "nix-community", "repo": "home-manager", - "rev": "e526fd2b1a40e4ca0b5e07e87b8c960281c67412", + "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", "type": "github" }, "original": { @@ -286,11 +286,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { From 524dac968d128add9df7138e0c153dc04f174aff Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Tue, 17 Dec 2024 16:24:41 +0100 Subject: [PATCH 30/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/66c5d8b62818ec4c1edb3e941f55ef78df8141a8?narHash=sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4%3D' (2024-12-13) → 'github:nix-community/home-manager/83ecd50915a09dca928971139d3a102377a8d242?narHash=sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA%3D' (2024-12-16) • Updated input 'nix-alien': 'github:thiagokokada/nix-alien/dc5b882f131eceb37d381292c62ab5c0c0112b7b?narHash=sha256-7Dag5567gNpEOwcPTUCuT9jR5shxInnsJVUwzbh611k%3D' (2024-12-10) → 'github:thiagokokada/nix-alien/a266d0f74dd4a82ec6a72b02fbf3fbc5f7105f15?narHash=sha256-iKY/OGNANXpd9hXBGfx8vObpHW4IcOH0MrerLCCc7hA%3D' (2024-12-15) • Updated input 'nix-alien/flake-compat': 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33?narHash=sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U%3D' (2023-10-04) → 'github:edolstra/flake-compat/ff81ac966bb2cae68946d5ed5fc4994f96d0ffec?narHash=sha256-NeCCThCEP3eCl2l/%2B27kNNK7QrwZB1IJCrXfrbv5oqU%3D' (2024-12-04) • Updated input 'nix-alien/nix-index-database': 'github:nix-community/nix-index-database/40d882b55e89add1ded379cc99edaab24983d6d9?narHash=sha256-FvksinoI2Y6kuwH%2BcKBu1oDA8uPGfoRqgtQV6O8GDc4%3D' (2024-11-14) → 'github:nix-community/nix-index-database/311d6cf3ad3f56cb051ffab1f480b2909b3f754d?narHash=sha256-icEMqBt4HtGH52PU5FHidgBrNJvOfXH6VQKNtnD1aw8%3D' (2024-12-15) • Updated input 'nix-alien/nixpkgs': 'github:NixOS/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c?narHash=sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY%2B/Z96ZcLpooIbuEI%3D' (2024-11-11) → 'github:NixOS/nixpkgs/5d67ea6b4b63378b9c13be21e2ec9d1afc921713?narHash=sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g%3D' (2024-12-11) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/f1e477a7dd11e27e7f98b646349cd66bbabf2fb8?narHash=sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU%3D' (2024-12-08) → 'github:nix-community/nix-index-database/311d6cf3ad3f56cb051ffab1f480b2909b3f754d?narHash=sha256-icEMqBt4HtGH52PU5FHidgBrNJvOfXH6VQKNtnD1aw8%3D' (2024-12-15) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5d67ea6b4b63378b9c13be21e2ec9d1afc921713?narHash=sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g%3D' (2024-12-11) → 'github:NixOS/nixpkgs/3566ab7246670a43abd2ffa913cc62dad9cdf7d5?narHash=sha256-AKU6qqskl0yf2%2BJdRdD0cfxX4b9x3KKV5RqA6wijmPM%3D' (2024-12-13) • Updated input 'nixpkgs-update': 'github:ryantm/nixpkgs-update/c56a31e6dd4149ab5fc334c40267f23aff22745b?narHash=sha256-QGjqvF6YtgOI6qXx5bJVMjX%2Bqxa26MQp1OczUCF9LnE%3D' (2024-12-04) → 'github:ryantm/nixpkgs-update/712e24bd6543801c52f6c0656a8371f8d029030e?narHash=sha256-vsr%2B9xKkirwEjvXTS2sOVIxlKQmF/QjszD%2BPh0/oRgc%3D' (2024-12-15) --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 2708611..44cb4e5 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ }, "flake-compat": { "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1734093295, - "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", + "lastModified": 1734344598, + "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", "owner": "nix-community", "repo": "home-manager", - "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", + "rev": "83ecd50915a09dca928971139d3a102377a8d242", "type": "github" }, "original": { @@ -157,11 +157,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1733838574, - "narHash": "sha256-7Dag5567gNpEOwcPTUCuT9jR5shxInnsJVUwzbh611k=", + "lastModified": 1734239219, + "narHash": "sha256-iKY/OGNANXpd9hXBGfx8vObpHW4IcOH0MrerLCCc7hA=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "dc5b882f131eceb37d381292c62ab5c0c0112b7b", + "rev": "a266d0f74dd4a82ec6a72b02fbf3fbc5f7105f15", "type": "github" }, "original": { @@ -193,11 +193,11 @@ ] }, "locked": { - "lastModified": 1731593150, - "narHash": "sha256-FvksinoI2Y6kuwH+cKBu1oDA8uPGfoRqgtQV6O8GDc4=", + "lastModified": 1734234111, + "narHash": "sha256-icEMqBt4HtGH52PU5FHidgBrNJvOfXH6VQKNtnD1aw8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "40d882b55e89add1ded379cc99edaab24983d6d9", + "rev": "311d6cf3ad3f56cb051ffab1f480b2909b3f754d", "type": "github" }, "original": { @@ -213,11 +213,11 @@ ] }, "locked": { - "lastModified": 1733629314, - "narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=", + "lastModified": 1734234111, + "narHash": "sha256-icEMqBt4HtGH52PU5FHidgBrNJvOfXH6VQKNtnD1aw8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8", + "rev": "311d6cf3ad3f56cb051ffab1f480b2909b3f754d", "type": "github" }, "original": { @@ -249,11 +249,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -271,11 +271,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1733352485, - "narHash": "sha256-QGjqvF6YtgOI6qXx5bJVMjX+qxa26MQp1OczUCF9LnE=", + "lastModified": 1734260421, + "narHash": "sha256-vsr+9xKkirwEjvXTS2sOVIxlKQmF/QjszD+Ph0/oRgc=", "owner": "ryantm", "repo": "nixpkgs-update", - "rev": "c56a31e6dd4149ab5fc334c40267f23aff22745b", + "rev": "712e24bd6543801c52f6c0656a8371f8d029030e", "type": "github" }, "original": { @@ -286,11 +286,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733940404, - "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { From 056a6a5a78995bff6c2f7d1e6f6c12ec21c50af5 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Wed, 18 Dec 2024 15:08:42 +0100 Subject: [PATCH 31/32] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/3566ab7246670a43abd2ffa913cc62dad9cdf7d5?narHash=sha256-AKU6qqskl0yf2%2BJdRdD0cfxX4b9x3KKV5RqA6wijmPM%3D' (2024-12-13) → 'github:NixOS/nixpkgs/d3c42f187194c26d9f0309a8ecc469d6c878ce33?narHash=sha256-cHar1vqHOOyC7f1%2BtVycPoWTfKIaqkoe1Q6TnKzuti4%3D' (2024-12-17) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 44cb4e5..d1dcae3 100644 --- a/flake.lock +++ b/flake.lock @@ -286,11 +286,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { From 998f2da70ee862e17615130caa47d676e568e51f Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Thu, 19 Dec 2024 01:26:25 +0100 Subject: [PATCH 32/32] introduce official nixgl wrapper --- configs/fedora/home.nix | 5 ---- home-manager/modules/machine.nix | 8 +++++++ home-manager/modules/packages.nix | 2 +- home-manager/programs/alacritty.nix | 2 +- home-manager/programs/kitty.nix | 2 +- home-manager/utils/nixGLWrap.nix | 36 ----------------------------- 6 files changed, 11 insertions(+), 44 deletions(-) delete mode 100644 home-manager/utils/nixGLWrap.nix diff --git a/configs/fedora/home.nix b/configs/fedora/home.nix index 4298e5c..0b7b99a 100644 --- a/configs/fedora/home.nix +++ b/configs/fedora/home.nix @@ -6,9 +6,6 @@ ... }: -let - nixGL = import ./../../home-manager/utils/nixGLWrap.nix { inherit pkgs config; }; -in { imports = [ ./../../home-manager/modules/machine.nix ]; @@ -24,7 +21,5 @@ in nixpkgs.config.allowUnfree = true; - nixGLPrefix = lib.getExe pkgs.nixgl.nixGLIntel; - nix.settings.builders = "@/etc/nix/machines"; } diff --git a/home-manager/modules/machine.nix b/home-manager/modules/machine.nix index 90abc88..22f9e03 100644 --- a/home-manager/modules/machine.nix +++ b/home-manager/modules/machine.nix @@ -2,6 +2,7 @@ lib, pkgs, config, + inputs, ... }: with lib; @@ -81,6 +82,13 @@ with lib; news.display = "silent"; targets.genericLinux.enable = config.machine.isGeneric; + nixGL = { + packages = inputs.nixgl.packages; + defaultWrapper = "mesa"; + installScripts = ["mesa"]; + vulkan.enable = true; + }; + home = { username = "${config.machine.username}"; homeDirectory = "/home/${config.machine.username}"; diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix index 27c4494..cdb67e9 100644 --- a/home-manager/modules/packages.nix +++ b/home-manager/modules/packages.nix @@ -8,7 +8,7 @@ with lib; let - nixGL = import ./../../home-manager/utils/nixGLWrap.nix { inherit pkgs config; }; + nixGL = config.lib.nixGL.wrap; electronFlags = "--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime --disable-gpu-shader-disk-cache -n"; in { diff --git a/home-manager/programs/alacritty.nix b/home-manager/programs/alacritty.nix index 01e5308..97d48ad 100644 --- a/home-manager/programs/alacritty.nix +++ b/home-manager/programs/alacritty.nix @@ -6,7 +6,7 @@ }: let - nixGL = import ./../../home-manager/utils/nixGLWrap.nix { inherit pkgs config; }; + nixGL = config.lib.nixGL.wrap; in { programs.alacritty = { diff --git a/home-manager/programs/kitty.nix b/home-manager/programs/kitty.nix index 1132920..0e9a3b0 100644 --- a/home-manager/programs/kitty.nix +++ b/home-manager/programs/kitty.nix @@ -5,7 +5,7 @@ }: let - nixGL = import ./../../home-manager/utils/nixGLWrap.nix { inherit pkgs config; }; + nixGL = config.lib.nixGL.wrap; in { programs.kitty = { diff --git a/home-manager/utils/nixGLWrap.nix b/home-manager/utils/nixGLWrap.nix deleted file mode 100644 index e068d3d..0000000 --- a/home-manager/utils/nixGLWrap.nix +++ /dev/null @@ -1,36 +0,0 @@ -# Call once on import to load global context -{ pkgs, config }: -# Wrap a single package -pkg: -if config.nixGLPrefix == "" then - pkg -else - # Wrap the package's binaries with nixGL, while preserving the rest of - # the outputs and derivation attributes. - (pkg.overrideAttrs (old: { - name = "nixGL-${pkg.name}"; - buildCommand = '' - set -eo pipefail - - ${ - # Heavily inspired by https://stackoverflow.com/a/68523368/6259505 - pkgs.lib.concatStringsSep "\n" ( - map (outputName: '' - echo "Copying output ${outputName}" - set -x - cp -rs --no-preserve=mode "${pkg.${outputName}}" "''$${outputName}" - set +x - '') (old.outputs or [ "out" ]) - ) - } - - rm -rf $out/bin/* - shopt -s nullglob # Prevent loop from running if no files - for file in ${pkg.out}/bin/*; do - echo "#!${pkgs.bash}/bin/bash" > "$out/bin/$(basename $file)" - echo "exec -a \"\$0\" ${config.nixGLPrefix} $file \"\$@\"" >> "$out/bin/$(basename $file)" - chmod +x "$out/bin/$(basename $file)" - done - shopt -u nullglob # Revert nullglob back to its normal default state - ''; - }))