From 1d8de843afff325dc15fabfaa84ad07d57e9f064 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 17 Feb 2024 17:52:52 +0100 Subject: [PATCH 001/330] framenix: try some recommendedpatches for amd-pmf --- hosts/framenix/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 81295a2..5ade202 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -33,6 +33,18 @@ in # revert some commits that introduced the clourful graphics artefacts flickering, # at least that's the current working hypothesis in https://gitlab.freedesktop.org/drm/amd/-/issues/3097 boot.kernelPatches = [ + {name = "[v3,2/2] platform/x86/amd/pmf: Fix TEE enact command failure after suspend and resume (suspend-resume-freeze)"; + patch = pkgs.fetchpatch { + url = "https://patchwork.kernel.org/project/platform-driver-x86/patch/20240216064112.962582-2-Shyam-sundar.S-k@amd.com/raw/"; + hash = "sha256-qUobf4IpvNemFcB0BAvMvpV/85O6to5XvJB3HA5fEOw="; + }; + } + {name = "[v3,1/2] platform/x86/amd/pmf: remove smart_pc_status enum (suspend-resume-freeze)"; + patch = pkgs.fetchpatch { + url = "https://patchwork.kernel.org/project/platform-driver-x86/patch/20240216064112.962582-1-Shyam-sundar.S-k@amd.com/raw/"; + hash = "sha256-whJEq3lubsRP+AX/BPLUUzX4T0RefuiCqw+GLG+pc5U="; + }; + } {name = "drm/buddy: Fix alloc_range() error handling code"; patch = pkgs.fetchpatch { url = "https://cgit.freedesktop.org/drm/drm-misc/patch/?id=8746c6c9dfa31d269c65dd52ab42fde0720b7d91"; @@ -41,7 +53,7 @@ in } ]; # fix freezes after s2idle suspend-resume - boot.blacklistedKernelModules = [ "amd-pmf" ]; + #boot.blacklistedKernelModules = [ "amd-pmf" ]; boot.kernelParams = [ # temporary workaround for white flickering graphics artefacts From 1bb42d4c1b1142271bb5e2625520dd51c8c3bb76 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 17 Feb 2024 18:34:23 +0100 Subject: [PATCH 002/330] framenix: try another kernel patch for the suspend-freeze issue --- hosts/framenix/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 5ade202..1f97a15 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -33,16 +33,10 @@ in # revert some commits that introduced the clourful graphics artefacts flickering, # at least that's the current working hypothesis in https://gitlab.freedesktop.org/drm/amd/-/issues/3097 boot.kernelPatches = [ - {name = "[v3,2/2] platform/x86/amd/pmf: Fix TEE enact command failure after suspend and resume (suspend-resume-freeze)"; + {name = "[PATCH] platform/x86/amd/pmf: Fix a suspend hang on Framework 13"; patch = pkgs.fetchpatch { - url = "https://patchwork.kernel.org/project/platform-driver-x86/patch/20240216064112.962582-2-Shyam-sundar.S-k@amd.com/raw/"; - hash = "sha256-qUobf4IpvNemFcB0BAvMvpV/85O6to5XvJB3HA5fEOw="; - }; - } - {name = "[v3,1/2] platform/x86/amd/pmf: remove smart_pc_status enum (suspend-resume-freeze)"; - patch = pkgs.fetchpatch { - url = "https://patchwork.kernel.org/project/platform-driver-x86/patch/20240216064112.962582-1-Shyam-sundar.S-k@amd.com/raw/"; - hash = "sha256-whJEq3lubsRP+AX/BPLUUzX4T0RefuiCqw+GLG+pc5U="; + url = "https://lore.kernel.org/platform-driver-x86/20240217005216.113408-1-mario.limonciello@amd.com/raw"; + hash = "sha256-FeKIQ0eLP4yq1WcMaf8Dp0c+DuqOdeuBQU07dFswzD4="; }; } {name = "drm/buddy: Fix alloc_range() error handling code"; From b042e2db5c2f8b9249e94d73bda5aa6782bd7804 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 17 Feb 2024 19:05:00 +0100 Subject: [PATCH 003/330] framenix: the patch fixes the amd-pmf issue, no need for blacklisting module anymore --- hosts/framenix/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 1f97a15..b5375fe 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -46,8 +46,6 @@ in }; } ]; - # fix freezes after s2idle suspend-resume - #boot.blacklistedKernelModules = [ "amd-pmf" ]; boot.kernelParams = [ # temporary workaround for white flickering graphics artefacts From 10f78e86bf0d79e6ca53e739e1852c5cefcee6dd Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 17 Feb 2024 19:06:49 +0100 Subject: [PATCH 004/330] framenix: porper patch for suspend-resume-freeze allows re-enabling the previously blacklisted module amd-pmf --- hosts/framenix/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 81295a2..b5375fe 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -33,6 +33,12 @@ in # revert some commits that introduced the clourful graphics artefacts flickering, # at least that's the current working hypothesis in https://gitlab.freedesktop.org/drm/amd/-/issues/3097 boot.kernelPatches = [ + {name = "[PATCH] platform/x86/amd/pmf: Fix a suspend hang on Framework 13"; + patch = pkgs.fetchpatch { + url = "https://lore.kernel.org/platform-driver-x86/20240217005216.113408-1-mario.limonciello@amd.com/raw"; + hash = "sha256-FeKIQ0eLP4yq1WcMaf8Dp0c+DuqOdeuBQU07dFswzD4="; + }; + } {name = "drm/buddy: Fix alloc_range() error handling code"; patch = pkgs.fetchpatch { url = "https://cgit.freedesktop.org/drm/drm-misc/patch/?id=8746c6c9dfa31d269c65dd52ab42fde0720b7d91"; @@ -40,8 +46,6 @@ in }; } ]; - # fix freezes after s2idle suspend-resume - boot.blacklistedKernelModules = [ "amd-pmf" ]; boot.kernelParams = [ # temporary workaround for white flickering graphics artefacts From 346b7afd6544b04aa3b3554c35626af1a962bfd7 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 21 Feb 2024 18:57:07 +0100 Subject: [PATCH 005/330] host framenix: linux 6.8-rc4 -> 6.8-rc5 allows dropping the drm buddy patch --- hosts/framenix/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index b5375fe..1c9e651 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -24,10 +24,10 @@ in argsOverride = rec { src = pkgs.fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-sLypPyMhFhamhQOWDIkzZ5cVrWfoZDb3prJaESD6UU0="; + hash = "sha256-cC6UbYUFBkAiD70lBDE94aE4UQ2ryYQftIppJy48Pto="; }; - version = "6.8-rc4"; - modDirVersion = "6.8.0-rc4"; + version = "6.8-rc5"; + modDirVersion = "6.8.0-rc5"; }; }); # revert some commits that introduced the clourful graphics artefacts flickering, @@ -39,12 +39,6 @@ in hash = "sha256-FeKIQ0eLP4yq1WcMaf8Dp0c+DuqOdeuBQU07dFswzD4="; }; } - {name = "drm/buddy: Fix alloc_range() error handling code"; - patch = pkgs.fetchpatch { - url = "https://cgit.freedesktop.org/drm/drm-misc/patch/?id=8746c6c9dfa31d269c65dd52ab42fde0720b7d91"; - hash = "sha256-Ir7TDLspbYilTJr6aVVb8urIYI2N2vZwI5ayp7laaGw="; - }; - } ]; boot.kernelParams = [ From 6f49e60a7048b766f56ae8c389cbebc204a44e4e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 21 Feb 2024 18:57:41 +0100 Subject: [PATCH 006/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/a4d4fe8c5002202493e87ec8dbc91335ff55552c' (2024-02-15) → 'github:NixOS/nixpkgs/0e74ca98a74bc7270d28838369593635a5db3260' (2024-02-21) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/c68a9fc85c2cb3a313be6ff40511635544dde8da' (2024-02-15) → 'github:NixOS/nixpkgs/526d051b128b82ae045a70e5ff1adf8e6dafa560' (2024-02-20) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 7aff31c..21cb7ce 100644 --- a/flake.lock +++ b/flake.lock @@ -206,11 +206,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1707956935, - "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1707978831, - "narHash": "sha256-UblFdWQ2MMZNzD9C/w8+7RjAJ2QIbebbzHUniQ/a44o=", + "lastModified": 1708440434, + "narHash": "sha256-XY+B9mbhL/i+Q6fP6gBQ6P76rv9rWtpjQiUJ+DGtaUg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c68a9fc85c2cb3a313be6ff40511635544dde8da", + "rev": "526d051b128b82ae045a70e5ff1adf8e6dafa560", "type": "github" }, "original": { From e43b1b240aac871ded51ae89e53e3a0b7be04e2d Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 25 Feb 2024 22:46:57 +0100 Subject: [PATCH 007/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/0e74ca98a74bc7270d28838369593635a5db3260' (2024-02-21) → 'github:NixOS/nixpkgs/73de017ef2d18a04ac4bfd0c02650007ccb31c2a' (2024-02-24) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/526d051b128b82ae045a70e5ff1adf8e6dafa560' (2024-02-20) → 'github:NixOS/nixpkgs/5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b' (2024-02-25) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 21cb7ce..e243f93 100644 --- a/flake.lock +++ b/flake.lock @@ -206,11 +206,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1708807242, + "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1708440434, - "narHash": "sha256-XY+B9mbhL/i+Q6fP6gBQ6P76rv9rWtpjQiUJ+DGtaUg=", + "lastModified": 1708831307, + "narHash": "sha256-0iL/DuGjiUeck1zEaL+aIe2WvA3/cVhp/SlmTcOZXH4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "526d051b128b82ae045a70e5ff1adf8e6dafa560", + "rev": "5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b", "type": "github" }, "original": { From 77bdc00e9581483e4db75988f2561c9ccf1c7f1d Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 25 Feb 2024 22:53:31 +0100 Subject: [PATCH 008/330] logseq: move back to upstream nixpkgs --- flake.lock | 17 ----------------- flake.nix | 1 - home/home.nix | 2 +- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index e243f93..709bb1d 100644 --- a/flake.lock +++ b/flake.lock @@ -156,22 +156,6 @@ "type": "github" } }, - "logseq-fix-nixpkgs": { - "locked": { - "lastModified": 1707316439, - "narHash": "sha256-3dVL8Wk7ECMiQrHVO1ys7FawMLo7iyQJyKG+aie1eaE=", - "owner": "schmittlauch", - "repo": "nixpkgs", - "rev": "6f1431c8e2dfdfdfe25837c2cc94857900153cab", - "type": "github" - }, - "original": { - "owner": "schmittlauch", - "ref": "backport2311-logseq-0.10.5", - "repo": "nixpkgs", - "type": "github" - } - }, "mysecrets": { "flake": false, "locked": { @@ -318,7 +302,6 @@ "inputs": { "home-manager": "home-manager", "lanzaboote": "lanzaboote", - "logseq-fix-nixpkgs": "logseq-fix-nixpkgs", "mysecrets": "mysecrets", "nixos-hardware": "nixos-hardware", "nixos-unstable": "nixos-unstable", diff --git a/flake.nix b/flake.nix index bcfb9b6..0a3a150 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; - logseq-fix-nixpkgs.url = "github:schmittlauch/nixpkgs/backport2311-logseq-0.10.5"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { diff --git a/home/home.nix b/home/home.nix index 1f42843..61231dd 100644 --- a/home/home.nix +++ b/home/home.nix @@ -43,7 +43,7 @@ let #(pkgs.pidgin-with-plugins.override { # plugins = [ pkgs.pidginotr ];}) - inputs.logseq-fix-nixpkgs.legacyPackages.${system}.logseq + logseq # for Hibiscus banking software From 3e481206f1aa792eddf3f34f3ca237de2497813a Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 2 Mar 2024 21:51:12 +0100 Subject: [PATCH 009/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/73de017ef2d18a04ac4bfd0c02650007ccb31c2a' (2024-02-24) → 'github:NixOS/nixpkgs/1536926ef5621b09bba54035ae2bb6d806d72ac8' (2024-02-29) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b' (2024-02-25) → 'github:NixOS/nixpkgs/79baff8812a0d68e24a836df0a364c678089e2c7' (2024-03-01) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 709bb1d..2d2e6f3 100644 --- a/flake.lock +++ b/flake.lock @@ -190,11 +190,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1708807242, - "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": { @@ -238,11 +238,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1708831307, - "narHash": "sha256-0iL/DuGjiUeck1zEaL+aIe2WvA3/cVhp/SlmTcOZXH4=", + "lastModified": 1709309926, + "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b", + "rev": "79baff8812a0d68e24a836df0a364c678089e2c7", "type": "github" }, "original": { From 0abcc294af5e8a618b81558a90159a1d0de3f4ef Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 3 Mar 2024 20:13:18 +0100 Subject: [PATCH 010/330] host framenix: linux 6.8-rc5 -> 6.8-rc6 - allows dropping the suspend patch - now back at an unpatched kernel --- hosts/framenix/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 1c9e651..de3f567 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -24,22 +24,12 @@ in argsOverride = rec { src = pkgs.fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-cC6UbYUFBkAiD70lBDE94aE4UQ2ryYQftIppJy48Pto="; + hash = "sha256-GhuvgL4gfMB6ONL8NI48WWJJAPBYT+6vFS8OwGkKz74="; }; - version = "6.8-rc5"; - modDirVersion = "6.8.0-rc5"; + version = "6.8-rc6"; + modDirVersion = "6.8.0-rc6"; }; }); - # revert some commits that introduced the clourful graphics artefacts flickering, - # at least that's the current working hypothesis in https://gitlab.freedesktop.org/drm/amd/-/issues/3097 - boot.kernelPatches = [ - {name = "[PATCH] platform/x86/amd/pmf: Fix a suspend hang on Framework 13"; - patch = pkgs.fetchpatch { - url = "https://lore.kernel.org/platform-driver-x86/20240217005216.113408-1-mario.limonciello@amd.com/raw"; - hash = "sha256-FeKIQ0eLP4yq1WcMaf8Dp0c+DuqOdeuBQU07dFswzD4="; - }; - } - ]; boot.kernelParams = [ # temporary workaround for white flickering graphics artefacts From 049ff40b14735e5715a2c737204593763d212f53 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 4 Mar 2024 00:55:24 +0100 Subject: [PATCH 011/330] host framenix: linux 6.8-rc6 -> 6.8-rc7 --- hosts/framenix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index de3f567..72d24f5 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -24,10 +24,10 @@ in argsOverride = rec { src = pkgs.fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-GhuvgL4gfMB6ONL8NI48WWJJAPBYT+6vFS8OwGkKz74="; + hash = "sha256-ff+VhfWcCXlDRKfikAaxcLdrRb+YgM8BHPPgoVwfB2g="; }; - version = "6.8-rc6"; - modDirVersion = "6.8.0-rc6"; + version = "6.8-rc7"; + modDirVersion = "6.8.0-rc7"; }; }); From 8a9d249904bc545e3da33c7bcc23242679201482 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 8 Mar 2024 21:47:19 +0100 Subject: [PATCH 012/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/1536926ef5621b09bba54035ae2bb6d806d72ac8' (2024-02-29) → 'github:NixOS/nixpkgs/9df3e30ce24fd28c7b3e2de0d986769db5d6225d' (2024-03-06) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/79baff8812a0d68e24a836df0a364c678089e2c7' (2024-03-01) → 'github:NixOS/nixpkgs/880992dcc006a5e00dd0591446fdf723e6a51a64' (2024-03-05) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 2d2e6f3..401be24 100644 --- a/flake.lock +++ b/flake.lock @@ -190,11 +190,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { @@ -238,11 +238,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1709309926, - "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=", + "lastModified": 1709677081, + "narHash": "sha256-tix36Y7u0rkn6mTm0lA45b45oab2cFLqAzDbJxeXS+c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "79baff8812a0d68e24a836df0a364c678089e2c7", + "rev": "880992dcc006a5e00dd0591446fdf723e6a51a64", "type": "github" }, "original": { From 5fecbcfc5e9ccb546f66deff278bc9a177ddd616 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 9 Mar 2024 15:00:19 +0100 Subject: [PATCH 013/330] 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/880992dcc006a5e00dd0591446fdf723e6a51a64' (2024-03-05) → 'github:NixOS/nixpkgs/2be119add7b37dc535da2dd4cba68e2cf8d1517e' (2024-03-08) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 401be24..283b0e1 100644 --- a/flake.lock +++ b/flake.lock @@ -238,11 +238,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1709677081, - "narHash": "sha256-tix36Y7u0rkn6mTm0lA45b45oab2cFLqAzDbJxeXS+c=", + "lastModified": 1709884566, + "narHash": "sha256-NSYJg2sfdO/XS3L8XN/59Zhzn0dqWm7XtVnKI2mHq3w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "880992dcc006a5e00dd0591446fdf723e6a51a64", + "rev": "2be119add7b37dc535da2dd4cba68e2cf8d1517e", "type": "github" }, "original": { From a5b5edc6779758c31e9922dcc71ff0f2b8fcc895 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 12 Mar 2024 11:32:25 +0100 Subject: [PATCH 014/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/9df3e30ce24fd28c7b3e2de0d986769db5d6225d' (2024-03-06) → 'github:NixOS/nixpkgs/3030f185ba6a4bf4f18b87f345f104e6a6961f34' (2024-03-09) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/2be119add7b37dc535da2dd4cba68e2cf8d1517e' (2024-03-08) → 'github:NixOS/nixpkgs/ddcd7598b2184008c97e6c9c6a21c5f37590b8d2' (2024-03-11) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 283b0e1..a8f7c50 100644 --- a/flake.lock +++ b/flake.lock @@ -190,11 +190,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { @@ -238,11 +238,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1709884566, - "narHash": "sha256-NSYJg2sfdO/XS3L8XN/59Zhzn0dqWm7XtVnKI2mHq3w=", + "lastModified": 1710162809, + "narHash": "sha256-i2R2bcnQp+85de67yjgZVvJhd6rRnJbSYNpGmB6Leb8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2be119add7b37dc535da2dd4cba68e2cf8d1517e", + "rev": "ddcd7598b2184008c97e6c9c6a21c5f37590b8d2", "type": "github" }, "original": { From f63fd5a54814d6e8ada290596ae2b3b7b2b8f88f Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 14 Mar 2024 00:28:24 +0100 Subject: [PATCH 015/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/3030f185ba6a4bf4f18b87f345f104e6a6961f34' (2024-03-09) → 'github:NixOS/nixpkgs/0ad13a6833440b8e238947e47bea7f11071dc2b2' (2024-03-12) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/ddcd7598b2184008c97e6c9c6a21c5f37590b8d2' (2024-03-11) → 'github:NixOS/nixpkgs/51063ed4f2343a59fdeebb279bb81d87d453942b' (2024-03-12) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index a8f7c50..04de1b7 100644 --- a/flake.lock +++ b/flake.lock @@ -190,11 +190,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1709961763, - "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "type": "github" }, "original": { @@ -238,11 +238,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710162809, - "narHash": "sha256-i2R2bcnQp+85de67yjgZVvJhd6rRnJbSYNpGmB6Leb8=", + "lastModified": 1710283656, + "narHash": "sha256-nI+AOy4uK6jLGBi9nsbHjL1EdSIzoo8oa+9oeVhbyFc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ddcd7598b2184008c97e6c9c6a21c5f37590b8d2", + "rev": "51063ed4f2343a59fdeebb279bb81d87d453942b", "type": "github" }, "original": { From d25fffc89985638bc76a0d268a1632d294d2782b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 14 Mar 2024 00:32:54 +0100 Subject: [PATCH 016/330] host framenix: linux 6.8-rc6 -> 6.8.0 from nixpkgs again --- hosts/framenix/default.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 72d24f5..3c47240 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -20,16 +20,7 @@ in systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp"; # try newer kernels - boot.kernelPackages = pkgs.linuxPackagesFor (pkgs.linux_latest.override { - argsOverride = rec { - src = pkgs.fetchurl { - url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-ff+VhfWcCXlDRKfikAaxcLdrRb+YgM8BHPPgoVwfB2g="; - }; - version = "6.8-rc7"; - modDirVersion = "6.8.0-rc7"; - }; - }); + boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelParams = [ # temporary workaround for white flickering graphics artefacts From 3a31c21ae2967b7a62ea3ec682cfade202594125 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 16 Mar 2024 17:14:33 +0100 Subject: [PATCH 017/330] flake: enable treefmt for formatting - for now, uses only `nixfmt-rfc-style` - can be invoked with `nix flake check` and `nix fmt` --- flake.lock | 21 +++++++++++++++++++++ flake.nix | 18 +++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 04de1b7..40ba650 100644 --- a/flake.lock +++ b/flake.lock @@ -307,6 +307,7 @@ "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs_2", "nur": "nur", + "treefmt-nix": "treefmt-nix", "utils": "utils" } }, @@ -365,6 +366,26 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1710278050, + "narHash": "sha256-Oc6BP7soXqb8itlHI8UKkdf3V9GeJpa1S39SR5+HJys=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "35791f76524086ab4b785a33e4abbedfda64bd22", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems_2" diff --git a/flake.nix b/flake.nix index 0a3a150..3f1d182 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,10 @@ # deliberately do _not_ follow the nixpkgs input here, because paranoia and test coverage }; utils.url = "github:numtide/flake-utils"; + treefmt-nix = { + url = "github:numtide/treefmt-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nur.url = "github:nix-community/NUR"; # TODO: possible make this a flake as well @@ -25,7 +29,7 @@ }; outputs = - { self, nixpkgs, nur, lanzaboote, utils, home-manager, ... }@inputs: + { self, nixpkgs, nur, lanzaboote, utils, home-manager, treefmt-nix, ... }@inputs: let # FIXME: allow different systems systems = utils.lib.system; @@ -71,6 +75,10 @@ inherit inputs system; }; }; + treefmtConf = {pkgs, ...}:{ + projectRootFile = "flake.nix"; + programs.nixfmt-rfc-style.enable = true; + }; in { overlays.default = import ./packages; @@ -85,11 +93,19 @@ inherit system; overlays = nixpkgs.lib.attrValues self.overlays; }; + nixpkgs_unstable = import inputs.nixos-unstable { + inherit system; + overlays = nixpkgs.lib.attrValues self.overlays; + }; pkgs = inputs.nixpkgs.legacyPackages.${system}; + pkgs_unstable = inputs.nixos-unstable.legacyPackages.${system}; + treefmtEval = treefmt-nix.lib.evalModule pkgs_unstable treefmtConf; in { devShells.default = pkgs.mkShell { buildInputs = []; }; + formatter = treefmtEval.config.build.wrapper; + checks.formatting = treefmtEval.config.build.check self; # expose nixpkgs with overlay; TODO: figure out role of config #legacyPackages = nixpkgs; }); From 2bdff39416b9cdd1a69be6fbd834ee2a7e3b8790 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 16 Mar 2024 17:18:20 +0100 Subject: [PATCH 018/330] [treewide] reformat all files with nixfmt-rfc-style --- common/default.nix | 169 +++++---- common/nitrokey.nix | 20 +- common/packages.nix | 169 +++++---- flake.nix | 186 +++++----- home/home.nix | 425 +++++++++++----------- home/overlays.nix | 17 +- hosts/framenix/default.nix | 11 +- hosts/framenix/hardware-configuration.nix | 21 +- hosts/framenix/storage.nix | 25 +- hosts/framenix/swap.nix | 4 +- hosts/thinknix/default.nix | 9 +- hosts/thinknix/hardware-configuration.nix | 26 +- hosts/thinknix/secureboot.nix | 14 +- hosts/thinknix/storage.nix | 37 +- hosts/thinknix/swap.nix | 4 +- nixos/Hash2PubTestbed.nix | 46 ++- packages/default.nix | 1 - 17 files changed, 653 insertions(+), 531 deletions(-) diff --git a/common/default.nix b/common/default.nix index fc54ad9..2be6122 100644 --- a/common/default.nix +++ b/common/default.nix @@ -1,20 +1,22 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: let inputs = config.inputInjection.flake-inputs; unstable = inputs.nixos-unstable; - in { - imports = - [ - ./packages.nix - ./nitrokey.nix - ]; + imports = [ + ./packages.nix + ./nitrokey.nix + ]; services.davfs2.enable = true; - # exfat support #boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ]; @@ -38,11 +40,10 @@ in # Some programs need SUID wrappers, can be configured further or are # started in user sessions. programs.bash.enableCompletion = true; - programs.wireshark = - { - enable = true; - package = pkgs.wireshark; - }; + programs.wireshark = { + enable = true; + package = pkgs.wireshark; + }; programs.adb.enable = true; @@ -59,79 +60,88 @@ in # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; - networking.firewall.allowedTCPPortRanges = [{ from = 1714; to = 1764; }]; - networking.firewall.allowedUDPPortRanges = [{ from = 1714; to = 1764; }]; # for KDE connect + networking.firewall.allowedTCPPortRanges = [ + { + from = 1714; + to = 1764; + } + ]; + networking.firewall.allowedUDPPortRanges = [ + { + from = 1714; + to = 1764; + } + ]; # for KDE connect # FIXME: kdeconnect module # Or disable the firewall altogether. # networking.firewall.enable = false; - networking.networkmanager = { + networking.networkmanager = { enable = true; # FIXME: move into own file, use SOPS for secrets ensureProfiles.profiles = { - "37C3" = { - connection = { - id = "37C3"; - type = "wifi"; - interface-name = "wlan0"; - }; - wifi = { - mode = "infrastructure"; - ssid = "37C3"; - }; - wifi-security = { - auth-alg = "open"; - key-mgmt = "wpa-eap"; - }; - "802-1x" = { - anonymous-identity = "37C3"; - eap = "ttls;"; - identity = "37C3"; - password = "37C3"; - phase2-auth = "pap"; - altsubject-matches = "DNS:radius.c3noc.net"; - ca-cert = "${builtins.fetchurl { - url = "https://letsencrypt.org/certs/isrgrootx1.pem"; - sha256 = "sha256:1la36n2f31j9s03v847ig6ny9lr875q3g7smnq33dcsmf2i5gd92"; - }}"; - }; - ipv4 = { - method = "auto"; - }; - ipv6 = { - addr-gen-mode = "default"; - method = "auto"; + "37C3" = { + connection = { + id = "37C3"; + type = "wifi"; + interface-name = "wlan0"; + }; + wifi = { + mode = "infrastructure"; + ssid = "37C3"; + }; + wifi-security = { + auth-alg = "open"; + key-mgmt = "wpa-eap"; + }; + "802-1x" = { + anonymous-identity = "37C3"; + eap = "ttls;"; + identity = "37C3"; + password = "37C3"; + phase2-auth = "pap"; + altsubject-matches = "DNS:radius.c3noc.net"; + ca-cert = "${builtins.fetchurl { + url = "https://letsencrypt.org/certs/isrgrootx1.pem"; + sha256 = "sha256:1la36n2f31j9s03v847ig6ny9lr875q3g7smnq33dcsmf2i5gd92"; + }}"; + }; + ipv4 = { + method = "auto"; + }; + ipv6 = { + addr-gen-mode = "default"; + method = "auto"; + }; }; }; }; -}; services.avahi.enable = true; # Enable CUPS to print documents. - services.printing = - { - enable = true; - drivers = [ pkgs.hplip ]; - }; + services.printing = { + enable = true; + drivers = [ pkgs.hplip ]; + }; # scanners - hardware.sane = - { - enable = true; - extraBackends = [ pkgs.hplip ]; - }; + hardware.sane = { + enable = true; + extraBackends = [ pkgs.hplip ]; + }; # Enable sound. hardware.pulseaudio = { enable = true; # decouple pulseaudio application and sink volumes - daemon.config = { flat-volumes = "no"; }; + daemon.config = { + flat-volumes = "no"; + }; # C3D2 hq music zeroconf.discovery.enable = true; zeroconf.publish.enable = true; }; - # Bluetooth hardware.bluetooth = { enable = true; @@ -141,7 +151,6 @@ in package = pkgs.pulseaudioFull; }; - # FIXME: at some point, hide GUI and sound (desktop vs. server) behind an option # Enable the X11 windowing system. services.xserver.enable = true; @@ -160,8 +169,8 @@ in # dconf required for several Gnome applications programs.dconf.enable = true; - - programs.firefox.enable = true; # enables support for automatically setting additionsl nativeMessagingHosts + + programs.firefox.enable = true; # enables support for automatically setting additionsl nativeMessagingHosts # Flatpak support services.flatpak.enable = true; @@ -171,7 +180,18 @@ in users.users.spiollinux = { isNormalUser = true; uid = 1000; - extraGroups = [ "vboxusers" "wheel" "networkmanager" "scanner" "lp" "wireshark" "dialout" "cdrom" "input" "adbusers" ]; + extraGroups = [ + "vboxusers" + "wheel" + "networkmanager" + "scanner" + "lp" + "wireshark" + "dialout" + "cdrom" + "input" + "adbusers" + ]; shell = pkgs.zsh; }; @@ -184,11 +204,10 @@ in nixpkgs.config.whitelistedLicenses = [ pkgs.lib.licenses.virtualbox-puel ]; users.extraGroups.vboxusers.members = [ "spiollinux" ]; - programs.zsh = - { - enable = true; - autosuggestions.enable = true; - }; + programs.zsh = { + enable = true; + autosuggestions.enable = true; + }; # profile sync daemon services.psd.enable = true; @@ -208,13 +227,17 @@ in nixpkgs.flake = inputs.nixpkgs; }; nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; - # keep build-time deps around for offline-rebuilding + # keep build-time deps around for offline-rebuilding settings = { # keep around all inputs necessary for offline-rebuilding the system keep-outputs = true; keep-derivations = true; trusted-users = [ "spiollinux" ]; - experimental-features = [ "nix-command" "flakes" "repl-flake" ]; + experimental-features = [ + "nix-command" + "flakes" + "repl-flake" + ]; # use all cores for building cores = 0; }; @@ -254,6 +277,4 @@ in # stop NetworkManager from managing virtual interfaces networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; - - } diff --git a/common/nitrokey.nix b/common/nitrokey.nix index dc6ed75..40457d1 100644 --- a/common/nitrokey.nix +++ b/common/nitrokey.nix @@ -1,11 +1,13 @@ -{ pkgs, lib, ...}: +{ pkgs, lib, ... }: { -hardware.nitrokey.enable = true; -environment.systemPackages = [ pkgs.pynitrokey ]; -nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "nrfutil" - "pc-ble-driver-py" - "pc-ble-driver" - "pypemicro" -]; + hardware.nitrokey.enable = true; + environment.systemPackages = [ pkgs.pynitrokey ]; + nixpkgs.config.allowUnfreePredicate = + pkg: + builtins.elem (lib.getName pkg) [ + "nrfutil" + "pc-ble-driver-py" + "pc-ble-driver" + "pypemicro" + ]; } diff --git a/common/packages.nix b/common/packages.nix index d507b42..e1316c4 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -1,89 +1,98 @@ -{ lib, pkgs, config, ... }: +{ + lib, + pkgs, + config, + ... +}: -{ +{ # take overlays from flake nixpkgs.overlays = lib.attrValues config.inputInjection.flake-inputs.self.overlays; # List packages installed in system profile. - environment.systemPackages = with pkgs; [ - wget - vim - vimPlugins.vim-nix - vimPlugins.pathogen - tmux - htop - zsh - btrfs-progs - git - python3 - man-pages - dnsutils - netcat-openbsd - ntfs3g - file - multipath-tools - strace - ltrace - valgrind - testdisk - rsync - pv - exfat - iotop - cifs-utils - dstat - lsof - macchanger - borgbackup + environment.systemPackages = + with pkgs; + [ + wget + vim + vimPlugins.vim-nix + vimPlugins.pathogen + tmux + htop + zsh + btrfs-progs + git + python3 + man-pages + dnsutils + netcat-openbsd + ntfs3g + file + multipath-tools + strace + ltrace + valgrind + testdisk + rsync + pv + exfat + iotop + cifs-utils + dstat + lsof + macchanger + borgbackup - # for debugging WLAN failures: - ethtool - trace-cmd - - # NetworkManager stuff - networkmanager-openconnect - networkmanager-vpnc - networkmanager-openvpn - plasma5Packages.kdeGear.akonadi-mime # for KOrganizer + # for debugging WLAN failures: + ethtool + trace-cmd + + # NetworkManager stuff + networkmanager-openconnect + networkmanager-vpnc + networkmanager-openvpn + plasma5Packages.kdeGear.akonadi-mime # for KOrganizer ] - ++ (with plasma5Packages; with kdeGear; [ - #akonadi - #akonadi-calendar - #akonadi-contacts - #akonadi-import-wizard - #akonadi-mime - #akonadi-notes - #akonadi-search - #akonadiconsole - #akregator - #kaddressbook - #kalarm - #kalarmcal - #kcalutils - #kcontacts - #kdav - #kdepim-addons + ++ ( + with plasma5Packages; + with kdeGear; + [ + #akonadi + #akonadi-calendar + #akonadi-contacts + #akonadi-import-wizard + #akonadi-mime + #akonadi-notes + #akonadi-search + #akonadiconsole + #akregator + #kaddressbook + #kalarm + #kalarmcal + #kcalutils + #kcontacts + #kdav + #kdepim-addons - #kdepim-runtime - #kidentitymanagement - #kldap - #kmail - #kmailtransport - #kmbox - #kmime - #kontact - #kontactinterface - #korganizer - #kpimtextedit - #libkdepim - #libksieve - #mailcommon - #messagelib - #pimcommon - #pim-sieve-editor + #kdepim-runtime + #kidentitymanagement + #kldap + #kmail + #kmailtransport + #kmbox + #kmime + #kontact + #kontactinterface + #korganizer + #kpimtextedit + #libkdepim + #libksieve + #mailcommon + #messagelib + #pimcommon + #pim-sieve-editor - # for some Flatpak packkages - accountsservice - ]); + # for some Flatpak packkages + accountsservice + ] + ); } - - diff --git a/flake.nix b/flake.nix index 3f1d182..4d0d2ce 100644 --- a/flake.nix +++ b/flake.nix @@ -19,94 +19,118 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nur.url = "github:nix-community/NUR"; + nur.url = "github:nix-community/NUR"; # TODO: possible make this a flake as well mysecrets = { flake = false; url = "git+ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git"; }; - }; - outputs = - { self, nixpkgs, nur, lanzaboote, utils, home-manager, treefmt-nix, ... }@inputs: - let - # FIXME: allow different systems - systems = utils.lib.system; - # necessary to make the top-level inputs available to system configuration - # inspired by https://jade.fyi/blog/flakes-arent-real/ - inputInjection = {pkgs, lib, ...}: { - options.inputInjection = lib.mkOption { - type = with lib.types; attrsOf unspecified; - default = {}; - }; - config.inputInjection = { - flake-inputs = inputs; - }; - }; - defaultModules = system: [ - inputInjection - ]; - mkSystem = system: extraModules: - nixpkgs.lib.nixosSystem rec { - modules = (defaultModules system) ++ extraModules; - inherit system; - specialArgs = {inherit system;}; - }; - mkHomeManager = confName: user: system: # unfortunately, home-manager configs are still system-specific - # FIXME: this is thus still linux-x86_64 specific - home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.${system}; - modules = [ - { - imports = [ - nur.hmModules.nur - # TODO: $name can be utilised to conditionally load other config files - ./home/home.nix - ]; - # extends the home config - home.username = user; - home.homeDirectory = "/home/${user}"; - } - ]; - # Optionally use extraSpecialArgs - # to pass through arguments to home.nix - extraSpecialArgs = { - inherit inputs system; - }; - }; - treefmtConf = {pkgs, ...}:{ - projectRootFile = "flake.nix"; - programs.nixfmt-rfc-style.enable = true; - }; - in - { - overlays.default = import ./packages; - nixosConfigurations = { - thinknix = mkSystem systems.x86_64-linux [ ./hosts/thinknix inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t440s lanzaboote.nixosModules.lanzaboote ]; - framenix = mkSystem systems.x86_64-linux [ ./hosts/framenix inputs.nixos-hardware.nixosModules.framework-13-7040-amd lanzaboote.nixosModules.lanzaboote ]; - }; - homeConfigurations.spiollinux = mkHomeManager "spiollinux" "spiollinux" systems.x86_64-linux; - } // utils.lib.eachDefaultSystem(system: + outputs = + { + self, + nixpkgs, + nur, + lanzaboote, + utils, + home-manager, + treefmt-nix, + ... + }@inputs: let - nixpkgs = import inputs.nixpkgs { - inherit system; - overlays = nixpkgs.lib.attrValues self.overlays; + # FIXME: allow different systems + systems = utils.lib.system; + # necessary to make the top-level inputs available to system configuration + # inspired by https://jade.fyi/blog/flakes-arent-real/ + inputInjection = + { pkgs, lib, ... }: + { + options.inputInjection = lib.mkOption { + type = with lib.types; attrsOf unspecified; + default = { }; + }; + config.inputInjection = { + flake-inputs = inputs; + }; + }; + defaultModules = system: [ inputInjection ]; + mkSystem = + system: extraModules: + nixpkgs.lib.nixosSystem rec { + modules = (defaultModules system) ++ extraModules; + inherit system; + specialArgs = { + inherit system; + }; + }; + mkHomeManager = + confName: user: system: # unfortunately, home-manager configs are still system-specific + # FIXME: this is thus still linux-x86_64 specific + home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.${system}; + modules = [ + { + imports = [ + nur.hmModules.nur + # TODO: $name can be utilised to conditionally load other config files + ./home/home.nix + ]; + # extends the home config + home.username = user; + home.homeDirectory = "/home/${user}"; + } + ]; + # Optionally use extraSpecialArgs + # to pass through arguments to home.nix + extraSpecialArgs = { + inherit inputs system; + }; + }; + treefmtConf = + { pkgs, ... }: + { + projectRootFile = "flake.nix"; + programs.nixfmt-rfc-style.enable = true; + }; + in + { + overlays.default = import ./packages; + nixosConfigurations = { + thinknix = mkSystem systems.x86_64-linux [ + ./hosts/thinknix + inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t440s + lanzaboote.nixosModules.lanzaboote + ]; + framenix = mkSystem systems.x86_64-linux [ + ./hosts/framenix + inputs.nixos-hardware.nixosModules.framework-13-7040-amd + lanzaboote.nixosModules.lanzaboote + ]; }; - nixpkgs_unstable = import inputs.nixos-unstable { - inherit system; - overlays = nixpkgs.lib.attrValues self.overlays; - }; - pkgs = inputs.nixpkgs.legacyPackages.${system}; - pkgs_unstable = inputs.nixos-unstable.legacyPackages.${system}; - treefmtEval = treefmt-nix.lib.evalModule pkgs_unstable treefmtConf; - in { - devShells.default = pkgs.mkShell { - buildInputs = []; - }; - formatter = treefmtEval.config.build.wrapper; - checks.formatting = treefmtEval.config.build.check self; - # expose nixpkgs with overlay; TODO: figure out role of config - #legacyPackages = nixpkgs; - }); + homeConfigurations.spiollinux = mkHomeManager "spiollinux" "spiollinux" systems.x86_64-linux; + } + // utils.lib.eachDefaultSystem ( + system: + let + nixpkgs = import inputs.nixpkgs { + inherit system; + overlays = nixpkgs.lib.attrValues self.overlays; + }; + nixpkgs_unstable = import inputs.nixos-unstable { + inherit system; + overlays = nixpkgs.lib.attrValues self.overlays; + }; + pkgs = inputs.nixpkgs.legacyPackages.${system}; + pkgs_unstable = inputs.nixos-unstable.legacyPackages.${system}; + treefmtEval = treefmt-nix.lib.evalModule pkgs_unstable treefmtConf; + in + { + devShells.default = pkgs.mkShell { buildInputs = [ ]; }; + formatter = treefmtEval.config.build.wrapper; + checks.formatting = treefmtEval.config.build.check self; + # expose nixpkgs with overlay; TODO: figure out role of config + #legacyPackages = nixpkgs; + } + ); } diff --git a/home/home.nix b/home/home.nix index 61231dd..fe6cdc2 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,4 +1,10 @@ -{ pkgs, inputs, config, system, ... }: +{ + pkgs, + inputs, + config, + system, + ... +}: with pkgs; let @@ -45,7 +51,6 @@ let logseq - # for Hibiscus banking software jameica #ToDo: which of these drivers is actually used? @@ -53,21 +58,20 @@ let chromedriver ]; - graphicsApps = [ - inkscape - darktable - hugin - luminanceHDR - exiftool - gimp - xournal - ] - ++ ( - with gimpPlugins; [ + graphicsApps = + [ + inkscape + darktable + hugin + luminanceHDR + exiftool + gimp + xournal + ] + ++ (with gimpPlugins; [ fourier lqrPlugin - ] - ); + ]); multimediaApps = [ mpv @@ -127,39 +131,40 @@ let nix-output-monitor ]; - kdeTools = with plasma5Packages; with kdeGear; [ - okular - gwenview - yakuake - kmail - kontact - korganizer - akonadi-mime #for KOrganizer - kaddressbook - kdeconnect - dolphin - spectacle - kate - kleopatra - qdirstat - ark - kwalletmanager - ktouch - kcharselect - konversation - okteta - krdc - skanlite - akonadiconsole - tokodon # mastodon client - ] - ++ ( - with kdeFrameworks; [ + kdeTools = + with plasma5Packages; + with kdeGear; + [ + okular + gwenview + yakuake + kmail + kontact + korganizer + akonadi-mime # for KOrganizer + kaddressbook + kdeconnect + dolphin + spectacle + kate + kleopatra + qdirstat + ark + kwalletmanager + ktouch + kcharselect + konversation + okteta + krdc + skanlite + akonadiconsole + tokodon # mastodon client + ] + ++ (with kdeFrameworks; [ networkmanager-qt kcrash breeze-gtk - ] - ); + ]); devTools = [ curl @@ -182,39 +187,36 @@ let cabal2nix ]; - latexApps = [ texmaker kile biber # customize texlive installation - ( - texlive.combine { - inherit (texlive) - scheme-medium + (texlive.combine { + inherit (texlive) + scheme-medium - xetex - luatex - unicode-math - fontspec - collection-binextra - collection-fontsrecommended - collection-latex - collection-latexextra - collection-latexrecommended - collection-langgerman - moderncv - fontawesome5 - academicons - acronym - ccicons - fontawesome - biblatex - logreq - koma-script - ; - } - ) + xetex + luatex + unicode-math + fontspec + collection-binextra + collection-fontsrecommended + collection-latex + collection-latexextra + collection-latexrecommended + collection-langgerman + moderncv + fontawesome5 + academicons + acronym + ccicons + fontawesome + biblatex + logreq + koma-script + ; + }) ]; pythonApps = with python3Packages; [ @@ -228,7 +230,6 @@ let mypy ]; - fonts = [ comic-neue source-sans-pro @@ -237,9 +238,7 @@ let ubuntu_font_family twemoji-color-font open-sans - (iosevka-bin.override { - variant = "curly-slab"; - }) + (iosevka-bin.override { variant = "curly-slab"; }) config.nur.repos.schmittlauch.vollkorn # TODO: humor-sans ]; @@ -248,15 +247,14 @@ let superTuxKart #hedgewars ]; - in { nixpkgs.overlays = (import ./overlays.nix); nixpkgs.config = { clementine.spotify = false; - vim = - { gui = "gtk3"; + vim = { + gui = "gtk3"; python = true; multibyteSupport = true; }; @@ -273,18 +271,16 @@ in ++ kdeTools ++ fonts ++ nixHelpers - ++ games - ; + ++ games; programs.home-manager.enable = true; home.stateVersion = "22.11"; - programs.direnv = - { - enable = true; - nix-direnv.enable = true; - enableZshIntegration = true; - }; + programs.direnv = { + enable = true; + nix-direnv.enable = true; + enableZshIntegration = true; + }; # programs.vim = # { enable = true; @@ -292,34 +288,32 @@ in programs.bat.enable = true; - services.gpg-agent = - { - enable = true; - #enableSshSupport = true; - pinentryFlavor = "qt"; - }; + services.gpg-agent = { + enable = true; + #enableSshSupport = true; + pinentryFlavor = "qt"; + }; - programs.ssh = - { - enable = true; - # ssh host config - matchBlocks = - import "${inputs.mysecrets}/ssh_hosts.nix"; - }; + programs.ssh = { + enable = true; + # ssh host config + matchBlocks = import "${inputs.mysecrets}/ssh_hosts.nix"; + }; programs.tmux = { enable = true; keyMode = "vi"; extraConfig = # for direnv not messing up the environment - ''set-option -g update-environment "DIRENV_DIFF DIRENV_DIR DIRENV_WATCHES" - set-environment -gu DIRENV_DIFF - set-environment -gu DIRENV_DIR - set-environment -gu DIRENV_WATCHES - set-environment -gu DIRENV_LAYOUT - - bind-key -T copy-mode-vi 'v' send -X begin-selection - bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel''; + '' + set-option -g update-environment "DIRENV_DIFF DIRENV_DIR DIRENV_WATCHES" + set-environment -gu DIRENV_DIFF + set-environment -gu DIRENV_DIR + set-environment -gu DIRENV_WATCHES + set-environment -gu DIRENV_LAYOUT + + bind-key -T copy-mode-vi 'v' send -X begin-selection + bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel''; terminal = "screen-256color"; }; @@ -334,120 +328,135 @@ in fonts.fontconfig.enable = true; programs.git = - let contacts = import "${inputs.mysecrets}/contacts.nix"; + let + contacts = import "${inputs.mysecrets}/contacts.nix"; in { enable = true; - includes = [ - { - condition = "gitdir:~/Seafile/Studium/"; - contents = { - user.name = contacts.realName; - user.email = contacts.uniMail; - }; - } - { - condition = "gitdir:~/src/nixpkgs/"; - contents = { - user.name = "Trolli Schmittlauch"; - user.email = contacts.nixosMail; - }; - } - ] - # set default name for several other common locations - ++ map - (dir: { - condition = "gitdir:${dir}"; - contents = { - user.name = "Trolli Schmittlauch"; - user.email = contacts.mainMail; - }; - }) [ "~/src/" "~/bin/" "~/tmp/" "~/nixconfigs/" ]; + includes = + [ + { + condition = "gitdir:~/Seafile/Studium/"; + contents = { + user.name = contacts.realName; + user.email = contacts.uniMail; + }; + } + { + condition = "gitdir:~/src/nixpkgs/"; + contents = { + user.name = "Trolli Schmittlauch"; + user.email = contacts.nixosMail; + }; + } + ] + # set default name for several other common locations + ++ + map + (dir: { + condition = "gitdir:${dir}"; + contents = { + user.name = "Trolli Schmittlauch"; + user.email = contacts.mainMail; + }; + }) + [ + "~/src/" + "~/bin/" + "~/tmp/" + "~/nixconfigs/" + ]; extraConfig = { credential.helper = "cache"; push.default = "simple"; init.defaultBranch = "mainline"; diff.tool = "vimdiff"; merge.tool = "vimdiff"; - core.excludesfile = toString (pkgs.writeText ".gitignore_global" '' - # Direnv stuff - .direnv - .envrc - # Editor files # - ################ - *~ - *.swp - *.swo - ''); + core.excludesfile = toString ( + pkgs.writeText ".gitignore_global" '' + # Direnv stuff + .direnv + .envrc + # Editor files # + ################ + *~ + *.swp + *.swo + '' + ); core.whitespace = "-blank-at-eol,blank-at-eof,space-before-tab"; }; lfs.enable = true; }; - # shell config - programs.zsh = { + # shell config + programs.zsh = { + enable = true; + syntaxHighlighting.enable = true; + history.ignoreSpace = true; + initExtra = '' + # Uncomment following line if you want red dots to be displayed while waiting for completion + COMPLETION_WAITING_DOTS="true" + ### Fix slowness of pastes with zsh-syntax-highlighting.zsh + pasteinit() { + OLD_SELF_INSERT=''${''${(s.:.)widgets[self-insert]}[2,3]} + zle -N self-insert url-quote-magic # I wonder if you'd need `.url-quote-magic`? + } + + pastefinish() { + zle -N self-insert $OLD_SELF_INSERT + } + zstyle :bracketed-paste-magic paste-init pasteinit + zstyle :bracketed-paste-magic paste-finish pastefinish + + # automatic rehash of path completion + zstyle ':completion:*' rehash true + + eval "$(${pkgs.thefuck}/bin/thefuck --alias)" + + ## helper functions + nixify() { + if [ ! -e ./.envrc ]; then + echo "eval \"$(lorri direnv)\"" > .envrc + direnv allow + fi + if [ ! -e shell.nix ]; then + cat > shell.nix <<'EOF' + with import {}; + mkShell { + buildInputs = [ + bashInteractive + ]; + } + EOF + ${"EDITOR:-vim"} default.nix + fi + } + + binpath() { + realpath $(${pkgs.which}/bin/which $1) + } + ''; + + oh-my-zsh = { enable = true; - syntaxHighlighting.enable = true; - history.ignoreSpace = true; - initExtra = '' - # Uncomment following line if you want red dots to be displayed while waiting for completion - COMPLETION_WAITING_DOTS="true" - ### Fix slowness of pastes with zsh-syntax-highlighting.zsh - pasteinit() { - OLD_SELF_INSERT=''${''${(s.:.)widgets[self-insert]}[2,3]} - zle -N self-insert url-quote-magic # I wonder if you'd need `.url-quote-magic`? - } - - pastefinish() { - zle -N self-insert $OLD_SELF_INSERT - } - zstyle :bracketed-paste-magic paste-init pasteinit - zstyle :bracketed-paste-magic paste-finish pastefinish - - # automatic rehash of path completion - zstyle ':completion:*' rehash true - - eval "$(${pkgs.thefuck}/bin/thefuck --alias)" - - ## helper functions - nixify() { - if [ ! -e ./.envrc ]; then - echo "eval \"$(lorri direnv)\"" > .envrc - direnv allow - fi - if [ ! -e shell.nix ]; then - cat > shell.nix <<'EOF' - with import {}; - mkShell { - buildInputs = [ - bashInteractive - ]; - } - EOF - ${EDITOR:-vim} default.nix - fi - } - - binpath() { - realpath $(${pkgs.which}/bin/which $1) - } - ''; - - - oh-my-zsh = { - enable = true; - theme = "bira"; - plugins = [ "git" "python" "systemd" "gpg-agent"]; - }; - }; - home.shellAliases = { - ip = "ip --color"; - ipb = "ip --color --brief"; - ll = "ls -l"; - wavesynth = "nix-shell -p sox --run 'play -n synth brownnoise synth pinknoise mix synth 0 0 0 15 40 80 trapezium amod 0.2 20'"; - vim = "nvim"; - }; - home.sessionVariables = { - EDITOR = "nvim"; + theme = "bira"; + plugins = [ + "git" + "python" + "systemd" + "gpg-agent" + ]; }; + }; + home.shellAliases = { + ip = "ip --color"; + ipb = "ip --color --brief"; + ll = "ls -l"; + wavesynth = "nix-shell -p sox --run 'play -n synth brownnoise synth pinknoise mix synth 0 0 0 15 40 80 trapezium amod 0.2 20'"; + vim = "nvim"; + }; + home.sessionVariables = { + EDITOR = "nvim"; + }; } diff --git a/home/overlays.nix b/home/overlays.nix index f2ae044..5a9b213 100644 --- a/home/overlays.nix +++ b/home/overlays.nix @@ -1,9 +1,9 @@ - [ - ( - self: super: - rec { - myVim = with super; neovim.override { configure = { + (self: super: rec { + myVim = + with super; + neovim.override { + configure = { packages.myVimPackage = with pkgs.vimPlugins; { # loaded on start start = [ @@ -25,8 +25,7 @@ ]; }; customRC = builtins.readFile ./vimrc; - };}; - } - ) - + }; + }; + }) ] diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 3c47240..666a581 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -1,4 +1,10 @@ -{ config, lib, pkgs, system, ...}: +{ + config, + lib, + pkgs, + system, + ... +}: let unstable = config.inputInjection.flake-inputs.nixos-unstable.legacyPackages.${system}; in @@ -22,7 +28,7 @@ in # try newer kernels boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernelParams = [ + boot.kernelParams = [ # temporary workaround for white flickering graphics artefacts "amdgpu.sg_display=0" # powersave @@ -65,4 +71,3 @@ in pkgs.framework-tool ]; } - diff --git a/hosts/framenix/hardware-configuration.nix b/hosts/framenix/hardware-configuration.nix index a731402..b9295b2 100644 --- a/hosts/framenix/hardware-configuration.nix +++ b/hosts/framenix/hardware-configuration.nix @@ -1,18 +1,27 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: +{ + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "thunderbolt" + "usb_storage" + "sd_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction diff --git a/hosts/framenix/storage.nix b/hosts/framenix/storage.nix index 3efa655..b4d5793 100644 --- a/hosts/framenix/storage.nix +++ b/hosts/framenix/storage.nix @@ -1,17 +1,25 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let - fsOptions = [ "noatime" "ssd" "compress=zstd" ]; + fsOptions = [ + "noatime" + "ssd" + "compress=zstd" + ]; in { boot.initrd.luks = { devices = # allow discards on all devices - builtins.mapAttrs (name: val: val // {allowDiscards = true;}) - { + builtins.mapAttrs (name: val: val // { allowDiscards = true; }) { "system".device = "/dev/disk/by-uuid/1838cdc5-9b0b-4c46-9f23-9465549eeb92"; - "cryptswap".device = "/dev/disk/by-uuid/ded7d649-ab3a-42ee-ae4a-f8c4ba029e9c"; + "cryptswap".device = "/dev/disk/by-uuid/ded7d649-ab3a-42ee-ae4a-f8c4ba029e9c"; }; - reusePassphrases = true; + reusePassphrases = true; }; fileSystems = { @@ -37,7 +45,10 @@ in services.fstrim.enable = true; services.btrfs.autoScrub = { enable = true; - fileSystems = [ "/" "/home" ]; + fileSystems = [ + "/" + "/home" + ]; }; boot.tmp.useTmpfs = true; diff --git a/hosts/framenix/swap.nix b/hosts/framenix/swap.nix index 262809c..ce2347e 100644 --- a/hosts/framenix/swap.nix +++ b/hosts/framenix/swap.nix @@ -1,7 +1,5 @@ { - swapDevices = - [ { device = "/dev/disk/by-uuid/24c47f3d-0d3e-4575-92a2-174b5a6b6086"; } - ]; + swapDevices = [ { device = "/dev/disk/by-uuid/24c47f3d-0d3e-4575-92a2-174b5a6b6086"; } ]; zramSwap = { enable = true; diff --git a/hosts/thinknix/default.nix b/hosts/thinknix/default.nix index ff1a2ff..a7344b4 100644 --- a/hosts/thinknix/default.nix +++ b/hosts/thinknix/default.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ...}: +{ + config, + lib, + pkgs, + ... +}: { imports = [ ../../common @@ -10,7 +15,6 @@ ./secureboot.nix ]; - hardware.trackpoint = { enable = true; sensitivity = 180; @@ -19,7 +23,6 @@ networking.hostName = "thinknix"; - # This value determines the NixOS release with which your system is to be # compatible, in order to avoid breaking some software such as database # servers. You should change this only after NixOS release notes say you diff --git a/hosts/thinknix/hardware-configuration.nix b/hosts/thinknix/hardware-configuration.nix index 18c7846..e60ac46 100644 --- a/hosts/thinknix/hardware-configuration.nix +++ b/hosts/thinknix/hardware-configuration.nix @@ -1,20 +1,28 @@ -{ config, lib, pkgs, modulesPath, ... }: - +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ehci_pci" + "ahci" + "usb_storage" + "sd_mod" + "rtsx_pci_sdmmc" + ]; boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = []; + boot.extraModulePackages = [ ]; nix.settings.max-jobs = lib.mkDefault 4; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; # modesetting is always better than intel (legacy) services.xserver.videoDrivers = [ "modesetting" ]; - } diff --git a/hosts/thinknix/secureboot.nix b/hosts/thinknix/secureboot.nix index 41eb516..657838e 100644 --- a/hosts/thinknix/secureboot.nix +++ b/hosts/thinknix/secureboot.nix @@ -1,11 +1,14 @@ -{ config, lib, pkgs, ...}: -{ +{ + config, + lib, + pkgs, + ... +}: +{ boot.loader.efi.canTouchEfiVariables = true; # UEFI secure boot - environment.systemPackages = [ - pkgs.sbctl - ]; + environment.systemPackages = [ pkgs.sbctl ]; # Lanzaboote currently replaces the systemd-boot module. # This setting is usually set to true in configuration.nix # generated at installation time. So we force it to false @@ -16,5 +19,4 @@ enable = true; pkiBundle = "/etc/secureboot"; }; - } diff --git a/hosts/thinknix/storage.nix b/hosts/thinknix/storage.nix index 55b9a0a..169cca6 100644 --- a/hosts/thinknix/storage.nix +++ b/hosts/thinknix/storage.nix @@ -1,19 +1,28 @@ -{ config, lib, pkgs, ...}: +{ + config, + lib, + pkgs, + ... +}: let - fsOptions = [ "noatime" "ssd" "space_cache" "compress=zstd" ]; + fsOptions = [ + "noatime" + "ssd" + "space_cache" + "compress=zstd" + ]; in { # encrypted partitions boot.initrd.luks = { devices = # allow discards on all devices - builtins.mapAttrs (name: val: val // {allowDiscards = true;}) - { + builtins.mapAttrs (name: val: val // { allowDiscards = true; }) { "system".device = "/dev/disk/by-uuid/85154131-b2a8-4ef5-9d74-47429cb267ef"; "cryptswap".device = "/dev/disk/by-uuid/ac586df6-6332-4809-beb1-f51906a2adaa"; "ssd2".device = "/dev/disk/by-uuid/cadd4e1f-3642-4faa-8d4e-37dd85465df1"; }; - reusePassphrases = true; + reusePassphrases = true; }; fileSystems = { @@ -57,16 +66,20 @@ in services.fstrim.enable = true; services.btrfs.autoScrub = { enable = true; - fileSystems = [ "/" "/home" ]; + fileSystems = [ + "/" + "/home" + ]; }; - boot.tmp.useTmpfs = true; fileSystems."/tmp".fsType = "tmpfs"; - services.smartd = - { - enable = true; - devices = [{ device = "/dev/sda"; } { device = "/dev/sdb"; }]; - }; + services.smartd = { + enable = true; + devices = [ + { device = "/dev/sda"; } + { device = "/dev/sdb"; } + ]; + }; } diff --git a/hosts/thinknix/swap.nix b/hosts/thinknix/swap.nix index 5aeb2bc..d600057 100644 --- a/hosts/thinknix/swap.nix +++ b/hosts/thinknix/swap.nix @@ -1,7 +1,5 @@ { - swapDevices = [ - { device = "/dev/disk/by-uuid/bf928178-4e92-4e7e-8df2-18fbd658eecf"; } - ]; + swapDevices = [ { device = "/dev/disk/by-uuid/bf928178-4e92-4e7e-8df2-18fbd658eecf"; } ]; zramSwap = { enable = true; diff --git a/nixos/Hash2PubTestbed.nix b/nixos/Hash2PubTestbed.nix index 1efbfe6..99c4cac 100644 --- a/nixos/Hash2PubTestbed.nix +++ b/nixos/Hash2PubTestbed.nix @@ -1,10 +1,15 @@ -{ config, pkgs, experimentUid ? 1000, ... }: +{ + config, + pkgs, + experimentUid ? 1000, + ... +}: let projectDir = "/home/spiollinux/Seafile/Studium/Semester11/INF-PM-FP-ANW"; projectPath = builtins.toPath projectDir; projectMount = "/mnt/project"; - shell = (import (projectDir + "/Hash2Pub/default.nix") {}).shell; + shell = (import (projectDir + "/Hash2Pub/default.nix") { }).shell; simulationSetupScript = pkgs.writeShellScriptBin "simulationSetup" '' # make cabal-install work offline mkdir $HOME/.cabal @@ -12,25 +17,30 @@ let # run simulation script within the shell ${pkgs.nix}/bin/nix-shell ${shell.drvPath} --command "cd ${projectMount} && bash ./build/simulationrunner.sh 2>&1" - ''; - instanceData = builtins.fromJSON (builtins.readFile "${projectDir}/simulationData/inputs/generated/instances_sample.json"); - + ''; + instanceData = builtins.fromJSON ( + builtins.readFile "${projectDir}/simulationData/inputs/generated/instances_sample.json" + ); in { privateNetwork = true; ephemeral = true; bindMounts = { - "${projectMount}" = { hostPath = projectDir; isReadOnly = false; }; + "${projectMount}" = { + hostPath = projectDir; + isReadOnly = false; + }; }; config = { networking = { firewall.enable = false; - interfaces.lo.ipv6.addresses = - builtins.map (inst: {address = inst.ip; prefixLength = 0;}) instanceData; - extraHosts = - pkgs.lib.concatMapStringsSep "\n" (inst: "${inst.ip} ${inst.hostname}") instanceData; + interfaces.lo.ipv6.addresses = builtins.map (inst: { + address = inst.ip; + prefixLength = 0; + }) instanceData; + extraHosts = pkgs.lib.concatMapStringsSep "\n" (inst: "${inst.ip} ${inst.hostname}") instanceData; }; # avoid permission problems with project builds users.users.experimentor = { @@ -39,12 +49,14 @@ in }; # adjust open file limits - security.pam.loginLimits = [{ - domain = "*" - ; type = "-" - ; item = "nofile" - ; value = "50000" - ;}]; + security.pam.loginLimits = [ + { + domain = "*"; + type = "-"; + item = "nofile"; + value = "50000"; + } + ]; environment.systemPackages = [ pkgs.netcat @@ -55,7 +67,7 @@ in pkgs.iftop (pkgs.writeShellScriptBin "doSimulation" '' su experimentor -c "${simulationSetupScript}/bin/simulationSetup" - '') + '') pkgs.tcpdump ]; }; diff --git a/packages/default.nix b/packages/default.nix index 557002f..3a8553f 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -8,5 +8,4 @@ final: prev: { }) ]; }); - } From f14b2909370d593e501a029fb288932fe5185dad Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 17 Mar 2024 19:18:53 +0100 Subject: [PATCH 019/330] unify home-manager configurations of workmac and main laptop - manually inspected changes of "workmac" branch - modularised out some config parts into modules --- flake.lock | 8 +- flake.nix | 14 +- home/common.nix | 149 +++++++++++ home/desktop.nix | 81 ++++++ home/home.nix | 462 ----------------------------------- home/modules/latex.nix | 47 ++++ home/modules/packages.nix | 284 +++++++++++++++++++++ home/modules/vscodium.nix | 111 +++++++++ home/scripts/reporsync.nix | 79 ++++++ home/scripts/ssh-loop-fc.nix | 19 ++ home/secrets | 2 +- home/workmac.nix | 91 +++++++ 12 files changed, 875 insertions(+), 472 deletions(-) create mode 100644 home/common.nix create mode 100644 home/desktop.nix delete mode 100644 home/home.nix create mode 100644 home/modules/latex.nix create mode 100644 home/modules/packages.nix create mode 100644 home/modules/vscodium.nix create mode 100644 home/scripts/reporsync.nix create mode 100644 home/scripts/ssh-loop-fc.nix create mode 100644 home/workmac.nix diff --git a/flake.lock b/flake.lock index 40ba650..cb653c2 100644 --- a/flake.lock +++ b/flake.lock @@ -159,11 +159,11 @@ "mysecrets": { "flake": false, "locked": { - "lastModified": 1618507998, - "narHash": "sha256-i5ph7JlFh8eFEnQehQaKj2SGG7WLE0DPO8R81ERGCZ0=", + "lastModified": 1710686355, + "narHash": "sha256-YcSywZx6/IMYfNax1Yx0EDLQiKsCn7glYVz1eglhbcM=", "ref": "refs/heads/master", - "rev": "068a4759e72948284c3de85d20a780723278f8b8", - "revCount": 2, + "rev": "72d2478b720fabf69971747641230387d0df7689", + "revCount": 4, "type": "git", "url": "ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git" }, diff --git a/flake.nix b/flake.nix index 4d0d2ce..3a9e708 100644 --- a/flake.nix +++ b/flake.nix @@ -66,19 +66,17 @@ }; mkHomeManager = confName: user: system: # unfortunately, home-manager configs are still system-specific - # FIXME: this is thus still linux-x86_64 specific home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.${system}; modules = [ { imports = [ nur.hmModules.nur - # TODO: $name can be utilised to conditionally load other config files - ./home/home.nix + ./home/common.nix + ./home/${confName}.nix ]; # extends the home config home.username = user; - home.homeDirectory = "/home/${user}"; } ]; # Optionally use extraSpecialArgs @@ -108,7 +106,13 @@ lanzaboote.nixosModules.lanzaboote ]; }; - homeConfigurations.spiollinux = mkHomeManager "spiollinux" "spiollinux" systems.x86_64-linux; + homeConfigurations = { + spiollinux-desktop = mkHomeManager "desktop" "spiollinux" systems.x86_64-linux; + os-workmac = mkHomeManager "workmac" "os" systems.aarch64-darwin; + }; + lib = { + inherit mkHomeManager; + }; } // utils.lib.eachDefaultSystem ( system: diff --git a/home/common.nix b/home/common.nix new file mode 100644 index 0000000..9b1e892 --- /dev/null +++ b/home/common.nix @@ -0,0 +1,149 @@ +{ + pkgs, + inputs, + config, + system, + ... +}: +{ + imports = [ + ./modules/packages.nix + ./modules/vscodium.nix + ]; + home.homeDirectory = + if pkgs.stdenv.isDarwin then "/Users/${config.home.username}" else "/home/${config.home.username}"; + programs.home-manager.enable = true; + + programs.bat.enable = true; + programs.direnv = { + enable = true; + nix-direnv.enable = true; + enableZshIntegration = true; + }; + + programs.tmux = { + enable = true; + keyMode = "vi"; + extraConfig = + # for direnv not messing up the environment + '' + set-option -g update-environment "DIRENV_DIFF DIRENV_DIR DIRENV_WATCHES" + set-environment -gu DIRENV_DIFF + set-environment -gu DIRENV_DIR + set-environment -gu DIRENV_WATCHES + set-environment -gu DIRENV_LAYOUT + + bind-key -T copy-mode-vi 'v' send -X begin-selection + bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel''; + terminal = "screen-256color"; + }; + + # for backwards compatibility + services.lorri.enable = true; + + fonts.fontconfig.enable = true; + + programs.git = { + enable = true; + extraConfig = { + credential.helper = "cache"; + push.default = "simple"; + init.defaultBranch = "mainline"; + diff.tool = "vimdiff"; + merge.tool = "vimdiff"; + core.excludesfile = toString ( + pkgs.writeText ".gitignore_global" '' + # Direnv stuff + .direnv + .envrc + # Editor files # + ################ + *~ + *.swp + *.swo + '' + ); + core.whitespace = "-blank-at-eol,blank-at-eof,space-before-tab"; + }; + lfs.enable = true; + delta = { + enable = true; + options = { + line-numbers = true; + side-by-side = true; + #dark = true; + }; + }; + }; + + # shell config + programs.zsh = { + enable = true; + syntaxHighlighting.enable = true; + history.ignoreSpace = true; + initExtra = '' + # Uncomment following line if you want red dots to be displayed while waiting for completion + COMPLETION_WAITING_DOTS="true" + ### Fix slowness of pastes with zsh-syntax-highlighting.zsh + pasteinit() { + OLD_SELF_INSERT=''${''${(s.:.)widgets[self-insert]}[2,3]} + zle -N self-insert url-quote-magic # I wonder if you'd need `.url-quote-magic`? + } + + pastefinish() { + zle -N self-insert $OLD_SELF_INSERT + } + zstyle :bracketed-paste-magic paste-init pasteinit + zstyle :bracketed-paste-magic paste-finish pastefinish + + # automatic rehash of path completion + zstyle ':completion:*' rehash true + + eval "$(${pkgs.thefuck}/bin/thefuck --alias)" + + ## helper functions + nixify() { + if [ ! -e ./.envrc ]; then + echo "eval \"$(lorri direnv)\"" > .envrc + direnv allow + fi + if [ ! -e shell.nix ]; then + cat > shell.nix <<'EOF' + with import {}; + mkShell { + buildInputs = [ + bashInteractive + ]; + } + EOF + ${"EDITOR:-vim"} default.nix + fi + } + + binpath() { + realpath $(${pkgs.which}/bin/which $1) + } + ''; + + oh-my-zsh = { + enable = true; + theme = "bira"; + plugins = [ + "git" + "python" + "systemd" + "gpg-agent" + ]; + }; + }; + home.shellAliases = { + ip = "ip --color"; + ipb = "ip --color --brief"; + ll = "ls -l"; + wavesynth = "nix-shell -p sox --run 'play -n synth brownnoise synth pinknoise mix synth 0 0 0 15 40 80 trapezium amod 0.2 20'"; + vim = "nvim"; + }; + home.sessionVariables = { + EDITOR = "nvim"; + }; +} diff --git a/home/desktop.nix b/home/desktop.nix new file mode 100644 index 0000000..2c5a2c1 --- /dev/null +++ b/home/desktop.nix @@ -0,0 +1,81 @@ +{ + pkgs, + inputs, + config, + system, + ... +}: +{ + imports = [ ./modules/latex.nix ]; + home.stateVersion = "23.11"; + + schmittlauch = { + packages = { + graphics = true; + multimedia = true; + nixHelpers = true; + devTools = true; + pythonTools = true; + games = true; + desktop = true; + kde = true; + }; + latex.guiTools = true; + }; + + programs.git = + let + # TODO profile specific + contacts = import "${inputs.mysecrets}/contacts.nix"; + in + { + includes = + [ + { + condition = "gitdir:~/Seafile/Studium/"; + contents = { + user.name = contacts.realName; + user.email = contacts.uniMail; + }; + } + { + condition = "gitdir:~/src/nixpkgs/"; + contents = { + user.name = "Trolli Schmittlauch"; + user.email = contacts.nixosMail; + }; + } + ] + # set default name for several other common locations + ++ + map + (dir: { + condition = "gitdir:${dir}"; + contents = { + user.name = "Trolli Schmittlauch"; + user.email = contacts.mainMail; + }; + }) + [ + "~/src/" + "~/bin/" + "~/tmp/" + "~/nixconfigs/" + ]; + }; + + services.gpg-agent = { + enable = true; + #enableSshSupport = true; + pinentryFlavor = "qt"; + }; + + programs.ssh = { + enable = true; + # ssh host config + matchBlocks = (import "${inputs.mysecrets}/ssh_hosts.nix").privateHosts; + }; + + # media button control support from Bluetooth devices + services.mpris-proxy.enable = true; +} diff --git a/home/home.nix b/home/home.nix deleted file mode 100644 index fe6cdc2..0000000 --- a/home/home.nix +++ /dev/null @@ -1,462 +0,0 @@ -{ - pkgs, - inputs, - config, - system, - ... -}: - -with pkgs; -let - unstable = inputs.nixos-unstable.legacyPackages.${system}; - - desktopApps = [ - firefox - chromium - falkon - thunderbird - calibre - dino - #zotero has open CVEs, wait for patch in Zotero7 - keepassxc - ding - aspell - aspellDicts.de - aspellDicts.en - # for kate/KDE applications - hunspellDicts.de-de - hunspellDicts.en-us - hunspellDicts.en-gb-ise - seafile-client - alacritty - libreoffice-qt # fresh with KDE integration - backintime-common - anki - signal-desktop - (tor-browser-bundle-bin.override { - mediaSupport = true; - pulseaudioSupport = true; - }) - pdfpc - quaternion - nheko - gpxsee - subsurface - yate - # split and merge PDFs in a GUI - pdfarranger - qbittorrent - #(pkgs.pidgin-with-plugins.override { - # plugins = [ pkgs.pidginotr ];}) - - logseq - - # for Hibiscus banking software - jameica - #ToDo: which of these drivers is actually used? - geckodriver - chromedriver - ]; - - graphicsApps = - [ - inkscape - darktable - hugin - luminanceHDR - exiftool - gimp - xournal - ] - ++ (with gimpPlugins; [ - fourier - lqrPlugin - ]); - - multimediaApps = [ - mpv - vlc - #amarok - clementine - elisa - yt-dlp - #sonic-pi - musescore - tenacity - #linphone - soundkonverter - config.nur.repos.fooker.studio-link - ]; - - cliApps = [ - myVim - htop - tmux - httpie - ponysay - gti - tree - lsof - mosh - openssh - sshfs-fuse - cryfs - smbnetfs # for FUSE smb mounting - sshuttle - thefuck - gnupg - unar - lzop - p7zip - pwgen - pandoc - agrep - pdfgrep - torsocks - ncdu - psmisc # for killall - dos2unix - reptyr # re-bind running program to other tty - xclip - unzip - lnav - config.nur.repos.schmittlauch.lolcommits # from NUR - ]; - - nixHelpers = [ - nixpkgs-review - nixpkgs-fmt - nix-top - statix - nix-output-monitor - ]; - - kdeTools = - with plasma5Packages; - with kdeGear; - [ - okular - gwenview - yakuake - kmail - kontact - korganizer - akonadi-mime # for KOrganizer - kaddressbook - kdeconnect - dolphin - spectacle - kate - kleopatra - qdirstat - ark - kwalletmanager - ktouch - kcharselect - konversation - okteta - krdc - skanlite - akonadiconsole - tokodon # mastodon client - ] - ++ (with kdeFrameworks; [ - networkmanager-qt - kcrash - breeze-gtk - ]); - - devTools = [ - curl - httpie - gdb - strace - ltrace - valgrind - zeal - gcc - shellcheck - mtr - ripgrep - gitui - lazygit - pre-commit - - # Haskell - ghc - cabal2nix - ]; - - latexApps = [ - texmaker - kile - biber - # customize texlive installation - (texlive.combine { - inherit (texlive) - scheme-medium - - xetex - luatex - unicode-math - fontspec - collection-binextra - collection-fontsrecommended - collection-latex - collection-latexextra - collection-latexrecommended - collection-langgerman - moderncv - fontawesome5 - academicons - acronym - ccicons - fontawesome - biblatex - logreq - koma-script - ; - }) - ]; - - pythonApps = with python3Packages; [ - notebook - ipython - pip - numpy - matplotlib - jedi - flake8 - mypy - ]; - - fonts = [ - comic-neue - source-sans-pro - source-serif-pro - fira-code - ubuntu_font_family - twemoji-color-font - open-sans - (iosevka-bin.override { variant = "curly-slab"; }) - config.nur.repos.schmittlauch.vollkorn - # TODO: humor-sans - ]; - - games = [ - superTuxKart - #hedgewars - ]; -in -{ - - nixpkgs.overlays = (import ./overlays.nix); - nixpkgs.config = { - clementine.spotify = false; - vim = { - gui = "gtk3"; - python = true; - multibyteSupport = true; - }; - }; - - home.packages = - desktopApps - ++ latexApps - ++ pythonApps - ++ graphicsApps - ++ cliApps - ++ multimediaApps - ++ devTools - ++ kdeTools - ++ fonts - ++ nixHelpers - ++ games; - - programs.home-manager.enable = true; - home.stateVersion = "22.11"; - - programs.direnv = { - enable = true; - nix-direnv.enable = true; - enableZshIntegration = true; - }; - - # programs.vim = - # { enable = true; - # }; - - programs.bat.enable = true; - - services.gpg-agent = { - enable = true; - #enableSshSupport = true; - pinentryFlavor = "qt"; - }; - - programs.ssh = { - enable = true; - # ssh host config - matchBlocks = import "${inputs.mysecrets}/ssh_hosts.nix"; - }; - - programs.tmux = { - enable = true; - keyMode = "vi"; - extraConfig = - # for direnv not messing up the environment - '' - set-option -g update-environment "DIRENV_DIFF DIRENV_DIR DIRENV_WATCHES" - set-environment -gu DIRENV_DIFF - set-environment -gu DIRENV_DIR - set-environment -gu DIRENV_WATCHES - set-environment -gu DIRENV_LAYOUT - - bind-key -T copy-mode-vi 'v' send -X begin-selection - bind-key -T copy-mode-vi 'y' send -X copy-selection-and-cancel''; - terminal = "screen-256color"; - }; - - systemd.user.startServices = true; - - # for backwards compatibility - services.lorri.enable = true; - - # media button control support from Bluetooth devices - services.mpris-proxy.enable = true; - - fonts.fontconfig.enable = true; - - programs.git = - let - contacts = import "${inputs.mysecrets}/contacts.nix"; - in - { - enable = true; - includes = - [ - { - condition = "gitdir:~/Seafile/Studium/"; - contents = { - user.name = contacts.realName; - user.email = contacts.uniMail; - }; - } - { - condition = "gitdir:~/src/nixpkgs/"; - contents = { - user.name = "Trolli Schmittlauch"; - user.email = contacts.nixosMail; - }; - } - ] - # set default name for several other common locations - ++ - map - (dir: { - condition = "gitdir:${dir}"; - contents = { - user.name = "Trolli Schmittlauch"; - user.email = contacts.mainMail; - }; - }) - [ - "~/src/" - "~/bin/" - "~/tmp/" - "~/nixconfigs/" - ]; - extraConfig = { - credential.helper = "cache"; - push.default = "simple"; - init.defaultBranch = "mainline"; - diff.tool = "vimdiff"; - merge.tool = "vimdiff"; - core.excludesfile = toString ( - pkgs.writeText ".gitignore_global" '' - # Direnv stuff - .direnv - .envrc - # Editor files # - ################ - *~ - *.swp - *.swo - '' - ); - core.whitespace = "-blank-at-eol,blank-at-eof,space-before-tab"; - }; - lfs.enable = true; - }; - - # shell config - programs.zsh = { - enable = true; - syntaxHighlighting.enable = true; - history.ignoreSpace = true; - initExtra = '' - # Uncomment following line if you want red dots to be displayed while waiting for completion - COMPLETION_WAITING_DOTS="true" - ### Fix slowness of pastes with zsh-syntax-highlighting.zsh - pasteinit() { - OLD_SELF_INSERT=''${''${(s.:.)widgets[self-insert]}[2,3]} - zle -N self-insert url-quote-magic # I wonder if you'd need `.url-quote-magic`? - } - - pastefinish() { - zle -N self-insert $OLD_SELF_INSERT - } - zstyle :bracketed-paste-magic paste-init pasteinit - zstyle :bracketed-paste-magic paste-finish pastefinish - - # automatic rehash of path completion - zstyle ':completion:*' rehash true - - eval "$(${pkgs.thefuck}/bin/thefuck --alias)" - - ## helper functions - nixify() { - if [ ! -e ./.envrc ]; then - echo "eval \"$(lorri direnv)\"" > .envrc - direnv allow - fi - if [ ! -e shell.nix ]; then - cat > shell.nix <<'EOF' - with import {}; - mkShell { - buildInputs = [ - bashInteractive - ]; - } - EOF - ${"EDITOR:-vim"} default.nix - fi - } - - binpath() { - realpath $(${pkgs.which}/bin/which $1) - } - ''; - - oh-my-zsh = { - enable = true; - theme = "bira"; - plugins = [ - "git" - "python" - "systemd" - "gpg-agent" - ]; - }; - }; - home.shellAliases = { - ip = "ip --color"; - ipb = "ip --color --brief"; - ll = "ls -l"; - wavesynth = "nix-shell -p sox --run 'play -n synth brownnoise synth pinknoise mix synth 0 0 0 15 40 80 trapezium amod 0.2 20'"; - vim = "nvim"; - }; - home.sessionVariables = { - EDITOR = "nvim"; - }; -} diff --git a/home/modules/latex.nix b/home/modules/latex.nix new file mode 100644 index 0000000..3f79930 --- /dev/null +++ b/home/modules/latex.nix @@ -0,0 +1,47 @@ +{ + pkgs, + inputs, + config, + system, + lib, + ... +}: +with pkgs; +let + latexGuiTools = [ + texmaker + kile + biber + ]; +in +{ + options.schmittlauch.latex.guiTools = lib.mkEnableOption "Install GUI LaTeX tools like editors"; + + config.home.packages = [ + (texlive.combine { + inherit (texlive) + scheme-medium + + xetex + luatex + unicode-math + fontspec + collection-binextra + collection-fontsrecommended + collection-latex + collection-latexextra + collection-latexrecommended + collection-langgerman + moderncv + fontawesome5 + academicons + acronym + ccicons + fontawesome + biblatex + logreq + koma-script + ; + }) + ] ++ lib.optionals config.schmittlauch.latex.guiTools latexGuiTools; +} diff --git a/home/modules/packages.nix b/home/modules/packages.nix new file mode 100644 index 0000000..0c05a15 --- /dev/null +++ b/home/modules/packages.nix @@ -0,0 +1,284 @@ +{ + pkgs, + inputs, + config, + system, + ... +}: + +with pkgs; +let + cfg = config.schmittlauch.packages; + unstable = inputs.nixos-unstable.legacyPackages.${system}; + + graphicsApps = + [ + inkscape + darktable + exiftool + gimp + ] + ++ (with gimpPlugins; [ + fourier + lqrPlugin + ]) + ++ lib.optionals pkgs.stdenv.isLinux [ + hugin + luminanceHDR + xournal + ]; + + multimediaApps = + [ + mpv + yt-dlp + ] + ++ lib.optionals pkgs.stdenv.isLinux [ + vlc + amarok + clementine + elisa + musescore + tenacity + soundkonverter + config.nur.repos.fooker.studio-link + ]; + + cliApps = + [ + myVim + htop + tmux + httpie + ponysay + gti + tree + lsof + mosh + openssh + sshfs-fuse + cryfs + openssh + sshuttle + thefuck + gnupg + unar + lzop + p7zip + pwgen + pandoc + pdfgrep + # zig dependency breaks occasionally, stay on C version for now + ncdu_1 + dos2unix + unzip + fswatch + jq + age + lnav + + nix-output-monitor # putting this here as a plain `nix` alternative + ] + ++ lib.optionals pkgs.stdenv.isLinux [ + xclip + smbnetfs # for FUSE smb mounting + psmisc # for killall + torsocks + agrep + reptyr # re-bind running program to other tty + config.nur.repos.schmittlauch.lolcommits + ]; + + nixHelpers = [ + nixpkgs-review + unstable.nixfmt-rfc-style + nix-top + statix + ]; + devTools = + [ + curl + httpie + gcc + shellcheck + mtr + ripgrep + gitui + lazygit + pre-commit + scriv + + # Haskell + ghc + cabal2nix + ] + ++ lib.optionals pkgs.stdenv.isLinux [ + gdb + strace + ltrace + valgrind + zeal + ]; + + pythonTools = with python3Packages; [ + notebook + ipython + pip + numpy + matplotlib + jedi + jedi-language-server + black + flake8 + mypy + ]; + + fonts = [ + comic-neue + source-sans-pro + source-code-pro + source-serif-pro + ubuntu_font_family + twemoji-color-font + open-sans + (iosevka-bin.override { variant = "curly-slab"; }) + config.nur.repos.schmittlauch.vollkorn + # TODO: humor-sans + + # fcio corporate design, TODO module + fira-code + fira-mono + # TODO fira-sans + condensed + # TODO museo 500 + ]; + + games = [ + superTuxKart + hedgewars + ]; + + desktopApps = [ + firefox + chromium + falkon + thunderbird + calibre + dino + zotero + keepassxc + ding + aspell + aspellDicts.de + aspellDicts.en + # for kate/KDE applications + hunspellDicts.de-de + hunspellDicts.en-us + hunspellDicts.en-gb-ise + seafile-client + alacritty + libreoffice-qt # fresh with KDE integration + backintime-common + anki + signal-desktop + (tor-browser-bundle-bin.override { + mediaSupport = true; + pulseaudioSupport = pkgs.stdenv.isLinux; + }) + pdfpc + quaternion + nheko + gpxsee + subsurface + yate + # split and merge PDFs in a GUI + pdfarranger + qbittorrent + #(pkgs.pidgin-with-plugins.override { + # plugins = [ pkgs.pidginotr ];}) + + logseq + + # for Hibiscus banking software + jameica + #ToDo: which of these drivers is actually used? + geckodriver + chromedriver + ]; + + kdeTools = + with plasma5Packages; + with kdeGear; + [ + okular + gwenview + yakuake + kmail + kontact + korganizer + akonadi-mime # for KOrganizer + kaddressbook + kdeconnect + dolphin + spectacle + kate + kleopatra + qdirstat + ark + kwalletmanager + ktouch + kcharselect + konversation + okteta + krdc + skanlite + akonadiconsole + tokodon # mastodon client + ] + ++ (with kdeFrameworks; [ + networkmanager-qt + kcrash + breeze-gtk + ]); +in +{ + options.schmittlauch.packages = { + graphics = lib.mkEnableOption "Enable a common set of graphics apps"; + multimedia = lib.mkEnableOption "Enable a common set of multimedia apps"; + cli = lib.mkOption { + description = "Enable a common set of CLI tools"; + type = lib.types.bool; + default = true; + }; + nixHelpers = lib.mkEnableOption "Enable a common set of Nix helper tools"; + devTools = lib.mkEnableOption "Enable a common set of dev tools"; + pythonTools = lib.mkEnableOption "Enable a common set of python tools"; + games = lib.mkEnableOption "Enable some games"; + desktop = lib.mkEnableOption "Enable a common set of desktop applications"; + kde = lib.mkEnableOption "Enable a common set of KDE applications"; + }; + # TODO fonts in separate module + # TODO latex in separate module + config = { + home.packages = lib.flatten ( + (lib.optional cfg.graphics graphicsApps) + ++ (lib.optional cfg.multimedia multimediaApps) + ++ (lib.optional cfg.cli cliApps) + ++ (lib.optional cfg.nixHelpers nixHelpers) + ++ (lib.optional cfg.devTools devTools) + ++ (lib.optional cfg.pythonTools pythonTools) + ++ (lib.optional cfg.games games) + ++ (lib.optional cfg.desktop desktopApps) + ++ (lib.optional cfg.kde kdeTools) + ); + + nixpkgs.overlays = import ../overlays.nix; + nixpkgs.config = { + clementine.spotify = false; + vim = { + gui = "gtk3"; + python = true; + multibyteSupport = true; + }; + }; + }; +} diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix new file mode 100644 index 0000000..d4875b6 --- /dev/null +++ b/home/modules/vscodium.nix @@ -0,0 +1,111 @@ +{ + pkgs, + inputs, + config, + system, + ... +}: +{ + programs.vscode = { + enable = true; + package = pkgs.vscodium; + extensions = + with pkgs.vscode-extensions; + [ + ms-python.python + vscodevim.vim + yzhang.markdown-all-in-one + bungcip.better-toml + eamodio.gitlens + jnoortheen.nix-ide + mkhl.direnv + ] + ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + name = "Sync-Rsync"; + publisher = "vscode-ext"; + version = "0.36.0"; + sha256 = "sha256-0b/OHLZfXo0NAVAVkzZSqMGDzF0uvPRoiqsZtW1iOdA"; + } + # TODO: probably available in nixpkgs soonish? + { + name = "mypy-type-checker"; + publisher = "ms-python"; + version = "2023.3.12681020"; + sha256 = "sha256-rhed7CQlvxksVCGc9nPU2oYQWtXcAV5TzuG63e8Y3zM="; + } + { + name = "black-formatter"; + publisher = "ms-python"; + version = "2023.5.12771008"; + sha256 = "sha256-lJG0RRUUMhQGs2a6oBtoqt+uY1kSJ0+cbmaP07hNh2o="; + } + { + name = "vscode-pets"; + publisher = "tonybaloney"; + version = "1.25.1"; + sha256 = "sha256-as3e2LzKBSsiGs/UGIZ06XqbLh37irDUaCzslqITEJQ="; + } + ]; + userSettings = + let + defaultPython = pkgs.python3.withPackages (ps: [ + ps.jedi + ps.jedi-language-server + ps.pip + ps.setuptools # for pkg_resources + ps.black + ps.mypy + ]); + in + { + "editor.fontLigatures" = true; + "window.autoDetectColorScheme" = true; + "workbench.preferredDarkColorTheme" = "Default Dark Modern"; + "workbench.preferredLightColorTheme" = "Default Light Modern"; + "[nix]" = { + "editor.insertSpaces" = true; + "editor.tabSize" = 2; + # for now, disable automatic formatting to prevent disruption of existing code bases + "editor.formatOnPaste" = false; + "editor.formatOnSave" = false; + "editor.formatOnType" = false; + }; + "nix.formatterPath" = "${pkgs.nixfmt}/bin/nixfmt"; + "editor.fontSize" = 13; + "editor.fontWeight" = "normal"; + "git.detectSubmodulesLimit" = 30; + "[python]" = { + "breadcrumbs.showClasses" = true; + "breadcrumbs.showFunctions" = true; + "gitlens.codeLens.symbolScopes" = [ "!Module" ]; + "editor.defaultFormatter" = "ms-python.black-formatter"; + "editor.formatOnSave" = true; + }; + "python.languageServer" = "Jedi"; # don't use proprietary pylance server + "python.defaultInterpreterPath" = "${defaultPython}/bin/python"; + "black-formatter.path" = [ "${pkgs.python3Packages.black}/bin/black" ]; + "black-formatter.importStrategy" = "fromEnvironment"; + "mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/mypy" ]; + "mypy-type-checker.importStrategy" = "fromEnvironment"; + "mypy-type-checker.args" = [ "--ignore-missing-imports" ]; + "gitlens.telemetry.enabled" = false; + "vim.highlightedyank.enable" = true; + "vim.history" = 500; + "vim.neovimUseConfigFile" = true; + "vim.enableNeovim" = true; + "git.suggestSmartCommit" = false; + "editor.rulers" = [ 79 ]; + "vim.useSystemClipboard" = true; + "vim.smartRelativeLine" = true; + "diffEditor.ignoreTrimWhitespace" = false; + "files.associations" = { + "*.py" = "python"; + }; + "editor.renderWhitespace" = "all"; + "editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace"; + "vim.neovimPath" = "/Users/os/.nix-profile/bin/nvim"; + "sync-rsync.options" = [ ]; + }; + }; +} diff --git a/home/scripts/reporsync.nix b/home/scripts/reporsync.nix new file mode 100644 index 0000000..8cafe47 --- /dev/null +++ b/home/scripts/reporsync.nix @@ -0,0 +1,79 @@ +{ pkgs, ... }: +'' + # rsync -rlptzv --progress --delete --exclude=.git --exclude=.vscode --exclude=result --exclude=channels/ /Users/os/src/fc.qemu os@hydra01: + # rsync -rlptzv --progress --rsh="ssh -J fcio-whq-jump" --delete --exclude=.git --exclude=.vscode --exclude=result --exclude=channels/ /Users/os/src/fc-nixos/ os@patty:fc-nixos/ + + + DEFAULT_JUMPHOST="fcio-whq-jump" + + _parse_rsync_args() { + # reset pre-defined variables that are read and manipulated throughout this function + unset JUMPHOST + # arrays are bash or zsh specific + RSYNC_OPTS=("-rlptzv" "--progress" "--delete" "--exclude=.git" "--exclude=.vscode" "--exclude=result" "--exclude=channels/" "--exclude=.mypy_cache") + + while getopts ':Jj:' OPT; do + case $OPT in + j) + if [ -n "$JUMPHOST" ]; then + echo "-j and -J are conflicting arguments" >&2 + return 1 + fi + JUMPHOST="$OPTARG" + ;; + J) + if [ -n "$JUMPHOST" ]; then + echo "-j and -J are conflicting arguments" >&2 + return 1 + fi + JUMPHOST="$DEFAULT_JUMPHOST" + ;; + ?) + echo "rsyncrepo [-J] [-j ] " + return 1 + ;; + esac + done + + # trim CLI parameters + shift "$(($OPTIND -1))" + + RR_FROM="$1" + RR_TO="$2" + } + + _do_rsync() { + # parameter check + if [ -z "$1" ] || [ -z "$2" ]; then + echo "Missing arguments, required: " >&2 + return 1 + fi + + if [ -n "$JUMPHOST" ]; then + RSYNC_OPTS+=("--rsh=/Users/os/.nix-profile/bin/ssh -J ''${JUMPHOST}") + fi + + for OPTI in "''${RSYNC_OPTS[@]}"; do + echo "$OPTI" + done + + # we always sync /path/to/dir/ to hostname:dir + RR_DEST="''${2}:$(basename $(realpath "''${1}"))" + + echo "Syncing ''${1} to ''${RR_DEST}…" + + # ensure trailing slash for src to avoid recreating directory + ${pkgs.rsync}/bin/rsync "''${RSYNC_OPTS[@]}" "''${1}/" "''${RR_DEST}" + } + + rsyncrepo() { + _parse_rsync_args "$@" + # inherits parsed arguments through variables + _do_rsync "$RR_FROM" "$RR_TO" + } + + rsynchydra() { + _parse_rsync_args "$@" + _do_rsync "$RR_FROM" "hydra01" + } +'' diff --git a/home/scripts/ssh-loop-fc.nix b/home/scripts/ssh-loop-fc.nix new file mode 100644 index 0000000..a632477 --- /dev/null +++ b/home/scripts/ssh-loop-fc.nix @@ -0,0 +1,19 @@ +{ pkgs, ... }: +'' + ssh-loop () { + setopt shwordsplit + local hosts=$1 + local cmd=$2 + + for x in $1; do echo $x; ${pkgs.openssh}/bin/ssh $x.fcio.net -o StrictHostKeyChecking=no -C "$2"; done + } + + ssh-loop-parallel () { + setopt shwordsplit + local hosts=$1 + local cmd=$2 + + for x in $1; do echo $x; ${pkgs.openssh}/bin/ssh $x.fcio.net -o StrictHostKeyChecking=no -C "$2" 2>&1 | sed -e "s/^/$x: /;" & done + wait + } +'' diff --git a/home/secrets b/home/secrets index 068a475..72d2478 160000 --- a/home/secrets +++ b/home/secrets @@ -1 +1 @@ -Subproject commit 068a4759e72948284c3de85d20a780723278f8b8 +Subproject commit 72d2478b720fabf69971747641230387d0df7689 diff --git a/home/workmac.nix b/home/workmac.nix new file mode 100644 index 0000000..408f055 --- /dev/null +++ b/home/workmac.nix @@ -0,0 +1,91 @@ +{ + pkgs, + inputs, + config, + system, + ... +}: + +with pkgs; +let + unstable = inputs.nixos-unstable.legacyPackages.${system}; +in +{ + + schmittlauch.packages = { + graphics = true; + multimedia = true; + nixHelpers = true; + devTools = true; + pythonTools = true; + games = true; + desktop = true; + kde = true; + }; + + home.packages = [ + wireshark # on NixOS systems enabled via system config + _1password + # also TODO: color schemes nix-darwin + ]; + + # pinning theme is necessary until iTerm 3.5, because despite the dark terminal background, bat detects light mode and adapts theme + programs.bat.config.theme = "Visual Studio Dark+"; + + programs.ssh = { + enable = true; + # ssh host config + matchBlocks = { + "hydra01" = { + hostname = "hydra01.fe.whq.fcio.net"; + user = "os"; + }; + "fcio-whq-jump" = { + hostname = "vpn-whq.services.fcio.net"; + extraOptions.LogLevel = "Verbose"; + }; + "fcio-rzob-jump" = { + hostname = "vpn-rzob.services.fcio.net"; + }; + }; + }; + + programs.git = + let + contacts = import ./secrets/contacts.nix; + in + { + includes = + [ + { + condition = "gitdir:~/src/schmittlauch/"; + contents = { + user.name = "Trolli Schmittlauch"; + user.email = contacts.nixosMail; + }; + } + ] + # set default name for several other common locations + ++ + map + (dir: { + condition = "gitdir:${dir}"; + contents = { + user.name = contacts.realName; + user.email = contacts.fcioMail; + }; + }) + [ + "~/src/" + "~/bin/" + "~/tmp/" + ]; + }; + + # some extra shell scripts + programs.zsh.initExtra = + lib.mkAfter (import ./scripts/reporsync.nix { inherit pkgs; }) + + (import ./scripts/ssh-loop-fc.nix { inherit pkgs; }); + + home.stateVersion = "22.05"; +} From b3cf056b949e88d7a2ca2cbc7482b458819d5092 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 17 Mar 2024 19:54:46 +0100 Subject: [PATCH 020/330] flake: add `nix run .#hm -- switch` command convenience shell script for invoking home-manager with the correct homeConfiguration output --- flake.nix | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/flake.nix b/flake.nix index 3a9e708..6a2c5f7 100644 --- a/flake.nix +++ b/flake.nix @@ -135,6 +135,48 @@ checks.formatting = treefmtEval.config.build.check self; # expose nixpkgs with overlay; TODO: figure out role of config #legacyPackages = nixpkgs; + + # inspired by https://github.com/Mic92/dotfiles/blob/main/home-manager/flake-module.nix + # run like: `nix run .#hm -- ` + apps.hm = { + type = "app"; + program = "${pkgs.writeShellScriptBin "hm" '' + set -x + export PATH=${ + pkgs.lib.makeBinPath [ + pkgs.git + pkgs.coreutils + pkgs.findutils + pkgs.nix + pkgs.jq + pkgs.unixtools.hostname + ] + } + declare -A profiles=( + ["framenix"]="spiollinux-desktop" + ["thinknix"]="spiollinux-desktop" + # TODO: hostname workmac + ["os"]="workmac" + ) + user=$(id -un) + host=$(hostname) + if [[ -n ''${profiles["$host-$user"]} ]]; then + profile=''${profiles["$host-$user"]}; + elif [[ -n ''${profiles[$host]:-} ]]; then + profile=''${profiles[$host]} + else + echo "No suitable profile found." >2 + exit 2 + fi + if [[ "''${1:-}" == profile ]]; then + echo $profile + exit 0 + fi + ${ + inputs.home-manager.packages.${pkgs.system}.home-manager + }/bin/home-manager --flake "${self}#$profile" "$@" + ''}/bin/hm"; + }; } ); } From 2a7ae8db063a9581005484f8e2c249ff3978b98a Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 18 Mar 2024 11:06:21 +0100 Subject: [PATCH 021/330] fixup! unify home-manager configurations of workmac and main laptop --- home/common.nix | 3 --- home/desktop.nix | 3 +++ home/modules/packages.nix | 2 +- home/workmac.nix | 14 +++++++------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/home/common.nix b/home/common.nix index 9b1e892..2156be7 100644 --- a/home/common.nix +++ b/home/common.nix @@ -38,9 +38,6 @@ terminal = "screen-256color"; }; - # for backwards compatibility - services.lorri.enable = true; - fonts.fontconfig.enable = true; programs.git = { diff --git a/home/desktop.nix b/home/desktop.nix index 2c5a2c1..31d33b1 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -23,6 +23,9 @@ latex.guiTools = true; }; + # for backwards compatibility + services.lorri.enable = true; + programs.git = let # TODO profile specific diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 0c05a15..93718f2 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -154,7 +154,7 @@ let games = [ superTuxKart - hedgewars + #hedgewars ]; desktopApps = [ diff --git a/home/workmac.nix b/home/workmac.nix index 408f055..9bb5bf7 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -18,9 +18,6 @@ in nixHelpers = true; devTools = true; pythonTools = true; - games = true; - desktop = true; - kde = true; }; home.packages = [ @@ -52,7 +49,7 @@ in programs.git = let - contacts = import ./secrets/contacts.nix; + contacts = import "${inputs.mysecrets}/contacts.nix"; in { includes = @@ -83,9 +80,12 @@ in }; # some extra shell scripts - programs.zsh.initExtra = - lib.mkAfter (import ./scripts/reporsync.nix { inherit pkgs; }) - + (import ./scripts/ssh-loop-fc.nix { inherit pkgs; }); + programs.zsh.initExtra = lib.mkAfter ( + import ./scripts/reporsync.nix { inherit pkgs; } + + import ./scripts/ssh-loop-fc.nix { inherit pkgs; } + ); + + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "1password-cli" ]; home.stateVersion = "22.05"; } From 969e3d981c958e64c7a2c7cc3bb2aa119c7669f4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 18 Mar 2024 11:49:35 +0100 Subject: [PATCH 022/330] workmac: move over the nix-darwin configuration --- darwin/configuration.nix | 28 ++++++++++++++++++++++++++++ flake.lock | 21 +++++++++++++++++++++ flake.nix | 10 +++++++++- 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 darwin/configuration.nix diff --git a/darwin/configuration.nix b/darwin/configuration.nix new file mode 100644 index 0000000..2a999ca --- /dev/null +++ b/darwin/configuration.nix @@ -0,0 +1,28 @@ +{ config, pkgs, ... }: + +{ + # List packages installed in system profile. To search by name, run: + # $ nix-env -qaP | grep wget + environment.systemPackages = [ pkgs.vim ]; + + # Use a custom configuration.nix location. + # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix + # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix"; + + # Auto upgrade nix package and the daemon service. + services.nix-daemon.enable = true; + # nix.package = pkgs.nix; + + # Create /etc/bashrc that loads the nix-darwin environment. + programs.zsh.enable = true; # default shell on catalina + + # system-wide SSH configuration, used by nix-daemon for remote builders + + # show hidden files + system.defaults.NSGlobalDomain.AppleShowAllFiles = true; + + # Used for backwards compatibility, please read the changelog before changing. + # $ darwin-rebuild changelog + system.stateVersion = 4; + nixpkgs.hostPlatform = "aarch64-darwin"; +} diff --git a/flake.lock b/flake.lock index cb653c2..3fed316 100644 --- a/flake.lock +++ b/flake.lock @@ -172,6 +172,26 @@ "url": "ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1710717205, + "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", + "owner": "LnL7", + "repo": "nix-darwin", + "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", + "type": "github" + }, + "original": { + "owner": "LnL7", + "repo": "nix-darwin", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1707211557, @@ -303,6 +323,7 @@ "home-manager": "home-manager", "lanzaboote": "lanzaboote", "mysecrets": "mysecrets", + "nix-darwin": "nix-darwin", "nixos-hardware": "nixos-hardware", "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index 6a2c5f7..23ed18a 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,10 @@ url = "github:numtide/treefmt-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-darwin = { + url = "github:LnL7/nix-darwin"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nur.url = "github:nix-community/NUR"; # TODO: possible make this a flake as well @@ -36,6 +40,7 @@ utils, home-manager, treefmt-nix, + nix-darwin, ... }@inputs: let @@ -106,6 +111,9 @@ lanzaboote.nixosModules.lanzaboote ]; }; + darwinConfigurations."OS-MacBook-Pro" = nix-darwin.lib.darwinSystem { + modules = [ ./darwin/configuration.nix ]; + }; homeConfigurations = { spiollinux-desktop = mkHomeManager "desktop" "spiollinux" systems.x86_64-linux; os-workmac = mkHomeManager "workmac" "os" systems.aarch64-darwin; @@ -156,7 +164,7 @@ ["framenix"]="spiollinux-desktop" ["thinknix"]="spiollinux-desktop" # TODO: hostname workmac - ["os"]="workmac" + ["OS MacBook Pro"]="workmac" ) user=$(id -un) host=$(hostname) From 3acecfd505a783a66117816a907a7072a58a57f0 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 18 Mar 2024 11:52:36 +0100 Subject: [PATCH 023/330] fixup! flake: add `nix run .#hm -- switch` command --- flake.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 23ed18a..21df996 100644 --- a/flake.nix +++ b/flake.nix @@ -163,8 +163,7 @@ declare -A profiles=( ["framenix"]="spiollinux-desktop" ["thinknix"]="spiollinux-desktop" - # TODO: hostname workmac - ["OS MacBook Pro"]="workmac" + ["OS MacBook Pro"]="os-workmac" ) user=$(id -un) host=$(hostname) From 3cdcd3a724c52868f81a961ecfaba0e7a9c9f158 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 18 Mar 2024 11:59:50 +0100 Subject: [PATCH 024/330] git: add .DS_Store files to global ignore --- home/common.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home/common.nix b/home/common.nix index 2156be7..8cfe5a1 100644 --- a/home/common.nix +++ b/home/common.nix @@ -50,7 +50,8 @@ merge.tool = "vimdiff"; core.excludesfile = toString ( pkgs.writeText ".gitignore_global" '' - # Direnv stuff + # Direnv stuff # + ################ .direnv .envrc # Editor files # @@ -58,6 +59,9 @@ *~ *.swp *.swo + # macOS foo # + ############# + .DS_Store '' ); core.whitespace = "-blank-at-eol,blank-at-eof,space-before-tab"; From db95b5ef8f83f1bac15e89b0d682c0f591c7d27f Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 18 Mar 2024 12:14:11 +0100 Subject: [PATCH 025/330] workmac: widen the scope of the general git identity --- home/workmac.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/home/workmac.nix b/home/workmac.nix index 9bb5bf7..c2bdcbb 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -73,9 +73,7 @@ in }; }) [ - "~/src/" - "~/bin/" - "~/tmp/" + "~/" ]; }; From ca7599201ee003e5fd819e7db293c1a74bffcf3b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 21 Mar 2024 22:12:36 +0100 Subject: [PATCH 026/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/0ad13a6833440b8e238947e47bea7f11071dc2b2' (2024-03-12) → 'github:NixOS/nixpkgs/b06025f1533a1e07b6db3e75151caa155d1c7eb3' (2024-03-19) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/51063ed4f2343a59fdeebb279bb81d87d453942b' (2024-03-12) → 'github:NixOS/nixpkgs/f091af045dff8347d66d186a62d42aceff159456' (2024-03-20) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 3fed316..034033f 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710283656, - "narHash": "sha256-nI+AOy4uK6jLGBi9nsbHjL1EdSIzoo8oa+9oeVhbyFc=", + "lastModified": 1710951922, + "narHash": "sha256-FOOBJ3DQenLpTNdxMHR2CpGZmYuctb92gF0lpiirZ30=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "51063ed4f2343a59fdeebb279bb81d87d453942b", + "rev": "f091af045dff8347d66d186a62d42aceff159456", "type": "github" }, "original": { From 7956d7ff0f736aa3cedf9edbae325dfff2146ab0 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 25 Mar 2024 10:02:33 +0100 Subject: [PATCH 027/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/6e5cc385fc8cf5ca6495d70243074ccdea9f64c7' (2024-02-06) → 'github:NixOS/nixos-hardware/9a763a7acc4cfbb8603bb0231fec3eda864f81c0' (2024-03-25) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/b06025f1533a1e07b6db3e75151caa155d1c7eb3' (2024-03-19) → 'github:NixOS/nixpkgs/44d0940ea560dee511026a53f0e2e2cde489b4d4' (2024-03-23) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/f091af045dff8347d66d186a62d42aceff159456' (2024-03-20) → 'github:NixOS/nixpkgs/56528ee42526794d413d6f244648aaee4a7b56c0' (2024-03-22) • Updated input 'nur': 'github:nix-community/NUR/abe9eb6d605d624e121d4f84749b47f7816f1686' (2024-02-04) → 'github:nix-community/NUR/2796d4664e8da2e094738766c36d81896ca85fed' (2024-03-25) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 034033f..54e8fbc 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1707211557, - "narHash": "sha256-LTKTzZ6fM5j8XWXf51IMBzDaOaJg9kYWLUZxoIhzRN8=", + "lastModified": 1711352745, + "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6e5cc385fc8cf5ca6495d70243074ccdea9f64c7", + "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1710806803, - "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710951922, - "narHash": "sha256-FOOBJ3DQenLpTNdxMHR2CpGZmYuctb92gF0lpiirZ30=", + "lastModified": 1711124224, + "narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f091af045dff8347d66d186a62d42aceff159456", + "rev": "56528ee42526794d413d6f244648aaee4a7b56c0", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1707071465, - "narHash": "sha256-sp+lgTl440Ex3v8rB6hspMJhg5uuGVfO1LRba/a8kSY=", + "lastModified": 1711355249, + "narHash": "sha256-7KdwA8JtfoGlxf5w7/XOxjjlOM7OirJPwyjvlzN8u9U=", "owner": "nix-community", "repo": "NUR", - "rev": "abe9eb6d605d624e121d4f84749b47f7816f1686", + "rev": "2796d4664e8da2e094738766c36d81896ca85fed", "type": "github" }, "original": { From 2e3694a6fb6408ecee005235faf1561600092834 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 26 Mar 2024 10:34:35 +0100 Subject: [PATCH 028/330] home: fix missing fonts, refactor into module --- home/common.nix | 2 +- home/modules/fonts.nix | 29 +++++++++++++++++++++++++++++ home/modules/packages.nix | 21 --------------------- 3 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 home/modules/fonts.nix diff --git a/home/common.nix b/home/common.nix index 8cfe5a1..07c5a46 100644 --- a/home/common.nix +++ b/home/common.nix @@ -9,6 +9,7 @@ imports = [ ./modules/packages.nix ./modules/vscodium.nix + ./modules/fonts.nix ]; home.homeDirectory = if pkgs.stdenv.isDarwin then "/Users/${config.home.username}" else "/home/${config.home.username}"; @@ -38,7 +39,6 @@ terminal = "screen-256color"; }; - fonts.fontconfig.enable = true; programs.git = { enable = true; diff --git a/home/modules/fonts.nix b/home/modules/fonts.nix new file mode 100644 index 0000000..ef7b543 --- /dev/null +++ b/home/modules/fonts.nix @@ -0,0 +1,29 @@ +{ + pkgs, + inputs, + config, + system, + ... +}: +{ + home.packages = with pkgs; [ + comic-neue + source-sans-pro + source-code-pro + source-serif-pro + ubuntu_font_family + twemoji-color-font + open-sans + (iosevka-bin.override { variant = "curly-slab"; }) + config.nur.repos.schmittlauch.vollkorn + # TODO: humor-sans + + # fcio corporate design, TODO module + fira-code + fira-mono + # TODO fira-sans + condensed + # TODO museo 500 + ]; + + fonts.fontconfig.enable = true; +} diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 93718f2..cc91e5a 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -133,25 +133,6 @@ let mypy ]; - fonts = [ - comic-neue - source-sans-pro - source-code-pro - source-serif-pro - ubuntu_font_family - twemoji-color-font - open-sans - (iosevka-bin.override { variant = "curly-slab"; }) - config.nur.repos.schmittlauch.vollkorn - # TODO: humor-sans - - # fcio corporate design, TODO module - fira-code - fira-mono - # TODO fira-sans + condensed - # TODO museo 500 - ]; - games = [ superTuxKart #hedgewars @@ -256,8 +237,6 @@ in desktop = lib.mkEnableOption "Enable a common set of desktop applications"; kde = lib.mkEnableOption "Enable a common set of KDE applications"; }; - # TODO fonts in separate module - # TODO latex in separate module config = { home.packages = lib.flatten ( (lib.optional cfg.graphics graphicsApps) From 0b239f93daf972dc675c13c0941ac54674c39f08 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 26 Mar 2024 10:44:15 +0100 Subject: [PATCH 029/330] treefmt --- home/common.nix | 1 - home/workmac.nix | 19 +++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/home/common.nix b/home/common.nix index 07c5a46..31d5887 100644 --- a/home/common.nix +++ b/home/common.nix @@ -39,7 +39,6 @@ terminal = "screen-256color"; }; - programs.git = { enable = true; extraConfig = { diff --git a/home/workmac.nix b/home/workmac.nix index c2bdcbb..359c4de 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -63,18 +63,13 @@ in } ] # set default name for several other common locations - ++ - map - (dir: { - condition = "gitdir:${dir}"; - contents = { - user.name = contacts.realName; - user.email = contacts.fcioMail; - }; - }) - [ - "~/" - ]; + ++ map (dir: { + condition = "gitdir:${dir}"; + contents = { + user.name = contacts.realName; + user.email = contacts.fcioMail; + }; + }) [ "~/" ]; }; # some extra shell scripts From 023b987cd077005a4154438c5b29111c8fd5de67 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 26 Mar 2024 16:38:49 +0100 Subject: [PATCH 030/330] vscodium: prevent interactive asking for screenreader --- home/modules/vscodium.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index d4875b6..2f5210f 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -60,6 +60,7 @@ in { "editor.fontLigatures" = true; + "editor.accessibilitySupport" = false; # prevent asking "window.autoDetectColorScheme" = true; "workbench.preferredDarkColorTheme" = "Default Dark Modern"; "workbench.preferredLightColorTheme" = "Default Light Modern"; From 0c1730d71e90e43a718da6f4b5bbf2f2125ecdcc Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 26 Mar 2024 16:44:51 +0100 Subject: [PATCH 031/330] vscodium: minor style changes --- home/modules/vscodium.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 2f5210f..268607e 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -61,6 +61,8 @@ { "editor.fontLigatures" = true; "editor.accessibilitySupport" = false; # prevent asking + "editor.cursorBlinking" = "phase"; + "workbench.editor.highlightModifiedTabs" = true; "window.autoDetectColorScheme" = true; "workbench.preferredDarkColorTheme" = "Default Dark Modern"; "workbench.preferredLightColorTheme" = "Default Light Modern"; From 92b01dc8fe5e910c3806c2d43c979ca207cb01a2 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 26 Mar 2024 16:47:35 +0100 Subject: [PATCH 032/330] scripts.reporsync: better inlining of called executables --- home/scripts/reporsync.nix | 6 +++--- home/workmac.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/home/scripts/reporsync.nix b/home/scripts/reporsync.nix index 8cafe47..dfdaa29 100644 --- a/home/scripts/reporsync.nix +++ b/home/scripts/reporsync.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: '' # rsync -rlptzv --progress --delete --exclude=.git --exclude=.vscode --exclude=result --exclude=channels/ /Users/os/src/fc.qemu os@hydra01: # rsync -rlptzv --progress --rsh="ssh -J fcio-whq-jump" --delete --exclude=.git --exclude=.vscode --exclude=result --exclude=channels/ /Users/os/src/fc-nixos/ os@patty:fc-nixos/ @@ -50,7 +50,7 @@ fi if [ -n "$JUMPHOST" ]; then - RSYNC_OPTS+=("--rsh=/Users/os/.nix-profile/bin/ssh -J ''${JUMPHOST}") + RSYNC_OPTS+=("--rsh=${lib.getExe pkgs.openssh} -J ''${JUMPHOST}") fi for OPTI in "''${RSYNC_OPTS[@]}"; do @@ -63,7 +63,7 @@ echo "Syncing ''${1} to ''${RR_DEST}…" # ensure trailing slash for src to avoid recreating directory - ${pkgs.rsync}/bin/rsync "''${RSYNC_OPTS[@]}" "''${1}/" "''${RR_DEST}" + ${lib.getExe pkgs.rsync} "''${RSYNC_OPTS[@]}" "''${1}/" "''${RR_DEST}" } rsyncrepo() { diff --git a/home/workmac.nix b/home/workmac.nix index 359c4de..6d16d53 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -74,8 +74,8 @@ in # some extra shell scripts programs.zsh.initExtra = lib.mkAfter ( - import ./scripts/reporsync.nix { inherit pkgs; } - + import ./scripts/ssh-loop-fc.nix { inherit pkgs; } + import ./scripts/reporsync.nix { inherit pkgs lib; } + + import ./scripts/ssh-loop-fc.nix { inherit pkgs lib; } ); nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "1password-cli" ]; From ef5dd89ffe0b4de8f3e48c2acf69c408c300046b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 27 Mar 2024 19:19:49 +0100 Subject: [PATCH 033/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/44d0940ea560dee511026a53f0e2e2cde489b4d4' (2024-03-23) → 'github:NixOS/nixpkgs/57e6b3a9e4ebec5aa121188301f04a6b8c354c9b' (2024-03-25) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/56528ee42526794d413d6f244648aaee4a7b56c0' (2024-03-22) → 'github:NixOS/nixpkgs/44733514b72e732bd49f5511bd0203dea9b9a434' (2024-03-26) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 54e8fbc..456b327 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1711333969, + "narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1711124224, - "narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=", + "lastModified": 1711460390, + "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "56528ee42526794d413d6f244648aaee4a7b56c0", + "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", "type": "github" }, "original": { From fee2deb6327104e4ef0c7a5a10540e55643e8812 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 28 Mar 2024 18:54:23 +0100 Subject: [PATCH 034/330] vim: default to expanding tabs, specify pandoc-markdown format settings Let's see whether the global expandtab is a good idea and might be an issue in the future for certain file types like makefiles? --- home/vimrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/vimrc b/home/vimrc index 847940e..48f6236 100644 --- a/home/vimrc +++ b/home/vimrc @@ -42,7 +42,7 @@ set history=1000 " representing system clipboard (not X11 clipboard) set clipboard=unnamedplus -" set expandtab +set expandtab set shiftwidth=4 set tabstop=4 set softtabstop=4 @@ -102,6 +102,7 @@ let g:haskell_enable_typeroles = 1 " to enable highlighting of type roles let g:haskell_enable_static_pointers = 1 " to enable highlighting of `static` let g:haskell_backpack = 1 " to enable highlighting of backpack keywords au FileType markdown setlocal tabstop=4 expandtab shiftwidth=4 softtabstop=4 +au FileType pandoc setlocal tabstop=4 expandtab shiftwidth=4 softtabstop=4 au FileType nix setlocal tabstop=2 expandtab shiftwidth=2 softtabstop=2 set ofu=syntaxcomplete#Complete " nmap "+gP From 9758c4169a3c51c4129871e1a8d54c399e3d53a9 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 28 Mar 2024 18:54:45 +0100 Subject: [PATCH 035/330] vim: default to relativenumbering, color scheme adjustment --- home/vimrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/vimrc b/home/vimrc index 48f6236..6032d5a 100644 --- a/home/vimrc +++ b/home/vimrc @@ -24,7 +24,7 @@ filetype plugin indent on syntax on -set number +set relativenumber set mouse=a set mousehide @@ -52,7 +52,7 @@ let &t_8f = "\[38;2;%lu;%lu;%lum" let &t_8b = "\[48;2;%lu;%lu;%lum" set termguicolors -"let base16colorspace=256 +let base16colorspace=256 colorscheme base16-tomorrow-night "colorscheme Tomorrow-Night From 16539d03104011b01f1dd168731440d83fd367be Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 1 Apr 2024 16:53:53 +0200 Subject: [PATCH 036/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/57e6b3a9e4ebec5aa121188301f04a6b8c354c9b' (2024-03-25) → 'github:NixOS/nixpkgs/d8fe5e6c92d0d190646fb9f1056741a229980089' (2024-03-29) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/44733514b72e732bd49f5511bd0203dea9b9a434' (2024-03-26) → 'github:NixOS/nixpkgs/219951b495fc2eac67b1456824cc1ec1fd2ee659' (2024-03-28) • Updated input 'nur': 'github:nix-community/NUR/2796d4664e8da2e094738766c36d81896ca85fed' (2024-03-25) → 'github:nix-community/NUR/d4b2d617721d968a7811b03ae2095af0d32a8180' (2024-04-01) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 456b327..5bc6bb3 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1711333969, - "narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1711460390, - "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", + "lastModified": 1711668574, + "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", + "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1711355249, - "narHash": "sha256-7KdwA8JtfoGlxf5w7/XOxjjlOM7OirJPwyjvlzN8u9U=", + "lastModified": 1711979987, + "narHash": "sha256-zlxP7Z+tJoJwv4X9dXXs7J5Du9SoYbpOEWBKf06e2X4=", "owner": "nix-community", "repo": "NUR", - "rev": "2796d4664e8da2e094738766c36d81896ca85fed", + "rev": "d4b2d617721d968a7811b03ae2095af0d32a8180", "type": "github" }, "original": { From db992aa2d38454ea67824853f243ecc196d3a001 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 4 Apr 2024 01:31:20 +0200 Subject: [PATCH 037/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/d8fe5e6c92d0d190646fb9f1056741a229980089' (2024-03-29) → 'github:NixOS/nixpkgs/08b9151ed40350725eb40b1fe96b0b86304a654b' (2024-04-03) • Updated input 'nur': 'github:nix-community/NUR/d4b2d617721d968a7811b03ae2095af0d32a8180' (2024-04-01) → 'github:nix-community/NUR/3ffb9a2b7bbc5576c81ab610875fa22199a1eaaf' (2024-04-03) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 5bc6bb3..6b1e4a5 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "lastModified": 1712122226, + "narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "rev": "08b9151ed40350725eb40b1fe96b0b86304a654b", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1711979987, - "narHash": "sha256-zlxP7Z+tJoJwv4X9dXXs7J5Du9SoYbpOEWBKf06e2X4=", + "lastModified": 1712180592, + "narHash": "sha256-8smRh8KCbiyDP8PUW410C6WjA8wuo/BDGiNhn4Dkd3U=", "owner": "nix-community", "repo": "NUR", - "rev": "d4b2d617721d968a7811b03ae2095af0d32a8180", + "rev": "3ffb9a2b7bbc5576c81ab610875fa22199a1eaaf", "type": "github" }, "original": { From b6d13cfa1ddbe4a79a34c9dd68fbb7b24b4df830 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 4 Apr 2024 01:32:49 +0200 Subject: [PATCH 038/330] treefmt --- home/modules/vscodium.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 268607e..89158b2 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -60,7 +60,7 @@ in { "editor.fontLigatures" = true; - "editor.accessibilitySupport" = false; # prevent asking + "editor.accessibilitySupport" = false; # prevent asking "editor.cursorBlinking" = "phase"; "workbench.editor.highlightModifiedTabs" = true; "window.autoDetectColorScheme" = true; From 822239fbe0c11adf6b8967c6ef41dd338a234343 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 4 Apr 2024 14:29:18 +0200 Subject: [PATCH 039/330] vscodium: enable sticky scroll --- home/modules/vscodium.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 89158b2..149e811 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -62,6 +62,7 @@ "editor.fontLigatures" = true; "editor.accessibilitySupport" = false; # prevent asking "editor.cursorBlinking" = "phase"; + "editor.stickyScroll.enabled" = true; "workbench.editor.highlightModifiedTabs" = true; "window.autoDetectColorScheme" = true; "workbench.preferredDarkColorTheme" = "Default Dark Modern"; From 6f87071aea776e15dc23feda70643a12989df7fd Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 5 Apr 2024 20:09:39 +0200 Subject: [PATCH 040/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/08b9151ed40350725eb40b1fe96b0b86304a654b' (2024-04-03) → 'github:NixOS/nixpkgs/fd281bd6b7d3e32ddfa399853946f782553163b5' (2024-04-03) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/219951b495fc2eac67b1456824cc1ec1fd2ee659' (2024-03-28) → 'github:NixOS/nixpkgs/1487bdea619e4a7a53a4590c475deabb5a9d1bfb' (2024-04-03) • Updated input 'nur': 'github:nix-community/NUR/3ffb9a2b7bbc5576c81ab610875fa22199a1eaaf' (2024-04-03) → 'github:nix-community/NUR/9ac97db2225dd90fc37c91fb6c91f2a10d331783' (2024-04-05) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 6b1e4a5..f47edc3 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1712122226, - "narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=", + "lastModified": 1712163089, + "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08b9151ed40350725eb40b1fe96b0b86304a654b", + "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1711668574, - "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", + "lastModified": 1712168706, + "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", + "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1712180592, - "narHash": "sha256-8smRh8KCbiyDP8PUW410C6WjA8wuo/BDGiNhn4Dkd3U=", + "lastModified": 1712320566, + "narHash": "sha256-F/NR0Xf/AU21Nbtrni+6i+7C4dBKg9MNg7qrOmPRy6M=", "owner": "nix-community", "repo": "NUR", - "rev": "3ffb9a2b7bbc5576c81ab610875fa22199a1eaaf", + "rev": "9ac97db2225dd90fc37c91fb6c91f2a10d331783", "type": "github" }, "original": { From 4976cea39d595095167a4e0ea19a4fca3e401682 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 7 Apr 2024 01:31:11 +0200 Subject: [PATCH 041/330] home: install keepassxc as a common desktop application Create new package category "desktopCommon" that is enabled by default on all home hosts, useful for getting GUI packages across platforms. --- home/desktop.nix | 2 +- home/modules/packages.nix | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/home/desktop.nix b/home/desktop.nix index 31d33b1..f485300 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -17,7 +17,7 @@ devTools = true; pythonTools = true; games = true; - desktop = true; + desktopLinux = true; kde = true; }; latex.guiTools = true; diff --git a/home/modules/packages.nix b/home/modules/packages.nix index cc91e5a..0c9b178 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -138,7 +138,9 @@ let #hedgewars ]; - desktopApps = [ + desktopCommon = [ keepassxc ]; + + desktopLinux = [ firefox chromium falkon @@ -146,7 +148,6 @@ let calibre dino zotero - keepassxc ding aspell aspellDicts.de @@ -234,7 +235,12 @@ in devTools = lib.mkEnableOption "Enable a common set of dev tools"; pythonTools = lib.mkEnableOption "Enable a common set of python tools"; games = lib.mkEnableOption "Enable some games"; - desktop = lib.mkEnableOption "Enable a common set of desktop applications"; + desktopCommon = lib.mkOption { + description = "GUI desktop applications that work cross-platform and cross-desktop"; + type = lib.types.bool; + default = true; + }; + desktopLinux = lib.mkEnableOption "Enable a common set of desktop applications"; kde = lib.mkEnableOption "Enable a common set of KDE applications"; }; config = { @@ -246,7 +252,8 @@ in ++ (lib.optional cfg.devTools devTools) ++ (lib.optional cfg.pythonTools pythonTools) ++ (lib.optional cfg.games games) - ++ (lib.optional cfg.desktop desktopApps) + ++ (lib.optional cfg.desktopCommon desktopCommon) + ++ (lib.optional cfg.desktopLinux desktopLinux) ++ (lib.optional cfg.kde kdeTools) ); From f08a7540efebd0e2ab0def58c29aede5b09ce3d3 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 7 Apr 2024 02:09:46 +0200 Subject: [PATCH 042/330] nix settings: unify for NixOS and nix-darwin moved into a common module --- common/default.nix | 23 ++--------------------- common/nix-settings.nix | 34 ++++++++++++++++++++++++++++++++++ darwin/configuration.nix | 2 ++ flake.nix | 5 ++++- 4 files changed, 42 insertions(+), 22 deletions(-) create mode 100644 common/nix-settings.nix diff --git a/common/default.nix b/common/default.nix index 2be6122..59b4765 100644 --- a/common/default.nix +++ b/common/default.nix @@ -13,6 +13,7 @@ in imports = [ ./packages.nix ./nitrokey.nix + ./nix-settings.nix ]; services.davfs2.enable = true; @@ -221,27 +222,7 @@ in # Enable all sysrq functions (useful to recover from some issues): boot.kernel.sysctl."kernel.sysrq" = 1; # NixOS default: 16 (only the sync command) - nix = { - # expose all flake inputs through nix Path and registry - registry = (lib.mapAttrs (_: value: { flake = value; }) inputs) // { - nixpkgs.flake = inputs.nixpkgs; - }; - nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; - # keep build-time deps around for offline-rebuilding - settings = { - # keep around all inputs necessary for offline-rebuilding the system - keep-outputs = true; - keep-derivations = true; - trusted-users = [ "spiollinux" ]; - experimental-features = [ - "nix-command" - "flakes" - "repl-flake" - ]; - # use all cores for building - cores = 0; - }; - }; + nix.settings.trusted-users = [ "spiollinux" ]; # override tmpdir for daemon #systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp"; diff --git a/common/nix-settings.nix b/common/nix-settings.nix new file mode 100644 index 0000000..eb8555d --- /dev/null +++ b/common/nix-settings.nix @@ -0,0 +1,34 @@ +# needs to be kept compatible to both NixOS and nix-darwin +{ + config, + pkgs, + lib, + ... +}: + +let + inputs = config.inputInjection.flake-inputs; + unstable = inputs.nixos-unstable; +in +{ + nix = { + # expose all flake inputs through nix Path and registry + registry = (lib.mapAttrs (_: value: { flake = value; }) inputs) // { + nixpkgs.flake = inputs.nixpkgs; + }; + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + }; + nix.settings = builtins.mapAttrs (_: lib.mkDefault) { + # keep around all inputs necessary for offline-rebuilding the system + keep-outputs = true; + keep-derivations = true; + trusted-users = [ "spiollinux" ]; + experimental-features = [ + "nix-command" + "flakes" + "repl-flake" + ]; + # use all cores for building + cores = 0; + }; +} diff --git a/darwin/configuration.nix b/darwin/configuration.nix index 2a999ca..779ab1c 100644 --- a/darwin/configuration.nix +++ b/darwin/configuration.nix @@ -1,6 +1,8 @@ { config, pkgs, ... }: { + imports = [ ../common/nix-settings.nix ]; + nix.settings.trusted-users = [ "os" ]; # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget environment.systemPackages = [ pkgs.vim ]; diff --git a/flake.nix b/flake.nix index 21df996..022a7e0 100644 --- a/flake.nix +++ b/flake.nix @@ -112,7 +112,10 @@ ]; }; darwinConfigurations."OS-MacBook-Pro" = nix-darwin.lib.darwinSystem { - modules = [ ./darwin/configuration.nix ]; + modules = [ + ./darwin/configuration.nix + inputInjection + ]; }; homeConfigurations = { spiollinux-desktop = mkHomeManager "desktop" "spiollinux" systems.x86_64-linux; From 02aad826d52f43540043d0a768c71ce4c424926c Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 7 Apr 2024 02:12:37 +0200 Subject: [PATCH 043/330] vim: fix absolute numbering for current line --- home/vimrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/vimrc b/home/vimrc index 6032d5a..05ea804 100644 --- a/home/vimrc +++ b/home/vimrc @@ -24,7 +24,11 @@ filetype plugin indent on syntax on +" use relative numbering… set relativenumber +" except for current line +set number + set mouse=a set mousehide From 88a92706dd3321a0724023cd6ae58c904dce4418 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 9 Apr 2024 21:55:49 +0200 Subject: [PATCH 044/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/fd281bd6b7d3e32ddfa399853946f782553163b5' (2024-04-03) → 'github:NixOS/nixpkgs/4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6' (2024-04-08) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/1487bdea619e4a7a53a4590c475deabb5a9d1bfb' (2024-04-03) → 'github:NixOS/nixpkgs/d272ca50d1f7424fbfcd1e6f1c9e01d92f6da167' (2024-04-08) • Updated input 'nur': 'github:nix-community/NUR/9ac97db2225dd90fc37c91fb6c91f2a10d331783' (2024-04-05) → 'github:nix-community/NUR/f09396de0fa0259bf562d026ca639dfbf3ccfa41' (2024-04-09) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index f47edc3..93d2f7f 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1712163089, - "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "lastModified": 1712608508, + "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1712168706, - "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=", + "lastModified": 1712588820, + "narHash": "sha256-y31s5idk3jMJMAVE4Ud9AdI7HT3CgTAeMTJ0StqKN7Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb", + "rev": "d272ca50d1f7424fbfcd1e6f1c9e01d92f6da167", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1712320566, - "narHash": "sha256-F/NR0Xf/AU21Nbtrni+6i+7C4dBKg9MNg7qrOmPRy6M=", + "lastModified": 1712690808, + "narHash": "sha256-oaIUJ79RgfKeeXpXhFpV5yjHBVoNG+hyYXx1RVBQp0w=", "owner": "nix-community", "repo": "NUR", - "rev": "9ac97db2225dd90fc37c91fb6c91f2a10d331783", + "rev": "f09396de0fa0259bf562d026ca639dfbf3ccfa41", "type": "github" }, "original": { From bc8f7e549e81ebcca5132f673926202c07bf17d2 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 10 Apr 2024 11:58:09 +0200 Subject: [PATCH 045/330] 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/f09396de0fa0259bf562d026ca639dfbf3ccfa41' (2024-04-09) → 'github:nix-community/NUR/183b908511f6cd1c1c6efd105fda89195c0ea6d3' (2024-04-10) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 93d2f7f..e554cff 100644 --- a/flake.lock +++ b/flake.lock @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1712690808, - "narHash": "sha256-oaIUJ79RgfKeeXpXhFpV5yjHBVoNG+hyYXx1RVBQp0w=", + "lastModified": 1712742269, + "narHash": "sha256-tp/udMJUT1Xr/UZdLJSxbt3sMJjRyeuDRCsEo4GdLpo=", "owner": "nix-community", "repo": "NUR", - "rev": "f09396de0fa0259bf562d026ca639dfbf3ccfa41", + "rev": "183b908511f6cd1c1c6efd105fda89195c0ea6d3", "type": "github" }, "original": { From 7ef48e0fe643823369f42e0df10cd44373ec18d4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 16 Apr 2024 16:35:31 +0200 Subject: [PATCH 046/330] 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-darwin': 'github:LnL7/nix-darwin/bcc8afd06e237df060c85bad6af7128e05fd61a3' (2024-03-17) → 'github:LnL7/nix-darwin/36524adc31566655f2f4d55ad6b875fb5c1a4083' (2024-03-30) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/9a763a7acc4cfbb8603bb0231fec3eda864f81c0' (2024-03-25) → 'github:NixOS/nixos-hardware/f58b25254be441cd2a9b4b444ed83f1e51244f1f' (2024-04-12) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6' (2024-04-08) → 'github:NixOS/nixpkgs/cfd6b5fc90b15709b780a5a1619695a88505a176' (2024-04-12) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/d272ca50d1f7424fbfcd1e6f1c9e01d92f6da167' (2024-04-08) → 'github:NixOS/nixpkgs/53a2c32bc66f5ae41a28d7a9a49d321172af621e' (2024-04-15) • Updated input 'nur': 'github:nix-community/NUR/183b908511f6cd1c1c6efd105fda89195c0ea6d3' (2024-04-10) → 'github:nix-community/NUR/af731823f6b440f86e4229ecbaedb887db53a1d8' (2024-04-16) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index e554cff..6bfbb93 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1710717205, - "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", + "lastModified": 1711763326, + "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", + "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", "type": "github" }, "original": { @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1711352745, - "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=", + "lastModified": 1712909959, + "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0", + "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1712608508, - "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1712588820, - "narHash": "sha256-y31s5idk3jMJMAVE4Ud9AdI7HT3CgTAeMTJ0StqKN7Y=", + "lastModified": 1713145326, + "narHash": "sha256-m7+IWM6mkWOg22EC5kRUFCycXsXLSU7hWmHdmBfmC3s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d272ca50d1f7424fbfcd1e6f1c9e01d92f6da167", + "rev": "53a2c32bc66f5ae41a28d7a9a49d321172af621e", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1712742269, - "narHash": "sha256-tp/udMJUT1Xr/UZdLJSxbt3sMJjRyeuDRCsEo4GdLpo=", + "lastModified": 1713274099, + "narHash": "sha256-7Y/0iVsaswxW4YTn8s5kuIQzuPq7Q/JWiQJbonW3CpA=", "owner": "nix-community", "repo": "NUR", - "rev": "183b908511f6cd1c1c6efd105fda89195c0ea6d3", + "rev": "af731823f6b440f86e4229ecbaedb887db53a1d8", "type": "github" }, "original": { From 69459e665daac596836642d94059d44c80810db9 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 19 Apr 2024 20:05:58 +0200 Subject: [PATCH 047/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/cfd6b5fc90b15709b780a5a1619695a88505a176' (2024-04-12) → 'github:NixOS/nixpkgs/66adc1e47f8784803f2deb6cacd5e07264ec2d5c' (2024-04-16) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/53a2c32bc66f5ae41a28d7a9a49d321172af621e' (2024-04-15) → 'github:NixOS/nixpkgs/e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd' (2024-04-17) • Updated input 'nur': 'github:nix-community/NUR/af731823f6b440f86e4229ecbaedb887db53a1d8' (2024-04-16) → 'github:nix-community/NUR/6d4165c4306a4166ce0cb39393fa9152f876840c' (2024-04-19) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 6bfbb93..ae564df 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "lastModified": 1713297878, + "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1713145326, - "narHash": "sha256-m7+IWM6mkWOg22EC5kRUFCycXsXLSU7hWmHdmBfmC3s=", + "lastModified": 1713344939, + "narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "53a2c32bc66f5ae41a28d7a9a49d321172af621e", + "rev": "e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1713274099, - "narHash": "sha256-7Y/0iVsaswxW4YTn8s5kuIQzuPq7Q/JWiQJbonW3CpA=", + "lastModified": 1713548116, + "narHash": "sha256-H/80JPGAkXvZSHd9RkL2p9jIHzWdZILkFCzq8AqnJ9c=", "owner": "nix-community", "repo": "NUR", - "rev": "af731823f6b440f86e4229ecbaedb887db53a1d8", + "rev": "6d4165c4306a4166ce0cb39393fa9152f876840c", "type": "github" }, "original": { From 154a8be69c0052243cfe5b6b230f1a39c96b5ffc Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 26 Apr 2024 17:38:24 +0200 Subject: [PATCH 048/330] host framenix: amdgpu flickering workaround not necessary anymore is resolved since firmware 3.05 --- hosts/framenix/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 666a581..1eb793d 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -29,8 +29,6 @@ in boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelParams = [ - # temporary workaround for white flickering graphics artefacts - "amdgpu.sg_display=0" # powersave "amd_pstate=active" "amdgpu.abmlevel=1" # adaptive backlight management From 3e15938a501791d1a768f7ded38c9fc85ffe92da Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 26 Apr 2024 17:38:59 +0200 Subject: [PATCH 049/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/66adc1e47f8784803f2deb6cacd5e07264ec2d5c' (2024-04-16) → 'github:NixOS/nixpkgs/7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856' (2024-04-25) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd' (2024-04-17) → 'github:NixOS/nixpkgs/dd37924974b9202f8226ed5d74a252a9785aedf8' (2024-04-24) • Updated input 'nur': 'github:nix-community/NUR/6d4165c4306a4166ce0cb39393fa9152f876840c' (2024-04-19) → 'github:nix-community/NUR/8765dcbc18b2bda9fc6c73ec8bcc4ed94e012bea' (2024-04-26) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index ae564df..3504faa 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1713297878, - "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=", + "lastModified": 1714076141, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1713344939, - "narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=", + "lastModified": 1713995372, + "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd", + "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1713548116, - "narHash": "sha256-H/80JPGAkXvZSHd9RkL2p9jIHzWdZILkFCzq8AqnJ9c=", + "lastModified": 1714141885, + "narHash": "sha256-hiGQbV4b59L5SXpvuX4OLNBusxRq6hanjpOw2O9RoH8=", "owner": "nix-community", "repo": "NUR", - "rev": "6d4165c4306a4166ce0cb39393fa9152f876840c", + "rev": "8765dcbc18b2bda9fc6c73ec8bcc4ed94e012bea", "type": "github" }, "original": { From 88e64d22dcf5de024bc1c77e005f414ec933c466 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 2 May 2024 22:48:06 +0200 Subject: [PATCH 050/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856' (2024-04-25) → 'github:NixOS/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994' (2024-04-27) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/dd37924974b9202f8226ed5d74a252a9785aedf8' (2024-04-24) → 'github:NixOS/nixpkgs/0638fe2715d998fa81d173aad264eb671ce2ebc1' (2024-05-01) • Updated input 'nur': 'github:nix-community/NUR/8765dcbc18b2bda9fc6c73ec8bcc4ed94e012bea' (2024-04-26) → 'github:nix-community/NUR/6132349be4a6cfe62cfe744d622a645e4981d458' (2024-05-02) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 3504faa..71faf2c 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1714076141, - "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1713995372, - "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=", + "lastModified": 1714531828, + "narHash": "sha256-ILsf3bdY/hNNI/Hu5bSt2/KbmHaAVhBbNUOdGztTHEg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8", + "rev": "0638fe2715d998fa81d173aad264eb671ce2ebc1", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1714141885, - "narHash": "sha256-hiGQbV4b59L5SXpvuX4OLNBusxRq6hanjpOw2O9RoH8=", + "lastModified": 1714681542, + "narHash": "sha256-7WQo+TMORkw/Bo1AADX7IuYu28rWVJN7qMTq3QDWU9E=", "owner": "nix-community", "repo": "NUR", - "rev": "8765dcbc18b2bda9fc6c73ec8bcc4ed94e012bea", + "rev": "6132349be4a6cfe62cfe744d622a645e4981d458", "type": "github" }, "original": { From 665b00548078d0d273523023e86e3631d063b05b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 8 May 2024 15:04:03 +0200 Subject: [PATCH 051/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994' (2024-04-27) → 'github:NixOS/nixpkgs/25865a40d14b3f9cf19f19b924e2ab4069b09588' (2024-05-05) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/0638fe2715d998fa81d173aad264eb671ce2ebc1' (2024-05-01) → 'github:NixOS/nixpkgs/27c13997bf450a01219899f5a83bd6ffbfc70d3c' (2024-05-06) • Updated input 'nur': 'github:nix-community/NUR/6132349be4a6cfe62cfe744d622a645e4981d458' (2024-05-02) → 'github:nix-community/NUR/89e5b0c44cbcd0a0b99662e68e905ee017562fac' (2024-05-08) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 71faf2c..509361f 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1714906307, + "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1714531828, - "narHash": "sha256-ILsf3bdY/hNNI/Hu5bSt2/KbmHaAVhBbNUOdGztTHEg=", + "lastModified": 1714971268, + "narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0638fe2715d998fa81d173aad264eb671ce2ebc1", + "rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1714681542, - "narHash": "sha256-7WQo+TMORkw/Bo1AADX7IuYu28rWVJN7qMTq3QDWU9E=", + "lastModified": 1715172813, + "narHash": "sha256-FdhLzDPLB8DoOpKsoRI7cAHsTm/k4Slqa2FKvhJJUwQ=", "owner": "nix-community", "repo": "NUR", - "rev": "6132349be4a6cfe62cfe744d622a645e4981d458", + "rev": "89e5b0c44cbcd0a0b99662e68e905ee017562fac", "type": "github" }, "original": { From aee03911599cea906763a31fde6f9c0c4e843c16 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 10 May 2024 10:08:19 +0200 Subject: [PATCH 052/330] hydra01: adapt hostname after network rearchitecture --- home/workmac.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/workmac.nix b/home/workmac.nix index 6d16d53..716dc15 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -34,7 +34,7 @@ in # ssh host config matchBlocks = { "hydra01" = { - hostname = "hydra01.fe.whq.fcio.net"; + hostname = "hydra01.access.whq.gocept.net"; user = "os"; }; "fcio-whq-jump" = { From 44784fca23ed7958ff28175aec37a99de0fd3688 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 10 May 2024 22:24:41 +0200 Subject: [PATCH 053/330] tigervnc: add as a default home package --- home/modules/packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 0c9b178..840966d 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -138,7 +138,10 @@ let #hedgewars ]; - desktopCommon = [ keepassxc ]; + desktopCommon = [ + keepassxc + tigervnc + ]; desktopLinux = [ firefox From f6d880aa1517fb9865f90682a41694394802967b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 10 May 2024 22:25:51 +0200 Subject: [PATCH 054/330] 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-darwin': 'github:LnL7/nix-darwin/36524adc31566655f2f4d55ad6b875fb5c1a4083' (2024-03-30) → 'github:LnL7/nix-darwin/230a197063de9287128e2c68a7a4b0cd7d0b50a7' (2024-04-24) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/f58b25254be441cd2a9b4b444ed83f1e51244f1f' (2024-04-12) → 'github:NixOS/nixos-hardware/a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a' (2024-05-08) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/25865a40d14b3f9cf19f19b924e2ab4069b09588' (2024-05-05) → 'github:NixOS/nixpkgs/f1010e0469db743d14519a1efd37e23f8513d714' (2024-05-09) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/27c13997bf450a01219899f5a83bd6ffbfc70d3c' (2024-05-06) → 'github:NixOS/nixpkgs/9a9960b98418f8c385f52de3b09a63f9c561427a' (2024-05-09) • Updated input 'nur': 'github:nix-community/NUR/89e5b0c44cbcd0a0b99662e68e905ee017562fac' (2024-05-08) → 'github:nix-community/NUR/65995cfffcbd9dff156f4807002201a7c913b9ef' (2024-05-10) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 509361f..5b3c449 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1711763326, - "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", + "lastModified": 1713946171, + "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", + "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", "type": "github" }, "original": { @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1712909959, - "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", + "lastModified": 1715148395, + "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", + "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1714906307, - "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1714971268, - "narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=", + "lastModified": 1715218190, + "narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c", + "rev": "9a9960b98418f8c385f52de3b09a63f9c561427a", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1715172813, - "narHash": "sha256-FdhLzDPLB8DoOpKsoRI7cAHsTm/k4Slqa2FKvhJJUwQ=", + "lastModified": 1715372719, + "narHash": "sha256-Y9n5ewZH/oLUXcGhMOD2UamNbvM8UU1HYAl3VXtEcsU=", "owner": "nix-community", "repo": "NUR", - "rev": "89e5b0c44cbcd0a0b99662e68e905ee017562fac", + "rev": "65995cfffcbd9dff156f4807002201a7c913b9ef", "type": "github" }, "original": { From 87497ea65b950d517b741a216678a887de95a67f Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 16 May 2024 17:19:59 +0200 Subject: [PATCH 055/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/f1010e0469db743d14519a1efd37e23f8513d714' (2024-05-09) → 'github:NixOS/nixpkgs/33d1e753c82ffc557b4a585c77de43d4c922ebb5' (2024-05-15) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/9a9960b98418f8c385f52de3b09a63f9c561427a' (2024-05-09) → 'github:NixOS/nixpkgs/9ddcaffecdf098822d944d4147dd8da30b4e6843' (2024-05-14) • Updated input 'nur': 'github:nix-community/NUR/65995cfffcbd9dff156f4807002201a7c913b9ef' (2024-05-10) → 'github:nix-community/NUR/ff15e8c091246f611200d40e265f60b381289fc6' (2024-05-16) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 5b3c449..1082d59 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1715218190, - "narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=", + "lastModified": 1715668745, + "narHash": "sha256-xp62OkRkbUDNUc6VSqH02jB0FbOS+MsfMb7wL1RJOfA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a9960b98418f8c385f52de3b09a63f9c561427a", + "rev": "9ddcaffecdf098822d944d4147dd8da30b4e6843", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1715372719, - "narHash": "sha256-Y9n5ewZH/oLUXcGhMOD2UamNbvM8UU1HYAl3VXtEcsU=", + "lastModified": 1715871275, + "narHash": "sha256-m9GtxcnJITKZ1YF29PZ7d67PAAXDjG9r66JwCrgyMNY=", "owner": "nix-community", "repo": "NUR", - "rev": "65995cfffcbd9dff156f4807002201a7c913b9ef", + "rev": "ff15e8c091246f611200d40e265f60b381289fc6", "type": "github" }, "original": { From 5e7a41ab470d89862ebf32a3e0a9e7992a662ea5 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 16 May 2024 17:26:15 +0200 Subject: [PATCH 056/330] framenix: pin to kernel 6.8 due to virtualbox --- hosts/framenix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 1eb793d..13c526d 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -26,7 +26,7 @@ in systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp"; # try newer kernels - boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = pkgs.linuxPackages_6_8; # FIXME: virtualbox not yet compatible with 6.9 boot.kernelParams = [ # powersave From 716df0c611543f38c995b60174d51b856ae6b6c4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 21 May 2024 22:40:26 +0200 Subject: [PATCH 057/330] audio: move framenix to pipewire, keep thinknix at pulseaudio --- common/default.nix | 15 --------------- common/pipewire.nix | 26 ++++++++++++++++++++++++++ common/pulseaudio.nix | 15 +++++++++++++++ hosts/framenix/default.nix | 3 ++- hosts/thinknix/default.nix | 1 + 5 files changed, 44 insertions(+), 16 deletions(-) create mode 100644 common/pipewire.nix create mode 100644 common/pulseaudio.nix diff --git a/common/default.nix b/common/default.nix index 59b4765..4d9bb2b 100644 --- a/common/default.nix +++ b/common/default.nix @@ -131,26 +131,11 @@ in extraBackends = [ pkgs.hplip ]; }; - # Enable sound. - hardware.pulseaudio = { - enable = true; - # decouple pulseaudio application and sink volumes - daemon.config = { - flat-volumes = "no"; - }; - # C3D2 hq music - zeroconf.discovery.enable = true; - zeroconf.publish.enable = true; - }; - # Bluetooth hardware.bluetooth = { enable = true; settings.General.Disable = "Headset"; # disable headset profile }; - hardware.pulseaudio = { - package = pkgs.pulseaudioFull; - }; # FIXME: at some point, hide GUI and sound (desktop vs. server) behind an option # Enable the X11 windowing system. diff --git a/common/pipewire.nix b/common/pipewire.nix new file mode 100644 index 0000000..cf9a01f --- /dev/null +++ b/common/pipewire.nix @@ -0,0 +1,26 @@ +{ pkgs, ... }: +{ + # rtkit is optional but recommended + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; + }; + environment.systemPackages = [ pkgs.easyeffects ]; + + # TODO: can be done in a simpler way in 24.05, see wiki.nixos.org + environment.etc = { + "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = '' + bluez_monitor.properties = { + ["bluez5.enable-sbc-xq"] = true, + ["bluez5.enable-msbc"] = true, + ["bluez5.enable-hw-volume"] = true, + ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" + } + ''; + }; +} diff --git a/common/pulseaudio.nix b/common/pulseaudio.nix new file mode 100644 index 0000000..6ca211a --- /dev/null +++ b/common/pulseaudio.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: +{ + # Enable sound. + hardware.pulseaudio = { + enable = true; + package = pkgs.pulseaudioFull; + # decouple pulseaudio application and sink volumes + daemon.config = { + flat-volumes = "no"; + }; + # C3D2 hq music + zeroconf.discovery.enable = true; + zeroconf.publish.enable = true; + }; +} diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 13c526d..de8c815 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -11,6 +11,7 @@ in { imports = [ ../../common + ../../common/pipewire.nix ./hardware-configuration.nix ./storage.nix @@ -26,7 +27,7 @@ in systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp"; # try newer kernels - boot.kernelPackages = pkgs.linuxPackages_6_8; # FIXME: virtualbox not yet compatible with 6.9 + boot.kernelPackages = pkgs.linuxPackages_6_8; # FIXME: virtualbox not yet compatible with 6.9 boot.kernelParams = [ # powersave diff --git a/hosts/thinknix/default.nix b/hosts/thinknix/default.nix index a7344b4..518f8ce 100644 --- a/hosts/thinknix/default.nix +++ b/hosts/thinknix/default.nix @@ -7,6 +7,7 @@ { imports = [ ../../common + ../../common/pulseaudio.nix ./hardware-configuration.nix ./storage.nix From b07df062b2cae67d03e1ee57885894d27bafb2af Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 21 May 2024 22:41:48 +0200 Subject: [PATCH 058/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/33d1e753c82ffc557b4a585c77de43d4c922ebb5' (2024-05-15) → 'github:NixOS/nixpkgs/6c0b7a92c30122196a761b440ac0d46d3d9954f1' (2024-05-19) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/9ddcaffecdf098822d944d4147dd8da30b4e6843' (2024-05-14) → 'github:NixOS/nixpkgs/a8695cbd09a7ecf3376bd62c798b9864d20f86ee' (2024-05-20) • Updated input 'nur': 'github:nix-community/NUR/ff15e8c091246f611200d40e265f60b381289fc6' (2024-05-16) → 'github:nix-community/NUR/26c7ac1a5959bd14fe782c88d576d69a146cf7b7' (2024-05-21) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 1082d59..6bc5b11 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1715787315, - "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "lastModified": 1716137900, + "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1715668745, - "narHash": "sha256-xp62OkRkbUDNUc6VSqH02jB0FbOS+MsfMb7wL1RJOfA=", + "lastModified": 1716218643, + "narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ddcaffecdf098822d944d4147dd8da30b4e6843", + "rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1715871275, - "narHash": "sha256-m9GtxcnJITKZ1YF29PZ7d67PAAXDjG9r66JwCrgyMNY=", + "lastModified": 1716323744, + "narHash": "sha256-oHc97X/Mf9InwYE9S3t10oEZYrSVCmf1oOeeDxzhKRU=", "owner": "nix-community", "repo": "NUR", - "rev": "ff15e8c091246f611200d40e265f60b381289fc6", + "rev": "26c7ac1a5959bd14fe782c88d576d69a146cf7b7", "type": "github" }, "original": { From 23cc9c7f80d048c38cc5ade4efeb947a4731b4f1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 21 May 2024 22:51:14 +0200 Subject: [PATCH 059/330] workmac: bat theming workaround can be removed after upgrading iTerm --- home/workmac.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/home/workmac.nix b/home/workmac.nix index 716dc15..8899e9f 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -26,9 +26,6 @@ in # also TODO: color schemes nix-darwin ]; - # pinning theme is necessary until iTerm 3.5, because despite the dark terminal background, bat detects light mode and adapts theme - programs.bat.config.theme = "Visual Studio Dark+"; - programs.ssh = { enable = true; # ssh host config From 26dc54a381e2ba3195f892efeae6ed0f76a31105 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 27 May 2024 14:49:57 +0200 Subject: [PATCH 060/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/6c0b7a92c30122196a761b440ac0d46d3d9954f1' (2024-05-19) → 'github:NixOS/nixpkgs/bfb7a882678e518398ce9a31a881538679f6f092' (2024-05-24) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/a8695cbd09a7ecf3376bd62c798b9864d20f86ee' (2024-05-20) → 'github:NixOS/nixpkgs/9d29cd266cebf80234c98dd0b87256b6be0af44e' (2024-05-25) • Updated input 'nur': 'github:nix-community/NUR/26c7ac1a5959bd14fe782c88d576d69a146cf7b7' (2024-05-21) → 'github:nix-community/NUR/550723a58f76bf43104bb04d154b9b1435d0ed61' (2024-05-27) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 6bc5b11..271982c 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1716137900, - "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716218643, - "narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=", + "lastModified": 1716633019, + "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee", + "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1716323744, - "narHash": "sha256-oHc97X/Mf9InwYE9S3t10oEZYrSVCmf1oOeeDxzhKRU=", + "lastModified": 1716813890, + "narHash": "sha256-UwFsUrSzUBdu+287spKulGucN7bPu0G022+ljRyQZHg=", "owner": "nix-community", "repo": "NUR", - "rev": "26c7ac1a5959bd14fe782c88d576d69a146cf7b7", + "rev": "550723a58f76bf43104bb04d154b9b1435d0ed61", "type": "github" }, "original": { From 732926fcd4fb4223f7f9e8392fa08b44fbd42c94 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 4 Jun 2024 00:47:07 +0200 Subject: [PATCH 061/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/bfb7a882678e518398ce9a31a881538679f6f092' (2024-05-24) → 'github:NixOS/nixpkgs/57610d2f8f0937f39dbd72251e9614b1561942d8' (2024-05-31) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/9d29cd266cebf80234c98dd0b87256b6be0af44e' (2024-05-25) → 'github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446' (2024-05-31) • Updated input 'nur': 'github:nix-community/NUR/550723a58f76bf43104bb04d154b9b1435d0ed61' (2024-05-27) → 'github:nix-community/NUR/c4f24fd0d45f73f969e58dfccfea5e5fa068d872' (2024-06-03) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 271982c..86911bf 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716633019, - "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1716813890, - "narHash": "sha256-UwFsUrSzUBdu+287spKulGucN7bPu0G022+ljRyQZHg=", + "lastModified": 1717452470, + "narHash": "sha256-8sbx/PhdKokC7FzogVk/fDVaKlJp9RNhE53tmSpZJyg=", "owner": "nix-community", "repo": "NUR", - "rev": "550723a58f76bf43104bb04d154b9b1435d0ed61", + "rev": "c4f24fd0d45f73f969e58dfccfea5e5fa068d872", "type": "github" }, "original": { From 563811c3ba3164a76ab2c23bc75693766911df15 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 11 Jun 2024 07:36:07 +0200 Subject: [PATCH 062/330] update to NixOS 24.05 --- common/default.nix | 12 +++++---- common/pipewire.nix | 23 +++++++++-------- flake.lock | 52 +++++++++++++++++++-------------------- flake.nix | 4 +-- home/desktop.nix | 2 +- home/modules/fonts.nix | 2 +- home/modules/vscodium.nix | 3 ++- packages/default.nix | 12 +-------- 8 files changed, 51 insertions(+), 59 deletions(-) diff --git a/common/default.nix b/common/default.nix index 4d9bb2b..093c83e 100644 --- a/common/default.nix +++ b/common/default.nix @@ -139,18 +139,20 @@ in # FIXME: at some point, hide GUI and sound (desktop vs. server) behind an option # Enable the X11 windowing system. - services.xserver.enable = true; - services.xserver.layout = "de"; - services.xserver.xkbOptions = "eurosign:e"; + services.xserver = { + enable = true; + xkb.layout = "de"; + xkb.options = "eurosign:e"; + }; # Enable touchpad support. - services.xserver.libinput.enable = true; + services.libinput.enable = true; # while libinput also supports graphic tablets, enable more-specific wacom driver services.xserver.wacom.enable = true; # Enable the KDE Desktop Environment. - services.xserver.displayManager.sddm.enable = true; + services.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; # dconf required for several Gnome applications diff --git a/common/pipewire.nix b/common/pipewire.nix index cf9a01f..1fb3c0e 100644 --- a/common/pipewire.nix +++ b/common/pipewire.nix @@ -9,18 +9,17 @@ pulse.enable = true; # If you want to use JACK applications, uncomment this #jack.enable = true; + + wireplumber.configPackages = [ + (pkgs.writeTextDir "share/wireplumber/bluetooth.lua.d/51-bluez-config.lua" '' + bluez_monitor.properties = { + ["bluez5.enable-sbc-xq"] = true, + ["bluez5.enable-msbc"] = true, + ["bluez5.enable-hw-volume"] = true, + ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" + } + '') + ]; }; environment.systemPackages = [ pkgs.easyeffects ]; - - # TODO: can be done in a simpler way in 24.05, see wiki.nixos.org - environment.etc = { - "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = '' - bluez_monitor.properties = { - ["bluez5.enable-sbc-xq"] = true, - ["bluez5.enable-msbc"] = true, - ["bluez5.enable-hw-volume"] = true, - ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" - } - ''; - }; } diff --git a/flake.lock b/flake.lock index 86911bf..425f039 100644 --- a/flake.lock +++ b/flake.lock @@ -117,16 +117,16 @@ ] }, "locked": { - "lastModified": 1706981411, - "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", + "lastModified": 1717527182, + "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", "owner": "nix-community", "repo": "home-manager", - "rev": "652fda4ca6dafeb090943422c34ae9145787af37", + "rev": "845a5c4c073f74105022533907703441e0464bc3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1713946171, - "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", + "lastModified": 1717976995, + "narHash": "sha256-u3HBinyIyUvL1+N816bODpJmSQdgn0Mbb8BprFw7kqo=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", + "rev": "315aa649ba307704db0b16c92f097a08a65ec955", "type": "github" }, "original": { @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1715148395, - "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=", + "lastModified": 1717995329, + "narHash": "sha256-lQJXEFHHVsFdFLx0bvoRbZH3IXUBsle6EWj9JroTJ/s=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a", + "rev": "58b52b0dd191af70f538c707c66c682331cfdffc", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1717196966, - "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "lastModified": 1717786204, + "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", "type": "github" }, "original": { @@ -258,27 +258,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1717159533, - "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "lastModified": 1717952948, + "narHash": "sha256-mJi4/gjiwQlSaxjA6AusXBN/6rQRaPCycR7bd8fydnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "rev": "2819fffa7fa42156680f0d282c60d81e8fb185b7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1717452470, - "narHash": "sha256-8sbx/PhdKokC7FzogVk/fDVaKlJp9RNhE53tmSpZJyg=", + "lastModified": 1718051178, + "narHash": "sha256-DFuR1xpIXuNjjBLbJ3wAZuITJDWDJctboTuEDNPOmNw=", "owner": "nix-community", "repo": "NUR", - "rev": "c4f24fd0d45f73f969e58dfccfea5e5fa068d872", + "rev": "c259254742217b3278f251c92945b49ac7f1d6a4", "type": "github" }, "original": { @@ -394,11 +394,11 @@ ] }, "locked": { - "lastModified": 1710278050, - "narHash": "sha256-Oc6BP7soXqb8itlHI8UKkdf3V9GeJpa1S39SR5+HJys=", + "lastModified": 1717850719, + "narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "35791f76524086ab4b785a33e4abbedfda64bd22", + "rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed", "type": "github" }, "original": { @@ -412,11 +412,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 022a7e0..16786b7 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ description = "NixOS system flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager/release-23.11"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; lanzaboote = { diff --git a/home/desktop.nix b/home/desktop.nix index f485300..7703508 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -70,7 +70,7 @@ services.gpg-agent = { enable = true; #enableSshSupport = true; - pinentryFlavor = "qt"; + pinentryPackage = pkgs.pinentry-qt; }; programs.ssh = { diff --git a/home/modules/fonts.nix b/home/modules/fonts.nix index ef7b543..05aa897 100644 --- a/home/modules/fonts.nix +++ b/home/modules/fonts.nix @@ -14,7 +14,7 @@ ubuntu_font_family twemoji-color-font open-sans - (iosevka-bin.override { variant = "curly-slab"; }) + (iosevka-bin.override { variant = "CurlySlab"; }) config.nur.repos.schmittlauch.vollkorn # TODO: humor-sans diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 149e811..497b3b7 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -1,5 +1,6 @@ { pkgs, + lib, inputs, config, system, @@ -75,7 +76,7 @@ "editor.formatOnSave" = false; "editor.formatOnType" = false; }; - "nix.formatterPath" = "${pkgs.nixfmt}/bin/nixfmt"; + "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style; "editor.fontSize" = 13; "editor.fontWeight" = "normal"; "git.detectSubmodulesLimit" = 30; diff --git a/packages/default.nix b/packages/default.nix index 3a8553f..ce16870 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -1,11 +1 @@ -final: prev: { - power-profiles-daemon = prev.power-profiles-daemon.overrideAttrs (old: { - patches = [ - # patch for AMD pstate CPUs - (final.fetchpatch { - url = "https://gitlab.freedesktop.org/upower/power-profiles-daemon/-/merge_requests/127.patch"; - sha256 = "sha256-CneqixlpZx9iZ0PM5MFIutsvnqKrLlM7FHOHUA/MK6g="; - }) - ]; - }); -} +final: prev: { } From 1619415a1b7e0a5a9faa16eeee3be38aa6dc8217 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 11 Jun 2024 08:38:55 +0200 Subject: [PATCH 063/330] home packages: add coreutils --- home/modules/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 840966d..27e17b6 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -46,6 +46,7 @@ let cliApps = [ + coreutils myVim htop tmux From baa0dd00f69d123ab52e56d16c1790e9aed151d1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 11 Jun 2024 21:01:32 +0200 Subject: [PATCH 064/330] home packages: add python --- home/modules/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 840966d..5209d1e 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -121,6 +121,7 @@ let ]; pythonTools = with python3Packages; [ + python3 # to shadow old macOS python notebook ipython pip From 4861e06380be5d2148e222321e2b988555fb0b79 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 11 Jun 2024 22:44:40 +0200 Subject: [PATCH 065/330] home-manager: show package diff at activation --- home/common.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/common.nix b/home/common.nix index 31d5887..46cf0cf 100644 --- a/home/common.nix +++ b/home/common.nix @@ -146,4 +146,10 @@ home.sessionVariables = { EDITOR = "nvim"; }; + + home.activation.reportChanges = config.lib.dag.entryAnywhere '' + if [[ -v oldGenPath ]]; then + run nix store diff-closures $oldGenPath $newGenPath + fi + ''; } From 67d34046316a39ef12f71195e2606b1163a12546 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 13 Jun 2024 21:41:06 +0200 Subject: [PATCH 066/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/051f920625ab5aabe37c920346e3e69d7d34400e' (2024-06-07) → 'github:NixOS/nixpkgs/57d6973abba7ea108bac64ae7629e7431e0199b6' (2024-06-12) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/2819fffa7fa42156680f0d282c60d81e8fb185b7' (2024-06-09) → 'github:NixOS/nixpkgs/cc54fb41d13736e92229c21627ea4f22199fee6b' (2024-06-12) • Updated input 'nur': 'github:nix-community/NUR/c259254742217b3278f251c92945b49ac7f1d6a4' (2024-06-10) → 'github:nix-community/NUR/ab6a53f69d8baa1b454fecffb271015588466e51' (2024-06-13) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 425f039..ff4d05b 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1717786204, - "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", + "lastModified": 1718160348, + "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", + "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1717952948, - "narHash": "sha256-mJi4/gjiwQlSaxjA6AusXBN/6rQRaPCycR7bd8fydnQ=", + "lastModified": 1718208800, + "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2819fffa7fa42156680f0d282c60d81e8fb185b7", + "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1718051178, - "narHash": "sha256-DFuR1xpIXuNjjBLbJ3wAZuITJDWDJctboTuEDNPOmNw=", + "lastModified": 1718307570, + "narHash": "sha256-Wkw/8Lkyd14op+zPx8XC/CRNyMMGC64m98aOWSEFmU4=", "owner": "nix-community", "repo": "NUR", - "rev": "c259254742217b3278f251c92945b49ac7f1d6a4", + "rev": "ab6a53f69d8baa1b454fecffb271015588466e51", "type": "github" }, "original": { From 5e4f5858424136b797e1161a25ec642c4bf4a96b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 16 Jun 2024 20:37:35 +0200 Subject: [PATCH 067/330] framenix: set battery charge limit of 85% at boot --- hosts/framenix/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index de8c815..feb58c5 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -35,6 +35,18 @@ in "amdgpu.abmlevel=1" # adaptive backlight management ]; + # at boot by default, limit charging capacity to protect battery. + # Hopefully there's gonna be a standard interface to control this from the desktop at some point. + systemd.services.battery-charge-limit = { + wantedBy = [ "basic.target" ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${lib.getExe pkgs.framework-tool} --driver portio --charge-limit 85"; + RemainAfterExit = true; + }; + }; + + boot.loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; From 3aa87825dc2fa2fda24c03c682a5d63f6a21d65d Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 20 Jun 2024 09:12:58 +0200 Subject: [PATCH 068/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/57d6973abba7ea108bac64ae7629e7431e0199b6' (2024-06-12) → 'github:NixOS/nixpkgs/b60ebf54c15553b393d144357375ea956f89e9a9' (2024-06-16) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/cc54fb41d13736e92229c21627ea4f22199fee6b' (2024-06-12) → 'github:NixOS/nixpkgs/938aa157bbd6e3c6fd7dcb77998b1f92c2ad1631' (2024-06-18) • Updated input 'nur': 'github:nix-community/NUR/ab6a53f69d8baa1b454fecffb271015588466e51' (2024-06-13) → 'github:nix-community/NUR/8985fe5d21e1a74582d32620bf11412305d0c9ae' (2024-06-20) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index ff4d05b..7f54c43 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1718160348, - "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", + "lastModified": 1718530797, + "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", + "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718208800, - "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", + "lastModified": 1718717462, + "narHash": "sha256-qddfQLMaWR2gxfEzUM/zFZVK6H1kTv9WBQSBQxbP3MU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b", + "rev": "938aa157bbd6e3c6fd7dcb77998b1f92c2ad1631", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1718307570, - "narHash": "sha256-Wkw/8Lkyd14op+zPx8XC/CRNyMMGC64m98aOWSEFmU4=", + "lastModified": 1718866942, + "narHash": "sha256-1FwtO67xeY/ojrJvZjXDqRzD4sF0tQ3bP6gW+j8HfKQ=", "owner": "nix-community", "repo": "NUR", - "rev": "ab6a53f69d8baa1b454fecffb271015588466e51", + "rev": "8985fe5d21e1a74582d32620bf11412305d0c9ae", "type": "github" }, "original": { From 44c96e88449c52611eb789f3f136138f294355b4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 20 Jun 2024 23:08:26 +0200 Subject: [PATCH 069/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/58b52b0dd191af70f538c707c66c682331cfdffc' (2024-06-10) → 'github:NixOS/nixos-hardware/083823b7904e43a4fc1c7229781417e875359a42' (2024-06-20) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/b60ebf54c15553b393d144357375ea956f89e9a9' (2024-06-16) → 'github:NixOS/nixpkgs/c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e' (2024-06-18) • Updated input 'nur': 'github:nix-community/NUR/8985fe5d21e1a74582d32620bf11412305d0c9ae' (2024-06-20) → 'github:nix-community/NUR/e922d68587b1a8e13f6bee7f00dda87f54549e34' (2024-06-20) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 7f54c43..809be40 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1717995329, - "narHash": "sha256-lQJXEFHHVsFdFLx0bvoRbZH3IXUBsle6EWj9JroTJ/s=", + "lastModified": 1718894893, + "narHash": "sha256-hxQBUtDbFOCCW1CsFZTS9Q5Ov1ZKdJgbBZHSez1M6iA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "58b52b0dd191af70f538c707c66c682331cfdffc", + "rev": "083823b7904e43a4fc1c7229781417e875359a42", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1718530797, - "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", + "lastModified": 1718714799, + "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", + "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1718866942, - "narHash": "sha256-1FwtO67xeY/ojrJvZjXDqRzD4sF0tQ3bP6gW+j8HfKQ=", + "lastModified": 1718916325, + "narHash": "sha256-3q784G/aNpHIkir+9kZC3cKAUQxt59AbSD7RdDEi4xc=", "owner": "nix-community", "repo": "NUR", - "rev": "8985fe5d21e1a74582d32620bf11412305d0c9ae", + "rev": "e922d68587b1a8e13f6bee7f00dda87f54549e34", "type": "github" }, "original": { From e6e6b3c162d365f7f13fb9fb07049002dc51b404 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 30 Jun 2024 21:26:30 +0200 Subject: [PATCH 070/330] 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/845a5c4c073f74105022533907703441e0464bc3' (2024-06-04) → 'github:nix-community/home-manager/a1fddf0967c33754271761d91a3d921772b30d0e' (2024-06-16) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/083823b7904e43a4fc1c7229781417e875359a42' (2024-06-20) → 'github:NixOS/nixos-hardware/a59f00f5ac65b19382617ba00f360f8bc07ed3ac' (2024-06-29) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e' (2024-06-18) → 'github:NixOS/nixpkgs/b2852eb9365c6de48ffb0dc2c9562591f652242a' (2024-06-27) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/938aa157bbd6e3c6fd7dcb77998b1f92c2ad1631' (2024-06-18) → 'github:NixOS/nixpkgs/89c49874fb15f4124bf71ca5f42a04f2ee5825fd' (2024-06-26) • Updated input 'nur': 'github:nix-community/NUR/e922d68587b1a8e13f6bee7f00dda87f54549e34' (2024-06-20) → 'github:nix-community/NUR/2ef1c7312fd083f118fee1bfeef40f4de36b14ca' (2024-06-30) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 809be40..0ab72e6 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1717527182, - "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", + "lastModified": 1718530513, + "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "owner": "nix-community", "repo": "home-manager", - "rev": "845a5c4c073f74105022533907703441e0464bc3", + "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "type": "github" }, "original": { @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1718894893, - "narHash": "sha256-hxQBUtDbFOCCW1CsFZTS9Q5Ov1ZKdJgbBZHSez1M6iA=", + "lastModified": 1719681865, + "narHash": "sha256-Lp+l1IsREVbz8WM35OJYZz8sAH0XOjrZWUXVB5bJ2qg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "083823b7904e43a4fc1c7229781417e875359a42", + "rev": "a59f00f5ac65b19382617ba00f360f8bc07ed3ac", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1718714799, - "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", + "lastModified": 1719506693, + "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", + "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718717462, - "narHash": "sha256-qddfQLMaWR2gxfEzUM/zFZVK6H1kTv9WBQSBQxbP3MU=", + "lastModified": 1719426051, + "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "938aa157bbd6e3c6fd7dcb77998b1f92c2ad1631", + "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1718916325, - "narHash": "sha256-3q784G/aNpHIkir+9kZC3cKAUQxt59AbSD7RdDEi4xc=", + "lastModified": 1719771190, + "narHash": "sha256-W2EApTej3kQYP+nn8BbCoSOQs+5Kvn+0LJzlT+GkB2E=", "owner": "nix-community", "repo": "NUR", - "rev": "e922d68587b1a8e13f6bee7f00dda87f54549e34", + "rev": "2ef1c7312fd083f118fee1bfeef40f4de36b14ca", "type": "github" }, "original": { From 5b21da30babdf9a580791f6c07eea6c40c2de799 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 2 Jul 2024 21:59:46 +0200 Subject: [PATCH 071/330] 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/a1fddf0967c33754271761d91a3d921772b30d0e' (2024-06-16) → 'github:nix-community/home-manager/391ca6e950c2525b4f853cbe29922452c14eda82' (2024-07-01) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/a59f00f5ac65b19382617ba00f360f8bc07ed3ac' (2024-06-29) → 'github:NixOS/nixos-hardware/6e253f12b1009053eff5344be5e835f604bb64cd' (2024-07-02) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/b2852eb9365c6de48ffb0dc2c9562591f652242a' (2024-06-27) → 'github:NixOS/nixpkgs/00d80d13810dbfea8ab4ed1009b09100cca86ba8' (2024-07-01) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/89c49874fb15f4124bf71ca5f42a04f2ee5825fd' (2024-06-26) → 'github:NixOS/nixpkgs/d032c1a6dfad4eedec7e35e91986becc699d7d69' (2024-07-01) • Updated input 'nur': 'github:nix-community/NUR/2ef1c7312fd083f118fee1bfeef40f4de36b14ca' (2024-06-30) → 'github:nix-community/NUR/ef879b77a1fbbe7170ab555852e18fa531c23a60' (2024-07-02) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 0ab72e6..2e485c2 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1718530513, - "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", + "lastModified": 1719827385, + "narHash": "sha256-qs+nU20Sm8czHg3bhGCqiH+8e13BJyRrKONW34g3i50=", "owner": "nix-community", "repo": "home-manager", - "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", + "rev": "391ca6e950c2525b4f853cbe29922452c14eda82", "type": "github" }, "original": { @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719681865, - "narHash": "sha256-Lp+l1IsREVbz8WM35OJYZz8sAH0XOjrZWUXVB5bJ2qg=", + "lastModified": 1719895800, + "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a59f00f5ac65b19382617ba00f360f8bc07ed3ac", + "rev": "6e253f12b1009053eff5344be5e835f604bb64cd", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1719506693, - "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1719426051, - "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=", + "lastModified": 1719838683, + "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd", + "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1719771190, - "narHash": "sha256-W2EApTej3kQYP+nn8BbCoSOQs+5Kvn+0LJzlT+GkB2E=", + "lastModified": 1719949581, + "narHash": "sha256-5oTHaCzhztZL0we4NxD9ZbHoRtxxS+psl+8VVVDNN+A=", "owner": "nix-community", "repo": "NUR", - "rev": "2ef1c7312fd083f118fee1bfeef40f4de36b14ca", + "rev": "ef879b77a1fbbe7170ab555852e18fa531c23a60", "type": "github" }, "original": { From f992a5096483a8cb5ca74648b0ccc944b2b6e3c4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 2 Jul 2024 23:42:52 +0200 Subject: [PATCH 072/330] treefmt --- common/packages.nix | 76 +++++++++++++++++++------------------- home/modules/packages.nix | 2 +- hosts/framenix/default.nix | 1 - 3 files changed, 38 insertions(+), 41 deletions(-) diff --git a/common/packages.nix b/common/packages.nix index e1316c4..d1c49a7 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -9,47 +9,41 @@ # take overlays from flake nixpkgs.overlays = lib.attrValues config.inputInjection.flake-inputs.self.overlays; # List packages installed in system profile. - environment.systemPackages = - with pkgs; - [ - wget - vim - vimPlugins.vim-nix - vimPlugins.pathogen - tmux - htop - zsh - btrfs-progs - git - python3 - man-pages - dnsutils - netcat-openbsd - ntfs3g - file - multipath-tools - strace - ltrace - valgrind - testdisk - rsync - pv - exfat - iotop - cifs-utils - dstat - lsof - macchanger - borgbackup + environment.systemPackages = with pkgs; [ + wget + vim + vimPlugins.vim-nix + vimPlugins.pathogen + tmux + htop + zsh + btrfs-progs + git + python3 + man-pages + dnsutils + netcat-openbsd + ntfs3g + file + multipath-tools + strace + ltrace + valgrind + testdisk + rsync + pv + exfat + iotop + cifs-utils + dstat + lsof + macchanger + borgbackup - # for debugging WLAN failures: - ethtool - trace-cmd + # for debugging WLAN failures: + ethtool + trace-cmd - # NetworkManager stuff - networkmanager-openconnect - networkmanager-vpnc - networkmanager-openvpn plasma5Packages.kdeGear.akonadi-mime # for KOrganizer ] ++ ( @@ -95,4 +89,8 @@ accountsservice ] ); + # NetworkManager stuff + networkmanager-openconnect + networkmanager-vpnc + networkmanager-openvpn } diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 2d30e03..955099a 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -122,7 +122,7 @@ let ]; pythonTools = with python3Packages; [ - python3 # to shadow old macOS python + python3 # to shadow old macOS python notebook ipython pip diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index feb58c5..8facb4d 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -46,7 +46,6 @@ in }; }; - boot.loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; From 695b6a0d2e05b7dd0af5de23f6d71af6b36ad55c Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 2 Jul 2024 23:43:46 +0200 Subject: [PATCH 073/330] plasma5 -> plasma6 for both the NixOS desktop env as well as home-manager packages. ktouch had to be disabled due to being marked as broken, let's fix this later --- common/default.nix | 9 +++++-- common/packages.nix | 50 ++++----------------------------------- home/modules/packages.nix | 10 +++----- 3 files changed, 15 insertions(+), 54 deletions(-) diff --git a/common/default.nix b/common/default.nix index 093c83e..594e9dd 100644 --- a/common/default.nix +++ b/common/default.nix @@ -152,8 +152,13 @@ in services.xserver.wacom.enable = true; # Enable the KDE Desktop Environment. - services.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; + services.displayManager.sddm = { + enable = true; + wayland.enable = true; + }; + services.desktopManager.plasma6.enable = true; + # enable wayland for Chromium and Electron + environment.sessionVariables.NIXOS_OZONE_WL = "1"; # dconf required for several Gnome applications programs.dconf.enable = true; diff --git a/common/packages.nix b/common/packages.nix index d1c49a7..b5a352a 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -44,53 +44,13 @@ ethtool trace-cmd - plasma5Packages.kdeGear.akonadi-mime # for KOrganizer - ] - ++ ( - with plasma5Packages; - with kdeGear; - [ - #akonadi - #akonadi-calendar - #akonadi-contacts - #akonadi-import-wizard - #akonadi-mime - #akonadi-notes - #akonadi-search - #akonadiconsole - #akregator - #kaddressbook - #kalarm - #kalarmcal - #kcalutils - #kcontacts - #kdav - #kdepim-addons - - #kdepim-runtime - #kidentitymanagement - #kldap - #kmail - #kmailtransport - #kmbox - #kmime - #kontact - #kontactinterface - #korganizer - #kpimtextedit - #libkdepim - #libksieve - #mailcommon - #messagelib - #pimcommon - #pim-sieve-editor - - # for some Flatpak packkages - accountsservice - ] - ); # NetworkManager stuff networkmanager-openconnect networkmanager-vpnc networkmanager-openvpn + # TODO: is this still necessary? + kdePackages.akonadi-mime # for KOrganizer + # for some Flatpak packkages + accountsservice + ]; } diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 955099a..924357f 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -193,9 +193,8 @@ let ]; kdeTools = - with plasma5Packages; - with kdeGear; - [ + [ okteta ] + ++ (with kdePackages; [ okular gwenview yakuake @@ -212,16 +211,13 @@ let qdirstat ark kwalletmanager - ktouch + #ktouch # TODO: unbreak kcharselect konversation - okteta krdc skanlite akonadiconsole tokodon # mastodon client - ] - ++ (with kdeFrameworks; [ networkmanager-qt kcrash breeze-gtk From 3cf7bb9fd50e42c817751dc6f0a841f8d7534425 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 7 Jul 2024 16:00:52 +0200 Subject: [PATCH 074/330] 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/391ca6e950c2525b4f853cbe29922452c14eda82' (2024-07-01) → 'github:nix-community/home-manager/e1391fb22e18a36f57e6999c7a9f966dc80ac073' (2024-07-03) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/d032c1a6dfad4eedec7e35e91986becc699d7d69' (2024-07-01) → 'github:NixOS/nixpkgs/49ee0e94463abada1de470c9c07bfc12b36dcf40' (2024-07-06) • Updated input 'nur': 'github:nix-community/NUR/ef879b77a1fbbe7170ab555852e18fa531c23a60' (2024-07-02) → 'github:nix-community/NUR/5161f371baeb843454fd7aea918cb4354fa8ed08' (2024-07-07) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 2e485c2..b2b2b59 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1719827385, - "narHash": "sha256-qs+nU20Sm8czHg3bhGCqiH+8e13BJyRrKONW34g3i50=", + "lastModified": 1720042825, + "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "391ca6e950c2525b4f853cbe29922452c14eda82", + "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1719838683, - "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=", + "lastModified": 1720244366, + "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69", + "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1719949581, - "narHash": "sha256-5oTHaCzhztZL0we4NxD9ZbHoRtxxS+psl+8VVVDNN+A=", + "lastModified": 1720360661, + "narHash": "sha256-LmzfL+pA2mYLTf22oqgJKmkoxxE0Q7RxjYQDJtphNdQ=", "owner": "nix-community", "repo": "NUR", - "rev": "ef879b77a1fbbe7170ab555852e18fa531c23a60", + "rev": "5161f371baeb843454fd7aea918cb4354fa8ed08", "type": "github" }, "original": { From adc9daae84b22f0c62f5ba9e8533d78a971716b5 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 7 Jul 2024 19:08:32 +0200 Subject: [PATCH 075/330] python3Packages.spsdk: disable tests to unbreak pynitrokey The tests of spsdk time out on slower machines like thinknix. Disabling them via overlay to fix the system build. TODO: raise this upstream --- packages/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/default.nix b/packages/default.nix index ce16870..fe84da9 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -1 +1,8 @@ -final: prev: { } +final: prev: { + python3 = prev.python3.override { + packageOverrides = python-final: python-prev: { + # spsdk tests fail with timeout on old laptop thinknix + spsdk = python-prev.spsdk.overridePythonAttrs { doCheck = false; }; + }; + }; +} From 2135dd01f8f3a03eb55c9f1784bd1d0069e2b403 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 9 Jul 2024 20:11:32 +0200 Subject: [PATCH 076/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/6e253f12b1009053eff5344be5e835f604bb64cd' (2024-07-02) → 'github:NixOS/nixos-hardware/a111ce6b537df12a39874aa9672caa87f8677eda' (2024-07-09) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/00d80d13810dbfea8ab4ed1009b09100cca86ba8' (2024-07-01) → 'github:NixOS/nixpkgs/655a58a72a6601292512670343087c2d75d859c1' (2024-07-08) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/49ee0e94463abada1de470c9c07bfc12b36dcf40' (2024-07-06) → 'github:NixOS/nixpkgs/194846768975b7ad2c4988bdb82572c00222c0d7' (2024-07-07) • Updated input 'nur': 'github:nix-community/NUR/5161f371baeb843454fd7aea918cb4354fa8ed08' (2024-07-07) → 'github:nix-community/NUR/c7cc8060b718840cc8ca3d1d60dcb077c70f34eb' (2024-07-09) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index b2b2b59..e0d1f52 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719895800, - "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=", + "lastModified": 1720515935, + "narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6e253f12b1009053eff5344be5e835f604bb64cd", + "rev": "a111ce6b537df12a39874aa9672caa87f8677eda", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1719848872, - "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "lastModified": 1720418205, + "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "655a58a72a6601292512670343087c2d75d859c1", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720244366, - "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1720360661, - "narHash": "sha256-LmzfL+pA2mYLTf22oqgJKmkoxxE0Q7RxjYQDJtphNdQ=", + "lastModified": 1720547934, + "narHash": "sha256-8rKdCkhCDm4Zuf9ja9Uak5RJPBV4WoFWIfyh4C1KPR0=", "owner": "nix-community", "repo": "NUR", - "rev": "5161f371baeb843454fd7aea918cb4354fa8ed08", + "rev": "c7cc8060b718840cc8ca3d1d60dcb077c70f34eb", "type": "github" }, "original": { From 72529950c2c213a816c5a12ee5807f9fbaa73bcf Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 8 Jul 2024 16:08:41 +0200 Subject: [PATCH 077/330] vscodium: use neovim binary from nix store directly --- home/modules/vscodium.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 497b3b7..3c2e204 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -109,7 +109,7 @@ }; "editor.renderWhitespace" = "all"; "editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace"; - "vim.neovimPath" = "/Users/os/.nix-profile/bin/nvim"; + "vim.neovimPath" = lib.getExe pkgs.myVim; "sync-rsync.options" = [ ]; }; }; From 8bb9b734f1989c5c7fd5ed5bc9b21f63f49b6f9b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 8 Jul 2024 16:09:26 +0200 Subject: [PATCH 078/330] vscodium: basic enabling of nixd LSP still requires further config to fully use fc-nixos specifics --- home/modules/vscodium.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 3c2e204..6cf9628 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -77,6 +77,9 @@ "editor.formatOnType" = false; }; "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style; + "nix.enableLanguageServer" = true; + "nix.serverPath" = lib.getExe pkgs.nixd; + "nix.serverSettings" = { }; "editor.fontSize" = 13; "editor.fontWeight" = "normal"; "git.detectSubmodulesLimit" = 30; From a7be658b1bc081bbf3cb33a3407bfd7c64a551d1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 13 Jul 2024 01:12:43 +0200 Subject: [PATCH 079/330] nixos: show diff to current system at activation time --- common/default.nix | 1 + common/upgrade-diff.nix | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 common/upgrade-diff.nix diff --git a/common/default.nix b/common/default.nix index 594e9dd..a39cd77 100644 --- a/common/default.nix +++ b/common/default.nix @@ -14,6 +14,7 @@ in ./packages.nix ./nitrokey.nix ./nix-settings.nix + ./upgrade-diff.nix ]; services.davfs2.enable = true; diff --git a/common/upgrade-diff.nix b/common/upgrade-diff.nix new file mode 100644 index 0000000..a66725f --- /dev/null +++ b/common/upgrade-diff.nix @@ -0,0 +1,9 @@ +# MIT Jörg Thalheim - https://github.com/Mic92/dotfiles/blob/c6cad4e57016945c4816c8ec6f0a94daaa0c3203/nixos/modules/upgrade-diff.nix +{ pkgs, ... }: +{ + system.activationScripts.diff = '' + if [[ -e /run/current-system ]]; then + ${pkgs.nix}/bin/nix store diff-closures /run/current-system "$systemConfig" + fi + ''; +} From 0d4eadcea4284d68dfbc7c8d56c29b3d299e569c Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 11 Jul 2024 22:20:21 +0200 Subject: [PATCH 080/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/655a58a72a6601292512670343087c2d75d859c1' (2024-07-08) → 'github:NixOS/nixpkgs/feb2849fdeb70028c70d73b848214b00d324a497' (2024-07-09) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/194846768975b7ad2c4988bdb82572c00222c0d7' (2024-07-07) → 'github:NixOS/nixpkgs/249fbde2a178a2ea2638b65b9ecebd531b338cf9' (2024-07-09) • Updated input 'nur': 'github:nix-community/NUR/c7cc8060b718840cc8ca3d1d60dcb077c70f34eb' (2024-07-09) → 'github:nix-community/NUR/2a5acaf6d3fc5f1a7add61a076f81b2d6f194a5c' (2024-07-11) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index e0d1f52..733905e 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1720418205, - "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", + "lastModified": 1720542800, + "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "655a58a72a6601292512670343087c2d75d859c1", + "rev": "feb2849fdeb70028c70d73b848214b00d324a497", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1720553833, + "narHash": "sha256-IXMiHQMtdShDXcBW95ctA+m5Oq2kLxnBt7WlMxvDQXA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "249fbde2a178a2ea2638b65b9ecebd531b338cf9", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1720547934, - "narHash": "sha256-8rKdCkhCDm4Zuf9ja9Uak5RJPBV4WoFWIfyh4C1KPR0=", + "lastModified": 1720727175, + "narHash": "sha256-Bw1yg6TKMFMhRAhCQK1c3Up+6iNlJwZClaZsD4DZBL0=", "owner": "nix-community", "repo": "NUR", - "rev": "c7cc8060b718840cc8ca3d1d60dcb077c70f34eb", + "rev": "2a5acaf6d3fc5f1a7add61a076f81b2d6f194a5c", "type": "github" }, "original": { From 23135169fdb0c73560bbbd2ccec8917a9b2fd559 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 14 Jul 2024 16:52:43 +0200 Subject: [PATCH 081/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/a111ce6b537df12a39874aa9672caa87f8677eda' (2024-07-09) → 'github:NixOS/nixos-hardware/c5013aa7ce2c7ec90acee5d965d950c8348db751' (2024-07-11) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/feb2849fdeb70028c70d73b848214b00d324a497' (2024-07-09) → 'github:NixOS/nixpkgs/7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9' (2024-07-12) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/249fbde2a178a2ea2638b65b9ecebd531b338cf9' (2024-07-09) → 'github:NixOS/nixpkgs/f12ee5f64c6a09995e71c9626d88c4efa983b488' (2024-07-12) • Updated input 'nur': 'github:nix-community/NUR/2a5acaf6d3fc5f1a7add61a076f81b2d6f194a5c' (2024-07-11) → 'github:nix-community/NUR/731c6d74615f883d0a0d59451ef9d95d823b8cd9' (2024-07-14) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 733905e..b2a40c1 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1720515935, - "narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=", + "lastModified": 1720737798, + "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a111ce6b537df12a39874aa9672caa87f8677eda", + "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1720542800, - "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", + "lastModified": 1720768451, + "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "feb2849fdeb70028c70d73b848214b00d324a497", + "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720553833, - "narHash": "sha256-IXMiHQMtdShDXcBW95ctA+m5Oq2kLxnBt7WlMxvDQXA=", + "lastModified": 1720823163, + "narHash": "sha256-FZ5dnrvKkln9ESdoTR8R7GKW9rNpXNZrxGsOXsbsTpE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "249fbde2a178a2ea2638b65b9ecebd531b338cf9", + "rev": "f12ee5f64c6a09995e71c9626d88c4efa983b488", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1720727175, - "narHash": "sha256-Bw1yg6TKMFMhRAhCQK1c3Up+6iNlJwZClaZsD4DZBL0=", + "lastModified": 1720968635, + "narHash": "sha256-0x813oUpR5w+5o6JPfc99Pl9GVYPGRXPCFrybraECDA=", "owner": "nix-community", "repo": "NUR", - "rev": "2a5acaf6d3fc5f1a7add61a076f81b2d6f194a5c", + "rev": "731c6d74615f883d0a0d59451ef9d95d823b8cd9", "type": "github" }, "original": { From 924116bb2e14ab3f334c0abc2078da7c5dc8c58a Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 14 Jul 2024 17:07:42 +0200 Subject: [PATCH 082/330] nix: switch implemenatation to lix for NixOS installations for home-manager/darwin profiles, stay at Nix for now because this is what is used on work machines anyways. --- common/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/default.nix b/common/default.nix index a39cd77..4753b1c 100644 --- a/common/default.nix +++ b/common/default.nix @@ -215,6 +215,8 @@ in # Enable all sysrq functions (useful to recover from some issues): boot.kernel.sysctl."kernel.sysrq" = 1; # NixOS default: 16 (only the sync command) + nix.package = pkgs.lix; + nix.settings.trusted-users = [ "spiollinux" ]; # override tmpdir for daemon #systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp"; From 78bd93f71c139ab3c4e81bb3edcf9e2d375a7a44 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 19 Jul 2024 08:18:34 +0200 Subject: [PATCH 083/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/c5013aa7ce2c7ec90acee5d965d950c8348db751' (2024-07-11) → 'github:NixOS/nixos-hardware/bb90787ea034c8b9035dfcfc9b4dc23898d414be' (2024-07-18) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9' (2024-07-12) → 'github:NixOS/nixpkgs/ad0b5eed1b6031efaed382844806550c3dcb4206' (2024-07-16) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/f12ee5f64c6a09995e71c9626d88c4efa983b488' (2024-07-12) → 'github:NixOS/nixpkgs/c716603a63aca44f39bef1986c13402167450e0a' (2024-07-17) • Updated input 'nur': 'github:nix-community/NUR/731c6d74615f883d0a0d59451ef9d95d823b8cd9' (2024-07-14) → 'github:nix-community/NUR/15afd41de2dd589a3da9ed431f832889f456ad1f' (2024-07-19) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index b2a40c1..03ddf85 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1720737798, - "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", + "lastModified": 1721331912, + "narHash": "sha256-h2yaU+QEU4pHxMySHPIsRV2T/pihDHnrXBca8BY6xgc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", + "rev": "bb90787ea034c8b9035dfcfc9b4dc23898d414be", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1720768451, - "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", + "lastModified": 1721138476, + "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", + "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720823163, - "narHash": "sha256-FZ5dnrvKkln9ESdoTR8R7GKW9rNpXNZrxGsOXsbsTpE=", + "lastModified": 1721226092, + "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f12ee5f64c6a09995e71c9626d88c4efa983b488", + "rev": "c716603a63aca44f39bef1986c13402167450e0a", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1720968635, - "narHash": "sha256-0x813oUpR5w+5o6JPfc99Pl9GVYPGRXPCFrybraECDA=", + "lastModified": 1721363543, + "narHash": "sha256-aNH6r/7zzEmiGdjkV+m4xxqnzLKNFV1FFeHQBBwqBOA=", "owner": "nix-community", "repo": "NUR", - "rev": "731c6d74615f883d0a0d59451ef9d95d823b8cd9", + "rev": "15afd41de2dd589a3da9ed431f832889f456ad1f", "type": "github" }, "original": { From 494d591f7993e049ed82b139094cab0911b10ec1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 21 Jul 2024 19:26:25 +0200 Subject: [PATCH 084/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/bb90787ea034c8b9035dfcfc9b4dc23898d414be' (2024-07-18) → 'github:NixOS/nixos-hardware/ab165a8a6cd12781d76fe9cbccb9e975d0fb634f' (2024-07-19) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/ad0b5eed1b6031efaed382844806550c3dcb4206' (2024-07-16) → 'github:NixOS/nixpkgs/1d9c2c9b3e71b9ee663d11c5d298727dace8d374' (2024-07-19) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/c716603a63aca44f39bef1986c13402167450e0a' (2024-07-17) → 'github:NixOS/nixpkgs/0c53b6b8c2a3e46c68e04417e247bba660689c9d' (2024-07-19) • Updated input 'nur': 'github:nix-community/NUR/15afd41de2dd589a3da9ed431f832889f456ad1f' (2024-07-19) → 'github:nix-community/NUR/e5c39e7968233a4a482ec16b19bb9c7d90b8b0ca' (2024-07-21) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 03ddf85..2329d1f 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1721331912, - "narHash": "sha256-h2yaU+QEU4pHxMySHPIsRV2T/pihDHnrXBca8BY6xgc=", + "lastModified": 1721413321, + "narHash": "sha256-0GdiQScDceUrVGbxYpV819LHesK3szHOhJ09e6sgES4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "bb90787ea034c8b9035dfcfc9b4dc23898d414be", + "rev": "ab165a8a6cd12781d76fe9cbccb9e975d0fb634f", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1721138476, - "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", + "lastModified": 1721379653, + "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", + "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1721226092, - "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=", + "lastModified": 1721409541, + "narHash": "sha256-b6PLr0Ty7JPDBtJtjnYzlBf02bbH9alWMAgispMkTwk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c716603a63aca44f39bef1986c13402167450e0a", + "rev": "0c53b6b8c2a3e46c68e04417e247bba660689c9d", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1721363543, - "narHash": "sha256-aNH6r/7zzEmiGdjkV+m4xxqnzLKNFV1FFeHQBBwqBOA=", + "lastModified": 1721579896, + "narHash": "sha256-jsAHd5qQtKDnIXqxuRMs+QHNBfaT84YsjNjcT+5pJas=", "owner": "nix-community", "repo": "NUR", - "rev": "15afd41de2dd589a3da9ed431f832889f456ad1f", + "rev": "e5c39e7968233a4a482ec16b19bb9c7d90b8b0ca", "type": "github" }, "original": { From 146fce638bcf353d811781efe3a4dca2316f2938 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 24 Jul 2024 00:13:32 +0200 Subject: [PATCH 085/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/ab165a8a6cd12781d76fe9cbccb9e975d0fb634f' (2024-07-19) → 'github:NixOS/nixos-hardware/405b654893aba16c8014de6a17e84439d3fb8e46' (2024-07-23) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/1d9c2c9b3e71b9ee663d11c5d298727dace8d374' (2024-07-19) → 'github:NixOS/nixpkgs/68c9ed8bbed9dfce253cc91560bf9043297ef2fe' (2024-07-21) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/0c53b6b8c2a3e46c68e04417e247bba660689c9d' (2024-07-19) → 'github:NixOS/nixpkgs/63d37ccd2d178d54e7fb691d7ec76000740ea24a' (2024-07-21) • Updated input 'nur': 'github:nix-community/NUR/e5c39e7968233a4a482ec16b19bb9c7d90b8b0ca' (2024-07-21) → 'github:nix-community/NUR/a6160422592deae0a754b2d969cf611f9339f212' (2024-07-23) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 2329d1f..fbf7338 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1721413321, - "narHash": "sha256-0GdiQScDceUrVGbxYpV819LHesK3szHOhJ09e6sgES4=", + "lastModified": 1721754224, + "narHash": "sha256-JEVfxzZRo+/zdWKBjHpAUG905SDZL9fmoLJxf9b5CGU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ab165a8a6cd12781d76fe9cbccb9e975d0fb634f", + "rev": "405b654893aba16c8014de6a17e84439d3fb8e46", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1721379653, - "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", + "lastModified": 1721562059, + "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", + "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1721409541, - "narHash": "sha256-b6PLr0Ty7JPDBtJtjnYzlBf02bbH9alWMAgispMkTwk=", + "lastModified": 1721548954, + "narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c53b6b8c2a3e46c68e04417e247bba660689c9d", + "rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1721579896, - "narHash": "sha256-jsAHd5qQtKDnIXqxuRMs+QHNBfaT84YsjNjcT+5pJas=", + "lastModified": 1721771144, + "narHash": "sha256-XWOhdlTNf58pR8Mwu3a59vrA7aOftt/KSt4EI2GwZNY=", "owner": "nix-community", "repo": "NUR", - "rev": "e5c39e7968233a4a482ec16b19bb9c7d90b8b0ca", + "rev": "a6160422592deae0a754b2d969cf611f9339f212", "type": "github" }, "original": { From 90f5fa3de8af65e84e219ba9f8872b8e19259576 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 25 Jul 2024 12:26:20 +0200 Subject: [PATCH 086/330] home packages: add fd --- home/modules/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 924357f..4df6e6d 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -104,6 +104,7 @@ let shellcheck mtr ripgrep + fd gitui lazygit pre-commit From 85147a4fd6d956e913e4d6e9091c039121f6c2dc Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 25 Jul 2024 16:19:46 +0200 Subject: [PATCH 087/330] home.workmac: enable 1Password SSH agent integration --- home/workmac.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/home/workmac.nix b/home/workmac.nix index 8899e9f..043a0f0 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -3,6 +3,7 @@ inputs, config, system, + lib, ... }: @@ -30,15 +31,20 @@ in enable = true; # ssh host config matchBlocks = { - "hydra01" = { + + "*" = { + extraOptions.IdentityAgent = "\"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\""; + }; + + "hydra01" = lib.hm.dag.entryAfter ["*"] { hostname = "hydra01.access.whq.gocept.net"; user = "os"; }; - "fcio-whq-jump" = { + "fcio-whq-jump" = lib.hm.dag.entryAfter ["*"] { hostname = "vpn-whq.services.fcio.net"; extraOptions.LogLevel = "Verbose"; }; - "fcio-rzob-jump" = { + "fcio-rzob-jump" = lib.hm.dag.entryAfter ["*"] { hostname = "vpn-rzob.services.fcio.net"; }; }; From cfa41acafc099cc3b7c5148b2979bac8a09c7a75 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 25 Jul 2024 18:10:54 +0200 Subject: [PATCH 088/330] packages: remove duplicate openssh --- home/modules/packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 4df6e6d..3a27d7f 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -58,9 +58,8 @@ let mosh openssh sshfs-fuse - cryfs - openssh sshuttle + cryfs thefuck gnupg unar From 2e16c5e914b7f48c7bc5d6ad8b858d4cc67d5326 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 25 Jul 2024 23:09:57 +0200 Subject: [PATCH 089/330] rsyncrepo script: allow optionally supplying target name The `rsyncrepo` and `rsynchydra` scripts now support an optional 3rd argument to define the target name on the host instead of auto-determining it from the basename. This is important for syncing local directories of varying names all to the same `fc-nixos` target for dev checkouts on VMs. --- home/scripts/reporsync.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/home/scripts/reporsync.nix b/home/scripts/reporsync.nix index dfdaa29..c5fcb4c 100644 --- a/home/scripts/reporsync.nix +++ b/home/scripts/reporsync.nix @@ -29,7 +29,7 @@ JUMPHOST="$DEFAULT_JUMPHOST" ;; ?) - echo "rsyncrepo [-J] [-j ] " + echo "rsyncrepo [-J] [-j ] [target dir name]" return 1 ;; esac @@ -40,6 +40,7 @@ RR_FROM="$1" RR_TO="$2" + RR_TARGET="$3" } _do_rsync() { @@ -57,8 +58,12 @@ echo "$OPTI" done - # we always sync /path/to/dir/ to hostname:dir - RR_DEST="''${2}:$(basename $(realpath "''${1}"))" + # If no $3 is specified, we sync /path/to/dir/ to hostname:dir + if [ -z "$3" ]; then + RR_DEST="''${2}:$(basename $(realpath "''${1}"))" + else + RR_DEST="''${2}:''${3}" + fi echo "Syncing ''${1} to ''${RR_DEST}…" @@ -69,11 +74,11 @@ rsyncrepo() { _parse_rsync_args "$@" # inherits parsed arguments through variables - _do_rsync "$RR_FROM" "$RR_TO" + _do_rsync "$RR_FROM" "$RR_TO" "$RR_TARGET" } rsynchydra() { _parse_rsync_args "$@" - _do_rsync "$RR_FROM" "hydra01" + _do_rsync "$RR_FROM" "hydra01" "$RR_TARGET" } '' From 8000c42896870fa923667f2410ac191a9d0c1431 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 27 Jul 2024 12:00:56 +0200 Subject: [PATCH 090/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/405b654893aba16c8014de6a17e84439d3fb8e46' (2024-07-23) → 'github:NixOS/nixos-hardware/0b4d40f95a68ef0a6785f6b938ac8c1383321dbf' (2024-07-26) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/68c9ed8bbed9dfce253cc91560bf9043297ef2fe' (2024-07-21) → 'github:NixOS/nixpkgs/5ad6a14c6bf098e98800b091668718c336effc95' (2024-07-25) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/63d37ccd2d178d54e7fb691d7ec76000740ea24a' (2024-07-21) → 'github:NixOS/nixpkgs/a1cc729dcbc31d9b0d11d86dc7436163548a9665' (2024-07-25) • Updated input 'nur': 'github:nix-community/NUR/a6160422592deae0a754b2d969cf611f9339f212' (2024-07-23) → 'github:nix-community/NUR/5a048a702c733a917b6cdb760b3db8c20f705557' (2024-07-27) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index fbf7338..6ed7b48 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1721754224, - "narHash": "sha256-JEVfxzZRo+/zdWKBjHpAUG905SDZL9fmoLJxf9b5CGU=", + "lastModified": 1722017959, + "narHash": "sha256-vkv3MtjRtJdqeWMLH874ngbC6/5wUYzsdw0pb96ZLRc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "405b654893aba16c8014de6a17e84439d3fb8e46", + "rev": "0b4d40f95a68ef0a6785f6b938ac8c1383321dbf", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1721562059, - "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", + "lastModified": 1721924956, + "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe", + "rev": "5ad6a14c6bf098e98800b091668718c336effc95", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1721548954, - "narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=", + "lastModified": 1721949857, + "narHash": "sha256-DID446r8KsmJhbCzx4el8d9SnPiE8qa6+eEQOJ40vR0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a", + "rev": "a1cc729dcbc31d9b0d11d86dc7436163548a9665", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1721771144, - "narHash": "sha256-XWOhdlTNf58pR8Mwu3a59vrA7aOftt/KSt4EI2GwZNY=", + "lastModified": 1722069894, + "narHash": "sha256-ZA3OVFjy8o4uZlPMjollef+OUyVnoUmFdMLGr5RE8zE=", "owner": "nix-community", "repo": "NUR", - "rev": "a6160422592deae0a754b2d969cf611f9339f212", + "rev": "5a048a702c733a917b6cdb760b3db8c20f705557", "type": "github" }, "original": { From 0a4a26f94e5efdd013394888399e1a18bf00bfc5 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 31 Jul 2024 08:51:36 +0200 Subject: [PATCH 091/330] Revert "workmac: bat theming workaround can be removed after upgrading iTerm" This reverts commit 23cc9c7f80d048c38cc5ade4efeb947a4731b4f1. --- home/workmac.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/workmac.nix b/home/workmac.nix index 043a0f0..511ec4c 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -27,6 +27,9 @@ in # also TODO: color schemes nix-darwin ]; + # pinning theme is necessary until iTerm 3.5, because despite the dark terminal background, bat detects light mode and adapts theme + programs.bat.config.theme = "Visual Studio Dark+"; + programs.ssh = { enable = true; # ssh host config From 0f4bf77cbf4bdb8f2b6413eeb7c295d1a4a31ad3 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 31 Jul 2024 12:19:42 +0200 Subject: [PATCH 092/330] git config contacts: bump submodule, adapt to restructuring --- flake.lock | 8 ++++---- home/desktop.nix | 14 ++++++++------ home/secrets | 2 +- home/workmac.nix | 20 ++++++++++---------- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 6ed7b48..8cb5a96 100644 --- a/flake.lock +++ b/flake.lock @@ -159,11 +159,11 @@ "mysecrets": { "flake": false, "locked": { - "lastModified": 1710686355, - "narHash": "sha256-YcSywZx6/IMYfNax1Yx0EDLQiKsCn7glYVz1eglhbcM=", + "lastModified": 1722419972, + "narHash": "sha256-7gKcSKTu7Z6sswIK4QuMHtDbpKMs09b6w7uFjJJyAIA=", "ref": "refs/heads/master", - "rev": "72d2478b720fabf69971747641230387d0df7689", - "revCount": 4, + "rev": "c725f810bb9a43c213fcf964f036dd0c64b6ba04", + "revCount": 5, "type": "git", "url": "ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git" }, diff --git a/home/desktop.nix b/home/desktop.nix index 7703508..212debf 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -3,6 +3,7 @@ inputs, config, system, + lib, ... }: { @@ -29,7 +30,7 @@ programs.git = let # TODO profile specific - contacts = import "${inputs.mysecrets}/contacts.nix"; + contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; }; in { includes = @@ -37,15 +38,15 @@ { condition = "gitdir:~/Seafile/Studium/"; contents = { - user.name = contacts.realName; - user.email = contacts.uniMail; + user.name = contacts.personal.name; + user.email = contacts.uni.email; }; } { condition = "gitdir:~/src/nixpkgs/"; contents = { user.name = "Trolli Schmittlauch"; - user.email = contacts.nixosMail; + user.email = contacts.nixOs.email; }; } ] @@ -55,8 +56,9 @@ (dir: { condition = "gitdir:${dir}"; contents = { - user.name = "Trolli Schmittlauch"; - user.email = contacts.mainMail; + user = { + inherit (contacts.schmittlauch) email name; + }; }; }) [ diff --git a/home/secrets b/home/secrets index 72d2478..c725f81 160000 --- a/home/secrets +++ b/home/secrets @@ -1 +1 @@ -Subproject commit 72d2478b720fabf69971747641230387d0df7689 +Subproject commit c725f810bb9a43c213fcf964f036dd0c64b6ba04 diff --git a/home/workmac.nix b/home/workmac.nix index 511ec4c..5aab318 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -39,23 +39,21 @@ in extraOptions.IdentityAgent = "\"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\""; }; - "hydra01" = lib.hm.dag.entryAfter ["*"] { + "hydra01" = lib.hm.dag.entryAfter [ "*" ] { hostname = "hydra01.access.whq.gocept.net"; user = "os"; }; - "fcio-whq-jump" = lib.hm.dag.entryAfter ["*"] { + "fcio-whq-jump" = lib.hm.dag.entryAfter [ "*" ] { hostname = "vpn-whq.services.fcio.net"; extraOptions.LogLevel = "Verbose"; }; - "fcio-rzob-jump" = lib.hm.dag.entryAfter ["*"] { - hostname = "vpn-rzob.services.fcio.net"; - }; + "fcio-rzob-jump" = lib.hm.dag.entryAfter [ "*" ] { hostname = "vpn-rzob.services.fcio.net"; }; }; }; programs.git = let - contacts = import "${inputs.mysecrets}/contacts.nix"; + contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; }; in { includes = @@ -63,8 +61,9 @@ in { condition = "gitdir:~/src/schmittlauch/"; contents = { - user.name = "Trolli Schmittlauch"; - user.email = contacts.nixosMail; + user = { + inherit (contacts.schmittlauch) name email; + }; }; } ] @@ -72,8 +71,9 @@ in ++ map (dir: { condition = "gitdir:${dir}"; contents = { - user.name = contacts.realName; - user.email = contacts.fcioMail; + user = { + inherit (contacts.work) name email; + }; }; }) [ "~/" ]; }; From ef665026490595dc59dc7998f08b77704c6179eb Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 28 Jul 2024 00:04:33 +0200 Subject: [PATCH 093/330] kmail: explicitly install some needed dependencies for mail account creation merely a workaround --- home/modules/packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 3a27d7f..5752988 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -202,6 +202,8 @@ let kontact korganizer akonadi-mime # for KOrganizer + kmail-account-wizard + akonadi-import-wizard kaddressbook kdeconnect dolphin From 4a585cb6aa22692ba9c6ae9acf249d00696186ca Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 31 Jul 2024 21:08:55 +0200 Subject: [PATCH 094/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/0b4d40f95a68ef0a6785f6b938ac8c1383321dbf' (2024-07-26) → 'github:NixOS/nixos-hardware/14c333162ba53c02853add87a0000cbd7aa230c2' (2024-07-30) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/5ad6a14c6bf098e98800b091668718c336effc95' (2024-07-25) → 'github:NixOS/nixpkgs/52ec9ac3b12395ad677e8b62106f0b98c1f8569d' (2024-07-28) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/a1cc729dcbc31d9b0d11d86dc7436163548a9665' (2024-07-25) → 'github:NixOS/nixpkgs/12bf09802d77264e441f48e25459c10c93eada2e' (2024-07-29) • Updated input 'nur': 'github:nix-community/NUR/5a048a702c733a917b6cdb760b3db8c20f705557' (2024-07-27) → 'github:nix-community/NUR/6f645601159190be1c1ecddf14e738d2de45f6b6' (2024-07-31) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 8cb5a96..72b16f7 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1722017959, - "narHash": "sha256-vkv3MtjRtJdqeWMLH874ngbC6/5wUYzsdw0pb96ZLRc=", + "lastModified": 1722332872, + "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0b4d40f95a68ef0a6785f6b938ac8c1383321dbf", + "rev": "14c333162ba53c02853add87a0000cbd7aa230c2", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1721924956, - "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=", + "lastModified": 1722185531, + "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ad6a14c6bf098e98800b091668718c336effc95", + "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1721949857, - "narHash": "sha256-DID446r8KsmJhbCzx4el8d9SnPiE8qa6+eEQOJ40vR0=", + "lastModified": 1722221733, + "narHash": "sha256-sga9SrrPb+pQJxG1ttJfMPheZvDOxApFfwXCFO0H9xw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1cc729dcbc31d9b0d11d86dc7436163548a9665", + "rev": "12bf09802d77264e441f48e25459c10c93eada2e", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1722069894, - "narHash": "sha256-ZA3OVFjy8o4uZlPMjollef+OUyVnoUmFdMLGr5RE8zE=", + "lastModified": 1722450628, + "narHash": "sha256-El3ogv9x+0NMglw/cavXyWZAgoLzC0PRPyORuQOMbgU=", "owner": "nix-community", "repo": "NUR", - "rev": "5a048a702c733a917b6cdb760b3db8c20f705557", + "rev": "6f645601159190be1c1ecddf14e738d2de45f6b6", "type": "github" }, "original": { From d2e77b088f074fc831cf8ffb97f7af890c6c620a Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 31 Jul 2024 21:38:08 +0200 Subject: [PATCH 095/330] kmail/ kde-pim: install via NixOS option instead Installing the kde-pim sutie is quite complex. Thus, there's a `programs.kde-pim` in NixOS now to keep track of all necessarry packages. Removing the attempted list of necessary packages from explicit NixOS and home packages instead. --- common/default.nix | 7 +++++++ common/packages.nix | 2 -- home/modules/packages.nix | 7 ------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/common/default.nix b/common/default.nix index 4753b1c..739c0b5 100644 --- a/common/default.nix +++ b/common/default.nix @@ -158,6 +158,13 @@ in wayland.enable = true; }; services.desktopManager.plasma6.enable = true; + # TODO: move out into a plasma.nix module + programs.kde-pim = { + enable = true; + kmail = true; + kontact = true; + merkuro = true; + }; # enable wayland for Chromium and Electron environment.sessionVariables.NIXOS_OZONE_WL = "1"; diff --git a/common/packages.nix b/common/packages.nix index b5a352a..2dce963 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -48,8 +48,6 @@ networkmanager-openconnect networkmanager-vpnc networkmanager-openvpn - # TODO: is this still necessary? - kdePackages.akonadi-mime # for KOrganizer # for some Flatpak packkages accountsservice ]; diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 5752988..9ce8eef 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -198,13 +198,6 @@ let okular gwenview yakuake - kmail - kontact - korganizer - akonadi-mime # for KOrganizer - kmail-account-wizard - akonadi-import-wizard - kaddressbook kdeconnect dolphin spectacle From daa39f6d5ee2b9b102583873bdc7b5f7f602a29a Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 3 Aug 2024 21:33:59 +0200 Subject: [PATCH 096/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/52ec9ac3b12395ad677e8b62106f0b98c1f8569d' (2024-07-28) → 'github:NixOS/nixpkgs/9f918d616c5321ad374ae6cb5ea89c9e04bf3e58' (2024-07-31) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/12bf09802d77264e441f48e25459c10c93eada2e' (2024-07-29) → 'github:NixOS/nixpkgs/05405724efa137a0b899cce5ab4dde463b4fd30b' (2024-08-01) • Updated input 'nur': 'github:nix-community/NUR/6f645601159190be1c1ecddf14e738d2de45f6b6' (2024-07-31) → 'github:nix-community/NUR/ac1226f223779364c73f1a450654383768dab1b7' (2024-08-03) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 72b16f7..b2aa4fa 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1722185531, - "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", + "lastModified": 1722421184, + "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", + "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1722221733, - "narHash": "sha256-sga9SrrPb+pQJxG1ttJfMPheZvDOxApFfwXCFO0H9xw=", + "lastModified": 1722519197, + "narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12bf09802d77264e441f48e25459c10c93eada2e", + "rev": "05405724efa137a0b899cce5ab4dde463b4fd30b", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1722450628, - "narHash": "sha256-El3ogv9x+0NMglw/cavXyWZAgoLzC0PRPyORuQOMbgU=", + "lastModified": 1722709906, + "narHash": "sha256-I27FkJ3qSsxc5aZSwpYHMqJwLpvQt6eV4MrwGfVjCvM=", "owner": "nix-community", "repo": "NUR", - "rev": "6f645601159190be1c1ecddf14e738d2de45f6b6", + "rev": "ac1226f223779364c73f1a450654383768dab1b7", "type": "github" }, "original": { From 8911511edc1fde3e630e02a1881fb52bce6f45cf Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 6 Aug 2024 00:41:09 +0200 Subject: [PATCH 097/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/9f918d616c5321ad374ae6cb5ea89c9e04bf3e58' (2024-07-31) → 'github:NixOS/nixpkgs/d04953086551086b44b6f3c6b7eeb26294f207da' (2024-08-02) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/05405724efa137a0b899cce5ab4dde463b4fd30b' (2024-08-01) → 'github:NixOS/nixpkgs/8b5b6723aca5a51edf075936439d9cd3947b7b2c' (2024-08-04) • Updated input 'nur': 'github:nix-community/NUR/ac1226f223779364c73f1a450654383768dab1b7' (2024-08-03) → 'github:nix-community/NUR/1261ebf63933d763c7eb2e3290782cf09d045fdb' (2024-08-05) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index b2aa4fa..bb9e943 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1722421184, - "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", + "lastModified": 1722630782, + "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", + "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1722519197, - "narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=", + "lastModified": 1722791413, + "narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "05405724efa137a0b899cce5ab4dde463b4fd30b", + "rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1722709906, - "narHash": "sha256-I27FkJ3qSsxc5aZSwpYHMqJwLpvQt6eV4MrwGfVjCvM=", + "lastModified": 1722894411, + "narHash": "sha256-OUOJ/dglPQ/YAN/zYAdEzzhSUv84QF8px9JT4eQb4GA=", "owner": "nix-community", "repo": "NUR", - "rev": "ac1226f223779364c73f1a450654383768dab1b7", + "rev": "1261ebf63933d763c7eb2e3290782cf09d045fdb", "type": "github" }, "original": { From 83858d6d118de29f19cf30685094d1793d1bf78b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 7 Aug 2024 00:32:03 +0200 Subject: [PATCH 098/330] thinknix: enable guest user as a module Introduce a guest user module that sets up a guest user with the default desktop home packages through the home-manager NixOS module. Enabled on thinknix. --- common/default.nix | 1 + common/guest.nix | 66 ++++++++++++++++++++++++++++++++++++++ flake.nix | 9 +++++- hosts/thinknix/default.nix | 2 ++ 4 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 common/guest.nix diff --git a/common/default.nix b/common/default.nix index 739c0b5..98e4eda 100644 --- a/common/default.nix +++ b/common/default.nix @@ -15,6 +15,7 @@ in ./nitrokey.nix ./nix-settings.nix ./upgrade-diff.nix + ./guest.nix ]; services.davfs2.enable = true; diff --git a/common/guest.nix b/common/guest.nix new file mode 100644 index 0000000..7183bc1 --- /dev/null +++ b/common/guest.nix @@ -0,0 +1,66 @@ +{ + config, + lib, + system, + ... +}: +let + inputs = config.inputInjection.flake-inputs; +in +{ + # interesting: this causes an infinite recursion + #imports = [ config.inputInjection.flake-inputs.home-manager.nixosModules.home-manager ]; + + options.schmittlauch.guestUser.enable = lib.options.mkEnableOption "Provide a guest user account"; + + config = lib.mkIf config.schmittlauch.guestUser.enable { + users.extraUsers.gast = { + isNormalUser = true; + group = "gast"; + hashedPassword = "$y$j9T$pPCjU8ZvVYo0aY4jtrHPj1$NxUWOP/YTcqJ1PYaP1Hy5MwTeDcNjg0k369R5rE5M48"; + }; + users.groups.gast = { }; + # a basic home-manager configuration to share installed packages of other accounts + # reason: keeping a separate config checkout for guests and requiring them to run + # their own `home-manager` instance does not make sense. + home-manager = + let + gast = config.users.extraUsers.gast; + in + { + useGlobalPkgs = false; # to allow usage of home-level overlays + # FIXME: possibly expose home modules through flake outputs instead of brittle path traversals + users.gast = { + imports = [ + inputs.nur.hmModules.nur + ../home/modules/packages.nix + ]; + home = { + username = gast.name; + homeDirectory = gast.home; + stateVersion = "24.05"; + }; + schmittlauch = { + packages = { + graphics = true; + multimedia = true; + nixHelpers = true; + devTools = true; + pythonTools = true; + games = true; + desktopLinux = true; + kde = true; + }; + }; + + }; + # Optionally use extraSpecialArgs + # to pass through arguments to home.nix + extraSpecialArgs = { + inherit inputs system; + }; + + }; + + }; +} diff --git a/flake.nix b/flake.nix index 16786b7..796a574 100644 --- a/flake.nix +++ b/flake.nix @@ -59,7 +59,13 @@ flake-inputs = inputs; }; }; - defaultModules = system: [ inputInjection ]; + defaultModules = system: [ + inputInjection + + # for some reason, `imports`-ing the home-manager module via inputInjection + # from a sub-module causes infinite recursion, so importing it here instead + home-manager.nixosModules.home-manager + ]; mkSystem = system: extraModules: nixpkgs.lib.nixosSystem rec { @@ -115,6 +121,7 @@ modules = [ ./darwin/configuration.nix inputInjection + ]; }; homeConfigurations = { diff --git a/hosts/thinknix/default.nix b/hosts/thinknix/default.nix index 518f8ce..75bd887 100644 --- a/hosts/thinknix/default.nix +++ b/hosts/thinknix/default.nix @@ -22,6 +22,8 @@ speed = 180; }; + schmittlauch.guestUser.enable = true; + networking.hostName = "thinknix"; # This value determines the NixOS release with which your system is to be From eca857f396986a0b7242ec58fd525ca829531708 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 12 Aug 2024 19:24:21 +0200 Subject: [PATCH 099/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/14c333162ba53c02853add87a0000cbd7aa230c2' (2024-07-30) → 'github:NixOS/nixos-hardware/c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf' (2024-08-10) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/d04953086551086b44b6f3c6b7eeb26294f207da' (2024-08-02) → 'github:NixOS/nixpkgs/5e0ca22929f3342b19569b21b2f3462f053e497b' (2024-08-09) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/8b5b6723aca5a51edf075936439d9cd3947b7b2c' (2024-08-04) → 'github:NixOS/nixpkgs/a781ff33ae258bbcfd4ed6e673860c3e923bf2cc' (2024-08-10) • Updated input 'nur': 'github:nix-community/NUR/1261ebf63933d763c7eb2e3290782cf09d045fdb' (2024-08-05) → 'github:nix-community/NUR/a4f1c6cf98a629c082edc90fd84be7cc4525e244' (2024-08-12) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index bb9e943..679cc7d 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1722332872, - "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=", + "lastModified": 1723310128, + "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "14c333162ba53c02853add87a0000cbd7aa230c2", + "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1722630782, - "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", + "lastModified": 1723175592, + "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1722791413, - "narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=", + "lastModified": 1723282977, + "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c", + "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1722894411, - "narHash": "sha256-OUOJ/dglPQ/YAN/zYAdEzzhSUv84QF8px9JT4eQb4GA=", + "lastModified": 1723480705, + "narHash": "sha256-f7y2tpf8A6pYsTtizXIYzPEJjyaZ9J5yylptI/ot8jA=", "owner": "nix-community", "repo": "NUR", - "rev": "1261ebf63933d763c7eb2e3290782cf09d045fdb", + "rev": "a4f1c6cf98a629c082edc90fd84be7cc4525e244", "type": "github" }, "original": { From 49a32ffcec4a6bc028034d7e90b837bd07b7c1ac Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 16 Aug 2024 18:36:11 +0200 Subject: [PATCH 100/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/5e0ca22929f3342b19569b21b2f3462f053e497b' (2024-08-09) → 'github:NixOS/nixpkgs/c3aa7b8938b17aebd2deecf7be0636000d62a2b9' (2024-08-14) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/a781ff33ae258bbcfd4ed6e673860c3e923bf2cc' (2024-08-10) → 'github:NixOS/nixpkgs/c3d4ac725177c030b1e289015989da2ad9d56af0' (2024-08-15) • Updated input 'nur': 'github:nix-community/NUR/a4f1c6cf98a629c082edc90fd84be7cc4525e244' (2024-08-12) → 'github:nix-community/NUR/27fff3e7e6d489968a48a2348b712ffaaf04b50b' (2024-08-16) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 679cc7d..0f9cc44 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723282977, - "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", + "lastModified": 1723688146, + "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", + "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1723480705, - "narHash": "sha256-f7y2tpf8A6pYsTtizXIYzPEJjyaZ9J5yylptI/ot8jA=", + "lastModified": 1723825553, + "narHash": "sha256-M7w/KcMfA4iQE9dJrCRk/vbBBH2fbuJEeiu1pod7HwI=", "owner": "nix-community", "repo": "NUR", - "rev": "a4f1c6cf98a629c082edc90fd84be7cc4525e244", + "rev": "27fff3e7e6d489968a48a2348b712ffaaf04b50b", "type": "github" }, "original": { From 8363b8afb7b880791490ded4627bf7ad14abd623 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 20 Aug 2024 12:29:38 +0200 Subject: [PATCH 101/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf' (2024-08-10) → 'github:NixOS/nixos-hardware/b09c46430ffcf18d575acf5c339b38ac4e1db5d2' (2024-08-19) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/c3aa7b8938b17aebd2deecf7be0636000d62a2b9' (2024-08-14) → 'github:NixOS/nixpkgs/8a3354191c0d7144db9756a74755672387b702ba' (2024-08-18) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/c3d4ac725177c030b1e289015989da2ad9d56af0' (2024-08-15) → 'github:NixOS/nixpkgs/c42fcfbdfeae23e68fc520f9182dde9f38ad1890' (2024-08-17) • Updated input 'nur': 'github:nix-community/NUR/27fff3e7e6d489968a48a2348b712ffaaf04b50b' (2024-08-16) → 'github:nix-community/NUR/9a27918cf884fd22f99992506ff218699e091541' (2024-08-20) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 0f9cc44..7dcf077 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1723310128, - "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", + "lastModified": 1724067415, + "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", + "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723688146, - "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", + "lastModified": 1723938990, + "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", + "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1723825553, - "narHash": "sha256-M7w/KcMfA4iQE9dJrCRk/vbBBH2fbuJEeiu1pod7HwI=", + "lastModified": 1724148655, + "narHash": "sha256-5dXFoa/Z7tLyB3cRZiw7T+KAtGhQRAlm+Amp7LXtPhU=", "owner": "nix-community", "repo": "NUR", - "rev": "27fff3e7e6d489968a48a2348b712ffaaf04b50b", + "rev": "9a27918cf884fd22f99992506ff218699e091541", "type": "github" }, "original": { From c70ecdf6f5d06fcbc42273b38082867cd80fd43c Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 20 Aug 2024 12:34:06 +0200 Subject: [PATCH 102/330] hosts/framenix: switch to latest linux kernel virtualbox modules have been fixed with linux_6_10; kernel 6_9 has been removed --- hosts/framenix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 8facb4d..688dd48 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -27,7 +27,7 @@ in systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp"; # try newer kernels - boot.kernelPackages = pkgs.linuxPackages_6_8; # FIXME: virtualbox not yet compatible with 6.9 + boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelParams = [ # powersave From 19618e3e64f4ffc1db8d29a244d2c437399d0f9c Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 21 Aug 2024 10:28:27 +0200 Subject: [PATCH 103/330] vscodium: absolute path to direnv executable --- home/modules/vscodium.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 6cf9628..971b4b7 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -114,6 +114,7 @@ "editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace"; "vim.neovimPath" = lib.getExe pkgs.myVim; "sync-rsync.options" = [ ]; + "direnv.path.executable" = lib.getExe pkgs.direnv; }; }; } From 8aa81426fb45d69cc430e633b110d58f7d7324a1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 26 Aug 2024 19:07:48 +0200 Subject: [PATCH 104/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/b09c46430ffcf18d575acf5c339b38ac4e1db5d2' (2024-08-19) → 'github:NixOS/nixos-hardware/9fc19be21f0807d6be092d70bf0b1de0c00ac895' (2024-08-25) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/8a3354191c0d7144db9756a74755672387b702ba' (2024-08-18) → 'github:NixOS/nixpkgs/d0e1602ddde669d5beb01aec49d71a51937ed7be' (2024-08-24) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/c42fcfbdfeae23e68fc520f9182dde9f38ad1890' (2024-08-17) → 'github:NixOS/nixpkgs/797f7dc49e0bc7fab4b57c021cdf68f595e47841' (2024-08-22) • Updated input 'nur': 'github:nix-community/NUR/9a27918cf884fd22f99992506ff218699e091541' (2024-08-20) → 'github:nix-community/NUR/2594ab11ee4fa8e0ff71ab79b351c33ff7c5f59b' (2024-08-26) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 7dcf077..562e6f4 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1724067415, - "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=", + "lastModified": 1724575805, + "narHash": "sha256-OB/kEL3GAhUZmUfkbPfsPhKs0pRqJKs0EEBiLfyKZw8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2", + "rev": "9fc19be21f0807d6be092d70bf0b1de0c00ac895", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1723991338, - "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", + "lastModified": 1724479785, + "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a3354191c0d7144db9756a74755672387b702ba", + "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723938990, - "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=", + "lastModified": 1724316499, + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1724148655, - "narHash": "sha256-5dXFoa/Z7tLyB3cRZiw7T+KAtGhQRAlm+Amp7LXtPhU=", + "lastModified": 1724691468, + "narHash": "sha256-G4BnYs6QduHw6z1+8m9TEXAxckE5lylN68369uC7sYU=", "owner": "nix-community", "repo": "NUR", - "rev": "9a27918cf884fd22f99992506ff218699e091541", + "rev": "2594ab11ee4fa8e0ff71ab79b351c33ff7c5f59b", "type": "github" }, "original": { From 528a55b0319bc1970eed0d117bcd53d55a23c505 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 29 Aug 2024 23:09:49 +0200 Subject: [PATCH 105/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/9fc19be21f0807d6be092d70bf0b1de0c00ac895' (2024-08-25) → 'github:NixOS/nixos-hardware/95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef' (2024-08-28) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/d0e1602ddde669d5beb01aec49d71a51937ed7be' (2024-08-24) → 'github:NixOS/nixpkgs/71e91c409d1e654808b2621f28a327acfdad8dc2' (2024-08-28) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/797f7dc49e0bc7fab4b57c021cdf68f595e47841' (2024-08-22) → 'github:NixOS/nixpkgs/36bae45077667aff5720e5b3f1a5458f51cf0776' (2024-08-27) • Updated input 'nur': 'github:nix-community/NUR/2594ab11ee4fa8e0ff71ab79b351c33ff7c5f59b' (2024-08-26) → 'github:nix-community/NUR/028382e80bc3080d537e5592ab4e6dfa8789afeb' (2024-08-29) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 562e6f4..0add83c 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1724575805, - "narHash": "sha256-OB/kEL3GAhUZmUfkbPfsPhKs0pRqJKs0EEBiLfyKZw8=", + "lastModified": 1724878143, + "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9fc19be21f0807d6be092d70bf0b1de0c00ac895", + "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1724479785, - "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1724316499, - "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "lastModified": 1724727824, + "narHash": "sha256-0XH9MJk54imJm+RHOLTUJ7e+ponLW00tw5ke4MTVa1Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "rev": "36bae45077667aff5720e5b3f1a5458f51cf0776", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1724691468, - "narHash": "sha256-G4BnYs6QduHw6z1+8m9TEXAxckE5lylN68369uC7sYU=", + "lastModified": 1724963418, + "narHash": "sha256-BuTADtoqfqq8bGmuuWNbN+UAkHoJK60CvkYG3xxa4TY=", "owner": "nix-community", "repo": "NUR", - "rev": "2594ab11ee4fa8e0ff71ab79b351c33ff7c5f59b", + "rev": "028382e80bc3080d537e5592ab4e6dfa8789afeb", "type": "github" }, "original": { From bebe953170cf114cb5504ccd4f00f7583d5c64be Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 2 Sep 2024 19:01:09 +0200 Subject: [PATCH 106/330] 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-darwin': 'github:LnL7/nix-darwin/315aa649ba307704db0b16c92f097a08a65ec955' (2024-06-09) → 'github:LnL7/nix-darwin/7c4b53a7d9f3a3df902b3fddf2ae245ef20ebcda' (2024-09-01) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/71e91c409d1e654808b2621f28a327acfdad8dc2' (2024-08-28) → 'github:NixOS/nixpkgs/12228ff1752d7b7624a54e9c1af4b222b3c1073b' (2024-08-31) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/36bae45077667aff5720e5b3f1a5458f51cf0776' (2024-08-27) → 'github:NixOS/nixpkgs/6e99f2a27d600612004fbd2c3282d614bfee6421' (2024-08-30) • Updated input 'nur': 'github:nix-community/NUR/028382e80bc3080d537e5592ab4e6dfa8789afeb' (2024-08-29) → 'github:nix-community/NUR/1a44c52a2f9d5512d6f98d4cd79bd933a6501006' (2024-09-02) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 0add83c..8ebc79a 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1717976995, - "narHash": "sha256-u3HBinyIyUvL1+N816bODpJmSQdgn0Mbb8BprFw7kqo=", + "lastModified": 1725189302, + "narHash": "sha256-IhXok/kwQqtusPsoguQLCHA+h6gKvgdCrkhIaN+kByA=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "315aa649ba307704db0b16c92f097a08a65ec955", + "rev": "7c4b53a7d9f3a3df902b3fddf2ae245ef20ebcda", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1724727824, - "narHash": "sha256-0XH9MJk54imJm+RHOLTUJ7e+ponLW00tw5ke4MTVa1Y=", + "lastModified": 1725001927, + "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "36bae45077667aff5720e5b3f1a5458f51cf0776", + "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1724963418, - "narHash": "sha256-BuTADtoqfqq8bGmuuWNbN+UAkHoJK60CvkYG3xxa4TY=", + "lastModified": 1725295398, + "narHash": "sha256-Bhv3+i6L0+wo+y4gO/URERZg69Y7MUJiPWXDly1NUyU=", "owner": "nix-community", "repo": "NUR", - "rev": "028382e80bc3080d537e5592ab4e6dfa8789afeb", + "rev": "1a44c52a2f9d5512d6f98d4cd79bd933a6501006", "type": "github" }, "original": { From 40ebfb5720fc7cb4cce442a4326be2d526eec0fa Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 7 Sep 2024 18:38:32 +0200 Subject: [PATCH 107/330] 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/e1391fb22e18a36f57e6999c7a9f966dc80ac073' (2024-07-03) → 'github:nix-community/home-manager/208df2e558b73b6a1f0faec98493cb59a25f62ba' (2024-09-07) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef' (2024-08-28) → 'github:NixOS/nixos-hardware/04a1cda0c1725094a4db703cccbb956b7558f5a6' (2024-09-07) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/12228ff1752d7b7624a54e9c1af4b222b3c1073b' (2024-08-31) → 'github:NixOS/nixpkgs/574d1eac1c200690e27b8eb4e24887f8df7ac27c' (2024-09-06) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/6e99f2a27d600612004fbd2c3282d614bfee6421' (2024-08-30) → 'github:NixOS/nixpkgs/6f6c45b5134a8ee2e465164811e451dcb5ad86e3' (2024-09-03) • Updated input 'nur': 'github:nix-community/NUR/1a44c52a2f9d5512d6f98d4cd79bd933a6501006' (2024-09-02) → 'github:nix-community/NUR/63fc93a575265d2764ad65817e0415c24cfc8801' (2024-09-07) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 8ebc79a..67658b5 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1725703823, + "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", "type": "github" }, "original": { @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1724878143, - "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=", + "lastModified": 1725716377, + "narHash": "sha256-7NzW9O/cAw7iWzRfh7Oo/SuSudL4a1YTKS6yoh3tMck=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef", + "rev": "04a1cda0c1725094a4db703cccbb956b7558f5a6", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1725103162, - "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1725001927, - "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", + "lastModified": 1725407940, + "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", + "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1725295398, - "narHash": "sha256-Bhv3+i6L0+wo+y4gO/URERZg69Y7MUJiPWXDly1NUyU=", + "lastModified": 1725720394, + "narHash": "sha256-DMNkkUAI1bpRCaLYs+RR8+DFqfOh0ScBn/jjCQ3P0e4=", "owner": "nix-community", "repo": "NUR", - "rev": "1a44c52a2f9d5512d6f98d4cd79bd933a6501006", + "rev": "63fc93a575265d2764ad65817e0415c24cfc8801", "type": "github" }, "original": { From 87dc330a7a4796ce956f8f7f84a0e5fc001a1b3c Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 7 Sep 2024 19:17:37 +0200 Subject: [PATCH 108/330] nheko: need to permit insecure libolm for now --- common/packages.nix | 5 +++++ home/modules/packages.nix | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/common/packages.nix b/common/packages.nix index 2dce963..9634e2a 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -8,6 +8,11 @@ { # take overlays from flake nixpkgs.overlays = lib.attrValues config.inputInjection.flake-inputs.self.overlays; + nixpkgs.config.permittedInsecurePackages = [ + # (temporarily) permit the usage of libolm + "olm-3.2.16" + ]; + # List packages installed in system profile. environment.systemPackages = with pkgs; [ wget diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 9ce8eef..36ca4bd 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -255,6 +255,11 @@ in nixpkgs.overlays = import ../overlays.nix; nixpkgs.config = { + + # (temporarily) permit the usage of libolm + permittedInsecurePackages = [ + "olm-3.2.16" + ]; clementine.spotify = false; vim = { gui = "gtk3"; From 61c55cedbc69b52907102e3d4cb7591d4468f9a9 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 7 Sep 2024 19:21:16 +0200 Subject: [PATCH 109/330] logseq: need to permit insecure electron_27 --- common/packages.nix | 1 + home/modules/packages.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common/packages.nix b/common/packages.nix index 9634e2a..0a2852d 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -11,6 +11,7 @@ nixpkgs.config.permittedInsecurePackages = [ # (temporarily) permit the usage of libolm "olm-3.2.16" + "electron-27.3.11" # logseq ]; # List packages installed in system profile. diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 36ca4bd..70cf89c 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -256,8 +256,9 @@ in nixpkgs.overlays = import ../overlays.nix; nixpkgs.config = { - # (temporarily) permit the usage of libolm permittedInsecurePackages = [ + "electron-27.3.11" # logseq + # (temporarily) permit the usage of libolm "olm-3.2.16" ]; clementine.spotify = false; From 6aaebe41b64b7abb40ab4a8652c0d97e71d819fa Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 15 Sep 2024 21:31:29 +0200 Subject: [PATCH 110/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/04a1cda0c1725094a4db703cccbb956b7558f5a6' (2024-09-07) → 'github:NixOS/nixos-hardware/166dee4f88a7e3ba1b7a243edb1aca822f00680e' (2024-09-09) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/574d1eac1c200690e27b8eb4e24887f8df7ac27c' (2024-09-06) → 'github:NixOS/nixpkgs/345c263f2f53a3710abe117f28a5cb86d0ba4059' (2024-09-13) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/6f6c45b5134a8ee2e465164811e451dcb5ad86e3' (2024-09-03) → 'github:NixOS/nixpkgs/8f7492cce28977fbf8bd12c72af08b1f6c7c3e49' (2024-09-14) • Updated input 'nur': 'github:nix-community/NUR/63fc93a575265d2764ad65817e0415c24cfc8801' (2024-09-07) → 'github:nix-community/NUR/5f5fb09aa2c4ad0bded335c64e32427fa40c2196' (2024-09-15) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 67658b5..a4fa330 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1725716377, - "narHash": "sha256-7NzW9O/cAw7iWzRfh7Oo/SuSudL4a1YTKS6yoh3tMck=", + "lastModified": 1725885300, + "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "04a1cda0c1725094a4db703cccbb956b7558f5a6", + "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "lastModified": 1726243404, + "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1725407940, - "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=", + "lastModified": 1726320982, + "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3", + "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1725720394, - "narHash": "sha256-DMNkkUAI1bpRCaLYs+RR8+DFqfOh0ScBn/jjCQ3P0e4=", + "lastModified": 1726425354, + "narHash": "sha256-Vq8bOvXzaeZUaFaQPIiQtcrjjg0tACCCXz95wqBbd/0=", "owner": "nix-community", "repo": "NUR", - "rev": "63fc93a575265d2764ad65817e0415c24cfc8801", + "rev": "5f5fb09aa2c4ad0bded335c64e32427fa40c2196", "type": "github" }, "original": { From 217cdea685d69055b62f387f00904d3369458f42 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 20 Sep 2024 00:34:27 +0200 Subject: [PATCH 111/330] 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/208df2e558b73b6a1f0faec98493cb59a25f62ba' (2024-09-07) → 'github:nix-community/home-manager/2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594' (2024-09-17) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/166dee4f88a7e3ba1b7a243edb1aca822f00680e' (2024-09-09) → 'github:NixOS/nixos-hardware/10d5e0ecc32984c1bf1a9a46586be3451c42fd94' (2024-09-19) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/345c263f2f53a3710abe117f28a5cb86d0ba4059' (2024-09-13) → 'github:NixOS/nixpkgs/99dc8785f6a0adac95f5e2ab05cc2e1bf666d172' (2024-09-16) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/8f7492cce28977fbf8bd12c72af08b1f6c7c3e49' (2024-09-14) → 'github:NixOS/nixpkgs/086b448a5d54fd117f4dc2dee55c9f0ff461bdc1' (2024-09-16) • Updated input 'nur': 'github:nix-community/NUR/5f5fb09aa2c4ad0bded335c64e32427fa40c2196' (2024-09-15) → 'github:nix-community/NUR/d2f17676f18b4cbec111c4b597ccf1444da4b88c' (2024-09-19) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index a4fa330..8c831cc 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1725703823, - "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", + "lastModified": 1726592409, + "narHash": "sha256-2Y6CDvD/BD43WLS77PHu6dUHbdUfFhuzkY8oJAecD/U=", "owner": "nix-community", "repo": "home-manager", - "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", + "rev": "2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594", "type": "github" }, "original": { @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1725885300, - "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", + "lastModified": 1726724509, + "narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", + "rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1726243404, - "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", + "lastModified": 1726463316, + "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", + "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1726320982, - "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", + "lastModified": 1726447378, + "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", + "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1726425354, - "narHash": "sha256-Vq8bOvXzaeZUaFaQPIiQtcrjjg0tACCCXz95wqBbd/0=", + "lastModified": 1726785248, + "narHash": "sha256-4r609NVbf8nvuwyRGI8ti3qQzYpYwjfj8U2WelZhauo=", "owner": "nix-community", "repo": "NUR", - "rev": "5f5fb09aa2c4ad0bded335c64e32427fa40c2196", + "rev": "d2f17676f18b4cbec111c4b597ccf1444da4b88c", "type": "github" }, "original": { From 582137da76b4efd373fa27217e2bd923f6e5300b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 20 Sep 2024 00:49:20 +0200 Subject: [PATCH 112/330] flake.lock: update nixpkgs to ahead-of-channel necessary to fix build of framework-laptop-kmod, which hasn't reached the full channel yet --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8c831cc..b5c2884 100644 --- a/flake.lock +++ b/flake.lock @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1726447378, - "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", + "lastModified": 1726587953, + "narHash": "sha256-cF9f2snq4zJkiiQP1qlIau+MdjbeECWsCXrwIc/uqro=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", + "rev": "6c09f0ce2cb034efbce2cf4aa0b8c540332b652e", "type": "github" }, "original": { From 839474db579a9ac7fac2758bf90853d20909fc4b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 25 Sep 2024 10:15:58 +0200 Subject: [PATCH 113/330] 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/2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594' (2024-09-17) → 'github:nix-community/home-manager/2f23fa308a7c067e52dfcc30a0758f47043ec176' (2024-09-22) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/10d5e0ecc32984c1bf1a9a46586be3451c42fd94' (2024-09-19) → 'github:NixOS/nixos-hardware/d0cb432a9d28218df11cbd77d984a2a46caeb5ac' (2024-09-22) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/99dc8785f6a0adac95f5e2ab05cc2e1bf666d172' (2024-09-16) → 'github:NixOS/nixpkgs/9357f4f23713673f310988025d9dc261c20e70c6' (2024-09-21) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/6c09f0ce2cb034efbce2cf4aa0b8c540332b652e' (2024-09-17) → 'github:NixOS/nixpkgs/babc25a577c3310cce57c72d5bed70f4c3c3843a' (2024-09-23) • Updated input 'nur': 'github:nix-community/NUR/d2f17676f18b4cbec111c4b597ccf1444da4b88c' (2024-09-19) → 'github:nix-community/NUR/647a9128c5836fb89f3d42cdfe081f9c881bda0a' (2024-09-25) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index b5c2884..0b51261 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1726592409, - "narHash": "sha256-2Y6CDvD/BD43WLS77PHu6dUHbdUfFhuzkY8oJAecD/U=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1726724509, - "narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=", + "lastModified": 1727040444, + "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94", + "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1726463316, - "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", + "lastModified": 1726937504, + "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", + "rev": "9357f4f23713673f310988025d9dc261c20e70c6", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1726587953, - "narHash": "sha256-cF9f2snq4zJkiiQP1qlIau+MdjbeECWsCXrwIc/uqro=", + "lastModified": 1727129439, + "narHash": "sha256-nPyrcFm6FSk7CxzVW4x2hu62aLDghNcv9dX6DF3dXw8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c09f0ce2cb034efbce2cf4aa0b8c540332b652e", + "rev": "babc25a577c3310cce57c72d5bed70f4c3c3843a", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1726785248, - "narHash": "sha256-4r609NVbf8nvuwyRGI8ti3qQzYpYwjfj8U2WelZhauo=", + "lastModified": 1727250299, + "narHash": "sha256-c1lp1n//ltreWKOWqGmMenVarSm0Jq7m63rias+M88A=", "owner": "nix-community", "repo": "NUR", - "rev": "d2f17676f18b4cbec111c4b597ccf1444da4b88c", + "rev": "647a9128c5836fb89f3d42cdfe081f9c881bda0a", "type": "github" }, "original": { From 89edfd02b4f9e75457a489eaf1d9dc480ded1e28 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 29 Sep 2024 19:02:31 +0200 Subject: [PATCH 114/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/d0cb432a9d28218df11cbd77d984a2a46caeb5ac' (2024-09-22) → 'github:NixOS/nixos-hardware/f5c239fa9acb27f0a5326ba2949c00fada89ca9f' (2024-09-29) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/9357f4f23713673f310988025d9dc261c20e70c6' (2024-09-21) → 'github:NixOS/nixpkgs/1925c603f17fc89f4c8f6bf6f631a802ad85d784' (2024-09-26) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/babc25a577c3310cce57c72d5bed70f4c3c3843a' (2024-09-23) → 'github:NixOS/nixpkgs/fbca5e745367ae7632731639de5c21f29c8744ed' (2024-09-28) • Updated input 'nur': 'github:nix-community/NUR/647a9128c5836fb89f3d42cdfe081f9c881bda0a' (2024-09-25) → 'github:nix-community/NUR/8ad93a63359caf2ed00d647264a59ca030691c71' (2024-09-29) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 0b51261..13d27d3 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727040444, - "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=", + "lastModified": 1727613673, + "narHash": "sha256-qqIffTQfxMYo3MKQ9BoY2s2mdKZNnUiksdnxv81js9U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac", + "rev": "f5c239fa9acb27f0a5326ba2949c00fada89ca9f", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1726937504, - "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9357f4f23713673f310988025d9dc261c20e70c6", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1727129439, - "narHash": "sha256-nPyrcFm6FSk7CxzVW4x2hu62aLDghNcv9dX6DF3dXw8=", + "lastModified": 1727540905, + "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "babc25a577c3310cce57c72d5bed70f4c3c3843a", + "rev": "fbca5e745367ae7632731639de5c21f29c8744ed", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1727250299, - "narHash": "sha256-c1lp1n//ltreWKOWqGmMenVarSm0Jq7m63rias+M88A=", + "lastModified": 1727622222, + "narHash": "sha256-Nh4gmTLDYZTKfXWBdL8EocTOyKKn+3nXqlUlg6GcnRE=", "owner": "nix-community", "repo": "NUR", - "rev": "647a9128c5836fb89f3d42cdfe081f9c881bda0a", + "rev": "8ad93a63359caf2ed00d647264a59ca030691c71", "type": "github" }, "original": { From d35294dd16044dacbb392c1a2d826541ca5ca145 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 4 Oct 2024 21:14:11 +0200 Subject: [PATCH 115/330] vscodium: add editorconfig --- home/modules/vscodium.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 971b4b7..b5e4e71 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -20,6 +20,7 @@ eamodio.gitlens jnoortheen.nix-ide mkhl.direnv + editorconfig.editorconfig ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ { From 4dd4f535330755bc731957960c2b856412d16192 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 5 Oct 2024 20:49:54 +0200 Subject: [PATCH 116/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/f5c239fa9acb27f0a5326ba2949c00fada89ca9f' (2024-09-29) → 'github:NixOS/nixos-hardware/b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28' (2024-10-04) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/1925c603f17fc89f4c8f6bf6f631a802ad85d784' (2024-09-26) → 'github:NixOS/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb' (2024-10-04) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/fbca5e745367ae7632731639de5c21f29c8744ed' (2024-09-28) → 'github:NixOS/nixpkgs/6e6b3dd395c3b1eb9be9f2d096383a8d05add030' (2024-10-04) • Updated input 'nur': 'github:nix-community/NUR/8ad93a63359caf2ed00d647264a59ca030691c71' (2024-09-29) → 'github:nix-community/NUR/e04ee56d887b86becbcb7bcef332bdba891b5714' (2024-10-05) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 13d27d3..a2ebb3c 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727613673, - "narHash": "sha256-qqIffTQfxMYo3MKQ9BoY2s2mdKZNnUiksdnxv81js9U=", + "lastModified": 1728056216, + "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f5c239fa9acb27f0a5326ba2949c00fada89ca9f", + "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1727540905, - "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", + "lastModified": 1728067476, + "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbca5e745367ae7632731639de5c21f29c8744ed", + "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1727622222, - "narHash": "sha256-Nh4gmTLDYZTKfXWBdL8EocTOyKKn+3nXqlUlg6GcnRE=", + "lastModified": 1728153016, + "narHash": "sha256-MKjHJ7iSlZTSslIk8d+QwPNDBvrfz61pl6jl2wnyuo0=", "owner": "nix-community", "repo": "NUR", - "rev": "8ad93a63359caf2ed00d647264a59ca030691c71", + "rev": "e04ee56d887b86becbcb7bcef332bdba891b5714", "type": "github" }, "original": { From fc6163d562654e2d1f40e8fb6a152f2a1aea1dd7 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 10 Oct 2024 12:45:50 +0200 Subject: [PATCH 117/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28' (2024-10-04) → 'github:NixOS/nixos-hardware/ecfcd787f373f43307d764762e139a7cdeb9c22b' (2024-10-07) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb' (2024-10-04) → 'github:NixOS/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7' (2024-10-09) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/6e6b3dd395c3b1eb9be9f2d096383a8d05add030' (2024-10-04) → 'github:NixOS/nixpkgs/d51c28603def282a24fa034bcb007e2bcb5b5dd0' (2024-10-09) • Updated input 'nur': 'github:nix-community/NUR/e04ee56d887b86becbcb7bcef332bdba891b5714' (2024-10-05) → 'github:nix-community/NUR/202de6e51b808ed907886a74f7ea6b4ce0b47555' (2024-10-10) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index a2ebb3c..f73e42c 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728056216, - "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", + "lastModified": 1728269138, + "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", + "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728067476, - "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=", + "lastModified": 1728500571, + "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030", + "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1728153016, - "narHash": "sha256-MKjHJ7iSlZTSslIk8d+QwPNDBvrfz61pl6jl2wnyuo0=", + "lastModified": 1728550049, + "narHash": "sha256-7oceEn7K0Ee2N9SHRxQK92ljj8VCn1PBA36femqL768=", "owner": "nix-community", "repo": "NUR", - "rev": "e04ee56d887b86becbcb7bcef332bdba891b5714", + "rev": "202de6e51b808ed907886a74f7ea6b4ce0b47555", "type": "github" }, "original": { From 3212f22ae4b0c723a3b84867c9c4dd1dc3846493 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 11 Oct 2024 21:00:24 +0200 Subject: [PATCH 118/330] flake.lock: override nixpkgs ahead of channel for firefox update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index f73e42c..c5c7af0 100644 --- a/flake.lock +++ b/flake.lock @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728500571, - "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", + "lastModified": 1728497494, + "narHash": "sha256-QeGZV2hrLult2yLxBW9Cqlvs0QnH9okJeSTGQMGe+UU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", + "rev": "ef731473a871b7e29d0d6db1a936f120f69d5c2f", "type": "github" }, "original": { From b1ac7fda956100c01741f9d77b076a038c4379aa Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 16 Oct 2024 22:42:12 +0200 Subject: [PATCH 119/330] flake.lock: update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/7c4b53a7d9f3a3df902b3fddf2ae245ef20ebcda' (2024-09-01) → 'github:LnL7/nix-darwin/a60ac02f9466f85f092e576fd8364dfc4406b5a6' (2024-10-14) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/ecfcd787f373f43307d764762e139a7cdeb9c22b' (2024-10-07) → 'github:NixOS/nixos-hardware/a8dd1b21995964b115b1e3ec639dd6ce24ab9806' (2024-10-12) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7' (2024-10-09) → 'github:NixOS/nixpkgs/a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c' (2024-10-14) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/ef731473a871b7e29d0d6db1a936f120f69d5c2f' (2024-10-09) → 'github:NixOS/nixpkgs/c0b1da36f7c34a7146501f684e9ebdf15d2bebf8' (2024-10-14) • Updated input 'nur': 'github:nix-community/NUR/202de6e51b808ed907886a74f7ea6b4ce0b47555' (2024-10-10) → 'github:nix-community/NUR/64cba381284b537b49c7ca2e6fa532250f785fc1' (2024-10-16) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/4fc1c45a5f50169f9f29f6a98a438fb910b834ed' (2024-06-08) → 'github:numtide/treefmt-nix/5307ba60125bb024d7e52d71d582eafd511f3fee' (2024-10-16) • Updated input 'utils': 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11) → 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index c5c7af0..e0fb476 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1725189302, - "narHash": "sha256-IhXok/kwQqtusPsoguQLCHA+h6gKvgdCrkhIaN+kByA=", + "lastModified": 1728901530, + "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "7c4b53a7d9f3a3df902b3fddf2ae245ef20ebcda", + "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6", "type": "github" }, "original": { @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728269138, - "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", + "lastModified": 1728729581, + "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", + "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728497494, - "narHash": "sha256-QeGZV2hrLult2yLxBW9Cqlvs0QnH9okJeSTGQMGe+UU=", + "lastModified": 1728909085, + "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ef731473a871b7e29d0d6db1a936f120f69d5c2f", + "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1728550049, - "narHash": "sha256-7oceEn7K0Ee2N9SHRxQK92ljj8VCn1PBA36femqL768=", + "lastModified": 1729100838, + "narHash": "sha256-TuLRhJEIfOTi9Ej5pQ5MIq8TvZtUugpnRLrLY04NgUE=", "owner": "nix-community", "repo": "NUR", - "rev": "202de6e51b808ed907886a74f7ea6b4ce0b47555", + "rev": "64cba381284b537b49c7ca2e6fa532250f785fc1", "type": "github" }, "original": { @@ -394,11 +394,11 @@ ] }, "locked": { - "lastModified": 1717850719, - "narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=", + "lastModified": 1729077719, + "narHash": "sha256-zayHqZO9gA1U85c4CPvVSnLV8/cBgc2yVrSKWaKeBUs=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed", + "rev": "5307ba60125bb024d7e52d71d582eafd511f3fee", "type": "github" }, "original": { @@ -412,11 +412,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { From 4cc138eeabfb481dbf35493d6305d1a6e2c8d4b9 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 14 Oct 2024 23:55:14 +0200 Subject: [PATCH 120/330] framenix: add color profile of internal display source: https://www.notebookcheck.net/uploads/tx_nbc2/BOE_CQ_______NE135FBM_N41_03.icm --- .../internal_display_profile_xrite-i1pro2.icm | Bin 0 -> 9932 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 hosts/framenix/internal_display_profile_xrite-i1pro2.icm diff --git a/hosts/framenix/internal_display_profile_xrite-i1pro2.icm b/hosts/framenix/internal_display_profile_xrite-i1pro2.icm new file mode 100644 index 0000000000000000000000000000000000000000..e067230fb68346d9d9c9cdfc6575d97067e9e589 GIT binary patch literal 9932 zcmZQzP&>oGz`(#Hz`&53S5g$@?xYYA8KuDfoPm=;mO+q#jX^sxxwybL*e!&C38WGm z{&tOl5hQ+DHzLT{7sMg~^QWX1Co?cGS}-s$Y)Q^YOkrSPe8a%Npp#rsRKmc(B*DPI zAYWcm0AhpGh~$*!W->4^`7kgrh!jOcMlmojC4kuJ5OxWOodjWbfY?PLLCy>eOmi3* z7zENG>@^^E5`?`6#4bxt2bq6{fq_lmxx!6>fq~->1A{D=i%UQ-1A`g|0|NtRZfZ#) z1B03f0|Ubjh?~K_lymZTRd5cBR{#S)S3_e{Hz(hCKNCZ}%;a3K5(WkaIR+;Ne+E|u z1qNq^K!$h*1tjRl;L2dgV9a33;Kty@;L8xt;KyLXV921ykjaqD05<|=6uES9nz0dB zFC%ve0|RUJ|NoyI7#P@|Ffja+`~Uy<=Kufy&S79+e$T*gK&B+M0u+u6&iMtEMVaXt zB?=L`L763~Itre7$$AV7pfmzDi{aZf28RFt85k}*z{D6E3w;?U?>fb}qhTpbjDewe z3j>2y9RmY17eXxFmw{oc1_OfxD?&{9Dg%Q+1OvkkgXGepGKd`vj7+8s421ZQIE3n8 zW@KPsVqj#r%eb3q4s$(AI%^1<8@oM+J*OL22zMq=3-2<%v;02<)rBI3`$P_l{t`Ek zNRyl;bz1tjth!u)e3`;@#Vtx_lpm;kQ2ndUp&_6trX{5iz>v#uXlOhhW?!s4o^Hg>H6e{Q{GJdKAmv} z&rI=IO0#w6Sj=^v=Q}@QLE^&fMa7G&mozQySk|+=f5n8A6IS)F?pxEdwsT$E`lbza z8!I=JY|h`3xix89^!AV)zB^ra+3hylqqkRWpWJ@Y1H1=W5B@#$_3)b`PmbO>cIEh) z6Gu<(J+$=?y!<#C%#BOuk{&DBU-Rt*` z-rw|K{==?ErH|vEcswiUv7Ri^L723)VJR6jNVJU|Nr6n$8(>yeV+HF z?Q7n*(C@ZCRDbgR{QB$e@1uX#{+-Iez;K&!JJVF=GL{%tcQ$i&T@GzdeJ(3*AD&d+ z7QU7ImjxMw424rgW{X}D=ajIQERk9!eNC2GPDegip;)m;X_4|4mBXs%)NZKX*Lb4& zLhF_G8=beh@ATg3zc=`3_{r$2@eh+frvJ>DEjTR&t;DV6Y*cKu>tMUCnba>x+hsCYok~a$0gr@>27|3p@*Liu8+>OC(D9 z%2><(mVc}GQ2Dy*dG*tp$F+~^9@jr@c-i=_>2veXR)#kAcK!~DPQ@f)~dx$y!>xta5qn ziiVX9s~T4~u4!D`xUO-1(}t#vO`94wH*BffTC=Tcd&Q2@okhFycjxTM+?%#9X@C5I zn1hjrLJtQW@jvQ&%Z$G?y z@czPwLmxMPTKakVm#(ih-}1jF{RsQ%^~>(J@gI%9vj2qtbAn1GhK-CVOwvr(m}j!2 zu$r@pvi)Iy$MKr;BR2z&IIkIB41c@8cEMM|vLZpEtztXGUr9ZKGX_eXB#8W4lwEbDK-6YqMLEd!t8#XPsBAca2ZAZgP7hY@F6Kxp`ts ze`{Y`PkVPqS7&Eedv{w;Yi~ zI4^d7)PjhG;ful+hc5|V8n!HWx!(%+mA0!4SF5ZMTg$Qb=en2cZ*4fWap$I$n`dt6 z*jlkIV|(}x_nj8IG>( zkVm$U)t?AF`StY4vvbdPyjc9Q|5f$tj5ncgo!=R~SNb6Qk@@4-PtQKz_;Tv&?r&?q z&x6(lIH;%yUr-wYB+FPa=k46wVwvp|kH63Tqghd-FYvd8ed=26=)RhDn}nyoRq4CG zurC%c>MTrdw;yW<%Q<+dUA5| z^+i8wwpV}r@Z!afKTm3Q*VX>1DgE~O*Ug{bO12gsf4giaR$Tb&@IRE^E)SEB;%%_r~H^S8sLhi;bVN z|Bl>x{b$DiKQ8|tDgRz>{`@&FXzaX)?e6zlTNDKue;t^&toz5qUxxKplP$d1{2V7(__qJ~ z`b*LNm12{QW-u4e9{XpY6t@%fI^V%IddAUB76>bQrR%yZ7UX4J(HxOTxq$ar>0{ zPHK;49B~f*SgCJUu5ah^+*N4fuelvD!uC672+#Izl<>@Y^m@gN#pjjmRtt0cZk@jO z+oiqVL}UxadXi3EThjifLB)whpCM$rU0}$^nTluGa#U+?c+2maZnxl9md_&d?6BkU zUo9ULF>nYatn;(&Qiaf;*|#=- z7HHy=_VKj!3x0b!?)R0w-x^-|Pja)+EN+&Ytz?Q`s3zsWSeNVsEm z;7s+);{TVpEkp91tK5yB&iZEfQbS9#@K zvRSnZiC3pBT~-&i+A^gSTlanh94KSi6q@#RhQy-qnzhGf z#NGAtuv>BZyyYRL*q3MdH6A$kt=#y}_|_qg9B-?jwlfNrOIO`?KRz*XFIURP2-(7` zPBI#r|Fo8!lw+QC(*CmUm;UW<7A=~3?7gC9dT25C&6k%O6&bTbCa?aKZLq2_jm5+6 z>6M7TlKF`Y`&5?~w5*u(G<5H)v-3qZF?n5@*tql6FVkm%Up2YXZNrnV8#C+iIP9=m z;q^#{v&QdggYcY;kR^$NDjrw2NUeC@|0|*5Y1_6;*%^%Dztm$|H3Dx6d0$9aYW3pP zf;UZlORRLB>y*AV%?p~&ENEQ4Xxppv6S)5d=b22`i*%Ui%@lU^dbIojzJT|WUrDw- zn3UkA#FS_IGn8Pf3l5ukA-vx`=J5tWizf`I1_1CuAG%eUP?fa7dVeE0UmBJf*FJ@>T%ev$2R~gwE zxsg|Tcio&w@!#pOz3Qszn{1Zv>dTtPJLk{_)jr87OINLnpV@1XeMZ?ZC~wWbGrMls zzjhO!kn~|n^Yc}&4HHeZE-h3nIOqLXZ-Ub7?~0xI)|;D*UnTut!EKe~cH#Clx3HDx zG~AvSpEz;mK)_k!B~MDWh+aEjYX05Y_)XIP4c$_HOq=fgc;Q?dBi3qK}&w15_f1-15c?9!MjhNnw zE0#C!7_4}`@WQo^7tZW5VS1g^G^e?5&y?EQhs)#^cO0z>kG{g`ExdbypuYg8c=QmA;PJ!aF& z`x1+Kd9BLKMdznqdHOGKdc@(GE7r_X{`sp)PNEBjWGO z(w+6!LiZJItD6?`$8y%rg?7JFUSDZyGkLMvZvNu!YfI)ao6L`TIJ0n%2Fc?YF?Ijr*=A#J{z0UAr*1uQ&bN(|?xYn{u~##huxD<@-|M8@;+x zM~#DOkFav_UEb2z6!f^YC1%@mz5_eCJQEhImP__~u*Y<>tCdc+$E)B6znq+|P4Ea{ z4ioJ7KJW3*$KA0<8S?i<)znAdsQtX?U*IZZbhm*MKj}GiY%>aO{-eba@$T#-?l7a|L~ebSvKP%xMn5a=Gat(B32fwdd7>iM3sE@4vjtaxOa(#}p~s@!Q|y&M~fHvyfX&A9L3xtUk%vd)^}C z`N0dHYy z1%`zDsR~vb4$V=Xx@}91w{}Oy6#1`W?ps~fL@_dye(BrxtmW?^7RRE<`RcN>rb_JE z;H3FOA$Q}?ZEG0xJVF$%dDLf?vUDh4ouRR4$**(qB`13Bg?$ZrcTjceC4M6oEA@?6 z^Cv8CvI{Y1?%Mo_SuuihQ|ofaoqa9A8=hqG7iO(wP;{QKIcVC|x1QS$2#C)SivB3? z;>Z)A-+0KXZMCkT&~23%{0zdG0Y zgW=O7fr`8A4o{x*(exM3!nn#A%+}hM6GOLLnP)pA(d~r+ixac;8L#t)tPWk9-}XX6 zWd21lAN?ztOwSLV+N!p6x89{yOAA~inigJU%b2}b@pgY;{5@0MIj6bAXKs+w5VY>_ zS@hxHocGm*ch{aVa4wNxS~PR+)wK(K&MfrH&(cir3fph`?AJV_*~uJ9D|_OYmIiq# z@i1PLoMXpY#m}A+x+{&XJA>6Er|m|QS@M+kdu{&0EM2Q&5?L6tK2Gy0v+C_6{kXY(Z#7ou z?ND6(dDTXp-vMEtOwA7STukKXn6{u#KG92DF#NgHj5!BPep*gF9Xl(BW1G*^uQPXj zFIu$S2&9gu+Y{$F zl+<`|Z{^R4G>bf$G3Vl&XO|PWk6d{5uzCM?-V@t59XfNNkfW{7%Bg#TsO+Ku{wZtp zWM-(NbTITX`X$l+>dEGtPC`;$4*y=|%*Z*Hz$EqFuBzNXytL1X@+JY7;@g2Ny z>U@~Tm1z~6SLO<(ZBx)_*8Q~Z-Be$%o0@Lg@h;!*Uwa!CHbc;gukpf!8pI;IRP9+85f9lXN$4X8js!95G-1_5vQA&)ep2mr8g# zLG;LG(*wJ{|IOKMblB%YAxBf+tFOh+GKABD;@2-XoWNw_&9h_2Tt$ly30vQK@Lp|| zOl#_M7T6Nh9O`ILpHzKp_0J_Qaug+#u32O>N;w7W31(tnz4wmm924adDW-+FfozdI znu-eH&+T(-3(l+dr4;QERnko&qNQIiwiDa zX;XSGW$&g{nYOQE9vt41ci3y*w}iG!%kw$f{0`nMJ1oO|q;=hn#96PuTPAN1opyD( zV{hlQ=&x2TcdECxM$b%4dtt)ne3&IJ=ko>bVqQU+6uxa=Ba8NiuFx$Jy8TDNL|iv> z&-Gll7ba{@-M#z6BqMVKv(Iu#&hhEpt~gzNsMIGe&5mDc@^k#F-kr|8Ttzpm7a5cOnz>|A3wEL^`wT-2T^`0Bzi#-L5lBH-bN$ z^WsMFYKb*Exuu&N`xSV%FH-nX{eEw$w(%LBx$OxVA>~fn4w|iczTV&LhKWf*Lr(U` zSGjTDWY_K6|1)PYncmjD`#9)u$_^Z_QHn6d2#=_UGp_nvadw7 zXY`-5+S`xE$d!;|5VZL z%CNo7{3RgNKdt3lvO|yXp-%ZCu=C`tKcs2K4^x?R;7uUVF9aUd_-Al-s|Am^d<8wofs#QN0{d0TR zBerWr;)RXPqKks3MdZs!-`qHLUV8THd#(PnIHmqbaLB%iOYcdU%)&j@$VAFFhjaN- zSIM4Nx7H}n4lEP*-l-~P&2#9&3yVeD%X&*IoVzDqxxV7s#p~K#3vX;I-J%%dxSPFg zTF4m#HkZlwPE6xk^x%2Je_iX2$p>y$sWyiwMorp0bN5Prxw62;jzt>}3yAbO=9iVe zxi;ha_3ulgKl!`ASTavj*JNMAl(~GoYnr#Hx>{{;{&1AfIbq9HEB2+viT*p~bbaUg zG;a^v^8}NHA0sblc&sUjxXW|#=maM2qIKnQe!mW^klp;&g>z;5RLRCJ z**1sF?A4Q}PP(~DQm;hWr>euwYz5=we(t4HnsOJMj*FdK5-4d~u<@{fPHu0KL8Nfu zYMaQ|l_|YRYrfbB1?+Vfir3TJyskndSUhb)Qk!DJt=pG)zP@hE)z8=)In}iE0;9^N z+@A}pmfF_u)V31#+ugM5gHP-7M2>lE+G;&dX68IEu5COPGUqn4>R0ctCj&N|<5yJa zopxrE?Tv*WOn44nw(^T!Hp@t`t#x8lvtp^mijM(bN*fZ`IoCX2`~AcP<`b<zn(+bHs?y^!ja=foX z`75*3l6^y(-~L)-$A8eZw^3Jro|Aa>gCwvz;oU2Lr3*wqh-KZmgfW=!;BCEcJ1_p> zwSMxzZC|sT@^2s&mvf}ZEo9FmdT-vy>nCwykc9{ zZ4@x&alCTvt$=fjgn;5TZF!+gixgJrj)ieW{A;-xwE~kTRNmXNQI;$4uz*YN&0Skn zduOa!e$weELy={~MB%S-0s1UnR(B?wdT&3b5qo2yfN788l`wt(9PTh4$=5S^FK#d? zIAQqOI5>87;z|DANY$I?I^_)X#1^$FcFda8w?SZ1uIZH4J#4q9x$=7D{#t0Ked?N@ za_77zyCb`nz7M}W|N3>_f}c*3Ge6b}etG^n-t746`h^*JEzOFr2t96xz@B6Dp^B(>_bdG=RtACO2Pp+O8qrXqT?Tz!5ZFyT$@;=rI zCd#ie`?gwDu=_pthhG!6ZcNs#46TXZ^KD`3-1n#F*<`;=Taokc_N1+A^L5{HHoCR0 zW{s7uzJ94dAS2{Zl)$!)^}4z&jc!ZVL>^oxlXFlGbZM-$&z@=LN)9kzxE7m|`#R2hwdDiGgx7kzwtZXAy1jzo&aUna zYh`mD>dG~2e|6~Fj0RoadkyRd)>^;3b>pbmokxj*OYHSQ;wzVZ)WHsbbqo?3pFScK`A@JgqNH;qavJ`IR>=E#XOF_%(}JAO_yHgn6?3%n`?RN>050e-Vy!Ja~R<>zrx>yV2iEPK4a>ARI@`|-E9(bL1Xj|## zrJF@t3JJ4m^`n1TI!ZJgO53>W{OM``d<57WHtare>)Od_ZQj2o{M}ZP`zFa-Sha(h z;YMsrZtScDAHroC_KUT=HPDa#CF3Z=u}2ui3)*}QapgkWw)X435oJ$UZ>@Rz z)=9B%UCbMrf)%3V;tJeCND z!uu<4uD)lT8T0Rzk$&}6U-e$@gxY7R>!qG7DU@7ue$SiG%d<@wT6s4`eOp!QE5&eN zft>giSw{1#TOWi=G3@{5`a1u`uKKTS>sWkCb-zqyTd+RhE7NbiW9B7OZ-iVw6qm{H z?Uwn&oeQ(q{c5c3KJ2zDZfm_KbAxz5ts_s^`-mIU|L3dbGOo8_sBm0yZ}aEV=1X~f z_r3|8Jk5rw>h14@`#nkD_3uwH+pb#{b3?oTKwJbn%bI&zcf5DF?se->TqVo5Ti;{% zYwCu-k6N!<%?d*jbud_Disx-gUI%b&6iWc5YA zPg?sb;p*gR;mRS!N2=PV1@*41y7Vc_Bdag;eUjFj*wd>GS6F)OJstl}+N@0H*_`jr z_hshY^YpuVagVxTvfyS*y}jONVtTErg^WcFXER^2e%VniZY*v%TlwPdBTv>X^I65X zTR+Qe`GSqxSVOM1EJ}O-C-{8VwkV@OQQ__xdzk}5eO9H}Ms<3+p1H@l!tP+m*>hWk zCU?)+s~iw|##X#kX_<&&b^3zVnMT?bER`uYx9C~zE!JF+Pc15TFK$`Ugk=qXxFM)t<4D@e5>A<|6rK> zCe)Cd{on+d5Yf-hIy+Z)MOtvQJz217#wSKG-O!^tGAzzTAp2!%E1>GW&#boi^&v}) z?~tP9igjr}7_`$?!Fm4}ym!NR`%(q%4?JrD*;e2Ia>QD(QzBqpcgt>pL_cgl?6~&b znI^{@)@*k({liyBZ*CCy#^?0)Y3tXQTf<@^qe>LM^*MbNZTrf(Ei5I{s#xJ0pYvDO zwy&Do!g3;i6)Jr7bLM`{Bc671*2mP$BaK(A1$A}IVrFD!ADgk1l|ATv$d(O{3KF-i zl}w*@PugSe$DZ+QM;mTe#OoImHmIU`@9$ORR=FifA+lp zLo;7)bHN3b-`8JXJ$m}>uaeqt-`;QQkFCCcZ|AZnTg%Vv>R+aRW6rwr+h;%CudCm+ zbH|N8o93>}&4{?Clx_w(1|&zsX{&yUYr zF8}$3fBI~3_0^lNmi;<)^zgd*uTM{&Jbn4>%`baT=YM)v^rrgv+}HDWf2-EJpR)6( z_5B|g&T8+fbG{<7qjHndpR2lG+7$1nKDOU?EbYD?z5=hX*=&wS`rntQAKy9sU(_xymvddc>aJAF!p%Al4jwF7 zcl!O0lI7cv`RkXz=H{JruI%>Jqwk`3pExbyxAFVQlUb{u-OBsgWp7!t$!ceWyxg18 zieEQRzWP!B)hK@6i|TuVMIJxj{}Si-boj3{VJ-XFnm_ULUYnjf9xNmt`0w1jm{T9$ zpSkDjUcWthu5E1Ye7m}Rx86PDww$H+XZG8lo6ny7wfk${@@2a%cJwUQ>;G9(ywLpi z`d{4k|IV}Xf3fzjkIL8QJ2zkUjs4fNS-Y+FT2y>E;8$9@$^LcVw+nxh7-x2s{0#l| z@A327pMymo|G2z-wfJuD)pgrqZEMT+)&BYz`1bDheU|Vxc!=tQ7($?Q26#mi0|RJ%6$=9cLk|N3g8~Bs z187|p7lSiH5ko3NB0~v7K0^_MBSQg00YfH(AwvK|5ko#h8bc;S4nrzK5rZ#SRWU;; uSbYkEBSS7j5<@0KDnlLv$OXD^Jy{H?49QUQP)%`TNMy)iC}v1yU;qHW%_e^U literal 0 HcmV?d00001 From 15e816ddc1226cfd0b528636453315ce708e1fb9 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 21 Oct 2024 10:21:58 +0200 Subject: [PATCH 121/330] 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-darwin': 'github:LnL7/nix-darwin/a60ac02f9466f85f092e576fd8364dfc4406b5a6' (2024-10-14) → 'github:LnL7/nix-darwin/a001f44cfc47164839eb61c6b1e7f4288813f7e8' (2024-10-20) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/a8dd1b21995964b115b1e3ec639dd6ce24ab9806' (2024-10-12) → 'github:NixOS/nixos-hardware/9fcf30fccf8435f6390efec4a4d38e69c2268a36' (2024-10-20) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c' (2024-10-14) → 'github:NixOS/nixpkgs/4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0' (2024-10-18) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/c0b1da36f7c34a7146501f684e9ebdf15d2bebf8' (2024-10-14) → 'github:NixOS/nixpkgs/a9b86fc2290b69375c5542b622088eb6eca2a7c3' (2024-10-19) • Updated input 'nur': 'github:nix-community/NUR/64cba381284b537b49c7ca2e6fa532250f785fc1' (2024-10-16) → 'github:nix-community/NUR/41ca6cfe238fdfab2831386c5a65f5c0a01e1cfd' (2024-10-21) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/5307ba60125bb024d7e52d71d582eafd511f3fee' (2024-10-16) → 'github:numtide/treefmt-nix/d986489c1c757f6921a48c1439f19bfb9b8ecab5' (2024-10-18) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index e0fb476..5e41709 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1728901530, - "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=", + "lastModified": 1729382845, + "narHash": "sha256-REiWck1zIOnZIgGmmOWfwvkQw1f4UrBsxxOSKVSAG4w=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6", + "rev": "a001f44cfc47164839eb61c6b1e7f4288813f7e8", "type": "github" }, "original": { @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728729581, - "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", + "lastModified": 1729455275, + "narHash": "sha256-THqzn/7um3oMHUEGXyq+1CJQE7EogwR3HjLMNOlhFBE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", + "rev": "9fcf30fccf8435f6390efec4a4d38e69c2268a36", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728909085, - "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=", + "lastModified": 1729307008, + "narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8", + "rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1729100838, - "narHash": "sha256-TuLRhJEIfOTi9Ej5pQ5MIq8TvZtUugpnRLrLY04NgUE=", + "lastModified": 1729491640, + "narHash": "sha256-k2mR4w+yvko/JsWaH+1fIqjWRFixEs+jv/lNw8qnfkQ=", "owner": "nix-community", "repo": "NUR", - "rev": "64cba381284b537b49c7ca2e6fa532250f785fc1", + "rev": "41ca6cfe238fdfab2831386c5a65f5c0a01e1cfd", "type": "github" }, "original": { @@ -394,11 +394,11 @@ ] }, "locked": { - "lastModified": 1729077719, - "narHash": "sha256-zayHqZO9gA1U85c4CPvVSnLV8/cBgc2yVrSKWaKeBUs=", + "lastModified": 1729242555, + "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5307ba60125bb024d7e52d71d582eafd511f3fee", + "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5", "type": "github" }, "original": { From 7331808f4051b62d1746c1d2391eca1ac8094d5e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 27 Oct 2024 01:16:16 +0200 Subject: [PATCH 122/330] apply nixfmt --- common/packages.nix | 2 +- home/modules/packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/packages.nix b/common/packages.nix index 0a2852d..db8de1e 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -11,7 +11,7 @@ nixpkgs.config.permittedInsecurePackages = [ # (temporarily) permit the usage of libolm "olm-3.2.16" - "electron-27.3.11" # logseq + "electron-27.3.11" # logseq ]; # List packages installed in system profile. diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 70cf89c..5fc198a 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -257,7 +257,7 @@ in nixpkgs.config = { permittedInsecurePackages = [ - "electron-27.3.11" # logseq + "electron-27.3.11" # logseq # (temporarily) permit the usage of libolm "olm-3.2.16" ]; From c634bad2f0358b9ebe470dfbadb375a6ffb07999 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 27 Oct 2024 01:16:55 +0200 Subject: [PATCH 123/330] vscodium: explicitly declare extensions as mutable is the default value anyways --- home/modules/vscodium.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index b5e4e71..76b4c8d 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -10,6 +10,7 @@ programs.vscode = { enable = true; package = pkgs.vscodium; + mutableExtensionsDir = true; extensions = with pkgs.vscode-extensions; [ From 7394129ada414cf9bf39c0b075b1fefabe8eca74 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 25 Oct 2024 17:11:09 +0200 Subject: [PATCH 124/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/9fcf30fccf8435f6390efec4a4d38e69c2268a36' (2024-10-20) → 'github:NixOS/nixos-hardware/e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda' (2024-10-24) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0' (2024-10-18) → 'github:NixOS/nixpkgs/2768c7d042a37de65bb1b5b3268fc987e534c49d' (2024-10-23) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/a9b86fc2290b69375c5542b622088eb6eca2a7c3' (2024-10-19) → 'github:NixOS/nixpkgs/32e940c7c420600ef0d1ef396dc63b04ee9cad37' (2024-10-23) • Updated input 'nur': 'github:nix-community/NUR/41ca6cfe238fdfab2831386c5a65f5c0a01e1cfd' (2024-10-21) → 'github:nix-community/NUR/70b30d23d33ca2acfb267430b08ddf82ff7116b2' (2024-10-25) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 5e41709..46495a1 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729455275, - "narHash": "sha256-THqzn/7um3oMHUEGXyq+1CJQE7EogwR3HjLMNOlhFBE=", + "lastModified": 1729742320, + "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9fcf30fccf8435f6390efec4a4d38e69c2268a36", + "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1729307008, - "narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=", + "lastModified": 1729691686, + "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3", + "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1729491640, - "narHash": "sha256-k2mR4w+yvko/JsWaH+1fIqjWRFixEs+jv/lNw8qnfkQ=", + "lastModified": 1729868220, + "narHash": "sha256-OxHE1U+FIIaQ50nZpt/VxLH0bokiqsEqAshehlHhOFs=", "owner": "nix-community", "repo": "NUR", - "rev": "41ca6cfe238fdfab2831386c5a65f5c0a01e1cfd", + "rev": "70b30d23d33ca2acfb267430b08ddf82ff7116b2", "type": "github" }, "original": { From 5d330fe83c9ab8bb9b8defbfa47a9f1cf5f58b50 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 25 Oct 2024 17:23:09 +0200 Subject: [PATCH 125/330] nix settings: use (github) access tokens designated for github access tokens to public repos, avoiding rate limits in conference networks --- common/nix-settings.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/nix-settings.nix b/common/nix-settings.nix index eb8555d..a83f77e 100644 --- a/common/nix-settings.nix +++ b/common/nix-settings.nix @@ -31,4 +31,9 @@ in # use all cores for building cores = 0; }; + # TODO: manage access token with sops instead of manual deployment + # permissions: needs to be readable by the user invoking nix and root (for nix daemon) + nix.extraOptions = '' + !include /etc/nix/secrets.conf + ''; } From fc86b4ba9e91379db3c695a6c6962f418f24b892 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 27 Oct 2024 11:33:04 +0100 Subject: [PATCH 126/330] 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-darwin': 'github:LnL7/nix-darwin/a001f44cfc47164839eb61c6b1e7f4288813f7e8' (2024-10-20) → 'github:LnL7/nix-darwin/2eb472230a5400c81d9008014888b4bff23bcf44' (2024-10-26) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/2768c7d042a37de65bb1b5b3268fc987e534c49d' (2024-10-23) → 'github:NixOS/nixpkgs/18536bf04cd71abd345f9579158841376fdd0c5a' (2024-10-25) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/32e940c7c420600ef0d1ef396dc63b04ee9cad37' (2024-10-23) → 'github:NixOS/nixpkgs/cd3e8833d70618c4eea8df06f95b364b016d4950' (2024-10-26) • Updated input 'nur': 'github:nix-community/NUR/70b30d23d33ca2acfb267430b08ddf82ff7116b2' (2024-10-25) → 'github:nix-community/NUR/c99f74da05c901e064eb98218844ad652f7f9216' (2024-10-27) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/d986489c1c757f6921a48c1439f19bfb9b8ecab5' (2024-10-18) → 'github:numtide/treefmt-nix/aac86347fb5063960eccb19493e0cadcdb4205ca' (2024-10-22) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 46495a1..cdebfeb 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1729382845, - "narHash": "sha256-REiWck1zIOnZIgGmmOWfwvkQw1f4UrBsxxOSKVSAG4w=", + "lastModified": 1729982130, + "narHash": "sha256-HmLLQbX07rYD0RXPxbf3kJtUo66XvEIX9Y+N5QHQ9aY=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "a001f44cfc47164839eb61c6b1e7f4288813f7e8", + "rev": "2eb472230a5400c81d9008014888b4bff23bcf44", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1729665710, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1729691686, - "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1729868220, - "narHash": "sha256-OxHE1U+FIIaQ50nZpt/VxLH0bokiqsEqAshehlHhOFs=", + "lastModified": 1730021733, + "narHash": "sha256-VcnseUulfsZM4sXq+oC3cKTSrkVNLp7fJTchJIGCyi4=", "owner": "nix-community", "repo": "NUR", - "rev": "70b30d23d33ca2acfb267430b08ddf82ff7116b2", + "rev": "c99f74da05c901e064eb98218844ad652f7f9216", "type": "github" }, "original": { @@ -394,11 +394,11 @@ ] }, "locked": { - "lastModified": 1729242555, - "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=", + "lastModified": 1729613947, + "narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5", + "rev": "aac86347fb5063960eccb19493e0cadcdb4205ca", "type": "github" }, "original": { From cbbb08d737ac12368a2bdefc92f551eae5d52378 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 3 Nov 2024 22:50:33 +0100 Subject: [PATCH 127/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda' (2024-10-24) → 'github:NixOS/nixos-hardware/f6e0cd5c47d150c4718199084e5764f968f1b560' (2024-11-02) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/18536bf04cd71abd345f9579158841376fdd0c5a' (2024-10-25) → 'github:NixOS/nixpkgs/7ffd9ae656aec493492b44d0ddfb28e79a1ea25d' (2024-11-02) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/cd3e8833d70618c4eea8df06f95b364b016d4950' (2024-10-26) → 'github:NixOS/nixpkgs/080166c15633801df010977d9d7474b4a6c549d7' (2024-10-30) • Updated input 'nur': 'github:nix-community/NUR/c99f74da05c901e064eb98218844ad652f7f9216' (2024-10-27) → 'github:nix-community/NUR/32892eee6299e1948ccc7708680f503359205432' (2024-11-03) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index cdebfeb..5141057 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729742320, - "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=", + "lastModified": 1730537918, + "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda", + "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1729973466, - "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", + "lastModified": 1730327045, + "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", + "rev": "080166c15633801df010977d9d7474b4a6c549d7", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1730021733, - "narHash": "sha256-VcnseUulfsZM4sXq+oC3cKTSrkVNLp7fJTchJIGCyi4=", + "lastModified": 1730661288, + "narHash": "sha256-o6mpqPB5FtbX/UiT012G0IgW1J9aXpL0g6eEPUXhshQ=", "owner": "nix-community", "repo": "NUR", - "rev": "c99f74da05c901e064eb98218844ad652f7f9216", + "rev": "32892eee6299e1948ccc7708680f503359205432", "type": "github" }, "original": { From 5f506882bdcb5c2baba966933377f4123a075123 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 3 Nov 2024 23:24:31 +0100 Subject: [PATCH 128/330] services.dbus: try dbus-broker implementation --- common/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/default.nix b/common/default.nix index 98e4eda..da46b63 100644 --- a/common/default.nix +++ b/common/default.nix @@ -261,4 +261,6 @@ in # stop NetworkManager from managing virtual interfaces networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; + + services.dbus.implementation = "broker"; } From 3452d29784cabc73c337591fdbf8f6f40ada47ac Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 6 Nov 2024 21:09:56 +0100 Subject: [PATCH 129/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/f6e0cd5c47d150c4718199084e5764f968f1b560' (2024-11-02) → 'github:NixOS/nixos-hardware/e1cc1f6483393634aee94514186d21a4871e78d7' (2024-11-06) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/7ffd9ae656aec493492b44d0ddfb28e79a1ea25d' (2024-11-02) → 'github:NixOS/nixpkgs/4aa36568d413aca0ea84a1684d2d46f55dbabad7' (2024-11-05) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/080166c15633801df010977d9d7474b4a6c549d7' (2024-10-30) → 'github:NixOS/nixpkgs/d063c1dd113c91ab27959ba540c0d9753409edf3' (2024-11-04) • Updated input 'nur': 'github:nix-community/NUR/32892eee6299e1948ccc7708680f503359205432' (2024-11-03) → 'github:nix-community/NUR/51420b39807738ce2e8c43f034c35cd6bc920076' (2024-11-06) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 5141057..d7af2f7 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730537918, - "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=", + "lastModified": 1730919458, + "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560", + "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730327045, - "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "080166c15633801df010977d9d7474b4a6c549d7", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1730661288, - "narHash": "sha256-o6mpqPB5FtbX/UiT012G0IgW1J9aXpL0g6eEPUXhshQ=", + "lastModified": 1730923063, + "narHash": "sha256-QSy8CAkCkDImoLEyICxXtPW9N4rSC9QXcPE83OLXc1c=", "owner": "nix-community", "repo": "NUR", - "rev": "32892eee6299e1948ccc7708680f503359205432", + "rev": "51420b39807738ce2e8c43f034c35cd6bc920076", "type": "github" }, "original": { From 63dd050c7f1ea51c3b2dd99b09337d2afcf731b6 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 6 Nov 2024 21:41:28 +0100 Subject: [PATCH 130/330] qbittorrent: uninstall due to insecure --- home/modules/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 5fc198a..af65012 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -179,7 +179,7 @@ let yate # split and merge PDFs in a GUI pdfarranger - qbittorrent + #qbittorrent # currently insecure #(pkgs.pidgin-with-plugins.override { # plugins = [ pkgs.pidginotr ];}) From e162b116585a488e2bb8404eb92a45d3d85dacae Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 7 Nov 2024 11:09:33 +0100 Subject: [PATCH 131/330] 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/d063c1dd113c91ab27959ba540c0d9753409edf3' (2024-11-04) → 'github:NixOS/nixpkgs/dba414932936fde69f0606b4f1d87c5bc0003ede' (2024-11-06) • Updated input 'nur': 'github:nix-community/NUR/51420b39807738ce2e8c43f034c35cd6bc920076' (2024-11-06) → 'github:nix-community/NUR/3c01051ba399f2d48dd577043fe1cf1d062d11d2' (2024-11-07) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index d7af2f7..a2df909 100644 --- a/flake.lock +++ b/flake.lock @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "lastModified": 1730883749, + "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1730923063, - "narHash": "sha256-QSy8CAkCkDImoLEyICxXtPW9N4rSC9QXcPE83OLXc1c=", + "lastModified": 1730971751, + "narHash": "sha256-qEX+HcPueJj08oiVxjNkaoIB1gDkI/2NlG/HTIiN3Kg=", "owner": "nix-community", "repo": "NUR", - "rev": "51420b39807738ce2e8c43f034c35cd6bc920076", + "rev": "3c01051ba399f2d48dd577043fe1cf1d062d11d2", "type": "github" }, "original": { From c130cb7e88cd6566d9c0b718a147e7d0c0e59bd6 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 7 Nov 2024 21:28:01 +0100 Subject: [PATCH 132/330] 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/3c01051ba399f2d48dd577043fe1cf1d062d11d2' (2024-11-07) → 'github:nix-community/NUR/dc5cb7606d6359297287945f6908ddf9d60e20f3' (2024-11-07) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a2df909..faabe5d 100644 --- a/flake.lock +++ b/flake.lock @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1730971751, - "narHash": "sha256-qEX+HcPueJj08oiVxjNkaoIB1gDkI/2NlG/HTIiN3Kg=", + "lastModified": 1731008709, + "narHash": "sha256-RBUutTfh/bcvWHzjnqybjB50evgMYGngOG1Iosxbs0E=", "owner": "nix-community", "repo": "NUR", - "rev": "3c01051ba399f2d48dd577043fe1cf1d062d11d2", + "rev": "dc5cb7606d6359297287945f6908ddf9d60e20f3", "type": "github" }, "original": { From 2112af2c0fdaafbad847462a6b139acd9e94e010 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 11 Nov 2024 19:54:46 +0100 Subject: [PATCH 133/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/e1cc1f6483393634aee94514186d21a4871e78d7' (2024-11-06) → 'github:NixOS/nixos-hardware/184687ae1a3139faa4746168baf071f60d0310c8' (2024-11-11) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/4aa36568d413aca0ea84a1684d2d46f55dbabad7' (2024-11-05) → 'github:NixOS/nixpkgs/76612b17c0ce71689921ca12d9ffdc9c23ce40b2' (2024-11-09) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/dba414932936fde69f0606b4f1d87c5bc0003ede' (2024-11-06) → 'github:NixOS/nixpkgs/9256f7c71a195ebe7a218043d9f93390d49e6884' (2024-11-10) • Updated input 'nur': 'github:nix-community/NUR/dc5cb7606d6359297287945f6908ddf9d60e20f3' (2024-11-07) → 'github:nix-community/NUR/4d77b647a89d6405bfd2a6a2fecf613a3520683b' (2024-11-11) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index faabe5d..24228cd 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730919458, - "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", + "lastModified": 1731332224, + "narHash": "sha256-0ctfVp27ingWtY7dbP5+QpSQ98HaOZleU0teyHQUAw0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", + "rev": "184687ae1a3139faa4746168baf071f60d0310c8", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730883749, - "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=", + "lastModified": 1731239293, + "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede", + "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1731008709, - "narHash": "sha256-RBUutTfh/bcvWHzjnqybjB50evgMYGngOG1Iosxbs0E=", + "lastModified": 1731350327, + "narHash": "sha256-FQg83gsyB++oVNPg6QP9enTlYxG9d5K5wcdc8jE5tTk=", "owner": "nix-community", "repo": "NUR", - "rev": "dc5cb7606d6359297287945f6908ddf9d60e20f3", + "rev": "4d77b647a89d6405bfd2a6a2fecf613a3520683b", "type": "github" }, "original": { From 81eaea946c54b0e3362df9a01decc7057a791fa6 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 14 Nov 2024 15:53:51 +0100 Subject: [PATCH 134/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/76612b17c0ce71689921ca12d9ffdc9c23ce40b2' (2024-11-09) → 'github:NixOS/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/9256f7c71a195ebe7a218043d9f93390d49e6884' (2024-11-10) → 'github:NixOS/nixpkgs/689fed12a013f56d4c4d3f612489634267d86529' (2024-11-12) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 24228cd..b6617ed 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1729982130, - "narHash": "sha256-HmLLQbX07rYD0RXPxbf3kJtUo66XvEIX9Y+N5QHQ9aY=", + "lastModified": 1731454423, + "narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "2eb472230a5400c81d9008014888b4bff23bcf44", + "rev": "6c71c49e2448e51ad830ed211024e6d0edc50116", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "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": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731239293, - "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", + "lastModified": 1731386116, + "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", + "rev": "689fed12a013f56d4c4d3f612489634267d86529", "type": "github" }, "original": { From 1d4666739ce9d445d0f773ca02f9c6a17a83d05a Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 15 Nov 2024 00:57:05 +0100 Subject: [PATCH 135/330] 24.05 -> 24.11 beta - switching to NixOS 24.11 family of inputs - after th branchoff, no channel bump or home-manager release has been made yet, thus pointing towards some preliminary branches so far - had to disable a few packages for now --- common/default.nix | 2 +- flake.lock | 40 +++++++++++++++++++------------------- flake.nix | 6 ++++-- home/modules/packages.nix | 12 +++++++----- hosts/framenix/default.nix | 3 --- 5 files changed, 32 insertions(+), 31 deletions(-) diff --git a/common/default.nix b/common/default.nix index da46b63..9c00df7 100644 --- a/common/default.nix +++ b/common/default.nix @@ -42,7 +42,7 @@ in # Some programs need SUID wrappers, can be configured further or are # started in user sessions. - programs.bash.enableCompletion = true; + programs.bash.completion.enable = true; programs.wireshark = { enable = true; package = pkgs.wireshark; diff --git a/flake.lock b/flake.lock index b6617ed..38da4fb 100644 --- a/flake.lock +++ b/flake.lock @@ -117,16 +117,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1731604581, + "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "master", "repo": "home-manager", "type": "github" } @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731332224, - "narHash": "sha256-0ctfVp27ingWtY7dbP5+QpSQ98HaOZleU0teyHQUAw0=", + "lastModified": 1731403644, + "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "184687ae1a3139faa4746168baf071f60d0310c8", + "rev": "f6581f1c3b137086e42a08a906bdada63045f991", "type": "github" }, "original": { @@ -258,27 +258,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731386116, - "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", + "lastModified": 1731613620, + "narHash": "sha256-Qb4cpVp1pr29mvbqMROn7BcYt60GJ948RSM4UKU2DV4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "689fed12a013f56d4c4d3f612489634267d86529", + "rev": "f4a0fbc120cd775346111246b453f8af94afc1d1", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "release-24.11", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1731350327, - "narHash": "sha256-FQg83gsyB++oVNPg6QP9enTlYxG9d5K5wcdc8jE5tTk=", + "lastModified": 1731623759, + "narHash": "sha256-v7ow++vH4cgaWeKnMdt/HGmvFPqCTyzkghyY/JdkMGE=", "owner": "nix-community", "repo": "NUR", - "rev": "4d77b647a89d6405bfd2a6a2fecf613a3520683b", + "rev": "b53bdb77031c86c9525329368fdd87b28792b1db", "type": "github" }, "original": { @@ -394,11 +394,11 @@ ] }, "locked": { - "lastModified": 1729613947, - "narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=", + "lastModified": 1730321837, + "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "aac86347fb5063960eccb19493e0cadcdb4205ca", + "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", "type": "github" }, "original": { @@ -412,11 +412,11 @@ "systems": "systems_2" }, "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": { diff --git a/flake.nix b/flake.nix index 796a574..2bc13e4 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,13 @@ description = "NixOS system flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/release-24.11"; + #nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/master"; + #url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; lanzaboote = { diff --git a/home/modules/packages.nix b/home/modules/packages.nix index af65012..2d289ae 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -41,7 +41,7 @@ let musescore tenacity soundkonverter - config.nur.repos.fooker.studio-link + #config.nur.repos.fooker.studio-link ]; cliApps = @@ -150,7 +150,7 @@ let chromium falkon thunderbird - calibre + #calibre # FIXME: using bin due to failing tests dino zotero ding @@ -179,7 +179,7 @@ let yate # split and merge PDFs in a GUI pdfarranger - #qbittorrent # currently insecure + qbittorrent #(pkgs.pidgin-with-plugins.override { # plugins = [ pkgs.pidginotr ];}) @@ -193,12 +193,14 @@ let ]; kdeTools = - [ okteta ] + [ + okteta + plasma5Packages.kdeconnect-kde + ] ++ (with kdePackages; [ okular gwenview yakuake - kdeconnect dolphin spectacle kate diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 688dd48..86cb501 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -20,9 +20,6 @@ in networking.hostName = "framenix"; # Define your hostname. - # use newer linux-firmware from unstable - hardware.firmware = lib.mkBefore [ unstable.linux-firmware ]; - # override tmpdir for daemon systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp"; From 57b91bbcbec7cb4ff4c5f7289b123e5191446d4e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 15 Nov 2024 01:14:47 +0100 Subject: [PATCH 136/330] nix: repl-flake feature not required anymore --- common/nix-settings.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/common/nix-settings.nix b/common/nix-settings.nix index a83f77e..caa16f9 100644 --- a/common/nix-settings.nix +++ b/common/nix-settings.nix @@ -26,7 +26,6 @@ in experimental-features = [ "nix-command" "flakes" - "repl-flake" ]; # use all cores for building cores = 0; From 92dfeb989bdb6acb06120738c74d60cd9d61950a Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 15 Nov 2024 01:15:08 +0100 Subject: [PATCH 137/330] workmac: package name changes for 24.11 update --- home/workmac.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/workmac.nix b/home/workmac.nix index 5aab318..724f64f 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -23,7 +23,7 @@ in home.packages = [ wireshark # on NixOS systems enabled via system config - _1password + _1password-cli # also TODO: color schemes nix-darwin ]; From b8d2906190bb57fed54c7610e547ee7b8a4a19cc Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 15 Nov 2024 01:19:59 +0100 Subject: [PATCH 138/330] nixfmt(-rfc-style): rename to new default --- flake.nix | 2 +- home/modules/packages.nix | 2 +- home/modules/vscodium.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 2bc13e4..4162d81 100644 --- a/flake.nix +++ b/flake.nix @@ -102,7 +102,7 @@ { pkgs, ... }: { projectRootFile = "flake.nix"; - programs.nixfmt-rfc-style.enable = true; + programs.nixfmt.enable = true; }; in { diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 2d289ae..1e23bd1 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -91,7 +91,7 @@ let nixHelpers = [ nixpkgs-review - unstable.nixfmt-rfc-style + nixfmt nix-top statix ]; diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 76b4c8d..2a2fa42 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -78,7 +78,7 @@ "editor.formatOnSave" = false; "editor.formatOnType" = false; }; - "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style; + "nix.formatterPath" = lib.getExe pkgs.nixfmt; "nix.enableLanguageServer" = true; "nix.serverPath" = lib.getExe pkgs.nixd; "nix.serverSettings" = { }; From 8d9e6f53ad4a5f028fc30d804e9d60ab984d39d7 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 15 Nov 2024 20:58:09 +0100 Subject: [PATCH 139/330] nixfmt: still user RC style package --- home/modules/packages.nix | 2 +- home/modules/vscodium.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 1e23bd1..0d5fdd9 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -91,7 +91,7 @@ let nixHelpers = [ nixpkgs-review - nixfmt + nixfmt-rfc-style nix-top statix ]; diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 2a2fa42..76b4c8d 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -78,7 +78,7 @@ "editor.formatOnSave" = false; "editor.formatOnType" = false; }; - "nix.formatterPath" = lib.getExe pkgs.nixfmt; + "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style; "nix.enableLanguageServer" = true; "nix.serverPath" = lib.getExe pkgs.nixd; "nix.serverSettings" = { }; From f9e5a42ca94e8d64235ff825000bcb3d61a877c5 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 15 Nov 2024 20:58:45 +0100 Subject: [PATCH 140/330] calibre: continue to pull in from nixos-24.05 for now On 24.11, there's a test failure. --- flake.lock | 17 +++++++++++++++++ flake.nix | 1 + home/modules/packages.nix | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 38da4fb..d2f63a3 100644 --- a/flake.lock +++ b/flake.lock @@ -192,6 +192,22 @@ "type": "github" } }, + "nixos-2405": { + "locked": { + "lastModified": 1731386116, + "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "689fed12a013f56d4c4d3f612489634267d86529", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1731403644, @@ -324,6 +340,7 @@ "lanzaboote": "lanzaboote", "mysecrets": "mysecrets", "nix-darwin": "nix-darwin", + "nixos-2405": "nixos-2405", "nixos-hardware": "nixos-hardware", "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index 4162d81..fcdd618 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/release-24.11"; #nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixos-2405.url = "github:NixOS/nixpkgs/nixos-24.05"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 0d5fdd9..32b5f33 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -150,7 +150,7 @@ let chromium falkon thunderbird - #calibre # FIXME: using bin due to failing tests + inputs.nixos-unstable.legacyPackages.${system}.calibre # FIXME: test failure in 24.11 dino zotero ding From f253285bae1c127ee63e48065446bc683fb19ff9 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 19 Nov 2024 12:43:32 +0100 Subject: [PATCH 141/330] flake: switch to proper 24.11 channels --- flake.lock | 16 ++++++++-------- flake.nix | 6 ++---- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index d2f63a3..5964148 100644 --- a/flake.lock +++ b/flake.lock @@ -117,16 +117,16 @@ ] }, "locked": { - "lastModified": 1731604581, - "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", + "lastModified": 1731880681, + "narHash": "sha256-FmYTkIyPBUxSWgA7DPIVTsCCMvSSbs56yOtHpLNSnKg=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", + "rev": "aecd341dfead1c3ef7a3c15468ecd71e8343b7c6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -274,16 +274,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731613620, - "narHash": "sha256-Qb4cpVp1pr29mvbqMROn7BcYt60GJ948RSM4UKU2DV4=", + "lastModified": 1731755305, + "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f4a0fbc120cd775346111246b453f8af94afc1d1", + "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-24.11", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index fcdd618..fddebc0 100644 --- a/flake.nix +++ b/flake.nix @@ -2,14 +2,12 @@ description = "NixOS system flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/release-24.11"; - #nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixos-2405.url = "github:NixOS/nixpkgs/nixos-24.05"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager/master"; - #url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; lanzaboote = { From 5c9f10a9f1f7e55adc30496fe7895f36bcbdef14 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 20 Nov 2024 22:50:49 +0100 Subject: [PATCH 142/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/f6581f1c3b137086e42a08a906bdada63045f991' (2024-11-12) → 'github:NixOS/nixos-hardware/672ac2ac86f7dff2f6f3406405bddecf960e0db6' (2024-11-16) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11) → 'github:NixOS/nixpkgs/23e89b7da85c3640bbc2173fe04f4bd114342367' (2024-11-19) • Updated input 'nur': 'github:nix-community/NUR/b53bdb77031c86c9525329368fdd87b28792b1db' (2024-11-14) → 'github:nix-community/NUR/34ea536162b11e0db2449bd2eb248dccce1bb9e6' (2024-11-20) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 5964148..158c398 100644 --- a/flake.lock +++ b/flake.lock @@ -210,11 +210,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731403644, - "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", + "lastModified": 1731797098, + "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f6581f1c3b137086e42a08a906bdada63045f991", + "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", "type": "github" }, "original": { @@ -226,11 +226,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -290,11 +290,11 @@ }, "nur": { "locked": { - "lastModified": 1731623759, - "narHash": "sha256-v7ow++vH4cgaWeKnMdt/HGmvFPqCTyzkghyY/JdkMGE=", + "lastModified": 1732134607, + "narHash": "sha256-vWkWJWMujimxIan8vSSXmB6ujov6SgQca3wD4c2EGIk=", "owner": "nix-community", "repo": "NUR", - "rev": "b53bdb77031c86c9525329368fdd87b28792b1db", + "rev": "34ea536162b11e0db2449bd2eb248dccce1bb9e6", "type": "github" }, "original": { From d9981eead30231f850f9bb69ef392ced900e04ac Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 21 Nov 2024 15:32:21 +0100 Subject: [PATCH 143/330] libreoffice: switch to qt6 build also downgrade from fresh to still version --- home/modules/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 32b5f33..dbc1e22 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -163,7 +163,7 @@ let hunspellDicts.en-gb-ise seafile-client alacritty - libreoffice-qt # fresh with KDE integration + libreoffice-qt6 # still with KDE integration backintime-common anki signal-desktop From b3b209be35867f8d49b705109009236a3eb6a97b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 23 Nov 2024 13:40:56 +0100 Subject: [PATCH 144/330] 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/aecd341dfead1c3ef7a3c15468ecd71e8343b7c6' (2024-11-17) → 'github:nix-community/home-manager/f8831cc700030e11fc91da9ef6270593e6440edc' (2024-11-22) • Updated input 'nur': 'github:nix-community/NUR/34ea536162b11e0db2449bd2eb248dccce1bb9e6' (2024-11-20) → 'github:nix-community/NUR/86997491ed2896f76088abf22617a54a45f3d22e' (2024-11-23) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 158c398..6719f0d 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1731880681, - "narHash": "sha256-FmYTkIyPBUxSWgA7DPIVTsCCMvSSbs56yOtHpLNSnKg=", + "lastModified": 1732319136, + "narHash": "sha256-wpmPl6FkAF9Jj5C/rzANgpUjfzQrUYOn267LnzKU2uI=", "owner": "nix-community", "repo": "home-manager", - "rev": "aecd341dfead1c3ef7a3c15468ecd71e8343b7c6", + "rev": "f8831cc700030e11fc91da9ef6270593e6440edc", "type": "github" }, "original": { @@ -290,11 +290,11 @@ }, "nur": { "locked": { - "lastModified": 1732134607, - "narHash": "sha256-vWkWJWMujimxIan8vSSXmB6ujov6SgQca3wD4c2EGIk=", + "lastModified": 1732361011, + "narHash": "sha256-dSAfd7wSrxd0GtwGRaW7MJv3OBNyw3XLM5AU+6mAKL4=", "owner": "nix-community", "repo": "NUR", - "rev": "34ea536162b11e0db2449bd2eb248dccce1bb9e6", + "rev": "86997491ed2896f76088abf22617a54a45f3d22e", "type": "github" }, "original": { From 5510b5e2af0b298f47d2b8307080501a6801367b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 24 Nov 2024 00:50:28 +0100 Subject: [PATCH 145/330] 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/86997491ed2896f76088abf22617a54a45f3d22e' (2024-11-23) → 'github:nix-community/NUR/7a3e6d03844e420619c76108379d012026a45d10' (2024-11-23) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 6719f0d..5f93159 100644 --- a/flake.lock +++ b/flake.lock @@ -290,11 +290,11 @@ }, "nur": { "locked": { - "lastModified": 1732361011, - "narHash": "sha256-dSAfd7wSrxd0GtwGRaW7MJv3OBNyw3XLM5AU+6mAKL4=", + "lastModified": 1732405614, + "narHash": "sha256-Xi/S5NN8R75fy0SJmYfDv0ACGHqjL0Xc9fX7okOGt/g=", "owner": "nix-community", "repo": "NUR", - "rev": "86997491ed2896f76088abf22617a54a45f3d22e", + "rev": "7a3e6d03844e420619c76108379d012026a45d10", "type": "github" }, "original": { From 16cc85b93d7b02b597928d6a0204eb7e68ec4b4d Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 24 Nov 2024 00:58:46 +0100 Subject: [PATCH 146/330] ausweisapp: install on NixOS hosts, open firewall --- common/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/default.nix b/common/default.nix index 9c00df7..635b8ba 100644 --- a/common/default.nix +++ b/common/default.nix @@ -53,6 +53,11 @@ in programs.mtr.enable = true; # programs.gnupg.agent = { enable = true; enableSSHSupport = true; }; + programs.ausweisapp = { + enable = true; + openFirewall = true; + }; + # List services that you want to enable: # Enable the OpenSSH daemon. From 3869ef68413a4a253f7bdb82e889d0f0d9399fb1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 27 Nov 2024 00:19:30 +0100 Subject: [PATCH 147/330] 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-darwin': 'github:LnL7/nix-darwin/6c71c49e2448e51ad830ed211024e6d0edc50116?narHash=sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3%2BTDqfX3Kp63oM%3D' (2024-11-12) → 'github:LnL7/nix-darwin/6ab87b7c84d4ee873e937108c4ff80c015a40c7a?narHash=sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8%3D' (2024-11-26) • Updated input 'nixos-unstable': '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) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/057f63b6dc1a2c67301286152eb5af20747a9cb4?narHash=sha256-v5P3dk5JdiT%2B4x69ZaB18B8%2BRcu3TIOrcdG4uEX7WZ8%3D' (2024-11-16) → 'github:NixOS/nixpkgs/0c582677378f2d9ffcb01490af2f2c678dcb29d3?narHash=sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4%3D' (2024-11-23) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 5f93159..99f93a3 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1731454423, - "narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=", + "lastModified": 1732603785, + "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "6c71c49e2448e51ad830ed211024e6d0edc50116", + "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a", "type": "github" }, "original": { @@ -226,11 +226,11 @@ }, "nixos-unstable": { "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": { @@ -274,11 +274,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731755305, - "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", + "lastModified": 1732350895, + "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", + "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3", "type": "github" }, "original": { From 1dc8be97d2497271384c8919e203b84f140fd332 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 27 Nov 2024 00:56:02 +0100 Subject: [PATCH 148/330] Revert "calibre: continue to pull in from nixos-24.05 for now" This reverts commit f9e5a42ca94e8d64235ff825000bcb3d61a877c5. --- flake.lock | 17 ----------------- flake.nix | 1 - home/modules/packages.nix | 2 +- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 99f93a3..6800461 100644 --- a/flake.lock +++ b/flake.lock @@ -192,22 +192,6 @@ "type": "github" } }, - "nixos-2405": { - "locked": { - "lastModified": 1731386116, - "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "689fed12a013f56d4c4d3f612489634267d86529", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1731797098, @@ -340,7 +324,6 @@ "lanzaboote": "lanzaboote", "mysecrets": "mysecrets", "nix-darwin": "nix-darwin", - "nixos-2405": "nixos-2405", "nixos-hardware": "nixos-hardware", "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index fddebc0..0fac46e 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - nixos-2405.url = "github:NixOS/nixpkgs/nixos-24.05"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { diff --git a/home/modules/packages.nix b/home/modules/packages.nix index dbc1e22..83b203b 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -150,7 +150,7 @@ let chromium falkon thunderbird - inputs.nixos-unstable.legacyPackages.${system}.calibre # FIXME: test failure in 24.11 + #calibre # FIXME: using bin due to failing tests dino zotero ding From e7bcda274c9b39fa6ef454bbea3a4bff31052026 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 27 Nov 2024 01:18:11 +0100 Subject: [PATCH 149/330] calibre: unbreak, pull in from main nixpkgs again --- home/modules/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 83b203b..a164d91 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -150,7 +150,7 @@ let chromium falkon thunderbird - #calibre # FIXME: using bin due to failing tests + calibre dino zotero ding From b847233c5f3d256ab1797307bae9c14972771e3e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 1 Dec 2024 19:43:07 +0100 Subject: [PATCH 150/330] 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/f8831cc700030e11fc91da9ef6270593e6440edc' (2024-11-22) → 'github:nix-community/home-manager/62d536255879be574ebfe9b87c4ac194febf47c5' (2024-12-01) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/672ac2ac86f7dff2f6f3406405bddecf960e0db6' (2024-11-16) → 'github:NixOS/nixos-hardware/fe01780d356d70fd119a19277bff71d3e78dad00' (2024-12-01) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/4633a7c72337ea8fd23a4f2ba3972865e3ec685d' (2024-11-25) → 'github:NixOS/nixpkgs/970e93b9f82e2a0f3675757eb0bfc73297cc6370' (2024-11-28) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/0c582677378f2d9ffcb01490af2f2c678dcb29d3' (2024-11-23) → 'github:NixOS/nixpkgs/62c435d93bf046a5396f3016472e8f7c8e2aed65' (2024-11-30) • Updated input 'nur': 'github:nix-community/NUR/7a3e6d03844e420619c76108379d012026a45d10' (2024-11-23) → 'github:nix-community/NUR/2b3136c2f2b55f97424a6ffe5926e811e14b3c71' (2024-12-01) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 6800461..662ca8a 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1732319136, - "narHash": "sha256-wpmPl6FkAF9Jj5C/rzANgpUjfzQrUYOn267LnzKU2uI=", + "lastModified": 1733050161, + "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", "owner": "nix-community", "repo": "home-manager", - "rev": "f8831cc700030e11fc91da9ef6270593e6440edc", + "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", "type": "github" }, "original": { @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731797098, - "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "lastModified": 1733066523, + "narHash": "sha256-aQorWITXZu7b095UwnpUvcGt9dNJie/GO9r4hZfe2sU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "rev": "fe01780d356d70fd119a19277bff71d3e78dad00", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1732837521, + "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732350895, - "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=", + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1732405614, - "narHash": "sha256-Xi/S5NN8R75fy0SJmYfDv0ACGHqjL0Xc9fX7okOGt/g=", + "lastModified": 1733077621, + "narHash": "sha256-Zo1md8M9LzlfFIrM7/wfEtm/4TbiObWmTckJ7yrgiJw=", "owner": "nix-community", "repo": "NUR", - "rev": "7a3e6d03844e420619c76108379d012026a45d10", + "rev": "2b3136c2f2b55f97424a6ffe5926e811e14b3c71", "type": "github" }, "original": { From 7c10275bacf96db8b83d1bb6608794ab1767dc00 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 3 Dec 2024 22:29:13 +0100 Subject: [PATCH 151/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/fe01780d356d70fd119a19277bff71d3e78dad00' (2024-12-01) → 'github:NixOS/nixos-hardware/cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9' (2024-12-03) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/970e93b9f82e2a0f3675757eb0bfc73297cc6370' (2024-11-28) → 'github:NixOS/nixpkgs/55d15ad12a74eb7d4646254e13638ad0c4128776' (2024-12-03) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/62c435d93bf046a5396f3016472e8f7c8e2aed65' (2024-11-30) → 'github:NixOS/nixpkgs/f9f0d5c5380be0a599b1fb54641fa99af8281539' (2024-12-02) • Updated input 'nur': 'github:nix-community/NUR/2b3136c2f2b55f97424a6ffe5926e811e14b3c71' (2024-12-01) → 'github:nix-community/NUR/0c7ae4a63afbc6c305e401a06191380027f5ec73' (2024-12-03) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 662ca8a..8b00e7e 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733066523, - "narHash": "sha256-aQorWITXZu7b095UwnpUvcGt9dNJie/GO9r4hZfe2sU=", + "lastModified": 1733217105, + "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "fe01780d356d70fd119a19277bff71d3e78dad00", + "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1732837521, - "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732981179, - "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", + "lastModified": 1733120037, + "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", + "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nur": { "locked": { - "lastModified": 1733077621, - "narHash": "sha256-Zo1md8M9LzlfFIrM7/wfEtm/4TbiObWmTckJ7yrgiJw=", + "lastModified": 1733260004, + "narHash": "sha256-Uem1KaDdvbHcTxii4t1fuuFsJlC7WeEjmXH+i1ElR/I=", "owner": "nix-community", "repo": "NUR", - "rev": "2b3136c2f2b55f97424a6ffe5926e811e14b3c71", + "rev": "0c7ae4a63afbc6c305e401a06191380027f5ec73", "type": "github" }, "original": { From cd5a092b112fb657d2eedd73fb171bee159ce4f7 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 3 Dec 2024 22:31:19 +0100 Subject: [PATCH 152/330] framenix: switch back to stable kernel (6_6) Let's see whether this fixes a hang in bluetooth and network daemons. --- hosts/framenix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 86cb501..644c542 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -24,7 +24,7 @@ in systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp"; # try newer kernels - boot.kernelPackages = pkgs.linuxPackages_latest; + #boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelParams = [ # powersave From 98678d644df0fd29d258c463e77f8a2f2aef2493 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 8 Dec 2024 14:33:57 +0100 Subject: [PATCH 153/330] 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/62d536255879be574ebfe9b87c4ac194febf47c5' (2024-12-01) → 'github:nix-community/home-manager/c7ffc9727d115e433fd884a62dc164b587ff651d' (2024-12-07) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9' (2024-12-03) → 'github:NixOS/nixos-hardware/e563803af3526852b6b1d77107a81908c66a9fcf' (2024-12-06) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/55d15ad12a74eb7d4646254e13638ad0c4128776' (2024-12-03) → 'github:NixOS/nixpkgs/22c3f2cf41a0e70184334a958e6b124fb0ce3e01' (2024-12-07) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/f9f0d5c5380be0a599b1fb54641fa99af8281539' (2024-12-02) → 'github:NixOS/nixpkgs/4dc2fc4e62dbf62b84132fe526356fbac7b03541' (2024-12-05) • Updated input 'nur': 'github:nix-community/NUR/0c7ae4a63afbc6c305e401a06191380027f5ec73' (2024-12-03) → 'github:nix-community/NUR/ba5f9019335390ab605713c9e56428f031ba2a35' (2024-12-08) • Added input 'nur/flake-parts': 'github:hercules-ci/flake-parts/205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9' (2024-12-04) • Added input 'nur/flake-parts/nixpkgs-lib': follows 'nur/nixpkgs' • Added input 'nur/nixpkgs': 'github:nixos/nixpkgs/22c3f2cf41a0e70184334a958e6b124fb0ce3e01' (2024-12-07) • Added input 'nur/treefmt-nix': 'github:numtide/treefmt-nix/49717b5af6f80172275d47a418c9719a31a78b53' (2024-12-03) • Added input 'nur/treefmt-nix/nixpkgs': follows 'nur/nixpkgs' --- flake.lock | 97 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 80 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 8b00e7e..9cfe4ea 100644 --- a/flake.lock +++ b/flake.lock @@ -70,6 +70,27 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -117,11 +138,11 @@ ] }, "locked": { - "lastModified": 1733050161, - "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", + "lastModified": 1733572789, + "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", + "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", "type": "github" }, "original": { @@ -194,11 +215,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733217105, - "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", + "lastModified": 1733481457, + "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", + "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", "type": "github" }, "original": { @@ -210,11 +231,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", "type": "github" }, "original": { @@ -258,11 +279,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733120037, - "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=", + "lastModified": 1733412085, + "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539", + "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", "type": "github" }, "original": { @@ -272,13 +293,34 @@ "type": "github" } }, - "nur": { + "nixpkgs_3": { "locked": { - "lastModified": 1733260004, - "narHash": "sha256-Uem1KaDdvbHcTxii4t1fuuFsJlC7WeEjmXH+i1ElR/I=", + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nur": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_3", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1733663205, + "narHash": "sha256-7O+8rbX8eMBp4ZljoYcgXWx8n1u2rBL+Bfz387g87tA=", "owner": "nix-community", "repo": "NUR", - "rev": "0c7ae4a63afbc6c305e401a06191380027f5ec73", + "rev": "ba5f9019335390ab605713c9e56428f031ba2a35", "type": "github" }, "original": { @@ -328,7 +370,7 @@ "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs_2", "nur": "nur", - "treefmt-nix": "treefmt-nix", + "treefmt-nix": "treefmt-nix_2", "utils": "utils" } }, @@ -388,6 +430,27 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nixpkgs" From bc375742bcaa13941d46df1c65395f16d51c0144 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 8 Dec 2024 14:50:47 +0100 Subject: [PATCH 154/330] nur: adjust eval to flakyfication of upstream --- common/guest.nix | 1 - flake.nix | 1 - home/modules/fonts.nix | 2 +- home/modules/packages.nix | 5 +++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/common/guest.nix b/common/guest.nix index 7183bc1..2084b97 100644 --- a/common/guest.nix +++ b/common/guest.nix @@ -32,7 +32,6 @@ in # FIXME: possibly expose home modules through flake outputs instead of brittle path traversals users.gast = { imports = [ - inputs.nur.hmModules.nur ../home/modules/packages.nix ]; home = { diff --git a/flake.nix b/flake.nix index 0fac46e..8a5a03a 100644 --- a/flake.nix +++ b/flake.nix @@ -82,7 +82,6 @@ modules = [ { imports = [ - nur.hmModules.nur ./home/common.nix ./home/${confName}.nix ]; diff --git a/home/modules/fonts.nix b/home/modules/fonts.nix index 05aa897..6ce1185 100644 --- a/home/modules/fonts.nix +++ b/home/modules/fonts.nix @@ -15,7 +15,7 @@ twemoji-color-font open-sans (iosevka-bin.override { variant = "CurlySlab"; }) - config.nur.repos.schmittlauch.vollkorn + inputs.nur.legacyPackages.${system}.repos.schmittlauch.vollkorn # TODO: humor-sans # fcio corporate design, TODO module diff --git a/home/modules/packages.nix b/home/modules/packages.nix index a164d91..1d946fe 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -10,6 +10,7 @@ with pkgs; let cfg = config.schmittlauch.packages; unstable = inputs.nixos-unstable.legacyPackages.${system}; + nur = inputs.nur.legacyPackages.${system}; graphicsApps = [ @@ -41,7 +42,7 @@ let musescore tenacity soundkonverter - #config.nur.repos.fooker.studio-link + #nur.repos.fooker.studio-link ]; cliApps = @@ -86,7 +87,7 @@ let torsocks agrep reptyr # re-bind running program to other tty - config.nur.repos.schmittlauch.lolcommits + nur.repos.schmittlauch.lolcommits ]; nixHelpers = [ From e6a795f19225f34da07776f0cc6c59b1d5069a8d Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 8 Dec 2024 14:55:24 +0100 Subject: [PATCH 155/330] thinknix: fix pulseaudio --- common/pulseaudio.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/common/pulseaudio.nix b/common/pulseaudio.nix index 6ca211a..ed94170 100644 --- a/common/pulseaudio.nix +++ b/common/pulseaudio.nix @@ -12,4 +12,5 @@ zeroconf.discovery.enable = true; zeroconf.publish.enable = true; }; + services.pipewire.enable = false; # conflicts otherwise } From d3e98870d0999943ac9a8b97b34e1218e2b741f1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 10 Dec 2024 23:55:15 +0100 Subject: [PATCH 156/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/e563803af3526852b6b1d77107a81908c66a9fcf' (2024-12-06) → 'github:NixOS/nixos-hardware/cf737e2eba82b603f54f71b10cb8fd09d22ce3f5' (2024-12-10) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/22c3f2cf41a0e70184334a958e6b124fb0ce3e01' (2024-12-07) → 'github:NixOS/nixpkgs/a73246e2eef4c6ed172979932bc80e1404ba2d56' (2024-12-09) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/4dc2fc4e62dbf62b84132fe526356fbac7b03541' (2024-12-05) → 'github:NixOS/nixpkgs/e2605d0744c2417b09f8bf850dfca42fcf537d34' (2024-12-07) • Updated input 'nur': 'github:nix-community/NUR/ba5f9019335390ab605713c9e56428f031ba2a35' (2024-12-08) → 'github:nix-community/NUR/60ec80f9c90e6738562a5fb2a064cbb1c76205fe' (2024-12-10) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/22c3f2cf41a0e70184334a958e6b124fb0ce3e01' (2024-12-07) → 'github:nixos/nixpkgs/a73246e2eef4c6ed172979932bc80e1404ba2d56' (2024-12-09) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 9cfe4ea..423e0c9 100644 --- a/flake.lock +++ b/flake.lock @@ -215,11 +215,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733481457, - "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", + "lastModified": 1733861262, + "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", + "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1733581040, - "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -279,11 +279,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733412085, - "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", + "lastModified": 1733550349, + "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", + "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", "type": "github" }, "original": { @@ -295,11 +295,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1733581040, - "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1733663205, - "narHash": "sha256-7O+8rbX8eMBp4ZljoYcgXWx8n1u2rBL+Bfz387g87tA=", + "lastModified": 1733859927, + "narHash": "sha256-HysYThAHdDqwRh+mUw1eFxsVe/VIE5Nj0uC6lTByrgs=", "owner": "nix-community", "repo": "NUR", - "rev": "ba5f9019335390ab605713c9e56428f031ba2a35", + "rev": "60ec80f9c90e6738562a5fb2a064cbb1c76205fe", "type": "github" }, "original": { From 548e85b9ca04594f10cc40b61dbf161318e7ccb9 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 13 Dec 2024 18:53:46 +0100 Subject: [PATCH 157/330] 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/c7ffc9727d115e433fd884a62dc164b587ff651d' (2024-12-07) → 'github:nix-community/home-manager/1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f' (2024-12-11) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/a73246e2eef4c6ed172979932bc80e1404ba2d56' (2024-12-09) → 'github:NixOS/nixpkgs/5d67ea6b4b63378b9c13be21e2ec9d1afc921713' (2024-12-11) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/e2605d0744c2417b09f8bf850dfca42fcf537d34' (2024-12-07) → 'github:NixOS/nixpkgs/a0f3e10d94359665dba45b71b4227b0aeb851f8e' (2024-12-10) • Updated input 'nur': 'github:nix-community/NUR/60ec80f9c90e6738562a5fb2a064cbb1c76205fe' (2024-12-10) → 'github:nix-community/NUR/f568b212f0e24c41c74accef12feebb71a0111e7' (2024-12-13) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/a73246e2eef4c6ed172979932bc80e1404ba2d56' (2024-12-09) → 'github:nixos/nixpkgs/5d67ea6b4b63378b9c13be21e2ec9d1afc921713' (2024-12-11) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 423e0c9..45b200b 100644 --- a/flake.lock +++ b/flake.lock @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1733572789, - "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", + "lastModified": 1733951536, + "narHash": "sha256-Zb5ZCa7Xj+0gy5XVXINTSr71fCfAv+IKtmIXNrykT54=", "owner": "nix-community", "repo": "home-manager", - "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", + "rev": "1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -279,11 +279,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733550349, - "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", "type": "github" }, "original": { @@ -295,11 +295,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1733859927, - "narHash": "sha256-HysYThAHdDqwRh+mUw1eFxsVe/VIE5Nj0uC6lTByrgs=", + "lastModified": 1734108439, + "narHash": "sha256-9ui7KXWYEUT60l91TR3GJLoGIC45jSHhcxskt/vK4r0=", "owner": "nix-community", "repo": "NUR", - "rev": "60ec80f9c90e6738562a5fb2a064cbb1c76205fe", + "rev": "f568b212f0e24c41c74accef12feebb71a0111e7", "type": "github" }, "original": { From bff7aef220eab395d744f38d48cb399879948310 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 13 Dec 2024 19:03:07 +0100 Subject: [PATCH 158/330] darwin: add flyingcircus trusted substituters --- darwin/configuration.nix | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/darwin/configuration.nix b/darwin/configuration.nix index 779ab1c..819be37 100644 --- a/darwin/configuration.nix +++ b/darwin/configuration.nix @@ -2,7 +2,20 @@ { imports = [ ../common/nix-settings.nix ]; - nix.settings.trusted-users = [ "os" ]; + nix.settings = { + trusted-users = [ + "os" + "@admin" + ]; # @admin for linux-builder + substituters = [ + "https://s3.whq.fcio.net/hydra" + "https://hydra.flyingcircus.io" + ]; + trusted-public-keys = [ + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + "flyingcircus.io-1:Rr9CwiPv8cdVf3EQu633IOTb6iJKnWbVfCC8x8gVz2o=" + ]; + }; # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget environment.systemPackages = [ pkgs.vim ]; @@ -27,4 +40,12 @@ # $ darwin-rebuild changelog system.stateVersion = 4; nixpkgs.hostPlatform = "aarch64-darwin"; + + # local vm-backed linux builder as background service + nix.linux-builder = { + enable = true; + ephemeral = true; + maxJobs = 3; + }; + } From 8246c459b8c5cc9e099b2550487e8662ea51187c Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 13 Dec 2024 19:42:36 +0100 Subject: [PATCH 159/330] nix fmt --- common/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/default.nix b/common/default.nix index 635b8ba..a600ff3 100644 --- a/common/default.nix +++ b/common/default.nix @@ -249,7 +249,8 @@ in # ]; # } #]; - programs.ssh.knownHosts."build01.nix-community.org".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIElIQ54qAy7Dh63rBudYKdbzJHrrbrrMXLYl7Pkmk88H"; + programs.ssh.knownHosts."build01.nix-community.org".publicKey = + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIElIQ54qAy7Dh63rBudYKdbzJHrrbrrMXLYl7Pkmk88H"; # package debugging # programs.sysdig.enable = true; From ece12bce766ccd8a891f62e1d3c9f6a37a1ba841 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 17 Dec 2024 17:37:43 +0100 Subject: [PATCH 160/330] scripts/rsynchydra: fix specifying target directory --- home/scripts/reporsync.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/scripts/reporsync.nix b/home/scripts/reporsync.nix index c5fcb4c..8412c8c 100644 --- a/home/scripts/reporsync.nix +++ b/home/scripts/reporsync.nix @@ -79,6 +79,7 @@ rsynchydra() { _parse_rsync_args "$@" - _do_rsync "$RR_FROM" "hydra01" "$RR_TARGET" + # the name of RR_TO is a bit misleading, it just describes the 2nd positional arg here + _do_rsync "$RR_FROM" "hydra01" "$RR_TO" } '' From 7aecda084f6f3a5b01da1b20dcfd98f3708ca107 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 17 Dec 2024 18:13:59 +0100 Subject: [PATCH 161/330] workmac ssh config: recommended multiplexer settings --- home/workmac.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/home/workmac.nix b/home/workmac.nix index 724f64f..0aff0cb 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -32,11 +32,21 @@ in programs.ssh = { enable = true; + # defaults in bottom match block "*" + # TODO: common config for desktop as well + # multiplexer, e.g. to avoid rate limiting on jumphost usage + serverAliveInterval = 60; + controlMaster = "auto"; + controlPersist = "4h"; # ssh host config matchBlocks = { + # early catchall to enforce agent socket usage. **NOT** the place for fallback defaults. "*" = { - extraOptions.IdentityAgent = "\"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\""; + extraOptions = { + IdentityAgent = "\"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\""; + #ControlPath = "/tmp/ssh_mux_%h_%p_%r"; + }; }; "hydra01" = lib.hm.dag.entryAfter [ "*" ] { From 4e3efbfd37e3b7d288abca559288f3629e6db392 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 17 Dec 2024 18:16:34 +0100 Subject: [PATCH 162/330] 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/1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f?narHash=sha256-Zb5ZCa7Xj%2B0gy5XVXINTSr71fCfAv%2BIKtmIXNrykT54%3D' (2024-12-11) → 'github:nix-community/home-manager/80b0fdf483c5d1cb75aaad909bd390d48673857f?narHash=sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw%3D' (2024-12-16) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/6ab87b7c84d4ee873e937108c4ff80c015a40c7a?narHash=sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8%3D' (2024-11-26) → 'github:LnL7/nix-darwin/a35b08d09efda83625bef267eb24347b446c80b8?narHash=sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk%3D' (2024-12-07) • Updated input 'nixos-unstable': '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': 'github:NixOS/nixpkgs/a0f3e10d94359665dba45b71b4227b0aeb851f8e?narHash=sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk%3D' (2024-12-10) → 'github:NixOS/nixpkgs/394571358ce82dff7411395829aa6a3aad45b907?narHash=sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE%3D' (2024-12-16) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 45b200b..0e74fca 100644 --- a/flake.lock +++ b/flake.lock @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1733951536, - "narHash": "sha256-Zb5ZCa7Xj+0gy5XVXINTSr71fCfAv+IKtmIXNrykT54=", + "lastModified": 1734366194, + "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", "owner": "nix-community", "repo": "home-manager", - "rev": "1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f", + "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", "type": "github" }, "original": { @@ -200,11 +200,11 @@ ] }, "locked": { - "lastModified": 1732603785, - "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1733940404, - "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -279,11 +279,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733808091, - "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", + "lastModified": 1734323986, + "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", + "rev": "394571358ce82dff7411395829aa6a3aad45b907", "type": "github" }, "original": { From 68e18087322b6889651c640217d84bb4c1465d80 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 21 Dec 2024 13:47:00 +0100 Subject: [PATCH 163/330] home: install uv --- home/modules/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 1d946fe..f3356f9 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -126,6 +126,7 @@ let python3 # to shadow old macOS python notebook ipython + uv pip numpy matplotlib From b561f135300a6d5abcfd37062519b3f007035c21 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 24 Dec 2024 01:01:16 +0100 Subject: [PATCH 164/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/cf737e2eba82b603f54f71b10cb8fd09d22ce3f5' (2024-12-10) → 'github:NixOS/nixos-hardware/def1d472c832d77885f174089b0d34854b007198' (2024-12-23) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/3566ab7246670a43abd2ffa913cc62dad9cdf7d5' (2024-12-13) → 'github:NixOS/nixpkgs/d70bd19e0a38ad4790d3913bf08fcbfc9eeca507' (2024-12-19) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/394571358ce82dff7411395829aa6a3aad45b907' (2024-12-16) → 'github:NixOS/nixpkgs/1807c2b91223227ad5599d7067a61665c52d1295' (2024-12-22) • Updated input 'nur': 'github:nix-community/NUR/f568b212f0e24c41c74accef12feebb71a0111e7' (2024-12-13) → 'github:nix-community/NUR/a8e1efb1506aad043ea673b66fed0d9e7b5c1e7d' (2024-12-23) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/5d67ea6b4b63378b9c13be21e2ec9d1afc921713' (2024-12-11) → 'github:nixos/nixpkgs/d70bd19e0a38ad4790d3913bf08fcbfc9eeca507' (2024-12-19) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 0e74fca..5713858 100644 --- a/flake.lock +++ b/flake.lock @@ -215,11 +215,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733861262, - "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", + "lastModified": 1734954597, + "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", + "rev": "def1d472c832d77885f174089b0d34854b007198", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -279,11 +279,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734323986, - "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", + "lastModified": 1734875076, + "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "394571358ce82dff7411395829aa6a3aad45b907", + "rev": "1807c2b91223227ad5599d7067a61665c52d1295", "type": "github" }, "original": { @@ -295,11 +295,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1733940404, - "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734108439, - "narHash": "sha256-9ui7KXWYEUT60l91TR3GJLoGIC45jSHhcxskt/vK4r0=", + "lastModified": 1734993941, + "narHash": "sha256-f9u6sOICxRdwTavjhsThxX8Ryc3FF0KPWYqMdeDdPMY=", "owner": "nix-community", "repo": "NUR", - "rev": "f568b212f0e24c41c74accef12feebb71a0111e7", + "rev": "a8e1efb1506aad043ea673b66fed0d9e7b5c1e7d", "type": "github" }, "original": { From 9043b83af857a70b629bb4cccbefc3c137b6e7d1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 1 Jan 2025 20:21:57 +0100 Subject: [PATCH 165/330] 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/80b0fdf483c5d1cb75aaad909bd390d48673857f' (2024-12-16) → 'github:nix-community/home-manager/613691f285dad87694c2ba1c9e6298d04736292d' (2024-12-28) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/def1d472c832d77885f174089b0d34854b007198' (2024-12-23) → 'github:NixOS/nixos-hardware/7c674c6734f61157e321db595dbfcd8523e04e19' (2024-12-28) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/d70bd19e0a38ad4790d3913bf08fcbfc9eeca507' (2024-12-19) → 'github:NixOS/nixpkgs/88195a94f390381c6afcdaa933c2f6ff93959cb4' (2024-12-29) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/1807c2b91223227ad5599d7067a61665c52d1295' (2024-12-22) → 'github:NixOS/nixpkgs/3ffbbdbac0566a0977da3d2657b89cbcfe9a173b' (2024-12-30) • Updated input 'nur': 'github:nix-community/NUR/a8e1efb1506aad043ea673b66fed0d9e7b5c1e7d' (2024-12-23) → 'github:nix-community/NUR/ad83359075b1c5d774bfc4d1d08cac4970f62750' (2025-01-01) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/d70bd19e0a38ad4790d3913bf08fcbfc9eeca507' (2024-12-19) → 'github:nixos/nixpkgs/88195a94f390381c6afcdaa933c2f6ff93959cb4' (2024-12-29) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 5713858..302bdce 100644 --- a/flake.lock +++ b/flake.lock @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "lastModified": 1735344290, + "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "rev": "613691f285dad87694c2ba1c9e6298d04736292d", "type": "github" }, "original": { @@ -215,11 +215,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1734954597, - "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "def1d472c832d77885f174089b0d34854b007198", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -279,11 +279,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734875076, - "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", + "lastModified": 1735531152, + "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1807c2b91223227ad5599d7067a61665c52d1295", + "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "type": "github" }, "original": { @@ -295,11 +295,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734993941, - "narHash": "sha256-f9u6sOICxRdwTavjhsThxX8Ryc3FF0KPWYqMdeDdPMY=", + "lastModified": 1735749773, + "narHash": "sha256-G9vlT7OwddKhDEw3VXpjb43lep3913QcLAsPi1e8gY0=", "owner": "nix-community", "repo": "NUR", - "rev": "a8e1efb1506aad043ea673b66fed0d9e7b5c1e7d", + "rev": "ad83359075b1c5d774bfc4d1d08cac4970f62750", "type": "github" }, "original": { From 56a4901f3a9f5e74e588325f413e084064325d90 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 2 Jan 2025 23:19:29 +0100 Subject: [PATCH 166/330] lolcommit: remove package itself broken for a long time anyways, now also mplayer fails to build with xvideo support --- home/modules/packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index f3356f9..b364b62 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -87,7 +87,6 @@ let torsocks agrep reptyr # re-bind running program to other tty - nur.repos.schmittlauch.lolcommits ]; nixHelpers = [ From 56302a417571202d84ff4e63aa0ec1a6d96ebb1c Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 5 Jan 2025 00:51:55 +0100 Subject: [PATCH 167/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/88195a94f390381c6afcdaa933c2f6ff93959cb4' (2024-12-29) → 'github:NixOS/nixpkgs/6df24922a1400241dae323af55f30e4318a6ca65' (2025-01-02) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/3ffbbdbac0566a0977da3d2657b89cbcfe9a173b' (2024-12-30) → 'github:NixOS/nixpkgs/d29ab98cd4a70a387b8ceea3e930b3340d41ac5a' (2025-01-03) • Updated input 'nur': 'github:nix-community/NUR/ad83359075b1c5d774bfc4d1d08cac4970f62750' (2025-01-01) → 'github:nix-community/NUR/782119f4b55be55f6578f8387c1b9a8017719997' (2025-01-04) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/88195a94f390381c6afcdaa933c2f6ff93959cb4' (2024-12-29) → 'github:nixos/nixpkgs/6df24922a1400241dae323af55f30e4318a6ca65' (2025-01-02) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 302bdce..fea9e52 100644 --- a/flake.lock +++ b/flake.lock @@ -231,11 +231,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1735471104, - "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -279,11 +279,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735531152, - "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", + "lastModified": 1735922141, + "narHash": "sha256-vk0xwGZSlvZ/596yxOtsk4gxsIx2VemzdjiU8zhjgWw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", + "rev": "d29ab98cd4a70a387b8ceea3e930b3340d41ac5a", "type": "github" }, "original": { @@ -295,11 +295,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1735471104, - "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735749773, - "narHash": "sha256-G9vlT7OwddKhDEw3VXpjb43lep3913QcLAsPi1e8gY0=", + "lastModified": 1736027142, + "narHash": "sha256-AZ5YNuV9w8SSxCM2KYnvcqntxPKED53oMjDotEj5jyU=", "owner": "nix-community", "repo": "NUR", - "rev": "ad83359075b1c5d774bfc4d1d08cac4970f62750", + "rev": "782119f4b55be55f6578f8387c1b9a8017719997", "type": "github" }, "original": { From 123396329e6b6d64e2c1411b73ca5b675d59e896 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 7 Jan 2025 19:50:20 +0100 Subject: [PATCH 168/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/7c674c6734f61157e321db595dbfcd8523e04e19' (2024-12-28) → 'github:NixOS/nixos-hardware/ca30f8501ab452ca687a7fdcb2d43e1fb1732317' (2025-01-07) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/6df24922a1400241dae323af55f30e4318a6ca65' (2025-01-02) → 'github:NixOS/nixpkgs/8f3e1f807051e32d8c95cd12b9b421623850a34d' (2025-01-04) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/d29ab98cd4a70a387b8ceea3e930b3340d41ac5a' (2025-01-03) → 'github:NixOS/nixpkgs/3f0a8ac25fb674611b98089ca3a5dd6480175751' (2025-01-06) • Updated input 'nur': 'github:nix-community/NUR/782119f4b55be55f6578f8387c1b9a8017719997' (2025-01-04) → 'github:nix-community/NUR/706045eb80f347d5418e81c5aa80d6c410394991' (2025-01-07) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/6df24922a1400241dae323af55f30e4318a6ca65' (2025-01-02) → 'github:nixos/nixpkgs/8f3e1f807051e32d8c95cd12b9b421623850a34d' (2025-01-04) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index fea9e52..872a2b1 100644 --- a/flake.lock +++ b/flake.lock @@ -215,11 +215,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1735388221, - "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", + "lastModified": 1736237814, + "narHash": "sha256-uTdscVaKjnRnBIMuu/oWwdiGhYd/JOQ4YZGHeCoroqs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", + "rev": "ca30f8501ab452ca687a7fdcb2d43e1fb1732317", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -279,11 +279,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735922141, - "narHash": "sha256-vk0xwGZSlvZ/596yxOtsk4gxsIx2VemzdjiU8zhjgWw=", + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d29ab98cd4a70a387b8ceea3e930b3340d41ac5a", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "type": "github" }, "original": { @@ -295,11 +295,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736027142, - "narHash": "sha256-AZ5YNuV9w8SSxCM2KYnvcqntxPKED53oMjDotEj5jyU=", + "lastModified": 1736268958, + "narHash": "sha256-O3cfbKgDb8A5VsUN0fPVpNf2EEFO5itnbkTYP+Vsuto=", "owner": "nix-community", "repo": "NUR", - "rev": "782119f4b55be55f6578f8387c1b9a8017719997", + "rev": "706045eb80f347d5418e81c5aa80d6c410394991", "type": "github" }, "original": { From 2e3cce839d949fadbe649f6d90b0fe8e56160ef8 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 10 Jan 2025 23:18:36 +0100 Subject: [PATCH 169/330] 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/613691f285dad87694c2ba1c9e6298d04736292d' (2024-12-28) → 'github:nix-community/home-manager/bd65bc3cde04c16755955630b344bc9e35272c56' (2025-01-08) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/ca30f8501ab452ca687a7fdcb2d43e1fb1732317' (2025-01-07) → 'github:NixOS/nixos-hardware/8870dcaff63dfc6647fb10648b827e9d40b0a337' (2025-01-09) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/8f3e1f807051e32d8c95cd12b9b421623850a34d' (2025-01-04) → 'github:NixOS/nixpkgs/bffc22eb12172e6db3c5dde9e3e5628f8e3e7912' (2025-01-08) • Updated input 'nur': 'github:nix-community/NUR/706045eb80f347d5418e81c5aa80d6c410394991' (2025-01-07) → 'github:nix-community/NUR/51f5fcef1e6cacea56c32313e5512652b761d19f' (2025-01-10) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/8f3e1f807051e32d8c95cd12b9b421623850a34d' (2025-01-04) → 'github:nixos/nixpkgs/bffc22eb12172e6db3c5dde9e3e5628f8e3e7912' (2025-01-08) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 872a2b1..7928eca 100644 --- a/flake.lock +++ b/flake.lock @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1735344290, - "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "613691f285dad87694c2ba1c9e6298d04736292d", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { @@ -215,11 +215,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1736237814, - "narHash": "sha256-uTdscVaKjnRnBIMuu/oWwdiGhYd/JOQ4YZGHeCoroqs=", + "lastModified": 1736441705, + "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ca30f8501ab452ca687a7fdcb2d43e1fb1732317", + "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "type": "github" }, "original": { @@ -295,11 +295,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736268958, - "narHash": "sha256-O3cfbKgDb8A5VsUN0fPVpNf2EEFO5itnbkTYP+Vsuto=", + "lastModified": 1736545051, + "narHash": "sha256-mhRO/Dss93wbJlo11dZEGSxPkat2sUEyH1mIC0D5B0Y=", "owner": "nix-community", "repo": "NUR", - "rev": "706045eb80f347d5418e81c5aa80d6c410394991", + "rev": "51f5fcef1e6cacea56c32313e5512652b761d19f", "type": "github" }, "original": { From 7c0006cff7c5c16f4cb0a6decb50ac2a5a78e98e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 10 Jan 2025 23:19:42 +0100 Subject: [PATCH 170/330] spacer: add as home package --- home/modules/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index b364b62..73ac231 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -87,6 +87,7 @@ let torsocks agrep reptyr # re-bind running program to other tty + spacer ]; nixHelpers = [ From 5aa96711a499c65c22bb93e1a2739a55f0cb8a0f Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 15 Jan 2025 23:48:07 +0100 Subject: [PATCH 171/330] 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-darwin': 'github:LnL7/nix-darwin/a35b08d09efda83625bef267eb24347b446c80b8?narHash=sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk%3D' (2024-12-07) → 'github:LnL7/nix-darwin/bd921223ba7cdac346477d7ea5204d6f4736fcc6?narHash=sha256-deQVtIH4UJueELJqluAICUtX7OosD9paTP%2B5FgbiSwI%3D' (2025-01-14) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/8870dcaff63dfc6647fb10648b827e9d40b0a337?narHash=sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb%2BmxySIP93o%3D' (2025-01-09) → 'github:NixOS/nixos-hardware/b678606690027913f3434dea3864e712b862dde5?narHash=sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk%3D' (2025-01-15) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/bffc22eb12172e6db3c5dde9e3e5628f8e3e7912?narHash=sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc%2Bc2c%3D' (2025-01-08) → 'github:NixOS/nixpkgs/9abb87b552b7f55ac8916b6fc9e5cb486656a2f3?narHash=sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ%3D' (2025-01-13) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/3f0a8ac25fb674611b98089ca3a5dd6480175751?narHash=sha256-JO%2BlFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I%3D' (2025-01-06) → 'github:NixOS/nixpkgs/9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc?narHash=sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8%3D' (2025-01-14) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 7928eca..d1c9628 100644 --- a/flake.lock +++ b/flake.lock @@ -200,11 +200,11 @@ ] }, "locked": { - "lastModified": 1733570843, - "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", + "lastModified": 1736819234, + "narHash": "sha256-deQVtIH4UJueELJqluAICUtX7OosD9paTP+5FgbiSwI=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "a35b08d09efda83625bef267eb24347b446c80b8", + "rev": "bd921223ba7cdac346477d7ea5204d6f4736fcc6", "type": "github" }, "original": { @@ -215,11 +215,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1736441705, - "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", + "lastModified": 1736978406, + "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", + "rev": "b678606690027913f3434dea3864e712b862dde5", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "lastModified": 1736798957, + "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", "type": "github" }, "original": { @@ -279,11 +279,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736200483, - "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", + "lastModified": 1736867362, + "narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc", "type": "github" }, "original": { From e2467646d8bb6f3207a684532c224b04888b6515 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 15 Jan 2025 23:58:17 +0100 Subject: [PATCH 172/330] nix-darwin: move to stable branch --- flake.lock | 7 ++++--- flake.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index d1c9628..97ea330 100644 --- a/flake.lock +++ b/flake.lock @@ -200,15 +200,16 @@ ] }, "locked": { - "lastModified": 1736819234, - "narHash": "sha256-deQVtIH4UJueELJqluAICUtX7OosD9paTP+5FgbiSwI=", + "lastModified": 1736820923, + "narHash": "sha256-SDuKLOWAh8VJRXlNWQn9QE99bjeEUAAbYXqrKGbsiyk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "bd921223ba7cdac346477d7ea5204d6f4736fcc6", + "rev": "944c2b181792ae7ae6b20c0df3f44879c11706c9", "type": "github" }, "original": { "owner": "LnL7", + "ref": "nix-darwin-24.11", "repo": "nix-darwin", "type": "github" } diff --git a/flake.nix b/flake.nix index 8a5a03a..5053a22 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nix-darwin = { - url = "github:LnL7/nix-darwin"; + url = "github:LnL7/nix-darwin/nix-darwin-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; From ba88e4604634d00bd0ed5b23810f79fa799700fa Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 16 Jan 2025 22:11:50 +0100 Subject: [PATCH 173/330] lazygit: config via home-manager --- home/common.nix | 10 ++++++++++ home/modules/packages.nix | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/home/common.nix b/home/common.nix index 46cf0cf..657bb57 100644 --- a/home/common.nix +++ b/home/common.nix @@ -75,6 +75,16 @@ }; }; }; + programs.lazygit = { + enable = true; + settings = { + git = { + autoFetch = false; + mainBranches = ["main" "master" "mainline"]; + }; + update.method = "never"; + }; + }; # shell config programs.zsh = { diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 73ac231..1d2a5f5 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -106,7 +106,6 @@ let ripgrep fd gitui - lazygit pre-commit scriv From 67904896a2797276b82202516f12e23550bd0cd3 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 16 Jan 2025 22:12:48 +0100 Subject: [PATCH 174/330] git: push --force-if-includes as default stronger protection against accidentally overwriting remote commits by another user, especially in the face of auto-fetching git clients. --- home/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/common.nix b/home/common.nix index 657bb57..e38801a 100644 --- a/home/common.nix +++ b/home/common.nix @@ -44,6 +44,7 @@ extraConfig = { credential.helper = "cache"; push.default = "simple"; + push.forceIfIncludes = true; # avoid accidental force overrides when remote is autofetched in background init.defaultBranch = "mainline"; diff.tool = "vimdiff"; merge.tool = "vimdiff"; From 31238451a94403d869eacdf549d8c67563132c95 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 20 Jan 2025 18:54:18 +0100 Subject: [PATCH 175/330] spacer: install on all platforms --- home/modules/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 1d2a5f5..ed223b6 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -77,6 +77,7 @@ let jq age lnav + spacer nix-output-monitor # putting this here as a plain `nix` alternative ] @@ -87,7 +88,6 @@ let torsocks agrep reptyr # re-bind running program to other tty - spacer ]; nixHelpers = [ From fc13bcc773c7ddac139c067702499e34c6aa8526 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 26 Jan 2025 23:47:06 +0100 Subject: [PATCH 176/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/b678606690027913f3434dea3864e712b862dde5' (2025-01-15) → 'github:NixOS/nixos-hardware/dfad538f751a5aa5d4436d9781ab27a6128ec9d4' (2025-01-24) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/9abb87b552b7f55ac8916b6fc9e5cb486656a2f3' (2025-01-13) → 'github:NixOS/nixpkgs/852ff1d9e153d8875a83602e03fdef8a63f0ecf8' (2025-01-26) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc' (2025-01-14) → 'github:NixOS/nixpkgs/035f8c0853c2977b24ffc4d0a42c74f00b182cd8' (2025-01-23) • Updated input 'nur': 'github:nix-community/NUR/51f5fcef1e6cacea56c32313e5512652b761d19f' (2025-01-10) → 'github:nix-community/NUR/d8b236e8d1ecd476478d45d5fcad21af4a2c46ca' (2025-01-26) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/bffc22eb12172e6db3c5dde9e3e5628f8e3e7912' (2025-01-08) → 'github:nixos/nixpkgs/852ff1d9e153d8875a83602e03fdef8a63f0ecf8' (2025-01-26) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 97ea330..8abfe4f 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1736978406, - "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=", + "lastModified": 1737751639, + "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b678606690027913f3434dea3864e712b862dde5", + "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736867362, - "narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=", + "lastModified": 1737672001, + "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc", + "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -317,11 +317,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736545051, - "narHash": "sha256-mhRO/Dss93wbJlo11dZEGSxPkat2sUEyH1mIC0D5B0Y=", + "lastModified": 1737928024, + "narHash": "sha256-E3Y7NbbguVWz+J/xG20Grbns3v+y42QAxFuTxEiQN60=", "owner": "nix-community", "repo": "NUR", - "rev": "51f5fcef1e6cacea56c32313e5512652b761d19f", + "rev": "d8b236e8d1ecd476478d45d5fcad21af4a2c46ca", "type": "github" }, "original": { From 27bf2c407eb209254a644bc5a08f2a3ef6dfd73c Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 27 Jan 2025 09:17:28 +0100 Subject: [PATCH 177/330] 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/035f8c0853c2977b24ffc4d0a42c74f00b182cd8' (2025-01-23) → 'github:NixOS/nixpkgs/4e96537f163fad24ed9eb317798a79afc85b51b7' (2025-01-26) • Updated input 'nur': 'github:nix-community/NUR/d8b236e8d1ecd476478d45d5fcad21af4a2c46ca' (2025-01-26) → 'github:nix-community/NUR/c706c146d36922bd1c91a2a6a09e096d5fb3c8cf' (2025-01-27) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8abfe4f..89d14e5 100644 --- a/flake.lock +++ b/flake.lock @@ -280,11 +280,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1737672001, - "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", + "lastModified": 1737885640, + "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", + "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7", "type": "github" }, "original": { @@ -317,11 +317,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737928024, - "narHash": "sha256-E3Y7NbbguVWz+J/xG20Grbns3v+y42QAxFuTxEiQN60=", + "lastModified": 1737963870, + "narHash": "sha256-Wrg4KIXsbj19xJMM/x34MmpaV2z5tJOHnlS1wACAlrM=", "owner": "nix-community", "repo": "NUR", - "rev": "d8b236e8d1ecd476478d45d5fcad21af4a2c46ca", + "rev": "c706c146d36922bd1c91a2a6a09e096d5fb3c8cf", "type": "github" }, "original": { From 937bc54b974ba9943b8ffd25da32ab35d88b2680 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 29 Jan 2025 00:40:29 +0100 Subject: [PATCH 178/330] 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-darwin': 'github:LnL7/nix-darwin/944c2b181792ae7ae6b20c0df3f44879c11706c9?narHash=sha256-SDuKLOWAh8VJRXlNWQn9QE99bjeEUAAbYXqrKGbsiyk%3D' (2025-01-14) → 'github:LnL7/nix-darwin/cae8d1c4a3bd37be5887203fe3b0c3a860c53a07?narHash=sha256-/hgw8fDKDpko0XqOw1e9tX8lS2Hqecg7W/JsONun6Qc%3D' (2025-01-21) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 89d14e5..f439df9 100644 --- a/flake.lock +++ b/flake.lock @@ -200,11 +200,11 @@ ] }, "locked": { - "lastModified": 1736820923, - "narHash": "sha256-SDuKLOWAh8VJRXlNWQn9QE99bjeEUAAbYXqrKGbsiyk=", + "lastModified": 1737421067, + "narHash": "sha256-/hgw8fDKDpko0XqOw1e9tX8lS2Hqecg7W/JsONun6Qc=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "944c2b181792ae7ae6b20c0df3f44879c11706c9", + "rev": "cae8d1c4a3bd37be5887203fe3b0c3a860c53a07", "type": "github" }, "original": { From bc50c1d16e998d76abcdd4d00b6c36ad81295384 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 1 Feb 2025 16:15:57 +0100 Subject: [PATCH 179/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/dfad538f751a5aa5d4436d9781ab27a6128ec9d4' (2025-01-24) → 'github:NixOS/nixos-hardware/34b64e4e1ddb14e3ffc7db8d4a781396dbbab773' (2025-02-01) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/852ff1d9e153d8875a83602e03fdef8a63f0ecf8' (2025-01-26) → 'github:NixOS/nixpkgs/9d3ae807ebd2981d593cddd0080856873139aa40' (2025-01-29) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/4e96537f163fad24ed9eb317798a79afc85b51b7' (2025-01-26) → 'github:NixOS/nixpkgs/666e1b3f09c267afd66addebe80fb05a5ef2b554' (2025-01-30) • Updated input 'nur': 'github:nix-community/NUR/c706c146d36922bd1c91a2a6a09e096d5fb3c8cf' (2025-01-27) → 'github:nix-community/NUR/95ddad0ff0e67c90314c6ca46324dce5f9a910d2' (2025-01-31) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/852ff1d9e153d8875a83602e03fdef8a63f0ecf8' (2025-01-26) → 'github:nixos/nixpkgs/9d3ae807ebd2981d593cddd0080856873139aa40' (2025-01-29) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index f439df9..703be66 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1737751639, - "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", + "lastModified": 1738391520, + "narHash": "sha256-6HI58PKjddsC0RA0gBQlt6ox47oH//jLUHwx05RO8g0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", + "rev": "34b64e4e1ddb14e3ffc7db8d4a781396dbbab773", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "lastModified": 1738142207, + "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1737885640, - "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=", + "lastModified": 1738277201, + "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7", + "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "lastModified": 1738142207, + "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "type": "github" }, "original": { @@ -317,11 +317,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737963870, - "narHash": "sha256-Wrg4KIXsbj19xJMM/x34MmpaV2z5tJOHnlS1wACAlrM=", + "lastModified": 1738362438, + "narHash": "sha256-EO2dVkMVLThWqv4hobEZEZGWBEuH2Z9SYqQDrbLSclU=", "owner": "nix-community", "repo": "NUR", - "rev": "c706c146d36922bd1c91a2a6a09e096d5fb3c8cf", + "rev": "95ddad0ff0e67c90314c6ca46324dce5f9a910d2", "type": "github" }, "original": { From a1fcb91bcd44813a44926b1236d5d96c1148461d Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 1 Feb 2025 17:53:36 +0100 Subject: [PATCH 180/330] framenix: switch back to linux_latest kernel --- hosts/framenix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 644c542..86cb501 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -24,7 +24,7 @@ in systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp"; # try newer kernels - #boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelParams = [ # powersave From 95e82ec74b90b0e16c8e9b7c6f642b64e336cd98 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 5 Feb 2025 14:17:14 +0100 Subject: [PATCH 181/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/34b64e4e1ddb14e3ffc7db8d4a781396dbbab773' (2025-02-01) → 'github:NixOS/nixos-hardware/9bdd53f5908453e4d03f395eb1615c3e9a351f70' (2025-02-04) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/9d3ae807ebd2981d593cddd0080856873139aa40' (2025-01-29) → 'github:NixOS/nixpkgs/799ba5bffed04ced7067a91798353d360788b30d' (2025-02-04) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/666e1b3f09c267afd66addebe80fb05a5ef2b554' (2025-01-30) → 'github:NixOS/nixpkgs/030ba1976b7c0e1a67d9716b17308ccdab5b381e' (2025-02-04) • Updated input 'nur': 'github:nix-community/NUR/95ddad0ff0e67c90314c6ca46324dce5f9a910d2' (2025-01-31) → 'github:nix-community/NUR/a69daa93add2979e2777c2eb062d501da66010fb' (2025-02-05) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/9d3ae807ebd2981d593cddd0080856873139aa40' (2025-01-29) → 'github:nixos/nixpkgs/799ba5bffed04ced7067a91798353d360788b30d' (2025-02-04) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 703be66..e7198da 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738391520, - "narHash": "sha256-6HI58PKjddsC0RA0gBQlt6ox47oH//jLUHwx05RO8g0=", + "lastModified": 1738638143, + "narHash": "sha256-ZYMe4c4OCtIUBn5hx15PEGr0+B1cNEpl2dsaLxwY2W0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "34b64e4e1ddb14e3ffc7db8d4a781396dbbab773", + "rev": "9bdd53f5908453e4d03f395eb1615c3e9a351f70", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1738142207, - "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", + "lastModified": 1738680400, + "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", + "rev": "799ba5bffed04ced7067a91798353d360788b30d", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1738277201, - "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=", + "lastModified": 1738702386, + "narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554", + "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1738142207, - "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", + "lastModified": 1738680400, + "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", + "rev": "799ba5bffed04ced7067a91798353d360788b30d", "type": "github" }, "original": { @@ -317,11 +317,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738362438, - "narHash": "sha256-EO2dVkMVLThWqv4hobEZEZGWBEuH2Z9SYqQDrbLSclU=", + "lastModified": 1738757877, + "narHash": "sha256-S6zQtUXhd82PlOdI88DA0L6h/vYtPcemiK6BohPTKbg=", "owner": "nix-community", "repo": "NUR", - "rev": "95ddad0ff0e67c90314c6ca46324dce5f9a910d2", + "rev": "a69daa93add2979e2777c2eb062d501da66010fb", "type": "github" }, "original": { From 1e4caf3fd5c146105e0ab02f4d6611473f869ac7 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 6 Feb 2025 14:17:37 +0100 Subject: [PATCH 182/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/9bdd53f5908453e4d03f395eb1615c3e9a351f70' (2025-02-04) → 'github:NixOS/nixos-hardware/2eccff41bab80839b1d25b303b53d339fbb07087' (2025-02-06) • Updated input 'nur': 'github:nix-community/NUR/a69daa93add2979e2777c2eb062d501da66010fb' (2025-02-05) → 'github:nix-community/NUR/b7bac25a408bfbe2b55b82b612ebf364e561568c' (2025-02-06) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index e7198da..16e463a 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738638143, - "narHash": "sha256-ZYMe4c4OCtIUBn5hx15PEGr0+B1cNEpl2dsaLxwY2W0=", + "lastModified": 1738816619, + "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9bdd53f5908453e4d03f395eb1615c3e9a351f70", + "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", "type": "github" }, "original": { @@ -317,11 +317,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738757877, - "narHash": "sha256-S6zQtUXhd82PlOdI88DA0L6h/vYtPcemiK6BohPTKbg=", + "lastModified": 1738847099, + "narHash": "sha256-xgra/fmOyFA1/4Ao9qpcoAz6keAdbLBcMqfxGyYNV1A=", "owner": "nix-community", "repo": "NUR", - "rev": "a69daa93add2979e2777c2eb062d501da66010fb", + "rev": "b7bac25a408bfbe2b55b82b612ebf364e561568c", "type": "github" }, "original": { From 095e882e50fba1d1ecb861abc91b038d9d8fd6ba Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 10 Feb 2025 00:25:41 +0100 Subject: [PATCH 183/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/799ba5bffed04ced7067a91798353d360788b30d' (2025-02-04) → 'github:NixOS/nixpkgs/a79cfe0ebd24952b580b1cf08cd906354996d547' (2025-02-08) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/030ba1976b7c0e1a67d9716b17308ccdab5b381e' (2025-02-04) → 'github:NixOS/nixpkgs/a45fa362d887f4d4a7157d95c28ca9ce2899b70e' (2025-02-08) • Updated input 'nur': 'github:nix-community/NUR/b7bac25a408bfbe2b55b82b612ebf364e561568c' (2025-02-06) → 'github:nix-community/NUR/2ebe2b3cf4643b66ab8362c9139454aac7daeed1' (2025-02-09) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/799ba5bffed04ced7067a91798353d360788b30d' (2025-02-04) → 'github:nixos/nixpkgs/a79cfe0ebd24952b580b1cf08cd906354996d547' (2025-02-08) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 16e463a..f176c1c 100644 --- a/flake.lock +++ b/flake.lock @@ -232,11 +232,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1738680400, - "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "799ba5bffed04ced7067a91798353d360788b30d", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1738702386, - "narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=", + "lastModified": 1739055578, + "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e", + "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1738680400, - "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "799ba5bffed04ced7067a91798353d360788b30d", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -317,11 +317,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738847099, - "narHash": "sha256-xgra/fmOyFA1/4Ao9qpcoAz6keAdbLBcMqfxGyYNV1A=", + "lastModified": 1739141262, + "narHash": "sha256-sOPVQn37Vehd/Er+jcO99WYFeOFxbDmpl0mAq3uJxxU=", "owner": "nix-community", "repo": "NUR", - "rev": "b7bac25a408bfbe2b55b82b612ebf364e561568c", + "rev": "2ebe2b3cf4643b66ab8362c9139454aac7daeed1", "type": "github" }, "original": { From aac613ee2716ceb0860297deba03b9847b90d23b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 10 Feb 2025 00:36:23 +0100 Subject: [PATCH 184/330] nix fmt --- home/common.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/home/common.nix b/home/common.nix index e38801a..6f9c9c7 100644 --- a/home/common.nix +++ b/home/common.nix @@ -44,7 +44,7 @@ extraConfig = { credential.helper = "cache"; push.default = "simple"; - push.forceIfIncludes = true; # avoid accidental force overrides when remote is autofetched in background + push.forceIfIncludes = true; # avoid accidental force overrides when remote is autofetched in background init.defaultBranch = "mainline"; diff.tool = "vimdiff"; merge.tool = "vimdiff"; @@ -81,7 +81,11 @@ settings = { git = { autoFetch = false; - mainBranches = ["main" "master" "mainline"]; + mainBranches = [ + "main" + "master" + "mainline" + ]; }; update.method = "never"; }; From 030940be939886be6e714bc7a34a2089cd17b3ea Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 14 Feb 2025 00:02:26 +0100 Subject: [PATCH 185/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/a79cfe0ebd24952b580b1cf08cd906354996d547' (2025-02-08) → 'github:NixOS/nixpkgs/64e75cd44acf21c7933d61d7721e812eac1b5a0a' (2025-02-10) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/a45fa362d887f4d4a7157d95c28ca9ce2899b70e' (2025-02-08) → 'github:NixOS/nixpkgs/0ff09db9d034a04acd4e8908820ba0b410d7a33a' (2025-02-12) • Updated input 'nur': 'github:nix-community/NUR/2ebe2b3cf4643b66ab8362c9139454aac7daeed1' (2025-02-09) → 'github:nix-community/NUR/0746319eae2a2ad6617c3c9eb51d0c2d199cca1d' (2025-02-13) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/a79cfe0ebd24952b580b1cf08cd906354996d547' (2025-02-08) → 'github:nixos/nixpkgs/64e75cd44acf21c7933d61d7721e812eac1b5a0a' (2025-02-10) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index f176c1c..84cb0a2 100644 --- a/flake.lock +++ b/flake.lock @@ -232,11 +232,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1739214665, + "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1739055578, - "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=", + "lastModified": 1739357830, + "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e", + "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1739214665, + "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "type": "github" }, "original": { @@ -317,11 +317,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739141262, - "narHash": "sha256-sOPVQn37Vehd/Er+jcO99WYFeOFxbDmpl0mAq3uJxxU=", + "lastModified": 1739487584, + "narHash": "sha256-gqeJsoQ/8k0QFRmAHACrowYkS+r1W6P2DnvEgb2lPtg=", "owner": "nix-community", "repo": "NUR", - "rev": "2ebe2b3cf4643b66ab8362c9139454aac7daeed1", + "rev": "0746319eae2a2ad6617c3c9eb51d0c2d199cca1d", "type": "github" }, "original": { From 561ce0de88dbe8fe978fa44db6cd5a8c9722fcfe Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 19 Feb 2025 22:20:38 +0100 Subject: [PATCH 186/330] 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/bd65bc3cde04c16755955630b344bc9e35272c56' (2025-01-08) → 'github:nix-community/home-manager/9d3d080aec2a35e05a15cedd281c2384767c2cfe' (2025-02-17) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/2eccff41bab80839b1d25b303b53d339fbb07087' (2025-02-06) → 'github:NixOS/nixos-hardware/3e2ea8a49d4d76276b0f4e2041df8ca5c0771371' (2025-02-17) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/64e75cd44acf21c7933d61d7721e812eac1b5a0a' (2025-02-10) → 'github:NixOS/nixpkgs/73cf49b8ad837ade2de76f87eb53fc85ed5d4680' (2025-02-18) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/0ff09db9d034a04acd4e8908820ba0b410d7a33a' (2025-02-12) → 'github:NixOS/nixpkgs/c618e28f70257593de75a7044438efc1c1fc0791' (2025-02-17) • Updated input 'nur': 'github:nix-community/NUR/0746319eae2a2ad6617c3c9eb51d0c2d199cca1d' (2025-02-13) → 'github:nix-community/NUR/2215ad5c4347f522523715e809f5f2022509f504' (2025-02-18) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/64e75cd44acf21c7933d61d7721e812eac1b5a0a' (2025-02-10) → 'github:nixos/nixpkgs/d74a2335ac9c133d6bbec9fc98d91a77f1604c1f' (2025-02-16) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 84cb0a2..449316b 100644 --- a/flake.lock +++ b/flake.lock @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1736373539, - "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "lastModified": 1739757849, + "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "type": "github" }, "original": { @@ -216,11 +216,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738816619, - "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", + "lastModified": 1739798439, + "narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", + "rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1739357830, - "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", + "lastModified": 1739758141, + "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", + "rev": "c618e28f70257593de75a7044438efc1c1fc0791", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1739736696, + "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", "type": "github" }, "original": { @@ -317,11 +317,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739487584, - "narHash": "sha256-gqeJsoQ/8k0QFRmAHACrowYkS+r1W6P2DnvEgb2lPtg=", + "lastModified": 1739903703, + "narHash": "sha256-w2tTcjx39lJoPDaFbIxi+INIjAKE0jbIx9TNjj9ghmg=", "owner": "nix-community", "repo": "NUR", - "rev": "0746319eae2a2ad6617c3c9eb51d0c2d199cca1d", + "rev": "2215ad5c4347f522523715e809f5f2022509f504", "type": "github" }, "original": { From d838e875c1be92e94ea5d6cb0afc41eb1d32b654 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 24 Feb 2025 10:40:32 +0100 Subject: [PATCH 187/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/3e2ea8a49d4d76276b0f4e2041df8ca5c0771371' (2025-02-17) → 'github:NixOS/nixos-hardware/d58f642ddb23320965b27beb0beba7236e9117b5' (2025-02-24) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/73cf49b8ad837ade2de76f87eb53fc85ed5d4680' (2025-02-18) → 'github:NixOS/nixpkgs/32fb99ba93fea2798be0e997ea331dd78167f814' (2025-02-21) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/c618e28f70257593de75a7044438efc1c1fc0791' (2025-02-17) → 'github:NixOS/nixpkgs/11415c7ae8539d6292f2928317ee7a8410b28bb9' (2025-02-21) • Updated input 'nur': 'github:nix-community/NUR/2215ad5c4347f522523715e809f5f2022509f504' (2025-02-18) → 'github:nix-community/NUR/86af25ede4eca9022e087f0970f20a7b07a6dca1' (2025-02-24) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/d74a2335ac9c133d6bbec9fc98d91a77f1604c1f' (2025-02-16) → 'github:nixos/nixpkgs/32fb99ba93fea2798be0e997ea331dd78167f814' (2025-02-21) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 449316b..85aeaee 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1739798439, - "narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=", + "lastModified": 1740387674, + "narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371", + "rev": "d58f642ddb23320965b27beb0beba7236e9117b5", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1739866667, - "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", + "lastModified": 1740126099, + "narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", + "rev": "32fb99ba93fea2798be0e997ea331dd78167f814", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1739758141, - "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", + "lastModified": 1740162160, + "narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c618e28f70257593de75a7044438efc1c1fc0791", + "rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1739736696, - "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", + "lastModified": 1740126099, + "narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", + "rev": "32fb99ba93fea2798be0e997ea331dd78167f814", "type": "github" }, "original": { @@ -317,11 +317,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739903703, - "narHash": "sha256-w2tTcjx39lJoPDaFbIxi+INIjAKE0jbIx9TNjj9ghmg=", + "lastModified": 1740387072, + "narHash": "sha256-359AJuQenQZBlSHObwzNV0e3xsjNCC0M9grbW8nmp3Q=", "owner": "nix-community", "repo": "NUR", - "rev": "2215ad5c4347f522523715e809f5f2022509f504", + "rev": "86af25ede4eca9022e087f0970f20a7b07a6dca1", "type": "github" }, "original": { From fe514699b9124ea2e7fcd6712d099f6d5b6b3da1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 27 Feb 2025 08:06:04 +0100 Subject: [PATCH 188/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/32fb99ba93fea2798be0e997ea331dd78167f814' (2025-02-21) → 'github:NixOS/nixpkgs/0196c0175e9191c474c26ab5548db27ef5d34b05' (2025-02-24) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/11415c7ae8539d6292f2928317ee7a8410b28bb9' (2025-02-21) → 'github:NixOS/nixpkgs/5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b' (2025-02-25) • Updated input 'nur': 'github:nix-community/NUR/86af25ede4eca9022e087f0970f20a7b07a6dca1' (2025-02-24) → 'github:nix-community/NUR/45fdeec61694b88fee67cb94c19b4f4a6576816d' (2025-02-27) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/32fb99ba93fea2798be0e997ea331dd78167f814' (2025-02-21) → 'github:nixos/nixpkgs/0196c0175e9191c474c26ab5548db27ef5d34b05' (2025-02-24) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 85aeaee..617df6b 100644 --- a/flake.lock +++ b/flake.lock @@ -232,11 +232,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1740126099, - "narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32fb99ba93fea2798be0e997ea331dd78167f814", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1740162160, - "narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=", + "lastModified": 1740463929, + "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9", + "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1740126099, - "narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "32fb99ba93fea2798be0e997ea331dd78167f814", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -317,11 +317,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1740387072, - "narHash": "sha256-359AJuQenQZBlSHObwzNV0e3xsjNCC0M9grbW8nmp3Q=", + "lastModified": 1740637646, + "narHash": "sha256-I6mwcSsoXQqyzf+79BCRcnOaGmcs3UnJm+kcVk/wfoA=", "owner": "nix-community", "repo": "NUR", - "rev": "86af25ede4eca9022e087f0970f20a7b07a6dca1", + "rev": "45fdeec61694b88fee67cb94c19b4f4a6576816d", "type": "github" }, "original": { From f9d5d9575f2d3c4e603086deca51b086d735b91f Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 4 Mar 2025 11:51:50 +0100 Subject: [PATCH 189/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/d58f642ddb23320965b27beb0beba7236e9117b5' (2025-02-24) → 'github:NixOS/nixos-hardware/009b764ac98a3602d41fc68072eeec5d24fc0e49' (2025-02-27) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/0196c0175e9191c474c26ab5548db27ef5d34b05' (2025-02-24) → 'github:NixOS/nixpkgs/ba487dbc9d04e0634c64e3b1f0d25839a0a68246' (2025-03-03) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b' (2025-02-25) → 'github:NixOS/nixpkgs/1546c45c538633ae40b93e2d14e0bb6fd8f13347' (2025-03-02) • Updated input 'nur': 'github:nix-community/NUR/45fdeec61694b88fee67cb94c19b4f4a6576816d' (2025-02-27) → 'github:nix-community/NUR/fb96210577675e00cd609f13c78749fa27c7555c' (2025-03-04) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/0196c0175e9191c474c26ab5548db27ef5d34b05' (2025-02-24) → 'github:nixos/nixpkgs/ba487dbc9d04e0634c64e3b1f0d25839a0a68246' (2025-03-03) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 617df6b..ace26a2 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1740387674, - "narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=", + "lastModified": 1740646007, + "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d58f642ddb23320965b27beb0beba7236e9117b5", + "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "lastModified": 1741010256, + "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1740463929, - "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=", + "lastModified": 1740932899, + "narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b", + "rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "lastModified": 1741010256, + "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", "type": "github" }, "original": { @@ -317,11 +317,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1740637646, - "narHash": "sha256-I6mwcSsoXQqyzf+79BCRcnOaGmcs3UnJm+kcVk/wfoA=", + "lastModified": 1741084010, + "narHash": "sha256-tkFp+RFcJKdoPPg1k1euon4hc4chvMBAzE3HCCT8rX4=", "owner": "nix-community", "repo": "NUR", - "rev": "45fdeec61694b88fee67cb94c19b4f4a6576816d", + "rev": "fb96210577675e00cd609f13c78749fa27c7555c", "type": "github" }, "original": { From 625639d1b5aa3f09b88689253f2c05d45371bacf Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 5 Mar 2025 23:42:01 +0100 Subject: [PATCH 190/330] 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/1546c45c538633ae40b93e2d14e0bb6fd8f13347' (2025-03-02) → 'github:NixOS/nixpkgs/6af28b834daca767a7ef99f8a7defa957d0ade6f' (2025-03-04) • Updated input 'nur': 'github:nix-community/NUR/fb96210577675e00cd609f13c78749fa27c7555c' (2025-03-04) → 'github:nix-community/NUR/45dd66cc02f24a645784b880fa5f92392363576c' (2025-03-05) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index ace26a2..56c5d53 100644 --- a/flake.lock +++ b/flake.lock @@ -280,11 +280,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1740932899, - "narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=", + "lastModified": 1741048562, + "narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347", + "rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f", "type": "github" }, "original": { @@ -317,11 +317,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1741084010, - "narHash": "sha256-tkFp+RFcJKdoPPg1k1euon4hc4chvMBAzE3HCCT8rX4=", + "lastModified": 1741210162, + "narHash": "sha256-7HM16FTrhqsOd8TJkVNO9OLpast6vhAvkl4ZPBPKSWI=", "owner": "nix-community", "repo": "NUR", - "rev": "fb96210577675e00cd609f13c78749fa27c7555c", + "rev": "45dd66cc02f24a645784b880fa5f92392363576c", "type": "github" }, "original": { From ccbc0b9d4aac6c501a3256f661666ffc6a04f4d2 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 11 Mar 2025 21:42:47 +0100 Subject: [PATCH 191/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/009b764ac98a3602d41fc68072eeec5d24fc0e49' (2025-02-27) → 'github:NixOS/nixos-hardware/b48cc4dab0f9711af296fc367b6108cf7b8ccb16' (2025-03-07) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/ba487dbc9d04e0634c64e3b1f0d25839a0a68246' (2025-03-03) → 'github:NixOS/nixpkgs/e3e32b642a31e6714ec1b712de8c91a3352ce7e1' (2025-03-09) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/6af28b834daca767a7ef99f8a7defa957d0ade6f' (2025-03-04) → 'github:NixOS/nixpkgs/ebe2788eafd539477f83775ef93c3c7e244421d3' (2025-03-10) • Updated input 'nur': 'github:nix-community/NUR/45dd66cc02f24a645784b880fa5f92392363576c' (2025-03-05) → 'github:nix-community/NUR/122e9d68505de4d1ee2db7544bd3dbf2dd08338b' (2025-03-11) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/ba487dbc9d04e0634c64e3b1f0d25839a0a68246' (2025-03-03) → 'github:nixos/nixpkgs/e3e32b642a31e6714ec1b712de8c91a3352ce7e1' (2025-03-09) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 56c5d53..673e54f 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1740646007, - "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", + "lastModified": 1741325094, + "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", + "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1741010256, - "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1741048562, - "narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=", + "lastModified": 1741600792, + "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f", + "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1741010256, - "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { @@ -317,11 +317,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1741210162, - "narHash": "sha256-7HM16FTrhqsOd8TJkVNO9OLpast6vhAvkl4ZPBPKSWI=", + "lastModified": 1741725118, + "narHash": "sha256-X7TMqHh9r38zZviHUGaBucPir9Zi5oeA04jfEG74imQ=", "owner": "nix-community", "repo": "NUR", - "rev": "45dd66cc02f24a645784b880fa5f92392363576c", + "rev": "122e9d68505de4d1ee2db7544bd3dbf2dd08338b", "type": "github" }, "original": { From 4eb513dc68d2c8e420e55d926fb47129ea893641 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 12 Mar 2025 21:09:58 +0100 Subject: [PATCH 192/330] 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-darwin': 'github:LnL7/nix-darwin/cae8d1c4a3bd37be5887203fe3b0c3a860c53a07?narHash=sha256-/hgw8fDKDpko0XqOw1e9tX8lS2Hqecg7W/JsONun6Qc%3D' (2025-01-21) → 'github:LnL7/nix-darwin/c172f50b55b087f8e7801631de977461603bb976?narHash=sha256-ng0a4cIq3c9E3iGKomlwqKzVYs2RLOzQho2U1Mc2sqU%3D' (2025-03-04) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/b48cc4dab0f9711af296fc367b6108cf7b8ccb16?narHash=sha256-RUAdT8dZ6k/486vnu3tiNRrNW6%2BQ8uSD2Mq7gTX4jlo%3D' (2025-03-07) → 'github:NixOS/nixos-hardware/e1f12151258b12c567f456d8248e4694e9390613?narHash=sha256-f0BVt1/cvA0DQ/q3rB%2BHY4g4tKksd03ZkzI4xehC2Ew%3D' (2025-03-12) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 673e54f..3f9664a 100644 --- a/flake.lock +++ b/flake.lock @@ -200,11 +200,11 @@ ] }, "locked": { - "lastModified": 1737421067, - "narHash": "sha256-/hgw8fDKDpko0XqOw1e9tX8lS2Hqecg7W/JsONun6Qc=", + "lastModified": 1741126078, + "narHash": "sha256-ng0a4cIq3c9E3iGKomlwqKzVYs2RLOzQho2U1Mc2sqU=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "cae8d1c4a3bd37be5887203fe3b0c3a860c53a07", + "rev": "c172f50b55b087f8e7801631de977461603bb976", "type": "github" }, "original": { @@ -216,11 +216,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1741325094, - "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", + "lastModified": 1741792691, + "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", + "rev": "e1f12151258b12c567f456d8248e4694e9390613", "type": "github" }, "original": { From 8c1ca922db1e644e9da0426959e7155b3e69c5bd Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 16 Mar 2025 22:06:07 +0100 Subject: [PATCH 193/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/e3e32b642a31e6714ec1b712de8c91a3352ce7e1' (2025-03-09) → 'github:NixOS/nixpkgs/c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5' (2025-03-15) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/ebe2788eafd539477f83775ef93c3c7e244421d3' (2025-03-10) → 'github:NixOS/nixpkgs/cdd2ef009676ac92b715ff26630164bb88fec4e0' (2025-03-13) • Updated input 'nur': 'github:nix-community/NUR/122e9d68505de4d1ee2db7544bd3dbf2dd08338b' (2025-03-11) → 'github:nix-community/NUR/88af54cefd786e310ca592a07102f09a593e89c6' (2025-03-16) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/e3e32b642a31e6714ec1b712de8c91a3352ce7e1' (2025-03-09) → 'github:nixos/nixpkgs/c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5' (2025-03-15) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 3f9664a..606df9c 100644 --- a/flake.lock +++ b/flake.lock @@ -232,11 +232,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1741600792, - "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=", + "lastModified": 1741862977, + "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebe2788eafd539477f83775ef93c3c7e244421d3", + "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -317,11 +317,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1741725118, - "narHash": "sha256-X7TMqHh9r38zZviHUGaBucPir9Zi5oeA04jfEG74imQ=", + "lastModified": 1742157031, + "narHash": "sha256-A+D2pGs/+ks9jmdaX8U/SWtqDLWW80S32afM6woZIl0=", "owner": "nix-community", "repo": "NUR", - "rev": "122e9d68505de4d1ee2db7544bd3dbf2dd08338b", + "rev": "88af54cefd786e310ca592a07102f09a593e89c6", "type": "github" }, "original": { From 0ab22fac84963a504221bb3e6218d5d14057ee8d Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 17 Mar 2025 14:53:22 +0100 Subject: [PATCH 194/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/e1f12151258b12c567f456d8248e4694e9390613' (2025-03-12) → 'github:NixOS/nixos-hardware/4f4d97d7b7be387286cc9c988760a7ebaa5be1f1' (2025-03-17) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/cdd2ef009676ac92b715ff26630164bb88fec4e0' (2025-03-13) → 'github:NixOS/nixpkgs/a1185f4064c18a5db37c5c84e5638c78b46e3341' (2025-03-16) • Updated input 'nur': 'github:nix-community/NUR/88af54cefd786e310ca592a07102f09a593e89c6' (2025-03-16) → 'github:nix-community/NUR/5d7be41b431b3556b2a1cacf8743ecd3a0cc9a23' (2025-03-17) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 606df9c..258af3b 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1741792691, - "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", + "lastModified": 1742217307, + "narHash": "sha256-3fwpN7KN226ghLlpO9TR0/WpgQOmOj1e8bieUxpIYSk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e1f12151258b12c567f456d8248e4694e9390613", + "rev": "4f4d97d7b7be387286cc9c988760a7ebaa5be1f1", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1741862977, - "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", + "lastModified": 1742136038, + "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", + "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", "type": "github" }, "original": { @@ -317,11 +317,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1742157031, - "narHash": "sha256-A+D2pGs/+ks9jmdaX8U/SWtqDLWW80S32afM6woZIl0=", + "lastModified": 1742218991, + "narHash": "sha256-otZLcv8VeXxCZkc3wHSeUVUSCzlU5jaVUQV9ajXrQ98=", "owner": "nix-community", "repo": "NUR", - "rev": "88af54cefd786e310ca592a07102f09a593e89c6", + "rev": "5d7be41b431b3556b2a1cacf8743ecd3a0cc9a23", "type": "github" }, "original": { From 151165cecd0b81c52162d66c419466fb6702fe22 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 17 Mar 2025 21:07:55 +0100 Subject: [PATCH 195/330] framenix: switch to systemd-stage1 boot --- hosts/framenix/default.nix | 2 ++ hosts/framenix/storage.nix | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 86cb501..166f4ee 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -32,6 +32,8 @@ in "amdgpu.abmlevel=1" # adaptive backlight management ]; + boot.initrd.systemd.enable = true; + # at boot by default, limit charging capacity to protect battery. # Hopefully there's gonna be a standard interface to control this from the desktop at some point. systemd.services.battery-charge-limit = { diff --git a/hosts/framenix/storage.nix b/hosts/framenix/storage.nix index b4d5793..7fb2801 100644 --- a/hosts/framenix/storage.nix +++ b/hosts/framenix/storage.nix @@ -19,7 +19,6 @@ in "system".device = "/dev/disk/by-uuid/1838cdc5-9b0b-4c46-9f23-9465549eeb92"; "cryptswap".device = "/dev/disk/by-uuid/ded7d649-ab3a-42ee-ae4a-f8c4ba029e9c"; }; - reusePassphrases = true; }; fileSystems = { From 4ebcaa637ea7f9a7361e0e74af4192f911e0d73a Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 18 Mar 2025 11:50:16 +0100 Subject: [PATCH 196/330] darwin/workmac: use nix 2.25 This is supposed to improve the performance of the git tarball cache. --- darwin/configuration.nix | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/darwin/configuration.nix b/darwin/configuration.nix index 819be37..fc577ec 100644 --- a/darwin/configuration.nix +++ b/darwin/configuration.nix @@ -2,20 +2,28 @@ { imports = [ ../common/nix-settings.nix ]; - nix.settings = { - trusted-users = [ - "os" - "@admin" - ]; # @admin for linux-builder - substituters = [ - "https://s3.whq.fcio.net/hydra" - "https://hydra.flyingcircus.io" - ]; - trusted-public-keys = [ - "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - "flyingcircus.io-1:Rr9CwiPv8cdVf3EQu633IOTb6iJKnWbVfCC8x8gVz2o=" - ]; + nix = { + enable = true; + package = pkgs.nixVersions.nix_2_25; + settings = { + trusted-users = [ + "os" + "@admin" + ]; # @admin for linux-builder + substituters = [ + "https://s3.whq.fcio.net/hydra" + "https://hydra.flyingcircus.io" + ]; + trusted-public-keys = [ + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + "flyingcircus.io-1:Rr9CwiPv8cdVf3EQu633IOTb6iJKnWbVfCC8x8gVz2o=" + ]; + }; }; + + # Auto upgrade nix package and the daemon service. + services.nix-daemon.enable = true; + # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget environment.systemPackages = [ pkgs.vim ]; @@ -24,10 +32,6 @@ # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix"; - # Auto upgrade nix package and the daemon service. - services.nix-daemon.enable = true; - # nix.package = pkgs.nix; - # Create /etc/bashrc that loads the nix-darwin environment. programs.zsh.enable = true; # default shell on catalina From 97d6bf380aa4c094e0e97d437fb6760376e5da92 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 18 Mar 2025 23:35:14 +0100 Subject: [PATCH 197/330] logseq: pull in an unstable more recent version from development branch Allows getting rid of insecure ancient electron_27 --- common/packages.nix | 1 - flake.lock | 17 +++++++++++++++++ flake.nix | 1 + home/modules/packages.nix | 3 +-- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/common/packages.nix b/common/packages.nix index db8de1e..9634e2a 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -11,7 +11,6 @@ nixpkgs.config.permittedInsecurePackages = [ # (temporarily) permit the usage of libolm "olm-3.2.16" - "electron-27.3.11" # logseq ]; # List packages installed in system profile. diff --git a/flake.lock b/flake.lock index 258af3b..23a8b16 100644 --- a/flake.lock +++ b/flake.lock @@ -214,6 +214,22 @@ "type": "github" } }, + "nix-logseq-unstable": { + "locked": { + "lastModified": 1742136863, + "narHash": "sha256-y8w/QKc6O3ZACA8gmraVl3ChIbtX+Ojl4RXrUWu9vpU=", + "owner": "TomaSajt", + "repo": "nixpkgs", + "rev": "1e18638e96cd3264a55f0831bc9866758dacd1bc", + "type": "github" + }, + "original": { + "owner": "TomaSajt", + "ref": "logseq", + "repo": "nixpkgs", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1742217307, @@ -367,6 +383,7 @@ "lanzaboote": "lanzaboote", "mysecrets": "mysecrets", "nix-darwin": "nix-darwin", + "nix-logseq-unstable": "nix-logseq-unstable", "nixos-hardware": "nixos-hardware", "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index 5053a22..3577777 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + nix-logseq-unstable.url = "github:TomaSajt/nixpkgs/logseq"; home-manager = { url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/modules/packages.nix b/home/modules/packages.nix index ed223b6..2cf8c42 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -184,7 +184,7 @@ let #(pkgs.pidgin-with-plugins.override { # plugins = [ pkgs.pidginotr ];}) - logseq + inputs.nix-logseq-unstable.legacyPackages.${system}.logseq # for Hibiscus banking software jameica @@ -260,7 +260,6 @@ in nixpkgs.config = { permittedInsecurePackages = [ - "electron-27.3.11" # logseq # (temporarily) permit the usage of libolm "olm-3.2.16" ]; From 3516b5fb91a42a2d54a71b46d2a61b75e3de2895 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 20 Mar 2025 15:33:34 +0100 Subject: [PATCH 198/330] workmac: add autossh-based socks proxy job to Hydra native launchd user job --- home/workmac.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/home/workmac.nix b/home/workmac.nix index 0aff0cb..f2b7969 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -94,6 +94,25 @@ in + import ./scripts/ssh-loop-fc.nix { inherit pkgs lib; } ); + launchd.agents.hydra_proxy = { + enable = true; + config = { + ProgramArguments = [ + "${lib.getExe pkgs.autossh}" + "-M" + "0" + "-D" + "1080" + "-oServerAliveInterval=60" + "-oControlMaster=no" + "-N" + "vpn-whq.services.fcio.net" + ]; + # TODO: consider socket activation instead + KeepAlive = true; + ThrottleInterval = 60; + }; + }; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "1password-cli" ]; home.stateVersion = "22.05"; From 6f936dc3f881d54ebf7b9da3b5fbf3be5d9ecf25 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 20 Mar 2025 15:38:02 +0100 Subject: [PATCH 199/330] home.git: provide `git mergetool -t nixfmt` --- home/common.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/common.nix b/home/common.nix index 6f9c9c7..f65ceff 100644 --- a/home/common.nix +++ b/home/common.nix @@ -3,6 +3,7 @@ inputs, config, system, + lib, ... }: { @@ -48,6 +49,11 @@ init.defaultBranch = "mainline"; diff.tool = "vimdiff"; merge.tool = "vimdiff"; + # provide `git mergetool -t nixfmt` + mergetool.nixfmt = { + cmd = "${lib.getExe pkgs.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""; + trustExitCode = true; + }; core.excludesfile = toString ( pkgs.writeText ".gitignore_global" '' # Direnv stuff # From bddb1bd0bbb45b66e9570041bc312438b7b24829 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 23 Mar 2025 19:53:09 +0100 Subject: [PATCH 200/330] 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/9d3d080aec2a35e05a15cedd281c2384767c2cfe' (2025-02-17) → 'github:nix-community/home-manager/0948aeedc296f964140d9429223c7e4a0702a1ff' (2025-03-22) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/4f4d97d7b7be387286cc9c988760a7ebaa5be1f1' (2025-03-17) → 'github:NixOS/nixos-hardware/380ed15bcd6440606c6856db44a99140d422b46f' (2025-03-22) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5' (2025-03-15) → 'github:NixOS/nixpkgs/a84ebe20c6bc2ecbcfb000a50776219f48d134cc' (2025-03-19) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/a1185f4064c18a5db37c5c84e5638c78b46e3341' (2025-03-16) → 'github:NixOS/nixpkgs/7105ae3957700a9646cc4b766f5815b23ed0c682' (2025-03-20) • Updated input 'nur': 'github:nix-community/NUR/5d7be41b431b3556b2a1cacf8743ecd3a0cc9a23' (2025-03-17) → 'github:nix-community/NUR/371448da3ce11464151d079210da53762c54cb2e' (2025-03-23) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5' (2025-03-15) → 'github:nixos/nixpkgs/a84ebe20c6bc2ecbcfb000a50776219f48d134cc' (2025-03-19) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 23a8b16..454f9bd 100644 --- a/flake.lock +++ b/flake.lock @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1739757849, - "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", + "lastModified": 1742655702, + "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", + "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", "type": "github" }, "original": { @@ -216,11 +216,11 @@ }, "nix-logseq-unstable": { "locked": { - "lastModified": 1742136863, - "narHash": "sha256-y8w/QKc6O3ZACA8gmraVl3ChIbtX+Ojl4RXrUWu9vpU=", + "lastModified": 1742338843, + "narHash": "sha256-U1ycpNrG1gO8YAAN0+KuNixha58L+uabRhCg/G9m/Lc=", "owner": "TomaSajt", "repo": "nixpkgs", - "rev": "1e18638e96cd3264a55f0831bc9866758dacd1bc", + "rev": "882d96f3e755c91626ce769a22841e49e540f811", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742217307, - "narHash": "sha256-3fwpN7KN226ghLlpO9TR0/WpgQOmOj1e8bieUxpIYSk=", + "lastModified": 1742631601, + "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4f4d97d7b7be387286cc9c988760a7ebaa5be1f1", + "rev": "380ed15bcd6440606c6856db44a99140d422b46f", "type": "github" }, "original": { @@ -248,11 +248,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1742069588, - "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742136038, - "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", + "lastModified": 1742512142, + "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", + "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", "type": "github" }, "original": { @@ -312,11 +312,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742069588, - "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -333,11 +333,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1742218991, - "narHash": "sha256-otZLcv8VeXxCZkc3wHSeUVUSCzlU5jaVUQV9ajXrQ98=", + "lastModified": 1742755772, + "narHash": "sha256-GJvs93gBaIWstehK1Zgh+1v8FHuUhf8W2S7bzqKx4vk=", "owner": "nix-community", "repo": "NUR", - "rev": "5d7be41b431b3556b2a1cacf8743ecd3a0cc9a23", + "rev": "371448da3ce11464151d079210da53762c54cb2e", "type": "github" }, "original": { From cdb5e568daf2437357d0e7dbec15b72ffc9a05c3 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 28 Mar 2025 11:28:39 +0100 Subject: [PATCH 201/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/380ed15bcd6440606c6856db44a99140d422b46f' (2025-03-22) → 'github:NixOS/nixos-hardware/ecaa2d911e77c265c2a5bac8b583c40b0f151726' (2025-03-24) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/a84ebe20c6bc2ecbcfb000a50776219f48d134cc' (2025-03-19) → 'github:NixOS/nixpkgs/698214a32beb4f4c8e3942372c694f40848b360d' (2025-03-25) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/7105ae3957700a9646cc4b766f5815b23ed0c682' (2025-03-20) → 'github:NixOS/nixpkgs/d02d88f8de5b882ccdde0465d8fa2db3aa1169f7' (2025-03-25) • Updated input 'nur': 'github:nix-community/NUR/371448da3ce11464151d079210da53762c54cb2e' (2025-03-23) → 'github:nix-community/NUR/24373c950c3c4757c64e9567391bcac0996c5c08' (2025-03-28) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/a84ebe20c6bc2ecbcfb000a50776219f48d134cc' (2025-03-19) → 'github:nixos/nixpkgs/698214a32beb4f4c8e3942372c694f40848b360d' (2025-03-25) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 454f9bd..1ddd1ab 100644 --- a/flake.lock +++ b/flake.lock @@ -232,11 +232,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742631601, - "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=", + "lastModified": 1742806253, + "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "380ed15bcd6440606c6856db44a99140d422b46f", + "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", "type": "github" }, "original": { @@ -248,11 +248,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1742889210, + "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "698214a32beb4f4c8e3942372c694f40848b360d", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742512142, - "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", + "lastModified": 1742937945, + "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", + "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", "type": "github" }, "original": { @@ -312,11 +312,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1742889210, + "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "698214a32beb4f4c8e3942372c694f40848b360d", "type": "github" }, "original": { @@ -333,11 +333,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1742755772, - "narHash": "sha256-GJvs93gBaIWstehK1Zgh+1v8FHuUhf8W2S7bzqKx4vk=", + "lastModified": 1743136605, + "narHash": "sha256-S7wG4Rq0BVNVfZWiJzX0cNw4fA1WEvHVYyojISJF1io=", "owner": "nix-community", "repo": "NUR", - "rev": "371448da3ce11464151d079210da53762c54cb2e", + "rev": "24373c950c3c4757c64e9567391bcac0996c5c08", "type": "github" }, "original": { From 0d25590eb32a34d3da23e1db0897072e94861f42 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 28 Mar 2025 19:07:01 +0100 Subject: [PATCH 202/330] git mergetool -t nixfmt: use unstable nixfmt For now, only the nixfmt from unstable has that feature. --- home/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/common.nix b/home/common.nix index f65ceff..92cee82 100644 --- a/home/common.nix +++ b/home/common.nix @@ -51,7 +51,7 @@ merge.tool = "vimdiff"; # provide `git mergetool -t nixfmt` mergetool.nixfmt = { - cmd = "${lib.getExe pkgs.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""; + cmd = "${lib.getExe inputs.nixos-unstable.legacyPackages.${system}.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""; trustExitCode = true; }; core.excludesfile = toString ( From 9c5dffc7d9a4ac2c2b7bc576dfafd87dfc317ad5 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 1 Apr 2025 23:35:08 +0200 Subject: [PATCH 203/330] 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/0948aeedc296f964140d9429223c7e4a0702a1ff?narHash=sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ%3D' (2025-03-22) → 'github:nix-community/home-manager/15c5f9d04fabd176f30286c8f52bbdb2c853a146?narHash=sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0%2B2Wo%3D' (2025-03-31) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/c172f50b55b087f8e7801631de977461603bb976?narHash=sha256-ng0a4cIq3c9E3iGKomlwqKzVYs2RLOzQho2U1Mc2sqU%3D' (2025-03-04) → 'github:LnL7/nix-darwin/fc843893cecc1838a59713ee3e50e9e7edc6207c?narHash=sha256-%2BsMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o%3D' (2025-03-28) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/ecaa2d911e77c265c2a5bac8b583c40b0f151726?narHash=sha256-zvQ4GsCJT6MTOzPKLmlFyM%2Blxo0JGQ0cSFaZSACmWfY%3D' (2025-03-24) → 'github:NixOS/nixos-hardware/de6fc5551121c59c01e2a3d45b277a6d05077bc4?narHash=sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo%3D' (2025-03-31) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/698214a32beb4f4c8e3942372c694f40848b360d?narHash=sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw%3D' (2025-03-25) → 'github:NixOS/nixpkgs/52faf482a3889b7619003c0daec593a1912fddc1?narHash=sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om%2BD4UnDhlDW9BE%3D' (2025-03-30) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/d02d88f8de5b882ccdde0465d8fa2db3aa1169f7?narHash=sha256-lWc%2B79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E%3D' (2025-03-25) → 'github:NixOS/nixpkgs/7ffe0edc685f14b8c635e3d6591b0bbb97365e6c?narHash=sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI%3D' (2025-03-30) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 1ddd1ab..26fd5a3 100644 --- a/flake.lock +++ b/flake.lock @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1742655702, - "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", + "lastModified": 1743387206, + "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=", "owner": "nix-community", "repo": "home-manager", - "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", + "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146", "type": "github" }, "original": { @@ -200,11 +200,11 @@ ] }, "locked": { - "lastModified": 1741126078, - "narHash": "sha256-ng0a4cIq3c9E3iGKomlwqKzVYs2RLOzQho2U1Mc2sqU=", + "lastModified": 1743127615, + "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "c172f50b55b087f8e7801631de977461603bb976", + "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742806253, - "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", + "lastModified": 1743420942, + "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", + "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", "type": "github" }, "original": { @@ -248,11 +248,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1743315132, + "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "52faf482a3889b7619003c0daec593a1912fddc1", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742937945, - "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", + "lastModified": 1743367904, + "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", + "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", "type": "github" }, "original": { From 44e881942ed45e73e63544de0269ac8cd1736509 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 26 Apr 2025 15:55:06 +0200 Subject: [PATCH 204/330] 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/15c5f9d04fabd176f30286c8f52bbdb2c853a146' (2025-03-31) → 'github:nix-community/home-manager/dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1' (2025-04-25) • Updated input 'nix-logseq-unstable': 'github:TomaSajt/nixpkgs/882d96f3e755c91626ce769a22841e49e540f811' (2025-03-18) → 'github:TomaSajt/nixpkgs/b457b39340679f8606312546887561fe0aa5fb02' (2025-04-01) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/de6fc5551121c59c01e2a3d45b277a6d05077bc4' (2025-03-31) → 'github:NixOS/nixos-hardware/f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1' (2025-04-24) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/52faf482a3889b7619003c0daec593a1912fddc1' (2025-03-30) → 'github:NixOS/nixpkgs/f771eb401a46846c1aebd20552521b233dd7e18b' (2025-04-24) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/7ffe0edc685f14b8c635e3d6591b0bbb97365e6c' (2025-03-30) → 'github:NixOS/nixpkgs/5630cf13cceac06cefe9fc607e8dfa8fb342dde3' (2025-04-24) • Updated input 'nur': 'github:nix-community/NUR/24373c950c3c4757c64e9567391bcac0996c5c08' (2025-03-28) → 'github:nix-community/NUR/34c80a75bf09085cfd04a476389a4162c6154d42' (2025-04-26) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/698214a32beb4f4c8e3942372c694f40848b360d' (2025-03-25) → 'github:nixos/nixpkgs/f771eb401a46846c1aebd20552521b233dd7e18b' (2025-04-24) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 26fd5a3..f75c5d4 100644 --- a/flake.lock +++ b/flake.lock @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1743387206, - "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=", + "lastModified": 1745557122, + "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", "owner": "nix-community", "repo": "home-manager", - "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146", + "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", "type": "github" }, "original": { @@ -216,11 +216,11 @@ }, "nix-logseq-unstable": { "locked": { - "lastModified": 1742338843, - "narHash": "sha256-U1ycpNrG1gO8YAAN0+KuNixha58L+uabRhCg/G9m/Lc=", + "lastModified": 1743493460, + "narHash": "sha256-Elxw/OLba9qpwampG/n/tRJFZEhidNP1+1HVUSnDHC8=", "owner": "TomaSajt", "repo": "nixpkgs", - "rev": "882d96f3e755c91626ce769a22841e49e540f811", + "rev": "b457b39340679f8606312546887561fe0aa5fb02", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1743420942, - "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", + "lastModified": 1745503349, + "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", + "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1", "type": "github" }, "original": { @@ -248,11 +248,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1743315132, - "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", + "lastModified": 1745526057, + "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52faf482a3889b7619003c0daec593a1912fddc1", + "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1743367904, - "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", + "lastModified": 1745487689, + "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", + "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", "type": "github" }, "original": { @@ -312,11 +312,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1745526057, + "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { @@ -333,11 +333,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1743136605, - "narHash": "sha256-S7wG4Rq0BVNVfZWiJzX0cNw4fA1WEvHVYyojISJF1io=", + "lastModified": 1745672678, + "narHash": "sha256-+3HDClco9BTgWovVMODc0e8Gh3+LNTt1EXZW2tJaXjA=", "owner": "nix-community", "repo": "NUR", - "rev": "24373c950c3c4757c64e9567391bcac0996c5c08", + "rev": "34c80a75bf09085cfd04a476389a4162c6154d42", "type": "github" }, "original": { From d68d2a64f3343a9a3cb349bce9e00dbfeed59cf0 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 26 Apr 2025 16:00:02 +0200 Subject: [PATCH 205/330] packages: take logseq from unstable instead of PR flake input --- flake.lock | 17 ----------------- flake.nix | 1 - home/modules/packages.nix | 2 +- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index f75c5d4..a68be18 100644 --- a/flake.lock +++ b/flake.lock @@ -214,22 +214,6 @@ "type": "github" } }, - "nix-logseq-unstable": { - "locked": { - "lastModified": 1743493460, - "narHash": "sha256-Elxw/OLba9qpwampG/n/tRJFZEhidNP1+1HVUSnDHC8=", - "owner": "TomaSajt", - "repo": "nixpkgs", - "rev": "b457b39340679f8606312546887561fe0aa5fb02", - "type": "github" - }, - "original": { - "owner": "TomaSajt", - "ref": "logseq", - "repo": "nixpkgs", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1745503349, @@ -383,7 +367,6 @@ "lanzaboote": "lanzaboote", "mysecrets": "mysecrets", "nix-darwin": "nix-darwin", - "nix-logseq-unstable": "nix-logseq-unstable", "nixos-hardware": "nixos-hardware", "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index 3577777..5053a22 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,6 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - nix-logseq-unstable.url = "github:TomaSajt/nixpkgs/logseq"; home-manager = { url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 2cf8c42..82e4343 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -184,7 +184,7 @@ let #(pkgs.pidgin-with-plugins.override { # plugins = [ pkgs.pidginotr ];}) - inputs.nix-logseq-unstable.legacyPackages.${system}.logseq + unstable.logseq # for Hibiscus banking software jameica From 07739ef1d10d5a7f0313b46e74cef13f892f330b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 26 Apr 2025 16:00:23 +0200 Subject: [PATCH 206/330] flake apps.hm: use lix instead of nix --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 5053a22..2fe6f6b 100644 --- a/flake.nix +++ b/flake.nix @@ -164,7 +164,7 @@ pkgs.git pkgs.coreutils pkgs.findutils - pkgs.nix + pkgs.lix pkgs.jq pkgs.unixtools.hostname ] From 12d0fc0b7968f55ededa2eb5bcd7c58a06a5068b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 27 Apr 2025 14:19:55 +0200 Subject: [PATCH 207/330] remove jupyter-notebook from default packages currently does not build on darwin; haven't used it for a while anymore anyways --- home/modules/packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 82e4343..79052c5 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -123,7 +123,6 @@ let pythonTools = with python3Packages; [ python3 # to shadow old macOS python - notebook ipython uv pip From b178274fe3365bf289672b4f44f1ff46da0513c9 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 27 Apr 2025 16:08:50 +0200 Subject: [PATCH 208/330] flake: bump nixpkgs input to pull in pending fixes --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a68be18..bb3cc52 100644 --- a/flake.lock +++ b/flake.lock @@ -280,11 +280,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1745487689, - "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", + "lastModified": 1745733216, + "narHash": "sha256-UTgWyFHohRQ8rOcsb6yMClNLwrQtBeyx5uHWGd7qdM8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", + "rev": "8ad8b9d65444c358b86bf75f73a036b3fd35bce4", "type": "github" }, "original": { From be859336b39f87aa6d779c064964ed30e9270557 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 27 Apr 2025 16:09:02 +0200 Subject: [PATCH 209/330] nixfmt --- home/common.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home/common.nix b/home/common.nix index 92cee82..693593f 100644 --- a/home/common.nix +++ b/home/common.nix @@ -51,7 +51,9 @@ merge.tool = "vimdiff"; # provide `git mergetool -t nixfmt` mergetool.nixfmt = { - cmd = "${lib.getExe inputs.nixos-unstable.legacyPackages.${system}.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""; + cmd = "${ + lib.getExe inputs.nixos-unstable.legacyPackages.${system}.nixfmt-rfc-style + } --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""; trustExitCode = true; }; core.excludesfile = toString ( From 4a6d5e92a93ae9b796a822260bffe8fd0784259e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 2 May 2025 15:59:19 +0200 Subject: [PATCH 210/330] 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/dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1' (2025-04-25) → 'github:nix-community/home-manager/50eee705bbdbac942074a8c120e8194185633675' (2025-05-02) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1' (2025-04-24) → 'github:NixOS/nixos-hardware/72081c9fbbef63765ae82bff9727ea79cc86bd5b' (2025-04-29) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/f771eb401a46846c1aebd20552521b233dd7e18b' (2025-04-24) → 'github:NixOS/nixpkgs/f02fddb8acef29a8b32f10a335d44828d7825b78' (2025-05-01) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/8ad8b9d65444c358b86bf75f73a036b3fd35bce4' (2025-04-27) → 'github:NixOS/nixpkgs/3e362ce63e16b9572d8c2297c04f7c19ab6725a5' (2025-04-30) • Updated input 'nur': 'github:nix-community/NUR/34c80a75bf09085cfd04a476389a4162c6154d42' (2025-04-26) → 'github:nix-community/NUR/8ac5a922cb4f6eb620ae8668ee89c94e83a04ad1' (2025-05-02) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/f771eb401a46846c1aebd20552521b233dd7e18b' (2025-04-24) → 'github:nixos/nixpkgs/f02fddb8acef29a8b32f10a335d44828d7825b78' (2025-05-01) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index bb3cc52..5cd15f5 100644 --- a/flake.lock +++ b/flake.lock @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1745557122, - "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", + "lastModified": 1746171682, + "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", "owner": "nix-community", "repo": "home-manager", - "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", + "rev": "50eee705bbdbac942074a8c120e8194185633675", "type": "github" }, "original": { @@ -216,11 +216,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1745503349, - "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=", + "lastModified": 1745955289, + "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1", + "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1745526057, - "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", + "lastModified": 1746141548, + "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", + "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1745733216, - "narHash": "sha256-UTgWyFHohRQ8rOcsb6yMClNLwrQtBeyx5uHWGd7qdM8=", + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8ad8b9d65444c358b86bf75f73a036b3fd35bce4", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1745526057, - "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", + "lastModified": 1746141548, + "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", + "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", "type": "github" }, "original": { @@ -317,11 +317,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1745672678, - "narHash": "sha256-+3HDClco9BTgWovVMODc0e8Gh3+LNTt1EXZW2tJaXjA=", + "lastModified": 1746187675, + "narHash": "sha256-3rHcefyJ7girEacTeHZ2qS01aoDpdWQG06WUj3omJ9w=", "owner": "nix-community", "repo": "NUR", - "rev": "34c80a75bf09085cfd04a476389a4162c6154d42", + "rev": "8ac5a922cb4f6eb620ae8668ee89c94e83a04ad1", "type": "github" }, "original": { From b2ab30cdbbfcc82c2dfeb6b7eb0ee3ef20cd8b0b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 4 May 2025 17:06:27 +0200 Subject: [PATCH 211/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/72081c9fbbef63765ae82bff9727ea79cc86bd5b' (2025-04-29) → 'github:NixOS/nixos-hardware/0833dc8bbc4ffa9cf9b0cbfccf1c5ec8632fc66e' (2025-05-04) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/f02fddb8acef29a8b32f10a335d44828d7825b78' (2025-05-01) → 'github:NixOS/nixpkgs/7a2622e2c0dbad5c4493cb268aba12896e28b008' (2025-05-03) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/3e362ce63e16b9572d8c2297c04f7c19ab6725a5' (2025-04-30) → 'github:NixOS/nixpkgs/bf3287dac860542719fe7554e21e686108716879' (2025-05-02) • Updated input 'nur': 'github:nix-community/NUR/8ac5a922cb4f6eb620ae8668ee89c94e83a04ad1' (2025-05-02) → 'github:nix-community/NUR/7882dfa39dad5ada77012882191e5c94b066a864' (2025-05-04) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/f02fddb8acef29a8b32f10a335d44828d7825b78' (2025-05-01) → 'github:nixos/nixpkgs/7a2622e2c0dbad5c4493cb268aba12896e28b008' (2025-05-03) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 5cd15f5..aa25896 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1745955289, - "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", + "lastModified": 1746341346, + "narHash": "sha256-WjupK5Xpc+viJlJWiyPHp/dF4aJItp1BPuFsEdv2/fI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", + "rev": "0833dc8bbc4ffa9cf9b0cbfccf1c5ec8632fc66e", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1746141548, - "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", + "lastModified": 1746232882, + "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", + "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1746183838, + "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "bf3287dac860542719fe7554e21e686108716879", "type": "github" }, "original": { @@ -296,11 +296,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1746141548, - "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", + "lastModified": 1746232882, + "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", + "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", "type": "github" }, "original": { @@ -317,11 +317,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1746187675, - "narHash": "sha256-3rHcefyJ7girEacTeHZ2qS01aoDpdWQG06WUj3omJ9w=", + "lastModified": 1746366397, + "narHash": "sha256-eLivytoIgyu75s7CDjf1z5jLmTGPPONmi2zPayIUNsM=", "owner": "nix-community", "repo": "NUR", - "rev": "8ac5a922cb4f6eb620ae8668ee89c94e83a04ad1", + "rev": "7882dfa39dad5ada77012882191e5c94b066a864", "type": "github" }, "original": { From bbdf2c3c4f0e152ca02a6ede68e02d75869480f3 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 5 May 2025 01:26:56 +0200 Subject: [PATCH 212/330] lanzaboote: 0.3.0->0.4.2; re-lock flake --- flake.lock | 150 ++++++++++++++++------------------------------------- flake.nix | 2 +- 2 files changed, 46 insertions(+), 106 deletions(-) diff --git a/flake.lock b/flake.lock index aa25896..c24c14d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,30 +1,12 @@ { "nodes": { "crane": { - "inputs": { - "flake-compat": [ - "lanzaboote", - "flake-compat" - ], - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ], - "rust-overlay": [ - "lanzaboote", - "rust-overlay" - ] - }, "locked": { - "lastModified": 1681177078, - "narHash": "sha256-ZNIjBDou2GOabcpctiQykEQVkI8BDwk7TyvlWlI4myE=", + "lastModified": 1731098351, + "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", "owner": "ipetkov", "repo": "crane", - "rev": "0c9f468ff00576577d83f5019a66c557ede5acf6", + "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", "type": "github" }, "original": { @@ -36,11 +18,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -57,11 +39,11 @@ ] }, "locked": { - "lastModified": 1680392223, - "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -91,24 +73,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -118,11 +82,11 @@ ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -157,22 +121,21 @@ "crane": "crane", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1682802423, - "narHash": "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs=", + "lastModified": 1737639419, + "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "64b903ca87d18cef2752c19c098af275c6e51d63", + "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.3.0", + "ref": "v0.4.2", "repo": "lanzaboote", "type": "github" } @@ -232,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1746232882, - "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", + "lastModified": 1746328495, + "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", + "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "type": "github" }, "original": { @@ -248,11 +211,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1682741954, - "narHash": "sha256-RPZxzRu8XU0YD2WeYUFYzJy5yAvWUsxkuK+zWw+6WVk=", + "lastModified": 1731919951, + "narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "373e9eb4c42b2fc0611d794de5ea715a35d72393", + "rev": "04386ac325a813047fc314d4b4d838a5b1e3c7fe", "type": "github" }, "original": { @@ -264,27 +227,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1678872516, - "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1746183838, - "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=", + "lastModified": 1746301764, + "narHash": "sha256-5odz+NZszRya//Zd0P8h+sIwOnV35qJi+73f4I+iv1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bf3287dac860542719fe7554e21e686108716879", + "rev": "537ee98218704e21ea465251de512ab6bbb9012e", "type": "github" }, "original": { @@ -296,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1746232882, - "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", + "lastModified": 1746328495, + "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", + "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "type": "github" }, "original": { @@ -317,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1746366397, - "narHash": "sha256-eLivytoIgyu75s7CDjf1z5jLmTGPPONmi2zPayIUNsM=", + "lastModified": 1746395134, + "narHash": "sha256-XU4kz54w4kVOlNKU6uMt/AKejnBJfNuwLTcooDFWM24=", "owner": "nix-community", "repo": "NUR", - "rev": "7882dfa39dad5ada77012882191e5c94b066a864", + "rev": "d4f47d772344dc46d4f190e9faa61ce03b98f454", "type": "github" }, "original": { @@ -336,10 +299,6 @@ "lanzaboote", "flake-compat" ], - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", @@ -348,11 +307,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1681413034, - "narHash": "sha256-/t7OjNQcNkeWeSq/CFLYVBfm+IEnkjoSm9iKvArnUUI=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "d3de8f69ca88fb6f8b09e5b598be5ac98d28ede5", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -377,21 +336,17 @@ }, "rust-overlay": { "inputs": { - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], "nixpkgs": [ "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1682129965, - "narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=", + "lastModified": 1731897198, + "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2c417c0460b788328220120c698630947547ee83", + "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "type": "github" }, "original": { @@ -415,21 +370,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -458,11 +398,11 @@ ] }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1746216483, + "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", "type": "github" }, "original": { @@ -473,7 +413,7 @@ }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1731533236, diff --git a/flake.nix b/flake.nix index 2fe6f6b..0f89e9b 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; lanzaboote = { - url = "github:nix-community/lanzaboote/v0.3.0"; + url = "github:nix-community/lanzaboote/v0.4.2"; # deliberately do _not_ follow the nixpkgs input here, because paranoia and test coverage }; utils.url = "github:numtide/flake-utils"; From 595b5cc2b3e603929abd5074ee3397b18f3b9b50 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 5 May 2025 02:00:07 +0200 Subject: [PATCH 213/330] hosts/thinknix: enable manual fan control possibilities --- hosts/thinknix/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/thinknix/default.nix b/hosts/thinknix/default.nix index 75bd887..431f3ba 100644 --- a/hosts/thinknix/default.nix +++ b/hosts/thinknix/default.nix @@ -22,6 +22,8 @@ speed = 180; }; + boot.extraModprobeConfig = "options thinkpad_acpi fan_control=1"; # enable fan control via echo to /proc/acpi/ibm/fan + schmittlauch.guestUser.enable = true; networking.hostName = "thinknix"; From 2570e191afdc3ede5428c75d65e7df635f0833b1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 9 May 2025 00:19:05 +0200 Subject: [PATCH 214/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/0833dc8bbc4ffa9cf9b0cbfccf1c5ec8632fc66e' (2025-05-04) → 'github:NixOS/nixos-hardware/2ea3ad8a1f26a76f8a8e23fc4f7757c46ef30ee5' (2025-05-07) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/979daf34c8cacebcd917d540070b52a3c2b9b16e' (2025-05-04) → 'github:NixOS/nixpkgs/3730d8a308f94996a9ba7c7138ede69c1b9ac4ae' (2025-05-05) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/537ee98218704e21ea465251de512ab6bbb9012e' (2025-05-03) → 'github:NixOS/nixpkgs/1d3aeb5a193b9ff13f63f4d9cc169fb88129f860' (2025-05-06) • Updated input 'nur': 'github:nix-community/NUR/d4f47d772344dc46d4f190e9faa61ce03b98f454' (2025-05-04) → 'github:nix-community/NUR/228d29ab7ffa3f89d0088917883b179c7bce05f2' (2025-05-08) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/979daf34c8cacebcd917d540070b52a3c2b9b16e' (2025-05-04) → 'github:nixos/nixpkgs/3730d8a308f94996a9ba7c7138ede69c1b9ac4ae' (2025-05-05) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index c24c14d..897ee17 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746341346, - "narHash": "sha256-WjupK5Xpc+viJlJWiyPHp/dF4aJItp1BPuFsEdv2/fI=", + "lastModified": 1746621361, + "narHash": "sha256-T9vOxEqI1j1RYugV0b9dgy0AreiZ9yBDKZJYyclF0og=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0833dc8bbc4ffa9cf9b0cbfccf1c5ec8632fc66e", + "rev": "2ea3ad8a1f26a76f8a8e23fc4f7757c46ef30ee5", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1746328495, - "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", + "lastModified": 1746461020, + "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", + "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746301764, - "narHash": "sha256-5odz+NZszRya//Zd0P8h+sIwOnV35qJi+73f4I+iv1M=", + "lastModified": 1746557022, + "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "537ee98218704e21ea465251de512ab6bbb9012e", + "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1746328495, - "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", + "lastModified": 1746461020, + "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", + "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1746395134, - "narHash": "sha256-XU4kz54w4kVOlNKU6uMt/AKejnBJfNuwLTcooDFWM24=", + "lastModified": 1746740791, + "narHash": "sha256-4o0Aj9BXpybfAkcxY3h9+y0AuC5TtIVztuTdVXYubrI=", "owner": "nix-community", "repo": "NUR", - "rev": "d4f47d772344dc46d4f190e9faa61ce03b98f454", + "rev": "228d29ab7ffa3f89d0088917883b179c7bce05f2", "type": "github" }, "original": { From dac2fb949d90a32295462617783cb4e27582f7c2 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 12 May 2025 23:47:32 +0200 Subject: [PATCH 215/330] 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/50eee705bbdbac942074a8c120e8194185633675' (2025-05-02) → 'github:nix-community/home-manager/b4bbdc6fde16fc2051fcde232f6e288cd22007ca' (2025-05-12) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/2ea3ad8a1f26a76f8a8e23fc4f7757c46ef30ee5' (2025-05-07) → 'github:NixOS/nixos-hardware/d1d68fe8b00248caaa5b3bbe4984c12b47e0867d' (2025-05-12) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/3730d8a308f94996a9ba7c7138ede69c1b9ac4ae' (2025-05-05) → 'github:NixOS/nixpkgs/d89fc19e405cb2d55ce7cc114356846a0ee5e956' (2025-05-10) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/1d3aeb5a193b9ff13f63f4d9cc169fb88129f860' (2025-05-06) → 'github:NixOS/nixpkgs/a39ed32a651fdee6842ec930761e31d1f242cb94' (2025-05-11) • Updated input 'nur': 'github:nix-community/NUR/228d29ab7ffa3f89d0088917883b179c7bce05f2' (2025-05-08) → 'github:nix-community/NUR/375559ab975135e694d34adb905260badf450773' (2025-05-12) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/3730d8a308f94996a9ba7c7138ede69c1b9ac4ae' (2025-05-05) → 'github:nixos/nixpkgs/d89fc19e405cb2d55ce7cc114356846a0ee5e956' (2025-05-10) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 897ee17..ecfab65 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1746171682, - "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", + "lastModified": 1747020534, + "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=", "owner": "nix-community", "repo": "home-manager", - "rev": "50eee705bbdbac942074a8c120e8194185633675", + "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746621361, - "narHash": "sha256-T9vOxEqI1j1RYugV0b9dgy0AreiZ9yBDKZJYyclF0og=", + "lastModified": 1747083103, + "narHash": "sha256-dMx20S2molwqJxbmMB4pGjNfgp5H1IOHNa1Eby6xL+0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2ea3ad8a1f26a76f8a8e23fc4f7757c46ef30ee5", + "rev": "d1d68fe8b00248caaa5b3bbe4984c12b47e0867d", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1746461020, - "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746557022, - "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", + "lastModified": 1746957726, + "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", + "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1746461020, - "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1746740791, - "narHash": "sha256-4o0Aj9BXpybfAkcxY3h9+y0AuC5TtIVztuTdVXYubrI=", + "lastModified": 1747084740, + "narHash": "sha256-jAOpBBLpq+MixGB5/h8Gh/+7EA2Rc/U8S01DcVEchIM=", "owner": "nix-community", "repo": "NUR", - "rev": "228d29ab7ffa3f89d0088917883b179c7bce05f2", + "rev": "375559ab975135e694d34adb905260badf450773", "type": "github" }, "original": { From 4e6ba8bdfda9ee0a01ad0a26b326758237df751e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 15 May 2025 02:19:47 +0200 Subject: [PATCH 216/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/d1d68fe8b00248caaa5b3bbe4984c12b47e0867d' (2025-05-12) → 'github:NixOS/nixos-hardware/e81fd167b33121269149c57806599045fd33eeed' (2025-05-13) • Updated input 'nur': 'github:nix-community/NUR/375559ab975135e694d34adb905260badf450773' (2025-05-12) → 'github:nix-community/NUR/e29c558fa4174da179e2e7f9a41c34466a200fda' (2025-05-14) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index ecfab65..8ee8ebd 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747083103, - "narHash": "sha256-dMx20S2molwqJxbmMB4pGjNfgp5H1IOHNa1Eby6xL+0=", + "lastModified": 1747129300, + "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d1d68fe8b00248caaa5b3bbe4984c12b47e0867d", + "rev": "e81fd167b33121269149c57806599045fd33eeed", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1747084740, - "narHash": "sha256-jAOpBBLpq+MixGB5/h8Gh/+7EA2Rc/U8S01DcVEchIM=", + "lastModified": 1747261242, + "narHash": "sha256-6p8kO62jbk+LUrDrLT23XbClNRyosnlfh/KCbE5fwnQ=", "owner": "nix-community", "repo": "NUR", - "rev": "375559ab975135e694d34adb905260badf450773", + "rev": "e29c558fa4174da179e2e7f9a41c34466a200fda", "type": "github" }, "original": { From 4222e4ac66dad50111da7cfeb68a3dbfea70e50a Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 16 May 2025 13:36:45 +0200 Subject: [PATCH 217/330] home: enable git rerere --- home/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/common.nix b/home/common.nix index 693593f..9cb8df9 100644 --- a/home/common.nix +++ b/home/common.nix @@ -73,6 +73,7 @@ '' ); core.whitespace = "-blank-at-eol,blank-at-eof,space-before-tab"; + rerere.enabled = true; }; lfs.enable = true; delta = { From e64fadd32bd65e4270282e9a63157329bda2b2cc Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 27 Apr 2025 16:15:45 +0200 Subject: [PATCH 218/330] support for patching nixpkgs instance used by home manager - introduce support for patching the used nixpkgs instance via `applyPatches`, see https://ertt.ca/nix/patch-nixpkgs/ - use patched nixpkgs instance in mkHomeManagern (TODO: use it in more places) - add patch for nodejs-20 test failure in darwin (currently just in staging) --- flake.nix | 12 ++++++++- ...2bc76d359b908ad1389ee28c23ee0e862324.patch | 26 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch diff --git a/flake.nix b/flake.nix index 0f89e9b..470ae9b 100644 --- a/flake.nix +++ b/flake.nix @@ -46,6 +46,16 @@ let # FIXME: allow different systems systems = utils.lib.system; + + # ability to extend nixpkgs with patches, e.g. from PRs or staging. See https://ertt.ca/nix/patch-nixpkgs/ + mkNixpkgs-patched = + system: + (import nixpkgs { inherit system; }).applyPatches { + name = "nixpkgs-patched"; + src = nixpkgs; + patches = [ ./patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch ]; + }; + # necessary to make the top-level inputs available to system configuration # inspired by https://jade.fyi/blog/flakes-arent-real/ inputInjection = @@ -78,7 +88,7 @@ mkHomeManager = confName: user: system: # unfortunately, home-manager configs are still system-specific home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.${system}; + pkgs = import (mkNixpkgs-patched system) { inherit system; }; modules = [ { imports = [ diff --git a/patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch b/patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch new file mode 100644 index 0000000..dbaf9ee --- /dev/null +++ b/patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch @@ -0,0 +1,26 @@ +From 362c2bc76d359b908ad1389ee28c23ee0e862324 Mon Sep 17 00:00:00 2001 +From: Ihar Hrachyshka +Date: Mon, 7 Apr 2025 21:03:09 -0400 +Subject: [PATCH] nodejs_20: fix test failure on darwin on latest MacOS 15.4 + +Signed-off-by: Ihar Hrachyshka +(cherry picked from commit 9674c1f688d12b99fbde26e6068ab62609fef3b1) +--- + pkgs/development/web/nodejs/v20.nix | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix +index b9c9345c441afa..20cceb5b5d1cda 100644 +--- a/pkgs/development/web/nodejs/v20.nix ++++ b/pkgs/development/web/nodejs/v20.nix +@@ -50,5 +50,10 @@ buildNodejs { + stripLen = 1; + hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg="; + }) ++ # fix test failure on macos 15.4 ++ (fetchpatch2 { ++ url = "https://github.com/nodejs/node/commit/33f6e1ea296cd20366ab94e666b03899a081af94.patch?full_index=1"; ++ hash = "sha256-aVBMcQlhQeviUQpMIfC988jjDB2BgYzlMYsq+w16mzU="; ++ }) + ] ++ gypPatches; + } From d95c277383bededf6c19bb3b713f3964373a5794 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 20 May 2025 17:28:48 +0200 Subject: [PATCH 219/330] flake: nixpkgs 24.11 -> 25.05, relock all inputs 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/b4bbdc6fde16fc2051fcde232f6e288cd22007ca' (2025-05-12) → 'github:nix-community/home-manager/d0bbd221482c2713cccb80220f3c9d16a6e20a33' (2025-05-18) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/fc843893cecc1838a59713ee3e50e9e7edc6207c' (2025-03-28) → 'github:LnL7/nix-darwin/74ecd01d2c122f8a4a48066ab1d48f3e01671671' (2025-05-20) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/e81fd167b33121269149c57806599045fd33eeed' (2025-05-13) → 'github:NixOS/nixos-hardware/6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282' (2025-05-20) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/d89fc19e405cb2d55ce7cc114356846a0ee5e956' (2025-05-10) → 'github:NixOS/nixpkgs/292fa7d4f6519c074f0a50394dbbe69859bb6043' (2025-05-18) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/a39ed32a651fdee6842ec930761e31d1f242cb94' (2025-05-11) → 'github:NixOS/nixpkgs/ca49c4304acf0973078db0a9d200fd2bae75676d' (2025-05-18) • Updated input 'nur': 'github:nix-community/NUR/e29c558fa4174da179e2e7f9a41c34466a200fda' (2025-05-14) → 'github:nix-community/NUR/e52a85ce10a990ac6d7356f3a753fde0860426a8' (2025-05-20) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/d89fc19e405cb2d55ce7cc114356846a0ee5e956' (2025-05-10) → 'github:nixos/nixpkgs/292fa7d4f6519c074f0a50394dbbe69859bb6043' (2025-05-18) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/29ec5026372e0dec56f890e50dbe4f45930320fd' (2025-05-02) → 'github:numtide/treefmt-nix/ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb' (2025-05-17) --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- flake.nix | 6 +++--- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 8ee8ebd..36ef547 100644 --- a/flake.lock +++ b/flake.lock @@ -102,16 +102,16 @@ ] }, "locked": { - "lastModified": 1747020534, - "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=", + "lastModified": 1747556831, + "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -163,27 +163,27 @@ ] }, "locked": { - "lastModified": 1743127615, - "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=", + "lastModified": 1747752302, + "narHash": "sha256-XqNAcEFfe5tJZGlx+Su0G67ZwRwZmHNWwiMK0fji0Hw=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c", + "rev": "74ecd01d2c122f8a4a48066ab1d48f3e01671671", "type": "github" }, "original": { "owner": "LnL7", - "ref": "nix-darwin-24.11", + "ref": "nix-darwin-25.05", "repo": "nix-darwin", "type": "github" } }, "nixos-hardware": { "locked": { - "lastModified": 1747129300, - "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", + "lastModified": 1747723695, + "narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e81fd167b33121269149c57806599045fd33eeed", + "rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1746904237, - "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { @@ -243,27 +243,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746957726, - "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", + "lastModified": 1747610100, + "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", + "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1746904237, - "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1747261242, - "narHash": "sha256-6p8kO62jbk+LUrDrLT23XbClNRyosnlfh/KCbE5fwnQ=", + "lastModified": 1747753144, + "narHash": "sha256-yCkh/1/NMrvXP0Ddqo4kX7rqLrn6euLkmP2RTvyLims=", "owner": "nix-community", "repo": "NUR", - "rev": "e29c558fa4174da179e2e7f9a41c34466a200fda", + "rev": "e52a85ce10a990ac6d7356f3a753fde0860426a8", "type": "github" }, "original": { @@ -398,11 +398,11 @@ ] }, "locked": { - "lastModified": 1746216483, - "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", + "lastModified": 1747469671, + "narHash": "sha256-bo1ptiFoNqm6m1B2iAhJmWCBmqveLVvxom6xKmtuzjg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", + "rev": "ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0f89e9b..68fb4e6 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ description = "NixOS system flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; lanzaboote = { @@ -19,7 +19,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nix-darwin = { - url = "github:LnL7/nix-darwin/nix-darwin-24.11"; + url = "github:LnL7/nix-darwin/nix-darwin-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; From 82b0a6cab18327859033a135432bf5b5eb6bac02 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 20 May 2025 18:55:08 +0200 Subject: [PATCH 220/330] Adjustments for 24.11 -> 25.05 package replacements, warnings, deprecations --- common/default.nix | 2 +- common/packages.nix | 2 +- common/pulseaudio.nix | 2 +- home/common.nix | 6 +- home/desktop.nix | 2 +- home/modules/packages.nix | 21 ++-- home/modules/vscodium.nix | 212 +++++++++++++++++++------------------- home/workmac.nix | 2 +- 8 files changed, 124 insertions(+), 125 deletions(-) diff --git a/common/default.nix b/common/default.nix index a600ff3..5fbf46a 100644 --- a/common/default.nix +++ b/common/default.nix @@ -181,7 +181,7 @@ in # Flatpak support services.flatpak.enable = true; - xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ]; + xdg.portal.extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ]; # Define a user account. Don't forget to set a password with `passwd`. users.users.spiollinux = { diff --git a/common/packages.nix b/common/packages.nix index 9634e2a..ec4f22b 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -40,7 +40,7 @@ exfat iotop cifs-utils - dstat + dool lsof macchanger borgbackup diff --git a/common/pulseaudio.nix b/common/pulseaudio.nix index ed94170..7323b57 100644 --- a/common/pulseaudio.nix +++ b/common/pulseaudio.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { # Enable sound. - hardware.pulseaudio = { + services.pulseaudio = { enable = true; package = pkgs.pulseaudioFull; # decouple pulseaudio application and sink volumes diff --git a/home/common.nix b/home/common.nix index 9cb8df9..c2c5264 100644 --- a/home/common.nix +++ b/home/common.nix @@ -51,9 +51,7 @@ merge.tool = "vimdiff"; # provide `git mergetool -t nixfmt` mergetool.nixfmt = { - cmd = "${ - lib.getExe inputs.nixos-unstable.legacyPackages.${system}.nixfmt-rfc-style - } --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""; + cmd = "${lib.getExe pkgs.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""; trustExitCode = true; }; core.excludesfile = toString ( @@ -105,7 +103,7 @@ enable = true; syntaxHighlighting.enable = true; history.ignoreSpace = true; - initExtra = '' + initContent = '' # Uncomment following line if you want red dots to be displayed while waiting for completion COMPLETION_WAITING_DOTS="true" ### Fix slowness of pastes with zsh-syntax-highlighting.zsh diff --git a/home/desktop.nix b/home/desktop.nix index 212debf..1e089e7 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -72,7 +72,7 @@ services.gpg-agent = { enable = true; #enableSshSupport = true; - pinentryPackage = pkgs.pinentry-qt; + pinentry.package = pkgs.pinentry-qt; }; programs.ssh = { diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 79052c5..1544646 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -17,16 +17,16 @@ let inkscape darktable exiftool - gimp + gimp3 ] - ++ (with gimpPlugins; [ - fourier - lqrPlugin + ++ (with gimp3Plugins; [ + #fourier # broken + #lqrPlugin # broken ]) ++ lib.optionals pkgs.stdenv.isLinux [ hugin - luminanceHDR - xournal + #luminanceHDR # FIXME, build failure + xournalpp ]; multimediaApps = @@ -38,7 +38,7 @@ let vlc amarok clementine - elisa + kdePackages.elisa musescore tenacity soundkonverter @@ -122,7 +122,7 @@ let ]; pythonTools = with python3Packages; [ - python3 # to shadow old macOS python + python # to shadow old macOS python ipython uv pip @@ -148,7 +148,7 @@ let desktopLinux = [ firefox chromium - falkon + kdePackages.falkon thunderbird calibre dino @@ -172,7 +172,6 @@ let pulseaudioSupport = pkgs.stdenv.isLinux; }) pdfpc - quaternion nheko gpxsee subsurface @@ -183,7 +182,7 @@ let #(pkgs.pidgin-with-plugins.override { # plugins = [ pkgs.pidginotr ];}) - unstable.logseq + logseq # for Hibiscus banking software jameica diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 76b4c8d..9678dce 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -11,112 +11,114 @@ enable = true; package = pkgs.vscodium; mutableExtensionsDir = true; - extensions = - with pkgs.vscode-extensions; - [ - ms-python.python - vscodevim.vim - yzhang.markdown-all-in-one - bungcip.better-toml - eamodio.gitlens - jnoortheen.nix-ide - mkhl.direnv - editorconfig.editorconfig - ] - ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + profiles.default = { + extensions = + with pkgs.vscode-extensions; + [ + ms-python.python + vscodevim.vim + yzhang.markdown-all-in-one + bungcip.better-toml + eamodio.gitlens + jnoortheen.nix-ide + mkhl.direnv + editorconfig.editorconfig + ] + ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + name = "Sync-Rsync"; + publisher = "vscode-ext"; + version = "0.36.0"; + sha256 = "sha256-0b/OHLZfXo0NAVAVkzZSqMGDzF0uvPRoiqsZtW1iOdA"; + } + # TODO: probably available in nixpkgs soonish? + { + name = "mypy-type-checker"; + publisher = "ms-python"; + version = "2023.3.12681020"; + sha256 = "sha256-rhed7CQlvxksVCGc9nPU2oYQWtXcAV5TzuG63e8Y3zM="; + } + { + name = "black-formatter"; + publisher = "ms-python"; + version = "2023.5.12771008"; + sha256 = "sha256-lJG0RRUUMhQGs2a6oBtoqt+uY1kSJ0+cbmaP07hNh2o="; + } + { + name = "vscode-pets"; + publisher = "tonybaloney"; + version = "1.25.1"; + sha256 = "sha256-as3e2LzKBSsiGs/UGIZ06XqbLh37irDUaCzslqITEJQ="; + } + ]; + userSettings = + let + defaultPython = pkgs.python3.withPackages (ps: [ + ps.jedi + ps.jedi-language-server + ps.pip + ps.setuptools # for pkg_resources + ps.black + ps.mypy + ]); + in { - name = "Sync-Rsync"; - publisher = "vscode-ext"; - version = "0.36.0"; - sha256 = "sha256-0b/OHLZfXo0NAVAVkzZSqMGDzF0uvPRoiqsZtW1iOdA"; - } - # TODO: probably available in nixpkgs soonish? - { - name = "mypy-type-checker"; - publisher = "ms-python"; - version = "2023.3.12681020"; - sha256 = "sha256-rhed7CQlvxksVCGc9nPU2oYQWtXcAV5TzuG63e8Y3zM="; - } - { - name = "black-formatter"; - publisher = "ms-python"; - version = "2023.5.12771008"; - sha256 = "sha256-lJG0RRUUMhQGs2a6oBtoqt+uY1kSJ0+cbmaP07hNh2o="; - } - { - name = "vscode-pets"; - publisher = "tonybaloney"; - version = "1.25.1"; - sha256 = "sha256-as3e2LzKBSsiGs/UGIZ06XqbLh37irDUaCzslqITEJQ="; - } - ]; - userSettings = - let - defaultPython = pkgs.python3.withPackages (ps: [ - ps.jedi - ps.jedi-language-server - ps.pip - ps.setuptools # for pkg_resources - ps.black - ps.mypy - ]); - in - { - "editor.fontLigatures" = true; - "editor.accessibilitySupport" = false; # prevent asking - "editor.cursorBlinking" = "phase"; - "editor.stickyScroll.enabled" = true; - "workbench.editor.highlightModifiedTabs" = true; - "window.autoDetectColorScheme" = true; - "workbench.preferredDarkColorTheme" = "Default Dark Modern"; - "workbench.preferredLightColorTheme" = "Default Light Modern"; - "[nix]" = { - "editor.insertSpaces" = true; - "editor.tabSize" = 2; - # for now, disable automatic formatting to prevent disruption of existing code bases - "editor.formatOnPaste" = false; - "editor.formatOnSave" = false; - "editor.formatOnType" = false; + "editor.fontLigatures" = true; + "editor.accessibilitySupport" = false; # prevent asking + "editor.cursorBlinking" = "phase"; + "editor.stickyScroll.enabled" = true; + "workbench.editor.highlightModifiedTabs" = true; + "window.autoDetectColorScheme" = true; + "workbench.preferredDarkColorTheme" = "Default Dark Modern"; + "workbench.preferredLightColorTheme" = "Default Light Modern"; + "[nix]" = { + "editor.insertSpaces" = true; + "editor.tabSize" = 2; + # for now, disable automatic formatting to prevent disruption of existing code bases + "editor.formatOnPaste" = false; + "editor.formatOnSave" = false; + "editor.formatOnType" = false; + }; + "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style; + "nix.enableLanguageServer" = true; + "nix.serverPath" = lib.getExe pkgs.nixd; + "nix.serverSettings" = { }; + "editor.fontSize" = 13; + "editor.fontWeight" = "normal"; + "git.detectSubmodulesLimit" = 30; + "[python]" = { + "breadcrumbs.showClasses" = true; + "breadcrumbs.showFunctions" = true; + "gitlens.codeLens.symbolScopes" = [ "!Module" ]; + "editor.defaultFormatter" = "ms-python.black-formatter"; + "editor.formatOnSave" = true; + }; + "python.languageServer" = "Jedi"; # don't use proprietary pylance server + "python.defaultInterpreterPath" = "${defaultPython}/bin/python"; + "black-formatter.path" = [ "${pkgs.python3Packages.black}/bin/black" ]; + "black-formatter.importStrategy" = "fromEnvironment"; + "mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/mypy" ]; + "mypy-type-checker.importStrategy" = "fromEnvironment"; + "mypy-type-checker.args" = [ "--ignore-missing-imports" ]; + "gitlens.telemetry.enabled" = false; + "vim.highlightedyank.enable" = true; + "vim.history" = 500; + "vim.neovimUseConfigFile" = true; + "vim.enableNeovim" = true; + "git.suggestSmartCommit" = false; + "editor.rulers" = [ 79 ]; + "vim.useSystemClipboard" = true; + "vim.smartRelativeLine" = true; + "diffEditor.ignoreTrimWhitespace" = false; + "files.associations" = { + "*.py" = "python"; + }; + "editor.renderWhitespace" = "all"; + "editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace"; + "vim.neovimPath" = lib.getExe pkgs.myVim; + "sync-rsync.options" = [ ]; + "direnv.path.executable" = lib.getExe pkgs.direnv; }; - "nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style; - "nix.enableLanguageServer" = true; - "nix.serverPath" = lib.getExe pkgs.nixd; - "nix.serverSettings" = { }; - "editor.fontSize" = 13; - "editor.fontWeight" = "normal"; - "git.detectSubmodulesLimit" = 30; - "[python]" = { - "breadcrumbs.showClasses" = true; - "breadcrumbs.showFunctions" = true; - "gitlens.codeLens.symbolScopes" = [ "!Module" ]; - "editor.defaultFormatter" = "ms-python.black-formatter"; - "editor.formatOnSave" = true; - }; - "python.languageServer" = "Jedi"; # don't use proprietary pylance server - "python.defaultInterpreterPath" = "${defaultPython}/bin/python"; - "black-formatter.path" = [ "${pkgs.python3Packages.black}/bin/black" ]; - "black-formatter.importStrategy" = "fromEnvironment"; - "mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/mypy" ]; - "mypy-type-checker.importStrategy" = "fromEnvironment"; - "mypy-type-checker.args" = [ "--ignore-missing-imports" ]; - "gitlens.telemetry.enabled" = false; - "vim.highlightedyank.enable" = true; - "vim.history" = 500; - "vim.neovimUseConfigFile" = true; - "vim.enableNeovim" = true; - "git.suggestSmartCommit" = false; - "editor.rulers" = [ 79 ]; - "vim.useSystemClipboard" = true; - "vim.smartRelativeLine" = true; - "diffEditor.ignoreTrimWhitespace" = false; - "files.associations" = { - "*.py" = "python"; - }; - "editor.renderWhitespace" = "all"; - "editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace"; - "vim.neovimPath" = lib.getExe pkgs.myVim; - "sync-rsync.options" = [ ]; - "direnv.path.executable" = lib.getExe pkgs.direnv; - }; + }; }; } diff --git a/home/workmac.nix b/home/workmac.nix index f2b7969..5227db0 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -89,7 +89,7 @@ in }; # some extra shell scripts - programs.zsh.initExtra = lib.mkAfter ( + programs.zsh.initContent = lib.mkAfter ( import ./scripts/reporsync.nix { inherit pkgs lib; } + import ./scripts/ssh-loop-fc.nix { inherit pkgs lib; } ); From 2b06c59dd8438fbe18b528f1cf4d5a9cf8b610ea Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 20 May 2025 23:11:00 +0200 Subject: [PATCH 221/330] flake, darwin: nixpkgs patching not required anymore with 25.05 keeping the architecture for doing so available for future needs though. --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index fc9cdaf..f12afde 100644 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,7 @@ (import nixpkgs { inherit system; }).applyPatches { name = "nixpkgs-patched"; src = nixpkgs; - patches = [ ./patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch ]; + patches = [ ]; }; # necessary to make the top-level inputs available to system configuration From f03e5ae52caf38cb8a070177f56fc372c276e829 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 20 May 2025 23:35:11 +0200 Subject: [PATCH 222/330] darwin: build adjustments for 25.05 --- darwin/configuration.nix | 5 +---- home/modules/packages.nix | 7 +++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/darwin/configuration.nix b/darwin/configuration.nix index fc577ec..307836f 100644 --- a/darwin/configuration.nix +++ b/darwin/configuration.nix @@ -4,7 +4,6 @@ imports = [ ../common/nix-settings.nix ]; nix = { enable = true; - package = pkgs.nixVersions.nix_2_25; settings = { trusted-users = [ "os" @@ -21,9 +20,6 @@ }; }; - # Auto upgrade nix package and the daemon service. - services.nix-daemon.enable = true; - # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget environment.systemPackages = [ pkgs.vim ]; @@ -38,6 +34,7 @@ # system-wide SSH configuration, used by nix-daemon for remote builders # show hidden files + system.primaryUser = "os"; system.defaults.NSGlobalDomain.AppleShowAllFiles = true; # Used for backwards compatibility, please read the changelog before changing. diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 1544646..e32b0e1 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -17,16 +17,19 @@ let inkscape darktable exiftool - gimp3 ] ++ (with gimp3Plugins; [ #fourier # broken #lqrPlugin # broken ]) ++ lib.optionals pkgs.stdenv.isLinux [ + gimp3 hugin #luminanceHDR # FIXME, build failure xournalpp + ] + ++ lib.optionals pkgs.stdenv.isDarwin [ + gimp ]; multimediaApps = @@ -142,7 +145,6 @@ let desktopCommon = [ keepassxc - tigervnc ]; desktopLinux = [ @@ -171,6 +173,7 @@ let mediaSupport = true; pulseaudioSupport = pkgs.stdenv.isLinux; }) + tigervnc pdfpc nheko gpxsee From 603411fa64eabe351279ea210aec2e2d03977105 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 20 May 2025 23:56:37 +0200 Subject: [PATCH 223/330] thinknix: do not use powersave CPU governor powersave turns out to be rather slow on today's software stacks --- hosts/thinknix/hardware-configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/thinknix/hardware-configuration.nix b/hosts/thinknix/hardware-configuration.nix index e60ac46..74708b5 100644 --- a/hosts/thinknix/hardware-configuration.nix +++ b/hosts/thinknix/hardware-configuration.nix @@ -21,7 +21,6 @@ boot.extraModulePackages = [ ]; nix.settings.max-jobs = lib.mkDefault 4; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; # modesetting is always better than intel (legacy) services.xserver.videoDrivers = [ "modesetting" ]; From 226cb11480eafbd79c49751b830a2f12dbc4d039 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 21 May 2025 16:14:09 +0200 Subject: [PATCH 224/330] vscodium: use ruff for python formatting instead of black --- home/modules/vscodium.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 9678dce..a42b7ec 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -16,6 +16,7 @@ with pkgs.vscode-extensions; [ ms-python.python + charliermarsh.ruff vscodevim.vim yzhang.markdown-all-in-one bungcip.better-toml @@ -38,12 +39,6 @@ version = "2023.3.12681020"; sha256 = "sha256-rhed7CQlvxksVCGc9nPU2oYQWtXcAV5TzuG63e8Y3zM="; } - { - name = "black-formatter"; - publisher = "ms-python"; - version = "2023.5.12771008"; - sha256 = "sha256-lJG0RRUUMhQGs2a6oBtoqt+uY1kSJ0+cbmaP07hNh2o="; - } { name = "vscode-pets"; publisher = "tonybaloney"; @@ -90,16 +85,17 @@ "breadcrumbs.showClasses" = true; "breadcrumbs.showFunctions" = true; "gitlens.codeLens.symbolScopes" = [ "!Module" ]; - "editor.defaultFormatter" = "ms-python.black-formatter"; + "editor.defaultFormatter" = "charliermarsh.ruff"; "editor.formatOnSave" = true; }; + "python.experiments.enabled" = false; "python.languageServer" = "Jedi"; # don't use proprietary pylance server "python.defaultInterpreterPath" = "${defaultPython}/bin/python"; - "black-formatter.path" = [ "${pkgs.python3Packages.black}/bin/black" ]; - "black-formatter.importStrategy" = "fromEnvironment"; "mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/mypy" ]; "mypy-type-checker.importStrategy" = "fromEnvironment"; "mypy-type-checker.args" = [ "--ignore-missing-imports" ]; + "ruff.path" = [ (lib.getExe pkgs.ruff) ]; + "ruff.importStrategy" = "fromEnvironment"; "gitlens.telemetry.enabled" = false; "vim.highlightedyank.enable" = true; "vim.history" = 500; From 3c18ec5d0a2b7b1ed91ffa5723752dc9b9d525d1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 25 May 2025 19:17:53 +0200 Subject: [PATCH 225/330] 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-darwin': 'github:LnL7/nix-darwin/74ecd01d2c122f8a4a48066ab1d48f3e01671671' (2025-05-20) → 'github:LnL7/nix-darwin/2456ff5c95edfc3b197cb012b947012faed77591' (2025-05-23) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282' (2025-05-20) → 'github:NixOS/nixos-hardware/11f2d9ea49c3e964315215d6baa73a8d42672f06' (2025-05-22) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/292fa7d4f6519c074f0a50394dbbe69859bb6043' (2025-05-18) → 'github:NixOS/nixpkgs/063f43f2dbdef86376cc29ad646c45c46e93234c' (2025-05-23) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/ca49c4304acf0973078db0a9d200fd2bae75676d' (2025-05-18) → 'github:NixOS/nixpkgs/7c43f080a7f28b2774f3b3f43234ca11661bf334' (2025-05-25) • Updated input 'nur': 'github:nix-community/NUR/e52a85ce10a990ac6d7356f3a753fde0860426a8' (2025-05-20) → 'github:nix-community/NUR/1fddc69b73b54110650213d13f363227da765237' (2025-05-25) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/292fa7d4f6519c074f0a50394dbbe69859bb6043' (2025-05-18) → 'github:nixos/nixpkgs/063f43f2dbdef86376cc29ad646c45c46e93234c' (2025-05-23) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb' (2025-05-17) → 'github:numtide/treefmt-nix/020cb423808365fa3f10ff4cb8c0a25df35065a3' (2025-05-22) --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 36ef547..98d969a 100644 --- a/flake.lock +++ b/flake.lock @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1747752302, - "narHash": "sha256-XqNAcEFfe5tJZGlx+Su0G67ZwRwZmHNWwiMK0fji0Hw=", + "lastModified": 1748044287, + "narHash": "sha256-9bJzyUX5+HXYmI60WMGYXXDdhGbSh1Le6yBM4og3K7E=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "74ecd01d2c122f8a4a48066ab1d48f3e01671671", + "rev": "2456ff5c95edfc3b197cb012b947012faed77591", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747723695, - "narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747610100, - "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", + "lastModified": 1748162331, + "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", + "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1747753144, - "narHash": "sha256-yCkh/1/NMrvXP0Ddqo4kX7rqLrn6euLkmP2RTvyLims=", + "lastModified": 1748190776, + "narHash": "sha256-t734cEJ3zKUEUdlIWVPiy9WxU66WhXqg9XQwoDhLMeA=", "owner": "nix-community", "repo": "NUR", - "rev": "e52a85ce10a990ac6d7356f3a753fde0860426a8", + "rev": "1fddc69b73b54110650213d13f363227da765237", "type": "github" }, "original": { @@ -398,11 +398,11 @@ ] }, "locked": { - "lastModified": 1747469671, - "narHash": "sha256-bo1ptiFoNqm6m1B2iAhJmWCBmqveLVvxom6xKmtuzjg=", + "lastModified": 1747912973, + "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb", + "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3", "type": "github" }, "original": { From a81f00bc832bfba8338852ca6d02760463f81891 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 28 May 2025 03:48:48 +0200 Subject: [PATCH 226/330] 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/d0bbd221482c2713cccb80220f3c9d16a6e20a33' (2025-05-18) → 'github:nix-community/home-manager/83665c39fa688bd6a1f7c43cf7997a70f6a109f9' (2025-05-26) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/2456ff5c95edfc3b197cb012b947012faed77591' (2025-05-23) → 'github:LnL7/nix-darwin/75b99daa12b1fffd646d6c3cf13b06f1fa5cef63' (2025-05-27) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/063f43f2dbdef86376cc29ad646c45c46e93234c' (2025-05-23) → 'github:NixOS/nixpkgs/62b852f6c6742134ade1abdd2a21685fd617a291' (2025-05-25) • Updated input 'nur': 'github:nix-community/NUR/1fddc69b73b54110650213d13f363227da765237' (2025-05-25) → 'github:nix-community/NUR/86cc4fe96799d2415a824daf0cfcdfc7205e7fca' (2025-05-28) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/063f43f2dbdef86376cc29ad646c45c46e93234c' (2025-05-23) → 'github:nixos/nixpkgs/62b852f6c6742134ade1abdd2a21685fd617a291' (2025-05-25) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/020cb423808365fa3f10ff4cb8c0a25df35065a3' (2025-05-22) → 'github:numtide/treefmt-nix/1f3f7b784643d488ba4bf315638b2b0a4c5fb007' (2025-05-26) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 98d969a..ed613c9 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1747556831, - "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", + "lastModified": 1748226808, + "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", + "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9", "type": "github" }, "original": { @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1748044287, - "narHash": "sha256-9bJzyUX5+HXYmI60WMGYXXDdhGbSh1Le6yBM4og3K7E=", + "lastModified": 1748373722, + "narHash": "sha256-qi6aDGP2W6GyAUNEhg+slQWEpUiJ8LNIrQkmxHpzadI=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "2456ff5c95edfc3b197cb012b947012faed77591", + "rev": "75b99daa12b1fffd646d6c3cf13b06f1fa5cef63", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1748190776, - "narHash": "sha256-t734cEJ3zKUEUdlIWVPiy9WxU66WhXqg9XQwoDhLMeA=", + "lastModified": 1748393063, + "narHash": "sha256-G7xbGhrSZqlMYrrjqe6HOG/yQldfnCaa7ZuPVteiIOE=", "owner": "nix-community", "repo": "NUR", - "rev": "1fddc69b73b54110650213d13f363227da765237", + "rev": "86cc4fe96799d2415a824daf0cfcdfc7205e7fca", "type": "github" }, "original": { @@ -398,11 +398,11 @@ ] }, "locked": { - "lastModified": 1747912973, - "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=", + "lastModified": 1748243702, + "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3", + "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", "type": "github" }, "original": { From afddb44d9cc0f2339a470d307a2d29f610fe2cec Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 31 May 2025 15:52:16 +0200 Subject: [PATCH 227/330] 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/83665c39fa688bd6a1f7c43cf7997a70f6a109f9' (2025-05-26) → 'github:nix-community/home-manager/282e1e029cb6ab4811114fc85110613d72771dea' (2025-05-31) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/11f2d9ea49c3e964315215d6baa73a8d42672f06' (2025-05-22) → 'github:NixOS/nixos-hardware/daa628a725ab4948e0e2b795e8fb6f4c3e289a7a' (2025-05-30) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/62b852f6c6742134ade1abdd2a21685fd617a291' (2025-05-25) → 'github:NixOS/nixpkgs/96ec055edbe5ee227f28cdbc3f1ddf1df5965102' (2025-05-28) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/7c43f080a7f28b2774f3b3f43234ca11661bf334' (2025-05-25) → 'github:NixOS/nixpkgs/7282cb574e0607e65224d33be8241eae7cfe0979' (2025-05-28) • Updated input 'nur': 'github:nix-community/NUR/86cc4fe96799d2415a824daf0cfcdfc7205e7fca' (2025-05-28) → 'github:nix-community/NUR/84d20e10373136d5741ff7d53fcf2b5a831518a0' (2025-05-31) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/62b852f6c6742134ade1abdd2a21685fd617a291' (2025-05-25) → 'github:nixos/nixpkgs/96ec055edbe5ee227f28cdbc3f1ddf1df5965102' (2025-05-28) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index ed613c9..f00c594 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1748226808, - "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=", + "lastModified": 1748665073, + "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=", "owner": "nix-community", "repo": "home-manager", - "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9", + "rev": "282e1e029cb6ab4811114fc85110613d72771dea", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747900541, - "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", + "lastModified": 1748634340, + "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", + "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748162331, - "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", + "lastModified": 1748437600, + "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", + "rev": "7282cb574e0607e65224d33be8241eae7cfe0979", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1748393063, - "narHash": "sha256-G7xbGhrSZqlMYrrjqe6HOG/yQldfnCaa7ZuPVteiIOE=", + "lastModified": 1748693932, + "narHash": "sha256-yvoVbPJzm230Q0lwJeuO/Ou4SVv9wXtlzMD1apKpZOo=", "owner": "nix-community", "repo": "NUR", - "rev": "86cc4fe96799d2415a824daf0cfcdfc7205e7fca", + "rev": "84d20e10373136d5741ff7d53fcf2b5a831518a0", "type": "github" }, "original": { From 718ca8c60b5f393277928a4cb3b681f93f36bc49 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 31 May 2025 18:23:07 +0200 Subject: [PATCH 228/330] framenix: switch to LTS kernel Hopefully the hardware is old enough now to work with LTS kernels. This way we avoid build failures with 3rd party kernel modules (e.g. virtualbox) that are not adapted yet. --- hosts/framenix/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 166f4ee..f1e62cd 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -23,9 +23,6 @@ in # override tmpdir for daemon systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp"; - # try newer kernels - boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernelParams = [ # powersave "amd_pstate=active" From 9a29b0411aa557a6921c0c1d7490aeb4646222a3 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 3 Jun 2025 20:51:16 +0200 Subject: [PATCH 229/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/daa628a725ab4948e0e2b795e8fb6f4c3e289a7a' (2025-05-30) → 'github:NixOS/nixos-hardware/fc7c4714125cfaa19b048e8aaf86b9c53e04d853' (2025-06-03) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/96ec055edbe5ee227f28cdbc3f1ddf1df5965102' (2025-05-28) → 'github:NixOS/nixpkgs/910796cabe436259a29a72e8d3f5e180fc6dfacc' (2025-05-31) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/7282cb574e0607e65224d33be8241eae7cfe0979' (2025-05-28) → 'github:NixOS/nixpkgs/10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922' (2025-06-02) • Updated input 'nur': 'github:nix-community/NUR/84d20e10373136d5741ff7d53fcf2b5a831518a0' (2025-05-31) → 'github:nix-community/NUR/90add46380908ba4395f5f1dfec84224a3b0d4b9' (2025-06-03) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/96ec055edbe5ee227f28cdbc3f1ddf1df5965102' (2025-05-28) → 'github:nixos/nixpkgs/910796cabe436259a29a72e8d3f5e180fc6dfacc' (2025-05-31) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index f00c594..57216c2 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1748634340, - "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=", + "lastModified": 1748942041, + "narHash": "sha256-HEu2gTct7nY0tAPRgBtqYepallryBKR1U8B4v2zEEqA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a", + "rev": "fc7c4714125cfaa19b048e8aaf86b9c53e04d853", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748437600, - "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=", + "lastModified": 1748889542, + "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7282cb574e0607e65224d33be8241eae7cfe0979", + "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1748693932, - "narHash": "sha256-yvoVbPJzm230Q0lwJeuO/Ou4SVv9wXtlzMD1apKpZOo=", + "lastModified": 1748973087, + "narHash": "sha256-ZN0XKKdCBC9eLeog7qYhfGPbajkPtQPdlxp/dhwONw4=", "owner": "nix-community", "repo": "NUR", - "rev": "84d20e10373136d5741ff7d53fcf2b5a831518a0", + "rev": "90add46380908ba4395f5f1dfec84224a3b0d4b9", "type": "github" }, "original": { From c118bebe15d2c54db57f9aeab9ada92f631745cf Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 3 Jun 2025 21:09:29 +0200 Subject: [PATCH 230/330] backintime: uninstall not really used anymore --- home/modules/packages.nix | 1 - nixremotebuildermachines | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 nixremotebuildermachines diff --git a/home/modules/packages.nix b/home/modules/packages.nix index e32b0e1..cd8391a 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -166,7 +166,6 @@ let seafile-client alacritty libreoffice-qt6 # still with KDE integration - backintime-common anki signal-desktop (tor-browser-bundle-bin.override { diff --git a/nixremotebuildermachines b/nixremotebuildermachines new file mode 100644 index 0000000..82800d1 --- /dev/null +++ b/nixremotebuildermachines @@ -0,0 +1 @@ +ssh-ng://schmittlauch@build01.nix-community.org x86_64-linux /root/.ssh/remote_builder_key 64 1 big-parallel,kvm,nixos-test - From f30919669353bb32f4703f8d8ffb2a9c6d69833e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 3 Jun 2025 21:59:56 +0200 Subject: [PATCH 231/330] keepassxc: fix build on darwin Pulling in a temporary patch for nixpkgs from an open PR. --- flake.nix | 2 +- patches/keepassxc-fix-darwin-build.patch | 26 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 patches/keepassxc-fix-darwin-build.patch diff --git a/flake.nix b/flake.nix index f12afde..20809d2 100644 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,7 @@ (import nixpkgs { inherit system; }).applyPatches { name = "nixpkgs-patched"; src = nixpkgs; - patches = [ ]; + patches = [ ./patches/keepassxc-fix-darwin-build.patch ]; }; # necessary to make the top-level inputs available to system configuration diff --git a/patches/keepassxc-fix-darwin-build.patch b/patches/keepassxc-fix-darwin-build.patch new file mode 100644 index 0000000..3684a24 --- /dev/null +++ b/patches/keepassxc-fix-darwin-build.patch @@ -0,0 +1,26 @@ +From 49b7ae226cedb0adb403758e0c63d09762297a22 Mon Sep 17 00:00:00 2001 +From: Fernando Rodrigues +Date: Wed, 28 May 2025 14:06:23 -0300 +Subject: [PATCH] keepassxc: remove unecessary dependency + +KIO no longer seems necessary for KeePassXC, so removing it should +decrease the closure size significantly. + +Reported-by: chopper2000uk <> +Signed-off-by: Fernando Rodrigues +--- + pkgs/by-name/ke/keepassxc/package.nix | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/pkgs/by-name/ke/keepassxc/package.nix b/pkgs/by-name/ke/keepassxc/package.nix +index 170cc7bfe8e384..40b6dc15170f5b 100644 +--- a/pkgs/by-name/ke/keepassxc/package.nix ++++ b/pkgs/by-name/ke/keepassxc/package.nix +@@ -142,7 +142,6 @@ stdenv.mkDerivation (finalAttrs: { + libXi + libXtst + libargon2 +- libsForQt5.kio + libsForQt5.qtbase + libsForQt5.qtsvg + minizip From d6b3f85c3b0e9a34b327f9c02b50870d23cbe4f7 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 3 Jun 2025 22:00:20 +0200 Subject: [PATCH 232/330] fixup! flake, darwin: nixpkgs patching not required anymore with 25.05 --- ...2bc76d359b908ad1389ee28c23ee0e862324.patch | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch diff --git a/patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch b/patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch deleted file mode 100644 index dbaf9ee..0000000 --- a/patches/nixos-nixpkgs-362c2bc76d359b908ad1389ee28c23ee0e862324.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 362c2bc76d359b908ad1389ee28c23ee0e862324 Mon Sep 17 00:00:00 2001 -From: Ihar Hrachyshka -Date: Mon, 7 Apr 2025 21:03:09 -0400 -Subject: [PATCH] nodejs_20: fix test failure on darwin on latest MacOS 15.4 - -Signed-off-by: Ihar Hrachyshka -(cherry picked from commit 9674c1f688d12b99fbde26e6068ab62609fef3b1) ---- - pkgs/development/web/nodejs/v20.nix | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix -index b9c9345c441afa..20cceb5b5d1cda 100644 ---- a/pkgs/development/web/nodejs/v20.nix -+++ b/pkgs/development/web/nodejs/v20.nix -@@ -50,5 +50,10 @@ buildNodejs { - stripLen = 1; - hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg="; - }) -+ # fix test failure on macos 15.4 -+ (fetchpatch2 { -+ url = "https://github.com/nodejs/node/commit/33f6e1ea296cd20366ab94e666b03899a081af94.patch?full_index=1"; -+ hash = "sha256-aVBMcQlhQeviUQpMIfC988jjDB2BgYzlMYsq+w16mzU="; -+ }) - ] ++ gypPatches; - } From b924ec905b7d0144a6d40cb404ec4ec795748557 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 5 Jun 2025 00:52:43 +0200 Subject: [PATCH 233/330] home: install vlc-bin on darwin --- home/modules/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index cd8391a..0b3f0ab 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -37,6 +37,7 @@ let mpv yt-dlp ] + ++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ] ++ lib.optionals pkgs.stdenv.isLinux [ vlc amarok From c49b8019a1890b463eefa4c74cff0e6111f3e96d Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 6 Jun 2025 11:58:09 +0200 Subject: [PATCH 234/330] home packages: install rsync to override openrsync shipped with macOS On NixOS systems, it comes from the system packages anyways. --- home/modules/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 0b3f0ab..c44170e 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -56,6 +56,7 @@ let htop tmux httpie + rsync ponysay gti tree From 6f3575ae1c4f130f7e5574da0346ada666b55fec Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 10 Jun 2025 00:43:20 +0200 Subject: [PATCH 235/330] 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/282e1e029cb6ab4811114fc85110613d72771dea' (2025-05-31) → 'github:nix-community/home-manager/7aae0ee71a17b19708b93b3ed448a1a0952bf111' (2025-06-05) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/fc7c4714125cfaa19b048e8aaf86b9c53e04d853' (2025-06-03) → 'github:NixOS/nixos-hardware/4602f7e1d3f197b3cb540d5accf5669121629628' (2025-06-06) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/910796cabe436259a29a72e8d3f5e180fc6dfacc' (2025-05-31) → 'github:NixOS/nixpkgs/3e3afe5174c561dee0df6f2c2b2236990146329f' (2025-06-07) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922' (2025-06-02) → 'github:NixOS/nixpkgs/70c74b02eac46f4e4aa071e45a6189ce0f6d9265' (2025-06-06) • Updated input 'nur': 'github:nix-community/NUR/90add46380908ba4395f5f1dfec84224a3b0d4b9' (2025-06-03) → 'github:nix-community/NUR/a08f1cd495f510a4e8f87c69165970bd97fdd84e' (2025-06-09) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/910796cabe436259a29a72e8d3f5e180fc6dfacc' (2025-05-31) → 'github:nixos/nixpkgs/3e3afe5174c561dee0df6f2c2b2236990146329f' (2025-06-07) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 57216c2..8526ba1 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1748665073, - "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=", + "lastModified": 1749154018, + "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "owner": "nix-community", "repo": "home-manager", - "rev": "282e1e029cb6ab4811114fc85110613d72771dea", + "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1748942041, - "narHash": "sha256-HEu2gTct7nY0tAPRgBtqYepallryBKR1U8B4v2zEEqA=", + "lastModified": 1749195551, + "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "fc7c4714125cfaa19b048e8aaf86b9c53e04d853", + "rev": "4602f7e1d3f197b3cb540d5accf5669121629628", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748889542, - "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=", + "lastModified": 1749237914, + "narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922", + "rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1748973087, - "narHash": "sha256-ZN0XKKdCBC9eLeog7qYhfGPbajkPtQPdlxp/dhwONw4=", + "lastModified": 1749502672, + "narHash": "sha256-FXobF6TY9wpMrXTfgO52LcKOg7VK1wjaexc1k/9ybpg=", "owner": "nix-community", "repo": "NUR", - "rev": "90add46380908ba4395f5f1dfec84224a3b0d4b9", + "rev": "a08f1cd495f510a4e8f87c69165970bd97fdd84e", "type": "github" }, "original": { From ca9aa161f849956dc402776de21edddd9d8e177d Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 12 Jun 2025 10:38:41 +0200 Subject: [PATCH 236/330] 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-darwin': 'github:LnL7/nix-darwin/75b99daa12b1fffd646d6c3cf13b06f1fa5cef63?narHash=sha256-qi6aDGP2W6GyAUNEhg%2BslQWEpUiJ8LNIrQkmxHpzadI%3D' (2025-05-27) → 'github:LnL7/nix-darwin/294d18da177b1e454104af7cd3c7002e34293209?narHash=sha256-9zwRWpVHlOLDbSngSCfppuogfHKnZ1N4j18WU5WzFBc%3D' (2025-06-11) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/70c74b02eac46f4e4aa071e45a6189ce0f6d9265?narHash=sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw%3D' (2025-06-06) → 'github:NixOS/nixpkgs/88331c17ba434359491e8d5889cce872464052c2?narHash=sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc%3D' (2025-06-09) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8526ba1..25ac319 100644 --- a/flake.lock +++ b/flake.lock @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1748373722, - "narHash": "sha256-qi6aDGP2W6GyAUNEhg+slQWEpUiJ8LNIrQkmxHpzadI=", + "lastModified": 1749622275, + "narHash": "sha256-9zwRWpVHlOLDbSngSCfppuogfHKnZ1N4j18WU5WzFBc=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "75b99daa12b1fffd646d6c3cf13b06f1fa5cef63", + "rev": "294d18da177b1e454104af7cd3c7002e34293209", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749237914, - "narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=", + "lastModified": 1749494155, + "narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265", + "rev": "88331c17ba434359491e8d5889cce872464052c2", "type": "github" }, "original": { From 9d3d69a6ff4bb918e2c7609c304e4315af5e61b4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 12 Jun 2025 10:48:01 +0200 Subject: [PATCH 237/330] apps.hm: provide description silences a `nix flake check` warning --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 20809d2..bf73948 100644 --- a/flake.nix +++ b/flake.nix @@ -166,6 +166,7 @@ # inspired by https://github.com/Mic92/dotfiles/blob/main/home-manager/flake-module.nix # run like: `nix run .#hm -- ` apps.hm = { + meta.description = "Wrapper around home-manager with automatic profile selection"; type = "app"; program = "${pkgs.writeShellScriptBin "hm" '' set -x From 280cfd2a9ec8c9991f2c0a635eee47cd421761b3 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 16 Jun 2025 23:45:03 +0200 Subject: [PATCH 238/330] 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-darwin': 'github:LnL7/nix-darwin/294d18da177b1e454104af7cd3c7002e34293209?narHash=sha256-9zwRWpVHlOLDbSngSCfppuogfHKnZ1N4j18WU5WzFBc%3D' (2025-06-11) → 'github:LnL7/nix-darwin/536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb?narHash=sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls%3D' (2025-06-12) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/4602f7e1d3f197b3cb540d5accf5669121629628?narHash=sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM%3D' (2025-06-06) → 'github:NixOS/nixos-hardware/61837d2a33ccc1582c5fabb7bf9130d39fee59ad?narHash=sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4%3D' (2025-06-16) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/3e3afe5174c561dee0df6f2c2b2236990146329f?narHash=sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU%3D' (2025-06-07) → 'github:NixOS/nixpkgs/ee930f9755f58096ac6e8ca94a1887e0534e2d81?narHash=sha256-Kh9K4taXbVuaLC0IL%2B9HcfvxsSUx8dPB5s5weJcc9pc%3D' (2025-06-13) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/88331c17ba434359491e8d5889cce872464052c2?narHash=sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc%3D' (2025-06-09) → 'github:NixOS/nixpkgs/6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3?narHash=sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b%2BJT0ZIP2WuGsJMU%3D' (2025-06-15) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 25ac319..b13d6a5 100644 --- a/flake.lock +++ b/flake.lock @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1749622275, - "narHash": "sha256-9zwRWpVHlOLDbSngSCfppuogfHKnZ1N4j18WU5WzFBc=", + "lastModified": 1749744770, + "narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "294d18da177b1e454104af7cd3c7002e34293209", + "rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1749195551, - "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", + "lastModified": 1750083401, + "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4602f7e1d3f197b3cb540d5accf5669121629628", + "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1749285348, - "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749494155, - "narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=", + "lastModified": 1750005367, + "narHash": "sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b+JT0ZIP2WuGsJMU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88331c17ba434359491e8d5889cce872464052c2", + "rev": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3", "type": "github" }, "original": { From b4acad44cf4b227a62072b29ceb4fc4ea36e48d4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 19 Jun 2025 10:24:50 +0200 Subject: [PATCH 239/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/ee930f9755f58096ac6e8ca94a1887e0534e2d81' (2025-06-13) → 'github:NixOS/nixpkgs/9e83b64f727c88a7711a2c463a7b16eedb69a84c' (2025-06-17) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3' (2025-06-15) → 'github:NixOS/nixpkgs/36ab78dab7da2e4e27911007033713bab534187b' (2025-06-17) • Updated input 'nur': 'github:nix-community/NUR/a08f1cd495f510a4e8f87c69165970bd97fdd84e' (2025-06-09) → 'github:nix-community/NUR/b44e74a3ca2f9ab75d4ad7cecc52a052faae9871' (2025-06-19) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/3e3afe5174c561dee0df6f2c2b2236990146329f' (2025-06-07) → 'github:nixos/nixpkgs/9e83b64f727c88a7711a2c463a7b16eedb69a84c' (2025-06-17) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index b13d6a5..d827167 100644 --- a/flake.lock +++ b/flake.lock @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1750134718, + "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750005367, - "narHash": "sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b+JT0ZIP2WuGsJMU=", + "lastModified": 1750133334, + "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3", + "rev": "36ab78dab7da2e4e27911007033713bab534187b", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1749285348, - "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", + "lastModified": 1750134718, + "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1749502672, - "narHash": "sha256-FXobF6TY9wpMrXTfgO52LcKOg7VK1wjaexc1k/9ybpg=", + "lastModified": 1750318896, + "narHash": "sha256-bf+0tbn3Oq72jZ+3MpKbQL6ZEjkz9BbZJFWHBWawphc=", "owner": "nix-community", "repo": "NUR", - "rev": "a08f1cd495f510a4e8f87c69165970bd97fdd84e", + "rev": "b44e74a3ca2f9ab75d4ad7cecc52a052faae9871", "type": "github" }, "original": { From bea4bbfe3fa3519be723c3d695277535a5c76fac Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 19 Jun 2025 10:42:08 +0200 Subject: [PATCH 240/330] nixos: use experimental nixos-rebuild-ng --- common/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/common/default.nix b/common/default.nix index 5fbf46a..c25fc12 100644 --- a/common/default.nix +++ b/common/default.nix @@ -269,4 +269,5 @@ in networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; services.dbus.implementation = "broker"; + system.rebuild.enableNg = true; } From 43830ff5fade7b2accf16902c5758fef71508079 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 22 Jun 2025 15:04:02 +0200 Subject: [PATCH 241/330] 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/d0bbd221482c2713cccb80220f3c9d16a6e20a33' (2025-05-18) → 'github:nix-community/home-manager/7aae0ee71a17b19708b93b3ed448a1a0952bf111' (2025-06-05) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282' (2025-05-20) → 'github:NixOS/nixos-hardware/1552a9f4513f3f0ceedcf90320e48d3d47165712' (2025-06-20) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/292fa7d4f6519c074f0a50394dbbe69859bb6043' (2025-05-18) → 'github:NixOS/nixpkgs/08f22084e6085d19bcfb4be30d1ca76ecb96fe54' (2025-06-19) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/ca49c4304acf0973078db0a9d200fd2bae75676d' (2025-05-18) → 'github:NixOS/nixpkgs/b2485d56967598da068b5a6946dadda8bfcbcd37' (2025-06-20) • Updated input 'nur': 'github:nix-community/NUR/e52a85ce10a990ac6d7356f3a753fde0860426a8' (2025-05-20) → 'github:nix-community/NUR/082e8247755fb0dff5640a6496337394e46c0f75' (2025-06-22) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/292fa7d4f6519c074f0a50394dbbe69859bb6043' (2025-05-18) → 'github:nixos/nixpkgs/08f22084e6085d19bcfb4be30d1ca76ecb96fe54' (2025-06-19) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index d827167..274c280 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750083401, - "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", + "lastModified": 1750431636, + "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", + "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750133334, - "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", + "lastModified": 1750400657, + "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "36ab78dab7da2e4e27911007033713bab534187b", + "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1750318896, - "narHash": "sha256-bf+0tbn3Oq72jZ+3MpKbQL6ZEjkz9BbZJFWHBWawphc=", + "lastModified": 1750587998, + "narHash": "sha256-2sd5N8hBoFXGqJshocg2LN/bWVXr1/oFZ6oRfc0puhg=", "owner": "nix-community", "repo": "NUR", - "rev": "b44e74a3ca2f9ab75d4ad7cecc52a052faae9871", + "rev": "082e8247755fb0dff5640a6496337394e46c0f75", "type": "github" }, "original": { From ea6c61eff95cb061174c0c2e9a8d3cdbe6680818 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 29 Jun 2025 20:36:44 +0200 Subject: [PATCH 242/330] 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/7aae0ee71a17b19708b93b3ed448a1a0952bf111' (2025-06-05) → 'github:nix-community/home-manager/366f00797b1efb70f2882d3da485e3c10fd3d557' (2025-06-24) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/1552a9f4513f3f0ceedcf90320e48d3d47165712' (2025-06-20) → 'github:NixOS/nixos-hardware/98236410ea0fe204d0447149537a924fb71a6d4f' (2025-06-25) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/08f22084e6085d19bcfb4be30d1ca76ecb96fe54' (2025-06-19) → 'github:NixOS/nixpkgs/30e2e2857ba47844aa71991daa6ed1fc678bcbb7' (2025-06-27) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/b2485d56967598da068b5a6946dadda8bfcbcd37' (2025-06-20) → 'github:NixOS/nixpkgs/a676066377a2fe7457369dd37c31fd2263b662f4' (2025-06-26) • Updated input 'nur': 'github:nix-community/NUR/082e8247755fb0dff5640a6496337394e46c0f75' (2025-06-22) → 'github:nix-community/NUR/873e573a93300046272a0b3dec82b0f9e732458f' (2025-06-29) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/08f22084e6085d19bcfb4be30d1ca76ecb96fe54' (2025-06-19) → 'github:nixos/nixpkgs/30e2e2857ba47844aa71991daa6ed1fc678bcbb7' (2025-06-27) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 274c280..4c04d3b 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1749154018, - "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", + "lastModified": 1750792728, + "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=", "owner": "nix-community", "repo": "home-manager", - "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", + "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750431636, - "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", + "lastModified": 1750837715, + "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", + "rev": "98236410ea0fe204d0447149537a924fb71a6d4f", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1750365781, - "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", + "lastModified": 1751011381, + "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", + "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750400657, - "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=", + "lastModified": 1750969886, + "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", + "rev": "a676066377a2fe7457369dd37c31fd2263b662f4", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1750365781, - "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", + "lastModified": 1751011381, + "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", + "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1750587998, - "narHash": "sha256-2sd5N8hBoFXGqJshocg2LN/bWVXr1/oFZ6oRfc0puhg=", + "lastModified": 1751219288, + "narHash": "sha256-IQJosUJhcfIVnEiQtMkeUS0klh97CjxqgPXE//xFDNg=", "owner": "nix-community", "repo": "NUR", - "rev": "082e8247755fb0dff5640a6496337394e46c0f75", + "rev": "873e573a93300046272a0b3dec82b0f9e732458f", "type": "github" }, "original": { From 10aad3f6990c78e88917f5546ba1c0af7694e794 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 1 Jul 2025 21:38:33 +0200 Subject: [PATCH 243/330] Revert "framenix: switch to LTS kernel" This reverts commit 718ca8c60b5f393277928a4cb3b681f93f36bc49. --- hosts/framenix/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index f1e62cd..166f4ee 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -23,6 +23,9 @@ in # override tmpdir for daemon systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp"; + # try newer kernels + boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelParams = [ # powersave "amd_pstate=active" From 2adf23410c228bed6df4d973973c5f6bef84053c Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 1 Jul 2025 21:39:19 +0200 Subject: [PATCH 244/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/98236410ea0fe204d0447149537a924fb71a6d4f' (2025-06-25) → 'github:NixOS/nixos-hardware/f49bb3b4107a0917ee144337bb02d311033ee1ba' (2025-07-01) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/30e2e2857ba47844aa71991daa6ed1fc678bcbb7' (2025-06-27) → 'github:NixOS/nixpkgs/3016b4b15d13f3089db8a41ef937b13a9e33a8df' (2025-06-30) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/a676066377a2fe7457369dd37c31fd2263b662f4' (2025-06-26) → 'github:NixOS/nixpkgs/b43c397f6c213918d6cfe6e3550abfe79b5d1c51' (2025-06-29) • Updated input 'nur': 'github:nix-community/NUR/873e573a93300046272a0b3dec82b0f9e732458f' (2025-06-29) → 'github:nix-community/NUR/326860af7a41ac4d1ab8055bf88fdc8e79b82acf' (2025-07-01) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/30e2e2857ba47844aa71991daa6ed1fc678bcbb7' (2025-06-27) → 'github:nixos/nixpkgs/3016b4b15d13f3089db8a41ef937b13a9e33a8df' (2025-06-30) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 4c04d3b..22c05c5 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750837715, - "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=", + "lastModified": 1751393906, + "narHash": "sha256-I1x6K61ZcdFlqc07weRBy3erCAB0lVkX10i0c9eXjDI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "98236410ea0fe204d0447149537a924fb71a6d4f", + "rev": "f49bb3b4107a0917ee144337bb02d311033ee1ba", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1751011381, - "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750969886, - "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=", + "lastModified": 1751211869, + "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a676066377a2fe7457369dd37c31fd2263b662f4", + "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1751011381, - "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1751219288, - "narHash": "sha256-IQJosUJhcfIVnEiQtMkeUS0klh97CjxqgPXE//xFDNg=", + "lastModified": 1751397775, + "narHash": "sha256-LMe/4mpv23Lkk9tLsTrxAB5nvLbQd92dkDz/MPqlvqM=", "owner": "nix-community", "repo": "NUR", - "rev": "873e573a93300046272a0b3dec82b0f9e732458f", + "rev": "326860af7a41ac4d1ab8055bf88fdc8e79b82acf", "type": "github" }, "original": { From 205de75f076cfba659ecac21c7d62e2fc19b83c1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 1 Jul 2025 21:47:05 +0200 Subject: [PATCH 245/330] nixpkgs: remove keepassxc patch after PR has reached channel --- flake.nix | 2 +- patches/keepassxc-fix-darwin-build.patch | 26 ------------------------ 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 patches/keepassxc-fix-darwin-build.patch diff --git a/flake.nix b/flake.nix index bf73948..cb177ff 100644 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,7 @@ (import nixpkgs { inherit system; }).applyPatches { name = "nixpkgs-patched"; src = nixpkgs; - patches = [ ./patches/keepassxc-fix-darwin-build.patch ]; + patches = [ ]; }; # necessary to make the top-level inputs available to system configuration diff --git a/patches/keepassxc-fix-darwin-build.patch b/patches/keepassxc-fix-darwin-build.patch deleted file mode 100644 index 3684a24..0000000 --- a/patches/keepassxc-fix-darwin-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 49b7ae226cedb0adb403758e0c63d09762297a22 Mon Sep 17 00:00:00 2001 -From: Fernando Rodrigues -Date: Wed, 28 May 2025 14:06:23 -0300 -Subject: [PATCH] keepassxc: remove unecessary dependency - -KIO no longer seems necessary for KeePassXC, so removing it should -decrease the closure size significantly. - -Reported-by: chopper2000uk <> -Signed-off-by: Fernando Rodrigues ---- - pkgs/by-name/ke/keepassxc/package.nix | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/pkgs/by-name/ke/keepassxc/package.nix b/pkgs/by-name/ke/keepassxc/package.nix -index 170cc7bfe8e384..40b6dc15170f5b 100644 ---- a/pkgs/by-name/ke/keepassxc/package.nix -+++ b/pkgs/by-name/ke/keepassxc/package.nix -@@ -142,7 +142,6 @@ stdenv.mkDerivation (finalAttrs: { - libXi - libXtst - libargon2 -- libsForQt5.kio - libsForQt5.qtbase - libsForQt5.qtsvg - minizip From a6a48657222e0c709bc87a5fbfbdd482d82a988e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 4 Jul 2025 10:48:12 +0200 Subject: [PATCH 246/330] 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/366f00797b1efb70f2882d3da485e3c10fd3d557' (2025-06-24) → 'github:nix-community/home-manager/501cfec8277f931a9c9af9f23d3105c537faeafe' (2025-07-02) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/f49bb3b4107a0917ee144337bb02d311033ee1ba' (2025-07-01) → 'github:NixOS/nixos-hardware/497ae1357f1ac97f1aea31a4cb74ad0d534ef41f' (2025-07-02) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/b43c397f6c213918d6cfe6e3550abfe79b5d1c51' (2025-06-29) → 'github:NixOS/nixpkgs/34627c90f062da515ea358360f448da57769236e' (2025-07-02) • Updated input 'nur': 'github:nix-community/NUR/326860af7a41ac4d1ab8055bf88fdc8e79b82acf' (2025-07-01) → 'github:nix-community/NUR/42cd07059585b6f8fa44c9cd585099339bc52606' (2025-07-04) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 22c05c5..bae41f2 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1750792728, - "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=", + "lastModified": 1751468302, + "narHash": "sha256-tWosziZTT039x6PgEZUhzGlV8oLvdDmIgKTE8ESMaEA=", "owner": "nix-community", "repo": "home-manager", - "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557", + "rev": "501cfec8277f931a9c9af9f23d3105c537faeafe", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1751393906, - "narHash": "sha256-I1x6K61ZcdFlqc07weRBy3erCAB0lVkX10i0c9eXjDI=", + "lastModified": 1751432711, + "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f49bb3b4107a0917ee144337bb02d311033ee1ba", + "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751211869, - "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", + "lastModified": 1751479989, + "narHash": "sha256-M5KgdpVBVcW4HRVq9/OSRbrxlwsQ1ogEKqnvzsClDqU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", + "rev": "34627c90f062da515ea358360f448da57769236e", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1751397775, - "narHash": "sha256-LMe/4mpv23Lkk9tLsTrxAB5nvLbQd92dkDz/MPqlvqM=", + "lastModified": 1751612801, + "narHash": "sha256-rxV0IvUfylILksY7+jGbA+3v1ed2cth9lpVLiVRgmYY=", "owner": "nix-community", "repo": "NUR", - "rev": "326860af7a41ac4d1ab8055bf88fdc8e79b82acf", + "rev": "42cd07059585b6f8fa44c9cd585099339bc52606", "type": "github" }, "original": { From 21b9b87e86447ee2863f5cc6ff50ed025101f4a5 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 6 Jul 2025 14:23:57 +0200 Subject: [PATCH 247/330] framenix: move nix build dir to tmpfs --- hosts/framenix/storage.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hosts/framenix/storage.nix b/hosts/framenix/storage.nix index 7fb2801..8acb7fd 100644 --- a/hosts/framenix/storage.nix +++ b/hosts/framenix/storage.nix @@ -39,6 +39,17 @@ in fsType = "vfat"; options = [ "discard" ]; }; + # nix/ lix build directory + # lix: + # > If you plan to use a tmpfs, we **strongly recommend** to set `mode=0755` as a mount option for that `tmpfs`, otherwise you are effectively reverting this mitigation. + "/nix/var/nix/builds" = { + device = "tmpfs"; + fsType = "tmpfs"; + options = [ + "mode=0755" + "size=75%" + ]; + }; }; services.fstrim.enable = true; From 28ea7844ebc8a61296a28821ce873f058c0d2d8a Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 7 Jul 2025 11:45:57 +0200 Subject: [PATCH 248/330] 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/501cfec8277f931a9c9af9f23d3105c537faeafe' (2025-07-02) → 'github:nix-community/home-manager/9b0873b46c9f9e4b7aa01eb634952c206af53068' (2025-07-06) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/3016b4b15d13f3089db8a41ef937b13a9e33a8df' (2025-06-30) → 'github:NixOS/nixpkgs/1fd8bada0b6117e6c7eb54aad5813023eed37ccb' (2025-07-06) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/34627c90f062da515ea358360f448da57769236e' (2025-07-02) → 'github:NixOS/nixpkgs/29e290002bfff26af1db6f64d070698019460302' (2025-07-05) • Updated input 'nur': 'github:nix-community/NUR/42cd07059585b6f8fa44c9cd585099339bc52606' (2025-07-04) → 'github:nix-community/NUR/4b0e8c78e8ff0e676b16fe4c60e80a9015064966' (2025-07-07) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/3016b4b15d13f3089db8a41ef937b13a9e33a8df' (2025-06-30) → 'github:nixos/nixpkgs/1fd8bada0b6117e6c7eb54aad5813023eed37ccb' (2025-07-06) • Removed input 'nur/treefmt-nix' • Removed input 'nur/treefmt-nix/nixpkgs' --- flake.lock | 56 +++++++++++++++++------------------------------------- 1 file changed, 17 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index bae41f2..9639838 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1751468302, - "narHash": "sha256-tWosziZTT039x6PgEZUhzGlV8oLvdDmIgKTE8ESMaEA=", + "lastModified": 1751810233, + "narHash": "sha256-kllkNbIqQi3VplgTMeGzuh1t8Gk8TauvkTRt93Km+tQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "501cfec8277f931a9c9af9f23d3105c537faeafe", + "rev": "9b0873b46c9f9e4b7aa01eb634952c206af53068", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751479989, - "narHash": "sha256-M5KgdpVBVcW4HRVq9/OSRbrxlwsQ1ogEKqnvzsClDqU=", + "lastModified": 1751741127, + "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "34627c90f062da515ea358360f448da57769236e", + "rev": "29e290002bfff26af1db6f64d070698019460302", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -276,15 +276,14 @@ "nur": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3", - "treefmt-nix": "treefmt-nix" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1751612801, - "narHash": "sha256-rxV0IvUfylILksY7+jGbA+3v1ed2cth9lpVLiVRgmYY=", + "lastModified": 1751878564, + "narHash": "sha256-u7e3tX/65k47hlvIZVhRjlOcx1Qcq5/Z9kN29yTuP6I=", "owner": "nix-community", "repo": "NUR", - "rev": "42cd07059585b6f8fa44c9cd585099339bc52606", + "rev": "4b0e8c78e8ff0e676b16fe4c60e80a9015064966", "type": "github" }, "original": { @@ -330,7 +329,7 @@ "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs_2", "nur": "nur", - "treefmt-nix": "treefmt-nix_2", + "treefmt-nix": "treefmt-nix", "utils": "utils" } }, @@ -371,27 +370,6 @@ } }, "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nixpkgs" From 8f930215f4dd912511ed5b5b348fa3a714183a95 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 12 Jul 2025 23:40:38 +0200 Subject: [PATCH 249/330] 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/9b0873b46c9f9e4b7aa01eb634952c206af53068' (2025-07-06) → 'github:nix-community/home-manager/c6a01e54af81b381695db796a43360bf6db5702f' (2025-07-11) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/497ae1357f1ac97f1aea31a4cb74ad0d534ef41f' (2025-07-02) → 'github:NixOS/nixos-hardware/7ced9122cff2163c6a0212b8d1ec8c33a1660806' (2025-07-09) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/1fd8bada0b6117e6c7eb54aad5813023eed37ccb' (2025-07-06) → 'github:NixOS/nixpkgs/9807714d6944a957c2e036f84b0ff8caf9930bc0' (2025-07-08) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/29e290002bfff26af1db6f64d070698019460302' (2025-07-05) → 'github:NixOS/nixpkgs/10e687235226880ed5e9f33f1ffa71fe60f2638a' (2025-07-10) • Updated input 'nur': 'github:nix-community/NUR/4b0e8c78e8ff0e676b16fe4c60e80a9015064966' (2025-07-07) → 'github:nix-community/NUR/b2350b4af69a7c9799cad80f28b32d9bbee37139' (2025-07-12) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/1fd8bada0b6117e6c7eb54aad5813023eed37ccb' (2025-07-06) → 'github:nixos/nixpkgs/9807714d6944a957c2e036f84b0ff8caf9930bc0' (2025-07-08) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 9639838..44f625a 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1751810233, - "narHash": "sha256-kllkNbIqQi3VplgTMeGzuh1t8Gk8TauvkTRt93Km+tQ=", + "lastModified": 1752208517, + "narHash": "sha256-aRY1cYOdVdXdNjcL/Twpa27CknO7pVHxooPsBizDraE=", "owner": "nix-community", "repo": "home-manager", - "rev": "9b0873b46c9f9e4b7aa01eb634952c206af53068", + "rev": "c6a01e54af81b381695db796a43360bf6db5702f", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1751432711, - "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", + "lastModified": 1752048960, + "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", + "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751741127, - "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", + "lastModified": 1752162966, + "narHash": "sha256-3MxxkU8ZXMHXcbFz7UE4M6qnIPTYGcE/7EMqlZNnVDE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "29e290002bfff26af1db6f64d070698019460302", + "rev": "10e687235226880ed5e9f33f1ffa71fe60f2638a", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1751878564, - "narHash": "sha256-u7e3tX/65k47hlvIZVhRjlOcx1Qcq5/Z9kN29yTuP6I=", + "lastModified": 1752352532, + "narHash": "sha256-w/lG3HF6StfB2VnbhulQwgHgw0KDPIKYICkfcq3Bp3I=", "owner": "nix-community", "repo": "NUR", - "rev": "4b0e8c78e8ff0e676b16fe4c60e80a9015064966", + "rev": "b2350b4af69a7c9799cad80f28b32d9bbee37139", "type": "github" }, "original": { From 530360e3f3d3198a55a11a4f74005f9bced7bf7c Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 13 Jul 2025 18:45:27 +0200 Subject: [PATCH 250/330] 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/c6a01e54af81b381695db796a43360bf6db5702f' (2025-07-11) → 'github:nix-community/home-manager/c26266790678863cce8e7460fdbf0d80991b1906' (2025-07-13) • Updated input 'nur': 'github:nix-community/NUR/b2350b4af69a7c9799cad80f28b32d9bbee37139' (2025-07-12) → 'github:nix-community/NUR/d34b5438c2e3cbcdb99b0c1951f732bdb9d834be' (2025-07-13) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 44f625a..5b0bc2a 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1752208517, - "narHash": "sha256-aRY1cYOdVdXdNjcL/Twpa27CknO7pVHxooPsBizDraE=", + "lastModified": 1752391422, + "narHash": "sha256-ReX0NG6nIAEtQQjLqeu1vUU2jjZuMlpymNtb4VQYeus=", "owner": "nix-community", "repo": "home-manager", - "rev": "c6a01e54af81b381695db796a43360bf6db5702f", + "rev": "c26266790678863cce8e7460fdbf0d80991b1906", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1752352532, - "narHash": "sha256-w/lG3HF6StfB2VnbhulQwgHgw0KDPIKYICkfcq3Bp3I=", + "lastModified": 1752424242, + "narHash": "sha256-3UmPf+U8v2JXE3uAh7FSxcmIqjEDMJyyEv/tVD+G8aA=", "owner": "nix-community", "repo": "NUR", - "rev": "b2350b4af69a7c9799cad80f28b32d9bbee37139", + "rev": "d34b5438c2e3cbcdb99b0c1951f732bdb9d834be", "type": "github" }, "original": { From 2413b6cf03a4320eeaec7ba81d3b16b21b3f8f7b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 17 Jul 2025 12:07:28 +0200 Subject: [PATCH 251/330] 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/c26266790678863cce8e7460fdbf0d80991b1906' (2025-07-13) → 'github:nix-community/home-manager/2e00ed310c218127e02ffcf28ddd4e0f669fde3e' (2025-07-15) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/7ced9122cff2163c6a0212b8d1ec8c33a1660806' (2025-07-09) → 'github:NixOS/nixos-hardware/d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153' (2025-07-16) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/9807714d6944a957c2e036f84b0ff8caf9930bc0' (2025-07-08) → 'github:NixOS/nixpkgs/62e0f05ede1da0d54515d4ea8ce9c733f12d9f08' (2025-07-14) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/10e687235226880ed5e9f33f1ffa71fe60f2638a' (2025-07-10) → 'github:NixOS/nixpkgs/32a4e87942101f1c9f9865e04dc3ddb175f5f32e' (2025-07-15) • Updated input 'nur': 'github:nix-community/NUR/d34b5438c2e3cbcdb99b0c1951f732bdb9d834be' (2025-07-13) → 'github:nix-community/NUR/945f926daf73c1380c8e45eaffc07904ae64195e' (2025-07-17) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/9807714d6944a957c2e036f84b0ff8caf9930bc0' (2025-07-08) → 'github:nixos/nixpkgs/62e0f05ede1da0d54515d4ea8ce9c733f12d9f08' (2025-07-14) --- flake.lock | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 5b0bc2a..84f4cee 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1752391422, + "lastModified": 1752544374, "narHash": "sha256-ReX0NG6nIAEtQQjLqeu1vUU2jjZuMlpymNtb4VQYeus=", "owner": "nix-community", "repo": "home-manager", - "rev": "c26266790678863cce8e7460fdbf0d80991b1906", + "rev": "2e00ed310c218127e02ffcf28ddd4e0f669fde3e", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1752048960, - "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", + "lastModified": 1752666637, + "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", + "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1752162966, - "narHash": "sha256-3MxxkU8ZXMHXcbFz7UE4M6qnIPTYGcE/7EMqlZNnVDE=", + "lastModified": 1752620740, + "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10e687235226880ed5e9f33f1ffa71fe60f2638a", + "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1752424242, - "narHash": "sha256-3UmPf+U8v2JXE3uAh7FSxcmIqjEDMJyyEv/tVD+G8aA=", + "lastModified": 1752746109, + "narHash": "sha256-21FKysxjY5IBrKsiQhwrrof1/tCdtclhucH/vsxOAWI=", "owner": "nix-community", "repo": "NUR", - "rev": "d34b5438c2e3cbcdb99b0c1951f732bdb9d834be", + "rev": "945f926daf73c1380c8e45eaffc07904ae64195e", "type": "github" }, "original": { From d11ac9fc554e1034cec2061ad82f41e4e4689820 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 21 Jul 2025 07:43:09 +0200 Subject: [PATCH 252/330] 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/2e00ed310c218127e02ffcf28ddd4e0f669fde3e' (2025-07-15) → 'github:nix-community/home-manager/adf195f021a8cbb0c317f75b52e96c82616526f9' (2025-07-20) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/62e0f05ede1da0d54515d4ea8ce9c733f12d9f08' (2025-07-14) → 'github:NixOS/nixpkgs/c87b95e25065c028d31a94f06a62927d18763fdf' (2025-07-19) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/32a4e87942101f1c9f9865e04dc3ddb175f5f32e' (2025-07-15) → 'github:NixOS/nixpkgs/f01fe91b0108a7aff99c99f2e9abbc45db0adc2a' (2025-07-18) • Updated input 'nur': 'github:nix-community/NUR/945f926daf73c1380c8e45eaffc07904ae64195e' (2025-07-17) → 'github:nix-community/NUR/84d952a1ed63dede792f1a1c5e9ae5bfab38ca83' (2025-07-21) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/62e0f05ede1da0d54515d4ea8ce9c733f12d9f08' (2025-07-14) → 'github:nixos/nixpkgs/c87b95e25065c028d31a94f06a62927d18763fdf' (2025-07-19) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 84f4cee..d3824b5 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1752544374, - "narHash": "sha256-ReX0NG6nIAEtQQjLqeu1vUU2jjZuMlpymNtb4VQYeus=", + "lastModified": 1753055804, + "narHash": "sha256-KerePGJYX47ex6OY3CWsid4AltO2gDtQROunYJ0eCEE=", "owner": "nix-community", "repo": "home-manager", - "rev": "2e00ed310c218127e02ffcf28ddd4e0f669fde3e", + "rev": "adf195f021a8cbb0c317f75b52e96c82616526f9", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1752620740, - "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", + "lastModified": 1752866191, + "narHash": "sha256-NV4S2Lf2hYmZQ3Qf4t/YyyBaJNuxLPyjzvDma0zPp/M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e", + "rev": "f01fe91b0108a7aff99c99f2e9abbc45db0adc2a", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1752746109, - "narHash": "sha256-21FKysxjY5IBrKsiQhwrrof1/tCdtclhucH/vsxOAWI=", + "lastModified": 1753076367, + "narHash": "sha256-0hsD2lDABn9+1+TPcqW+6A/hu6noBa7kvjG3LNHBH/M=", "owner": "nix-community", "repo": "NUR", - "rev": "945f926daf73c1380c8e45eaffc07904ae64195e", + "rev": "84d952a1ed63dede792f1a1c5e9ae5bfab38ca83", "type": "github" }, "original": { From 45a8a8a81ff5b628d96a082535858f70aaa8f5ec Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 27 Jul 2025 15:30:01 +0200 Subject: [PATCH 253/330] 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/adf195f021a8cbb0c317f75b52e96c82616526f9' (2025-07-20) → 'github:nix-community/home-manager/fc3add429f21450359369af74c2375cb34a2d204' (2025-07-27) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153' (2025-07-16) → 'github:NixOS/nixos-hardware/cc66fddc6cb04ab479a1bb062f4d4da27c936a22' (2025-07-21) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/c87b95e25065c028d31a94f06a62927d18763fdf' (2025-07-19) → 'github:NixOS/nixpkgs/7fd36ee82c0275fb545775cc5e4d30542899511d' (2025-07-25) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/f01fe91b0108a7aff99c99f2e9abbc45db0adc2a' (2025-07-18) → 'github:NixOS/nixpkgs/3ff0e34b1383648053bba8ed03f201d3466f90c9' (2025-07-24) • Updated input 'nur': 'github:nix-community/NUR/84d952a1ed63dede792f1a1c5e9ae5bfab38ca83' (2025-07-21) → 'github:nix-community/NUR/6f87ad268e07a0573f32f43d2505862b08542dc0' (2025-07-27) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/c87b95e25065c028d31a94f06a62927d18763fdf' (2025-07-19) → 'github:nixos/nixpkgs/7fd36ee82c0275fb545775cc5e4d30542899511d' (2025-07-25) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index d3824b5..270d84a 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1753055804, - "narHash": "sha256-KerePGJYX47ex6OY3CWsid4AltO2gDtQROunYJ0eCEE=", + "lastModified": 1753592768, + "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", "owner": "nix-community", "repo": "home-manager", - "rev": "adf195f021a8cbb0c317f75b52e96c82616526f9", + "rev": "fc3add429f21450359369af74c2375cb34a2d204", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1752666637, - "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", + "lastModified": 1753122741, + "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", + "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", + "lastModified": 1753429684, + "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", + "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1752866191, - "narHash": "sha256-NV4S2Lf2hYmZQ3Qf4t/YyyBaJNuxLPyjzvDma0zPp/M=", + "lastModified": 1753345091, + "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f01fe91b0108a7aff99c99f2e9abbc45db0adc2a", + "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", + "lastModified": 1753429684, + "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", + "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1753076367, - "narHash": "sha256-0hsD2lDABn9+1+TPcqW+6A/hu6noBa7kvjG3LNHBH/M=", + "lastModified": 1753621972, + "narHash": "sha256-E887hPHRcaSU8+kheTRjVFJQAKlps8OQvbCOyPMQ6Es=", "owner": "nix-community", "repo": "NUR", - "rev": "84d952a1ed63dede792f1a1c5e9ae5bfab38ca83", + "rev": "6f87ad268e07a0573f32f43d2505862b08542dc0", "type": "github" }, "original": { From 511462d6171b03e42e49487ecc35770282412045 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 27 Jul 2025 16:02:07 +0200 Subject: [PATCH 254/330] linuxPackages: install rustdesk --- home/modules/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index c44170e..57f097e 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -175,6 +175,7 @@ let pulseaudioSupport = pkgs.stdenv.isLinux; }) tigervnc + rustdesk-flutter pdfpc nheko gpxsee From ce54be9aac846c7798307d6d6fcee3346c01f601 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 30 Jul 2025 21:22:01 +0200 Subject: [PATCH 255/330] treewide: nixfmt nixfmt 1.0 has breaking formatting changes --- home/desktop.nix | 63 +++++----- home/modules/latex.nix | 3 +- home/modules/packages.nix | 253 +++++++++++++++++++------------------- home/workmac.nix | 31 +++-- 4 files changed, 172 insertions(+), 178 deletions(-) diff --git a/home/desktop.nix b/home/desktop.nix index 1e089e7..7fa7840 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -33,40 +33,39 @@ contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; }; in { - includes = - [ - { - condition = "gitdir:~/Seafile/Studium/"; + includes = [ + { + condition = "gitdir:~/Seafile/Studium/"; + contents = { + user.name = contacts.personal.name; + user.email = contacts.uni.email; + }; + } + { + condition = "gitdir:~/src/nixpkgs/"; + contents = { + user.name = "Trolli Schmittlauch"; + user.email = contacts.nixOs.email; + }; + } + ] + # set default name for several other common locations + ++ + map + (dir: { + condition = "gitdir:${dir}"; contents = { - user.name = contacts.personal.name; - user.email = contacts.uni.email; - }; - } - { - condition = "gitdir:~/src/nixpkgs/"; - contents = { - user.name = "Trolli Schmittlauch"; - user.email = contacts.nixOs.email; - }; - } - ] - # set default name for several other common locations - ++ - map - (dir: { - condition = "gitdir:${dir}"; - contents = { - user = { - inherit (contacts.schmittlauch) email name; - }; + user = { + inherit (contacts.schmittlauch) email name; }; - }) - [ - "~/src/" - "~/bin/" - "~/tmp/" - "~/nixconfigs/" - ]; + }; + }) + [ + "~/src/" + "~/bin/" + "~/tmp/" + "~/nixconfigs/" + ]; }; services.gpg-agent = { diff --git a/home/modules/latex.nix b/home/modules/latex.nix index 3f79930..a9b853c 100644 --- a/home/modules/latex.nix +++ b/home/modules/latex.nix @@ -43,5 +43,6 @@ in koma-script ; }) - ] ++ lib.optionals config.schmittlauch.latex.guiTools latexGuiTools; + ] + ++ lib.optionals config.schmittlauch.latex.guiTools latexGuiTools; } diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 57f097e..d9f1a31 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -12,88 +12,85 @@ let unstable = inputs.nixos-unstable.legacyPackages.${system}; nur = inputs.nur.legacyPackages.${system}; - graphicsApps = - [ - inkscape - darktable - exiftool - ] - ++ (with gimp3Plugins; [ - #fourier # broken - #lqrPlugin # broken - ]) - ++ lib.optionals pkgs.stdenv.isLinux [ - gimp3 - hugin - #luminanceHDR # FIXME, build failure - xournalpp - ] - ++ lib.optionals pkgs.stdenv.isDarwin [ - gimp - ]; + graphicsApps = [ + inkscape + darktable + exiftool + ] + ++ (with gimp3Plugins; [ + #fourier # broken + #lqrPlugin # broken + ]) + ++ lib.optionals pkgs.stdenv.isLinux [ + gimp3 + hugin + #luminanceHDR # FIXME, build failure + xournalpp + ] + ++ lib.optionals pkgs.stdenv.isDarwin [ + gimp + ]; - multimediaApps = - [ - mpv - yt-dlp - ] - ++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ] - ++ lib.optionals pkgs.stdenv.isLinux [ - vlc - amarok - clementine - kdePackages.elisa - musescore - tenacity - soundkonverter - #nur.repos.fooker.studio-link - ]; + multimediaApps = [ + mpv + yt-dlp + ] + ++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ] + ++ lib.optionals pkgs.stdenv.isLinux [ + vlc + amarok + clementine + kdePackages.elisa + musescore + tenacity + soundkonverter + #nur.repos.fooker.studio-link + ]; - cliApps = - [ - coreutils - myVim - htop - tmux - httpie - rsync - ponysay - gti - tree - lsof - mosh - openssh - sshfs-fuse - sshuttle - cryfs - thefuck - gnupg - unar - lzop - p7zip - pwgen - pandoc - pdfgrep - # zig dependency breaks occasionally, stay on C version for now - ncdu_1 - dos2unix - unzip - fswatch - jq - age - lnav - spacer + cliApps = [ + coreutils + myVim + htop + tmux + httpie + rsync + ponysay + gti + tree + lsof + mosh + openssh + sshfs-fuse + sshuttle + cryfs + thefuck + gnupg + unar + lzop + p7zip + pwgen + pandoc + pdfgrep + # zig dependency breaks occasionally, stay on C version for now + ncdu_1 + dos2unix + unzip + fswatch + jq + age + lnav + spacer - nix-output-monitor # putting this here as a plain `nix` alternative - ] - ++ lib.optionals pkgs.stdenv.isLinux [ - xclip - smbnetfs # for FUSE smb mounting - psmisc # for killall - torsocks - agrep - reptyr # re-bind running program to other tty - ]; + nix-output-monitor # putting this here as a plain `nix` alternative + ] + ++ lib.optionals pkgs.stdenv.isLinux [ + xclip + smbnetfs # for FUSE smb mounting + psmisc # for killall + torsocks + agrep + reptyr # re-bind running program to other tty + ]; nixHelpers = [ nixpkgs-review @@ -101,30 +98,29 @@ let nix-top statix ]; - devTools = - [ - curl - httpie - gcc - shellcheck - mtr - ripgrep - fd - gitui - pre-commit - scriv + devTools = [ + curl + httpie + gcc + shellcheck + mtr + ripgrep + fd + gitui + pre-commit + scriv - # Haskell - ghc - cabal2nix - ] - ++ lib.optionals pkgs.stdenv.isLinux [ - gdb - strace - ltrace - valgrind - zeal - ]; + # Haskell + ghc + cabal2nix + ] + ++ lib.optionals pkgs.stdenv.isLinux [ + gdb + strace + ltrace + valgrind + zeal + ]; pythonTools = with python3Packages; [ python # to shadow old macOS python @@ -196,33 +192,32 @@ let chromedriver ]; - kdeTools = - [ - okteta - plasma5Packages.kdeconnect-kde - ] - ++ (with kdePackages; [ - okular - gwenview - yakuake - dolphin - spectacle - kate - kleopatra - qdirstat - ark - kwalletmanager - #ktouch # TODO: unbreak - kcharselect - konversation - krdc - skanlite - akonadiconsole - tokodon # mastodon client - networkmanager-qt - kcrash - breeze-gtk - ]); + kdeTools = [ + okteta + plasma5Packages.kdeconnect-kde + ] + ++ (with kdePackages; [ + okular + gwenview + yakuake + dolphin + spectacle + kate + kleopatra + qdirstat + ark + kwalletmanager + #ktouch # TODO: unbreak + kcharselect + konversation + krdc + skanlite + akonadiconsole + tokodon # mastodon client + networkmanager-qt + kcrash + breeze-gtk + ]); in { options.schmittlauch.packages = { diff --git a/home/workmac.nix b/home/workmac.nix index 5227db0..f0803ec 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -66,26 +66,25 @@ in contacts = import "${inputs.mysecrets}/contacts.nix" { inherit lib; }; in { - includes = - [ - { - condition = "gitdir:~/src/schmittlauch/"; - contents = { - user = { - inherit (contacts.schmittlauch) name email; - }; - }; - } - ] - # set default name for several other common locations - ++ map (dir: { - condition = "gitdir:${dir}"; + includes = [ + { + condition = "gitdir:~/src/schmittlauch/"; contents = { user = { - inherit (contacts.work) name email; + inherit (contacts.schmittlauch) name email; }; }; - }) [ "~/" ]; + } + ] + # set default name for several other common locations + ++ map (dir: { + condition = "gitdir:${dir}"; + contents = { + user = { + inherit (contacts.work) name email; + }; + }; + }) [ "~/" ]; }; # some extra shell scripts From 633c93f1e0a43de91440c78ae731671bdaf6497d Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 30 Jul 2025 21:23:06 +0200 Subject: [PATCH 256/330] add nixfmt commit to ignored revisions --- .git-blame-ignore-revs | 1 + 1 file changed, 1 insertion(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..fb5a3ba --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1 @@ +ce54be9aac846c7798307d6d6fcee3346c01f601 From 18adff4c5260d4e2b9b79411affeff4626ba88fe Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 30 Jul 2025 21:24:38 +0200 Subject: [PATCH 257/330] home/modules/captive-browser: init module starting with Chrome/ Chromium only by copying command from https://github.com/FiloSottile/captive-browser/ --- home/common.nix | 1 + home/modules/captive-browser.nix | 77 ++++++++++++++++++++++++++++++++ home/workmac.nix | 5 +++ 3 files changed, 83 insertions(+) create mode 100644 home/modules/captive-browser.nix diff --git a/home/common.nix b/home/common.nix index c2c5264..b8dc67f 100644 --- a/home/common.nix +++ b/home/common.nix @@ -11,6 +11,7 @@ ./modules/packages.nix ./modules/vscodium.nix ./modules/fonts.nix + ./modules/captive-browser.nix ]; home.homeDirectory = if pkgs.stdenv.isDarwin then "/Users/${config.home.username}" else "/home/${config.home.username}"; diff --git a/home/modules/captive-browser.nix b/home/modules/captive-browser.nix new file mode 100644 index 0000000..b07be4c --- /dev/null +++ b/home/modules/captive-browser.nix @@ -0,0 +1,77 @@ +{ + pkgs, + lib, + inputs, + config, + system, + ... +}: + +let + tomlFormat = pkgs.formats.toml { }; + cfg = config.programs.captive-browser; + inherit (pkgs.stdenv.hostPlatform) isDarwin; +in +{ + options.programs.captive-browser = { + enable = lib.mkEnableOption "Enable custom captive-browser in user PATH"; + package = lib.mkPackageOption pkgs "captive-browser" { nullable = true; }; + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = tomlFormat.type; + + options = { + browser = lib.mkOption { + type = lib.types.str; + description = "command to invoke the browser with"; + + # browser is the shell (/bin/sh) command executed once the proxy starts. + # When browser exits, the proxy exits. An extra env var PROXY is available. + # + # Here, we use a separate Chrome instance in Incognito mode, so that + # it can run (and be waited for) alongside the default one, and that + # it maintains no state across runs. To configure this browser open a + # normal window in it, settings will be preserved. + default = '' + ${cfg.browserCommand} \ + --user-data-dir="$HOME/Library/Application Support/Google/Captive" \ + --proxy-server="socks5://$PROXY" \ + --host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost" \ + --no-first-run --new-window --incognito \ + http://example.com + ''; + }; + }; + }; + }; + interface = lib.mkOption { + type = lib.types.str; + description = "WLAN interface to use"; + }; + browserCommand = lib.mkOption { + type = lib.types.str; + default = if isDarwin then "open -n -W -a \"Google Chrome\" --args" else (lib.getExe pkgs.chromium); + }; + }; + config = lib.mkIf cfg.enable { + home.packages = [ cfg.package ]; + + programs.captive-browser.settings = { + # dhcp-dns is the shell (/bin/sh) command executed to obtain the DHCP + # DNS server address. The first match of an IPv4 regex is used. + # IPv4 only, because let's be real, it's a captive portal. + dhcp-dns = "ipconfig getoption ${cfg.interface} domain_name_server"; + + # socks5-addr is the listen address for the SOCKS5 proxy server. + socks5-addr = "localhost:1666"; + }; + home.file.".config/captive-browser.toml" = lib.mkIf (isDarwin && !config.xdg.enable) { + source = tomlFormat.generate "captive-browser-config" cfg.settings; + }; + + xdg.configFile."captive-browser.toml" = lib.mkIf (!(isDarwin && !config.xdg.enable)) { + source = tomlFormat.generate "captive-browser-config" cfg.settings; + }; + + }; +} diff --git a/home/workmac.nix b/home/workmac.nix index f0803ec..0a9cc65 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -93,6 +93,11 @@ in + import ./scripts/ssh-loop-fc.nix { inherit pkgs lib; } ); + # separate proxied browser using the DHCP-supplied DNS for accessing captive portals + programs.captive-browser = { + enable = true; + interface = "en0"; + }; launchd.agents.hydra_proxy = { enable = true; config = { From 9f43d64f499c400939ed9562dfae1f78c6f7bffc Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 30 Jul 2025 21:45:17 +0200 Subject: [PATCH 258/330] home/modules/captive-browser: linux DHCP command, default option priority let's just hardcode dhcpcd under Linux. untested. --- home/modules/captive-browser.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/home/modules/captive-browser.nix b/home/modules/captive-browser.nix index b07be4c..f3c8453 100644 --- a/home/modules/captive-browser.nix +++ b/home/modules/captive-browser.nix @@ -56,11 +56,15 @@ in config = lib.mkIf cfg.enable { home.packages = [ cfg.package ]; - programs.captive-browser.settings = { + programs.captive-browser.settings = builtins.mapAttrs (_: lib.mkOptionDefault) { # dhcp-dns is the shell (/bin/sh) command executed to obtain the DHCP # DNS server address. The first match of an IPv4 regex is used. # IPv4 only, because let's be real, it's a captive portal. - dhcp-dns = "ipconfig getoption ${cfg.interface} domain_name_server"; + dhcp-dns = + if isDarwin then + "ipconfig getoption ${cfg.interface} domain_name_server" + else + "${lib.getExe pkgs.dhcpcd} -U ${cfg.interface} | grep domain_name_servers"; # socks5-addr is the listen address for the SOCKS5 proxy server. socks5-addr = "localhost:1666"; From c9605844478224bed545eca6946de5a27473a5f3 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 31 Jul 2025 22:19:44 +0200 Subject: [PATCH 259/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/7fd36ee82c0275fb545775cc5e4d30542899511d?narHash=sha256-9h7%2B4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ%2BSJjk%3D' (2025-07-25) → 'github:NixOS/nixpkgs/dc9637876d0dcc8c9e5e22986b857632effeb727?narHash=sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM%3D' (2025-07-28) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/3ff0e34b1383648053bba8ed03f201d3466f90c9?narHash=sha256-CdX2Rtvp5I8HGu9swBmYuq%2BILwRxpXdJwlpg8jvN4tU%3D' (2025-07-24) → 'github:NixOS/nixpkgs/1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a?narHash=sha256-%2BjkEZxs7bfOKfBIk430K%2BtK9IvXlwzqQQnppC2ZKFj4%3D' (2025-07-29) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 270d84a..8228ed3 100644 --- a/flake.lock +++ b/flake.lock @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1753429684, - "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1753345091, - "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", + "lastModified": 1753749649, + "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", + "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", "type": "github" }, "original": { From 686bf132172a622184bbca08791f517dd7e7552f Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 1 Aug 2025 12:07:06 +0200 Subject: [PATCH 260/330] workmac, ssh: tune multiplexing timeouts Adjust multiplexing settings to avoid being stuck for too long when the control master has issues or the target host e.g. rebooted. Relevant e.g. when used for reboot recovery check pings. --- home/workmac.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/home/workmac.nix b/home/workmac.nix index 0a9cc65..0f8fd43 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -35,9 +35,11 @@ in # defaults in bottom match block "*" # TODO: common config for desktop as well # multiplexer, e.g. to avoid rate limiting on jumphost usage - serverAliveInterval = 60; + serverAliveInterval = 10; + serverAliveCountMax = 2; # 2 strikes and you're out controlMaster = "auto"; - controlPersist = "4h"; + # not too long, due to the frequent keepalives + controlPersist = "1h"; # ssh host config matchBlocks = { @@ -45,7 +47,6 @@ in "*" = { extraOptions = { IdentityAgent = "\"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\""; - #ControlPath = "/tmp/ssh_mux_%h_%p_%r"; }; }; @@ -107,7 +108,7 @@ in "0" "-D" "1080" - "-oServerAliveInterval=60" + "-oServerAliveInterval=30" "-oControlMaster=no" "-N" "vpn-whq.services.fcio.net" From 6b36602e06ee2c1ffe8d8a68119827fa62cf9751 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 5 Aug 2025 18:00:19 +0200 Subject: [PATCH 261/330] console.font: use default The meaning of the option appears to have slightly changed, it errors during early boot now. Defaults are fine. --- common/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/common/default.nix b/common/default.nix index c25fc12..1fef46d 100644 --- a/common/default.nix +++ b/common/default.nix @@ -28,7 +28,6 @@ in # configure console console = { - font = "Lat2-Terminus16"; keyMap = "de"; }; From 7af1a87afb69893868d613ecea752fd25887332c Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 11 Aug 2025 11:55:39 +0200 Subject: [PATCH 262/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/cc66fddc6cb04ab479a1bb062f4d4da27c936a22?narHash=sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM%3D' (2025-07-21) → 'github:NixOS/nixos-hardware/26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113?narHash=sha256-dz303vGuzWjzOPOaYkS9xSW%2BB93PSAJxvBd6CambXVA%3D' (2025-08-07) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/dc9637876d0dcc8c9e5e22986b857632effeb727?narHash=sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM%3D' (2025-07-28) → 'github:NixOS/nixpkgs/85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054?narHash=sha256-iAcj9T/Y%2B3DBy2J0N%2ByF9XQQQ8IEb5swLFzs23CdP88%3D' (2025-08-09) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a?narHash=sha256-%2BjkEZxs7bfOKfBIk430K%2BtK9IvXlwzqQQnppC2ZKFj4%3D' (2025-07-29) → 'github:NixOS/nixpkgs/c5f08b62ed75415439d48152c2a784e36909b1bc?narHash=sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g%3D' (2025-08-09) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 8228ed3..95cca4a 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1753122741, - "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", + "lastModified": 1754564048, + "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", + "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1753694789, - "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "lastModified": 1754725699, + "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", + "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1753749649, - "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", + "lastModified": 1754767907, + "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", + "rev": "c5f08b62ed75415439d48152c2a784e36909b1bc", "type": "github" }, "original": { From 6220f916a3689dd6b87b6352fda0aec784bc3dd4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 9 Aug 2025 16:51:08 +0200 Subject: [PATCH 263/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/cc66fddc6cb04ab479a1bb062f4d4da27c936a22' (2025-07-21) → 'github:NixOS/nixos-hardware/26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113' (2025-08-07) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/dc9637876d0dcc8c9e5e22986b857632effeb727' (2025-07-28) → 'github:NixOS/nixpkgs/c2ae88e026f9525daf89587f3cbee584b92b6134' (2025-08-06) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a' (2025-07-29) → 'github:NixOS/nixpkgs/fc756aa6f5d3e2e5666efcf865d190701fef150a' (2025-08-08) • Updated input 'nur': 'github:nix-community/NUR/6f87ad268e07a0573f32f43d2505862b08542dc0' (2025-07-27) → 'github:nix-community/NUR/f6fa362b700f64a9ac6e7d38b06db4f0c8101b4c' (2025-08-09) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/7fd36ee82c0275fb545775cc5e4d30542899511d' (2025-07-25) → 'github:nixos/nixpkgs/c2ae88e026f9525daf89587f3cbee584b92b6134' (2025-08-06) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 95cca4a..b978d53 100644 --- a/flake.lock +++ b/flake.lock @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1753429684, - "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", + "lastModified": 1754498491, + "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", + "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1753621972, - "narHash": "sha256-E887hPHRcaSU8+kheTRjVFJQAKlps8OQvbCOyPMQ6Es=", + "lastModified": 1754750314, + "narHash": "sha256-t44AhQ1ymV0nRjjhr5/K/0Q+lC/pnul8ncHEWBzyIIg=", "owner": "nix-community", "repo": "NUR", - "rev": "6f87ad268e07a0573f32f43d2505862b08542dc0", + "rev": "f6fa362b700f64a9ac6e7d38b06db4f0c8101b4c", "type": "github" }, "original": { From c1a24e386b87799d498af590a8c24131642d51fb Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 13 Aug 2025 13:24:12 +0200 Subject: [PATCH 264/330] 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/c5f08b62ed75415439d48152c2a784e36909b1bc' (2025-08-09) → 'github:NixOS/nixpkgs/ddae11e58c0c345bf66efbddbf2192ed0e58f896' (2025-08-11) • Updated input 'nur': 'github:nix-community/NUR/f6fa362b700f64a9ac6e7d38b06db4f0c8101b4c' (2025-08-09) → 'github:nix-community/NUR/3a675e8f6015cb8ea14138b0c69722b2a0e09dee' (2025-08-13) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/c2ae88e026f9525daf89587f3cbee584b92b6134' (2025-08-06) → 'github:nixos/nixpkgs/85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054' (2025-08-09) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index b978d53..6ceab5d 100644 --- a/flake.lock +++ b/flake.lock @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754767907, - "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=", + "lastModified": 1754937576, + "narHash": "sha256-3sWA5WJybUE16kIMZ3+uxcxKZY/JRR4DFBqLdSLBo7w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5f08b62ed75415439d48152c2a784e36909b1bc", + "rev": "ddae11e58c0c345bf66efbddbf2192ed0e58f896", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1754498491, - "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", + "lastModified": 1754725699, + "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", + "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1754750314, - "narHash": "sha256-t44AhQ1ymV0nRjjhr5/K/0Q+lC/pnul8ncHEWBzyIIg=", + "lastModified": 1755080806, + "narHash": "sha256-P94SMIPWhpSX5tvX4ccFDEC1pm0SsddKNouM49Dz5Oo=", "owner": "nix-community", "repo": "NUR", - "rev": "f6fa362b700f64a9ac6e7d38b06db4f0c8101b4c", + "rev": "3a675e8f6015cb8ea14138b0c69722b2a0e09dee", "type": "github" }, "original": { From 9b534c1c3c94ecea72c3df4407ba79663920634d Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 18 Aug 2025 15:12:39 +0200 Subject: [PATCH 265/330] workmac: pin ssh fcio jump hosts to IPv4 --- home/workmac.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/home/workmac.nix b/home/workmac.nix index 0f8fd43..0e9c722 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -56,9 +56,20 @@ in }; "fcio-whq-jump" = lib.hm.dag.entryAfter [ "*" ] { hostname = "vpn-whq.services.fcio.net"; - extraOptions.LogLevel = "Verbose"; + extraOptions = { + LogLevel = "Verbose"; + AddressFamily = "inet"; + }; + + }; + "fcio-rzob-jump" = lib.hm.dag.entryAfter [ "*" ] { + hostname = "vpn-rzob.services.fcio.net"; + extraOptions = { + LogLevel = "Verbose"; + AddressFamily = "inet"; + }; + }; - "fcio-rzob-jump" = lib.hm.dag.entryAfter [ "*" ] { hostname = "vpn-rzob.services.fcio.net"; }; }; }; From d48de400a7c05dac8a44666e605772d13ec955c4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 19 Aug 2025 19:20:33 +0200 Subject: [PATCH 266/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113?narHash=sha256-dz303vGuzWjzOPOaYkS9xSW%2BB93PSAJxvBd6CambXVA%3D' (2025-08-07) → 'github:NixOS/nixos-hardware/3dac8a872557e0ca8c083cdcfc2f218d18e113b0?narHash=sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA%3D' (2025-08-16) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054?narHash=sha256-iAcj9T/Y%2B3DBy2J0N%2ByF9XQQQ8IEb5swLFzs23CdP88%3D' (2025-08-09) → 'github:NixOS/nixpkgs/fbcf476f790d8a217c3eab4e12033dc4a0f6d23c?narHash=sha256-wNO3%2BKs2jZJ4nTHMuks%2BcxAiVBGNuEBXsT29Bz6HASo%3D' (2025-08-14) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/ddae11e58c0c345bf66efbddbf2192ed0e58f896?narHash=sha256-3sWA5WJybUE16kIMZ3%2BuxcxKZY/JRR4DFBqLdSLBo7w%3D' (2025-08-11) → 'github:NixOS/nixpkgs/48f4c982de68d966421d2b6f1ddbeb6227cc5ceb?narHash=sha256-axUoWcm4cNQ36jOlnkD9D40LTfSQgk8ExfHSRm3rTtg%3D' (2025-08-17) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 6ceab5d..8e68fff 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1754564048, - "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", + "lastModified": 1755330281, + "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113", + "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754937576, - "narHash": "sha256-3sWA5WJybUE16kIMZ3+uxcxKZY/JRR4DFBqLdSLBo7w=", + "lastModified": 1755471983, + "narHash": "sha256-axUoWcm4cNQ36jOlnkD9D40LTfSQgk8ExfHSRm3rTtg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ddae11e58c0c345bf66efbddbf2192ed0e58f896", + "rev": "48f4c982de68d966421d2b6f1ddbeb6227cc5ceb", "type": "github" }, "original": { From c1323c5756b3120461cba538a714fb97ab336b6a Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 17 Aug 2025 18:20:03 +0200 Subject: [PATCH 267/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113' (2025-08-07) → 'github:NixOS/nixos-hardware/3dac8a872557e0ca8c083cdcfc2f218d18e113b0' (2025-08-16) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054' (2025-08-09) → 'github:NixOS/nixpkgs/fbcf476f790d8a217c3eab4e12033dc4a0f6d23c' (2025-08-14) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/ddae11e58c0c345bf66efbddbf2192ed0e58f896' (2025-08-11) → 'github:NixOS/nixpkgs/ad7196ae55c295f53a7d1ec39e4a06d922f3b899' (2025-08-15) • Updated input 'nur': 'github:nix-community/NUR/3a675e8f6015cb8ea14138b0c69722b2a0e09dee' (2025-08-13) → 'github:nix-community/NUR/8509a13591f79f1772501d1d30c48f921c2aed3e' (2025-08-17) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054' (2025-08-09) → 'github:nixos/nixpkgs/fbcf476f790d8a217c3eab4e12033dc4a0f6d23c' (2025-08-14) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8e68fff..9ac805e 100644 --- a/flake.lock +++ b/flake.lock @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1755080806, - "narHash": "sha256-P94SMIPWhpSX5tvX4ccFDEC1pm0SsddKNouM49Dz5Oo=", + "lastModified": 1755441713, + "narHash": "sha256-bxN6mZti2vbHl4NUYLDaYdqULNay1qbkxUeVAN6DE+8=", "owner": "nix-community", "repo": "NUR", - "rev": "3a675e8f6015cb8ea14138b0c69722b2a0e09dee", + "rev": "8509a13591f79f1772501d1d30c48f921c2aed3e", "type": "github" }, "original": { From eb834fbc8a7688ccf83c96617b3d1ec4b19f0355 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 22 Aug 2025 14:37:47 +0200 Subject: [PATCH 268/330] framenix: disable WLAN powersave due to issues with the RZ616/MT7922 chip --- hosts/framenix/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index 166f4ee..3a31a19 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -32,6 +32,9 @@ in "amdgpu.abmlevel=1" # adaptive backlight management ]; + # disable WLAN powersave + networking.networkmanager.settings.connection."wifi.powersave" = 2; + boot.initrd.systemd.enable = true; # at boot by default, limit charging capacity to protect battery. From 52ead700022852a0d4b0e564c2f5f3f622c9c9a8 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 22 Aug 2025 14:39:04 +0200 Subject: [PATCH 269/330] 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/fc3add429f21450359369af74c2375cb34a2d204' (2025-07-27) → 'github:nix-community/home-manager/4fb695d10890e9fc6a19deadf85ff79ffb78da86' (2025-08-21) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/fbcf476f790d8a217c3eab4e12033dc4a0f6d23c' (2025-08-14) → 'github:NixOS/nixpkgs/20075955deac2583bb12f07151c2df830ef346b4' (2025-08-19) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/48f4c982de68d966421d2b6f1ddbeb6227cc5ceb' (2025-08-17) → 'github:NixOS/nixpkgs/9cb344e96d5b6918e94e1bca2d9f3ea1e9615545' (2025-08-20) • Updated input 'nur': 'github:nix-community/NUR/8509a13591f79f1772501d1d30c48f921c2aed3e' (2025-08-17) → 'github:nix-community/NUR/9055bc8750ab86fb5195f03d826de20450f9cc38' (2025-08-22) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/fbcf476f790d8a217c3eab4e12033dc4a0f6d23c' (2025-08-14) → 'github:nixos/nixpkgs/20075955deac2583bb12f07151c2df830ef346b4' (2025-08-19) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 9ac805e..ae251bf 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1753592768, - "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", + "lastModified": 1755776884, + "narHash": "sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc3add429f21450359369af74c2375cb34a2d204", + "rev": "4fb695d10890e9fc6a19deadf85ff79ffb78da86", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755471983, - "narHash": "sha256-axUoWcm4cNQ36jOlnkD9D40LTfSQgk8ExfHSRm3rTtg=", + "lastModified": 1755704039, + "narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48f4c982de68d966421d2b6f1ddbeb6227cc5ceb", + "rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1755441713, - "narHash": "sha256-bxN6mZti2vbHl4NUYLDaYdqULNay1qbkxUeVAN6DE+8=", + "lastModified": 1755858315, + "narHash": "sha256-pPsRgiD1m7IOJ0C3lzUzvk7Bq4qLOa7EpQ09QOdcM5g=", "owner": "nix-community", "repo": "NUR", - "rev": "8509a13591f79f1772501d1d30c48f921c2aed3e", + "rev": "9055bc8750ab86fb5195f03d826de20450f9cc38", "type": "github" }, "original": { From 0473529811afb7aad33ca11ed194df40c44a7524 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 24 Aug 2025 15:57:49 +0200 Subject: [PATCH 270/330] 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/4fb695d10890e9fc6a19deadf85ff79ffb78da86?narHash=sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI%3D' (2025-08-21) → 'github:nix-community/home-manager/4a44fb9f7555da362af9d499817084f4288a957f?narHash=sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk%3D' (2025-08-23) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/9cb344e96d5b6918e94e1bca2d9f3ea1e9615545?narHash=sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A%3D' (2025-08-20) → 'github:NixOS/nixpkgs/b1b3291469652d5a2edb0becc4ef0246fff97a7c?narHash=sha256-wY1%2B2JPH0ZZC4BQefoZw/k%2B3%2BDowFyfOxv17CN/idKs%3D' (2025-08-23) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index ae251bf..f9cea7e 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1755776884, - "narHash": "sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI=", + "lastModified": 1755928099, + "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=", "owner": "nix-community", "repo": "home-manager", - "rev": "4fb695d10890e9fc6a19deadf85ff79ffb78da86", + "rev": "4a44fb9f7555da362af9d499817084f4288a957f", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755704039, - "narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=", + "lastModified": 1755922037, + "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545", + "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", "type": "github" }, "original": { From 57a2e3b8392a3cd8ce5b9dc7dc0bbc8ae64bf7d3 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 25 Aug 2025 00:28:21 +0200 Subject: [PATCH 271/330] kdeconnect: properly use NixOS module --- common/default.nix | 14 +------------- home/modules/packages.nix | 1 - 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/common/default.nix b/common/default.nix index 1fef46d..4616f93 100644 --- a/common/default.nix +++ b/common/default.nix @@ -67,19 +67,6 @@ in # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; - networking.firewall.allowedTCPPortRanges = [ - { - from = 1714; - to = 1764; - } - ]; - networking.firewall.allowedUDPPortRanges = [ - { - from = 1714; - to = 1764; - } - ]; # for KDE connect - # FIXME: kdeconnect module # Or disable the firewall altogether. # networking.firewall.enable = false; @@ -170,6 +157,7 @@ in kontact = true; merkuro = true; }; + programs.kdeconnect.enable = true; # enable wayland for Chromium and Electron environment.sessionVariables.NIXOS_OZONE_WL = "1"; diff --git a/home/modules/packages.nix b/home/modules/packages.nix index d9f1a31..6b4cc88 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -194,7 +194,6 @@ let kdeTools = [ okteta - plasma5Packages.kdeconnect-kde ] ++ (with kdePackages; [ okular From 97e3a87d123cf7aba74d2b042d3455745114484d Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 29 Aug 2025 10:16:09 +0200 Subject: [PATCH 272/330] home/captive-browser: update chrome args to replace deprecated args taken from https://github.com/FiloSottile/captive-browser/pull/32 --- home/modules/captive-browser.nix | 16 ++++++++++++++-- home/modules/llm.nix | 13 +++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 home/modules/llm.nix diff --git a/home/modules/captive-browser.nix b/home/modules/captive-browser.nix index f3c8453..501cdfb 100644 --- a/home/modules/captive-browser.nix +++ b/home/modules/captive-browser.nix @@ -36,8 +36,20 @@ in ${cfg.browserCommand} \ --user-data-dir="$HOME/Library/Application Support/Google/Captive" \ --proxy-server="socks5://$PROXY" \ - --host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost" \ - --no-first-run --new-window --incognito \ + --proxy-bypass-list="<-loopback>" \ + --no-first-run \ + --new-window \ + --incognito \ + --no-default-browser-check \ + --no-crash-upload \ + --disable-extensions \ + --disable-sync \ + --disable-background-networking \ + --disable-client-side-phishing-detection \ + --disable-component-update \ + --disable-translate \ + --disable-web-resources \ + --safebrowsing-disable-auto-update \ http://example.com ''; }; diff --git a/home/modules/llm.nix b/home/modules/llm.nix new file mode 100644 index 0000000..9a33d8e --- /dev/null +++ b/home/modules/llm.nix @@ -0,0 +1,13 @@ +{ + pkgs, + lib, + inputs, + config, + system, + ... +}: + let myAider = pkgs.aider-chat.withOptional {withPlaywright = true; withBrowser = true; withHelp = true; withBedrock = false;}; + in + { + home.packages = [ myAider ]; + } From fd190dbdcd880885e17bba789065e909e07f49a0 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 29 Aug 2025 10:17:36 +0200 Subject: [PATCH 273/330] darwin: enable relaxed Nix sandbox --- darwin/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/darwin/configuration.nix b/darwin/configuration.nix index 307836f..0e0a10a 100644 --- a/darwin/configuration.nix +++ b/darwin/configuration.nix @@ -17,6 +17,7 @@ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "flyingcircus.io-1:Rr9CwiPv8cdVf3EQu633IOTb6iJKnWbVfCC8x8gVz2o=" ]; + sandbox = "relaxed"; }; }; From b1444e8967545f0cad3575d4854c41e25130222c Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 29 Aug 2025 10:17:57 +0200 Subject: [PATCH 274/330] workmac: start using some llm coding agents --- home/modules/llm.nix | 28 +++++++++++++++++++++++----- home/workmac.nix | 8 +++++++- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/home/modules/llm.nix b/home/modules/llm.nix index 9a33d8e..80466d4 100644 --- a/home/modules/llm.nix +++ b/home/modules/llm.nix @@ -6,8 +6,26 @@ system, ... }: - let myAider = pkgs.aider-chat.withOptional {withPlaywright = true; withBrowser = true; withHelp = true; withBedrock = false;}; - in - { - home.packages = [ myAider ]; - } +let + myAider = pkgs.aider-chat; + # FIXME: darwin build failure due to cfn-lint-1.32.1 + # myAider = pkgs.aider-chat.withOptional { + # withPlaywright = true; + # withBrowser = true; + # withHelp = true; + # withBedrock = false; + # }; +in +{ + home.packages = [ + myAider + pkgs.claude-code + ]; + #nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "claude-code" ]; # nixpkgs.config merging is unfortunately broken + # TODO: API token e.g. via sops + # TODO: proper codium and llm enable options + home.sessionVariables = { + AIDER_EDITOR = "codium --wait"; + DISABLE_TELEMETRY = 1; # for claude-code + }; +} diff --git a/home/workmac.nix b/home/workmac.nix index 0e9c722..64c3fc3 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -12,6 +12,7 @@ let unstable = inputs.nixos-unstable.legacyPackages.${system}; in { + imports = [ ./modules/llm.nix ]; schmittlauch.packages = { graphics = true; @@ -129,7 +130,12 @@ in ThrottleInterval = 60; }; }; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "1password-cli" ]; + nixpkgs.config.allowUnfreePredicate = + pkg: + builtins.elem (lib.getName pkg) [ + "1password-cli" + "claude-code" + ]; # nixpkgs.config merging is unfortunately broken home.stateVersion = "22.05"; } From 746c742f806f85026c004e8700b118ad99a6d1a4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 3 Sep 2025 18:23:50 +0200 Subject: [PATCH 275/330] 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/4a44fb9f7555da362af9d499817084f4288a957f?narHash=sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk%3D' (2025-08-23) → 'github:nix-community/home-manager/07fc025fe10487dd80f2ec694f1cd790e752d0e8?narHash=sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB%2BgTQ%3D' (2025-08-31) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/3dac8a872557e0ca8c083cdcfc2f218d18e113b0?narHash=sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA%3D' (2025-08-16) → 'github:NixOS/nixos-hardware/47eb4856cfd01eaeaa7bb5944a0f27db8fb9b94a?narHash=sha256-e4ZAu2sjOtGpvbdS5zo%2BVa5FUUkAnizl4wb0/JlIL2I%3D' (2025-09-01) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/20075955deac2583bb12f07151c2df830ef346b4?narHash=sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs%2BStOp19xNsbqdOg%3D' (2025-08-19) → 'github:NixOS/nixpkgs/d0fc30899600b9b3466ddb260fd83deb486c32f1?narHash=sha256-rw/PHa1cqiePdBxhF66V7R%2BWAP8WekQ0mCDG4CFqT8Y%3D' (2025-09-02) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/b1b3291469652d5a2edb0becc4ef0246fff97a7c?narHash=sha256-wY1%2B2JPH0ZZC4BQefoZw/k%2B3%2BDowFyfOxv17CN/idKs%3D' (2025-08-23) → 'github:NixOS/nixpkgs/0e6684e6c5755325f801bda1751a8a4038145d7d?narHash=sha256-6tooT142NLcFjt24Gi4B0G1pgWLvfw7y93sYEfSHlLI%3D' (2025-09-03) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index f9cea7e..6285dea 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1755928099, - "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=", + "lastModified": 1756679287, + "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "4a44fb9f7555da362af9d499817084f4288a957f", + "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1755330281, - "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", + "lastModified": 1756750488, + "narHash": "sha256-e4ZAu2sjOtGpvbdS5zo+Va5FUUkAnizl4wb0/JlIL2I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", + "rev": "47eb4856cfd01eaeaa7bb5944a0f27db8fb9b94a", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756787288, + "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755922037, - "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", + "lastModified": 1756886854, + "narHash": "sha256-6tooT142NLcFjt24Gi4B0G1pgWLvfw7y93sYEfSHlLI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", + "rev": "0e6684e6c5755325f801bda1751a8a4038145d7d", "type": "github" }, "original": { From a664245cde480d3530fba531757536c615250cf7 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 14 Sep 2025 16:38:26 +0200 Subject: [PATCH 276/330] 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/07fc025fe10487dd80f2ec694f1cd790e752d0e8' (2025-08-31) → 'github:nix-community/home-manager/f21d9167782c086a33ad53e2311854a8f13c281e' (2025-09-14) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/47eb4856cfd01eaeaa7bb5944a0f27db8fb9b94a' (2025-09-01) → 'github:NixOS/nixos-hardware/f89c620d3d6e584d98280b48f0af7be4f8506ab5' (2025-09-13) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/d0fc30899600b9b3466ddb260fd83deb486c32f1' (2025-09-02) → 'github:NixOS/nixpkgs/c23193b943c6c689d70ee98ce3128239ed9e32d1' (2025-09-13) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/0e6684e6c5755325f801bda1751a8a4038145d7d' (2025-09-03) → 'github:NixOS/nixpkgs/8cd5ce828d5d1d16feff37340171a98fc3bf6526' (2025-09-10) • Updated input 'nur': 'github:nix-community/NUR/9055bc8750ab86fb5195f03d826de20450f9cc38' (2025-08-22) → 'github:nix-community/NUR/3bb955f07a4d15f109a3dd25af7d36e6d34c682e' (2025-09-14) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/20075955deac2583bb12f07151c2df830ef346b4' (2025-08-19) → 'github:nixos/nixpkgs/c23193b943c6c689d70ee98ce3128239ed9e32d1' (2025-09-13) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 6285dea..08f1f9b 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1756679287, - "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", + "lastModified": 1757808926, + "narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=", "owner": "nix-community", "repo": "home-manager", - "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", + "rev": "f21d9167782c086a33ad53e2311854a8f13c281e", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1756750488, - "narHash": "sha256-e4ZAu2sjOtGpvbdS5zo+Va5FUUkAnizl4wb0/JlIL2I=", + "lastModified": 1757775351, + "narHash": "sha256-xWsxmNHwt9jV/yFJqzsNeilpH4BR8MPe44Yt0eaGAIM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "47eb4856cfd01eaeaa7bb5944a0f27db8fb9b94a", + "rev": "f89c620d3d6e584d98280b48f0af7be4f8506ab5", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1756787288, - "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756886854, - "narHash": "sha256-6tooT142NLcFjt24Gi4B0G1pgWLvfw7y93sYEfSHlLI=", + "lastModified": 1757545623, + "narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e6684e6c5755325f801bda1751a8a4038145d7d", + "rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1755858315, - "narHash": "sha256-pPsRgiD1m7IOJ0C3lzUzvk7Bq4qLOa7EpQ09QOdcM5g=", + "lastModified": 1757855570, + "narHash": "sha256-Z5qJlDnZpf2UBYmDchrZvgFZafea0cMgD4Y7QWhhXJY=", "owner": "nix-community", "repo": "NUR", - "rev": "9055bc8750ab86fb5195f03d826de20450f9cc38", + "rev": "3bb955f07a4d15f109a3dd25af7d36e6d34c682e", "type": "github" }, "original": { From c2eaf4418ad5a433c9206e05700c4b1fdfb069f1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 14 Sep 2025 18:45:56 +0200 Subject: [PATCH 277/330] nitrokey: install companion app though the app is currently suffering from incompatibility with its corresponding library -> FIXME --- common/nitrokey.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/nitrokey.nix b/common/nitrokey.nix index 40457d1..9383888 100644 --- a/common/nitrokey.nix +++ b/common/nitrokey.nix @@ -1,7 +1,7 @@ { pkgs, lib, ... }: { hardware.nitrokey.enable = true; - environment.systemPackages = [ pkgs.pynitrokey ]; + environment.systemPackages = [ pkgs.pynitrokey pkgs.nitrokey-app2 ]; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ From e0e455721f521f4dfd6644555f80c4c3fd283132 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 4 Sep 2025 14:42:39 +0200 Subject: [PATCH 278/330] workmac/ssh: only enable multiplexing for jump hosts otherwise reboot checks for remote machines were stuck waiting for the jump host socket. quick fix, could be nicer, introduces code duplication --- home/workmac.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/home/workmac.nix b/home/workmac.nix index 64c3fc3..9f7e922 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -35,12 +35,8 @@ in enable = true; # defaults in bottom match block "*" # TODO: common config for desktop as well - # multiplexer, e.g. to avoid rate limiting on jumphost usage serverAliveInterval = 10; serverAliveCountMax = 2; # 2 strikes and you're out - controlMaster = "auto"; - # not too long, due to the frequent keepalives - controlPersist = "1h"; # ssh host config matchBlocks = { @@ -60,14 +56,21 @@ in extraOptions = { LogLevel = "Verbose"; AddressFamily = "inet"; + ControlMaster = "auto"; + # not too long, due to the frequent keepalives + ControlPersist = "1h"; }; }; "fcio-rzob-jump" = lib.hm.dag.entryAfter [ "*" ] { + # multiplexer, e.g. to avoid rate limiting on jumphost usage hostname = "vpn-rzob.services.fcio.net"; extraOptions = { LogLevel = "Verbose"; AddressFamily = "inet"; + ControlMaster = "auto"; + # not too long, due to the frequent keepalives + ControlPersist = "1h"; }; }; From ba1c14da48fd513ca50f265b5d5662b504fb46f1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 18 Sep 2025 14:04:05 +0200 Subject: [PATCH 279/330] vscodium: migrate extension better-toml -> even-better-toml --- home/modules/vscodium.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index a42b7ec..e7893df 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -19,7 +19,7 @@ charliermarsh.ruff vscodevim.vim yzhang.markdown-all-in-one - bungcip.better-toml + tamasfe.even-better-toml eamodio.gitlens jnoortheen.nix-ide mkhl.direnv From 8612d39788ff002efa51b5119b97fa6c8c5c6a6e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 18 Sep 2025 16:17:19 +0200 Subject: [PATCH 280/330] 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-darwin': 'github:LnL7/nix-darwin/536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb?narHash=sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls%3D' (2025-06-12) → 'github:LnL7/nix-darwin/1fef4404de4d1596aa5ab2bd68078370e1b9dcdb?narHash=sha256-qHn%2B/0%2BIOz5cG68BZUwL9BV3EO/e9eNKCjH3%2BN7wMdI%3D' (2025-09-09) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/f89c620d3d6e584d98280b48f0af7be4f8506ab5?narHash=sha256-xWsxmNHwt9jV/yFJqzsNeilpH4BR8MPe44Yt0eaGAIM%3D' (2025-09-13) → 'github:NixOS/nixos-hardware/67a709cfe5d0643dafd798b0b613ed579de8be05?narHash=sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM%3D' (2025-09-15) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/c23193b943c6c689d70ee98ce3128239ed9e32d1?narHash=sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820%3D' (2025-09-13) → 'github:NixOS/nixpkgs/8d4ddb19d03c65a36ad8d189d001dc32ffb0306b?narHash=sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE%3D' (2025-09-16) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/8cd5ce828d5d1d16feff37340171a98fc3bf6526?narHash=sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ%3D' (2025-09-10) → 'github:NixOS/nixpkgs/e9b7f2ff62b35f711568b1f0866243c7c302028d?narHash=sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9%2BM56%2BOkf%2BWY%3D' (2025-09-17) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 08f1f9b..82fcd29 100644 --- a/flake.lock +++ b/flake.lock @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1749744770, - "narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=", + "lastModified": 1757432263, + "narHash": "sha256-qHn+/0+IOz5cG68BZUwL9BV3EO/e9eNKCjH3+N7wMdI=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb", + "rev": "1fef4404de4d1596aa5ab2bd68078370e1b9dcdb", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757775351, - "narHash": "sha256-xWsxmNHwt9jV/yFJqzsNeilpH4BR8MPe44Yt0eaGAIM=", + "lastModified": 1757943327, + "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f89c620d3d6e584d98280b48f0af7be4f8506ab5", + "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1758035966, + "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1757545623, - "narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=", + "lastModified": 1758070117, + "narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526", + "rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d", "type": "github" }, "original": { From fe39fb9a26a279d957b9013e9f11b7860ea649dc Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 19 Sep 2025 22:35:35 +0200 Subject: [PATCH 281/330] 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/f21d9167782c086a33ad53e2311854a8f13c281e' (2025-09-14) → 'github:nix-community/home-manager/6f656618ebc71ca82d93d306a8aecb2c5f6f2ab2' (2025-09-19) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/8d4ddb19d03c65a36ad8d189d001dc32ffb0306b' (2025-09-16) → 'github:NixOS/nixpkgs/0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d' (2025-09-18) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/e9b7f2ff62b35f711568b1f0866243c7c302028d' (2025-09-17) → 'github:NixOS/nixpkgs/d2ed99647a4b195f0bcc440f76edfa10aeb3b743' (2025-09-18) • Updated input 'nur': 'github:nix-community/NUR/3bb955f07a4d15f109a3dd25af7d36e6d34c682e' (2025-09-14) → 'github:nix-community/NUR/a039cbeb1c163a3481744cf2b306396bef373ace' (2025-09-19) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/c23193b943c6c689d70ee98ce3128239ed9e32d1' (2025-09-13) → 'github:nixos/nixpkgs/0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d' (2025-09-18) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 82fcd29..3153774 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1757808926, - "narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=", + "lastModified": 1758313341, + "narHash": "sha256-SsI6INUzWwPcRKRaxvi50RttnD9rcC4EjV+67TOEfrQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f21d9167782c086a33ad53e2311854a8f13c281e", + "rev": "6f656618ebc71ca82d93d306a8aecb2c5f6f2ab2", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1758035966, - "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", + "lastModified": 1758198701, + "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", + "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758070117, - "narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=", + "lastModified": 1758216857, + "narHash": "sha256-h1BW2y7CY4LI9w61R02wPaOYfmYo82FyRqHIwukQ6SY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d", + "rev": "d2ed99647a4b195f0bcc440f76edfa10aeb3b743", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1758198701, + "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1757855570, - "narHash": "sha256-Z5qJlDnZpf2UBYmDchrZvgFZafea0cMgD4Y7QWhhXJY=", + "lastModified": 1758313813, + "narHash": "sha256-Pl4UGaQ8MWRSQPyDJgjggUxIpIdon9d9QBZwSrxUs2Y=", "owner": "nix-community", "repo": "NUR", - "rev": "3bb955f07a4d15f109a3dd25af7d36e6d34c682e", + "rev": "a039cbeb1c163a3481744cf2b306396bef373ace", "type": "github" }, "original": { From 3a05d719cd73cc7eeb9061721ea3cab0aacad181 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 21 Sep 2025 21:04:14 +0200 Subject: [PATCH 282/330] 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/6f656618ebc71ca82d93d306a8aecb2c5f6f2ab2' (2025-09-19) → 'github:nix-community/home-manager/3b955f5f0a942f9f60cdc9cacb7844335d0f21c3' (2025-09-21) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d' (2025-09-18) → 'github:NixOS/nixpkgs/8eaee110344796db060382e15d3af0a9fc396e0e' (2025-09-19) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/d2ed99647a4b195f0bcc440f76edfa10aeb3b743' (2025-09-18) → 'github:NixOS/nixpkgs/b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20' (2025-09-20) • Updated input 'nur': 'github:nix-community/NUR/a039cbeb1c163a3481744cf2b306396bef373ace' (2025-09-19) → 'github:nix-community/NUR/69487852af657127184fbf299bcf0db18a0f5b7c' (2025-09-21) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d' (2025-09-18) → 'github:nixos/nixpkgs/8eaee110344796db060382e15d3af0a9fc396e0e' (2025-09-19) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 3153774..29fa002 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1758313341, - "narHash": "sha256-SsI6INUzWwPcRKRaxvi50RttnD9rcC4EjV+67TOEfrQ=", + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "owner": "nix-community", "repo": "home-manager", - "rev": "6f656618ebc71ca82d93d306a8aecb2c5f6f2ab2", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1758198701, - "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", + "lastModified": 1758277210, + "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", + "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758216857, - "narHash": "sha256-h1BW2y7CY4LI9w61R02wPaOYfmYo82FyRqHIwukQ6SY=", + "lastModified": 1758346548, + "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2ed99647a4b195f0bcc440f76edfa10aeb3b743", + "rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1758198701, - "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", + "lastModified": 1758277210, + "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", + "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1758313813, - "narHash": "sha256-Pl4UGaQ8MWRSQPyDJgjggUxIpIdon9d9QBZwSrxUs2Y=", + "lastModified": 1758480552, + "narHash": "sha256-etydkbJMu3ng7tB/aUiem70V5BxODi1ZLxSCpGM/wCA=", "owner": "nix-community", "repo": "NUR", - "rev": "a039cbeb1c163a3481744cf2b306396bef373ace", + "rev": "69487852af657127184fbf299bcf0db18a0f5b7c", "type": "github" }, "original": { From 7574890c3c29593cddb66091c1fffc4e7826df8f Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 22 Sep 2025 00:13:34 +0200 Subject: [PATCH 283/330] nixfmt --- common/nitrokey.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/nitrokey.nix b/common/nitrokey.nix index 9383888..a8328fa 100644 --- a/common/nitrokey.nix +++ b/common/nitrokey.nix @@ -1,7 +1,10 @@ { pkgs, lib, ... }: { hardware.nitrokey.enable = true; - environment.systemPackages = [ pkgs.pynitrokey pkgs.nitrokey-app2 ]; + environment.systemPackages = [ + pkgs.pynitrokey + pkgs.nitrokey-app2 + ]; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ From 49484e5729090644ce4a13daf2e0dad6a2859033 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 23 Sep 2025 23:21:18 +0200 Subject: [PATCH 284/330] home/vscodium: clean up python extension config, use mypy daemon --- home/modules/vscodium.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index e7893df..8fa1a03 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -58,6 +58,7 @@ ]); in { + "telemetry.enableTelemetry" = false; # might not be needed for Codium "editor.fontLigatures" = true; "editor.accessibilitySupport" = false; # prevent asking "editor.cursorBlinking" = "phase"; @@ -90,12 +91,12 @@ }; "python.experiments.enabled" = false; "python.languageServer" = "Jedi"; # don't use proprietary pylance server - "python.defaultInterpreterPath" = "${defaultPython}/bin/python"; - "mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/mypy" ]; + "python.defaultInterpreterPath" = lib.getExe defaultPython; + "mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/dmypy" ]; + "mypy-type-checker.preferDaemon" = true; "mypy-type-checker.importStrategy" = "fromEnvironment"; "mypy-type-checker.args" = [ "--ignore-missing-imports" ]; "ruff.path" = [ (lib.getExe pkgs.ruff) ]; - "ruff.importStrategy" = "fromEnvironment"; "gitlens.telemetry.enabled" = false; "vim.highlightedyank.enable" = true; "vim.history" = 500; From 12f8c73870eb93d5780f1b3354a83c4c6a61e521 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 23 Sep 2025 23:22:34 +0200 Subject: [PATCH 285/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/8eaee110344796db060382e15d3af0a9fc396e0e?narHash=sha256-iCGWf/LTy%2BaY0zFu8q12lK8KuZp7yvdhStehhyX1v8w%3D' (2025-09-19) → 'github:NixOS/nixpkgs/554be6495561ff07b6c724047bdd7e0716aa7b46?narHash=sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc%3D' (2025-09-21) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20?narHash=sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E%3D' (2025-09-20) → 'github:NixOS/nixpkgs/d1d883129b193f0b495d75c148c2c3a7d95789a0?narHash=sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k%3D' (2025-09-23) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 29fa002..baf3212 100644 --- a/flake.lock +++ b/flake.lock @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1758277210, - "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758346548, - "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=", + "lastModified": 1758589230, + "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20", + "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0", "type": "github" }, "original": { From 81142da3141490e103213045538ae868e8919c67 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 24 Sep 2025 16:17:28 +0200 Subject: [PATCH 286/330] vscodium: work around jedi lsp bug --- home/modules/vscodium.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 8fa1a03..3f80cd5 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -88,6 +88,8 @@ "gitlens.codeLens.symbolScopes" = [ "!Module" ]; "editor.defaultFormatter" = "charliermarsh.ruff"; "editor.formatOnSave" = true; + # workaround for jedi-language-server < 0.45.1, semantic tokens are still broken + "editor.semanticHighlighting.enabled" = false; }; "python.experiments.enabled" = false; "python.languageServer" = "Jedi"; # don't use proprietary pylance server From c042dc080fb458a6653c5c99b9b490f5949000cd Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 28 Sep 2025 16:52:24 +0200 Subject: [PATCH 287/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/67a709cfe5d0643dafd798b0b613ed579de8be05' (2025-09-15) → 'github:NixOS/nixos-hardware/170ff93c860b2a9868ed1e1102d4e52cb3d934e1' (2025-09-23) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/554be6495561ff07b6c724047bdd7e0716aa7b46' (2025-09-21) → 'github:NixOS/nixpkgs/e643668fd71b949c53f8626614b21ff71a07379d' (2025-09-24) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/d1d883129b193f0b495d75c148c2c3a7d95789a0' (2025-09-23) → 'github:NixOS/nixpkgs/25e53aa156d47bad5082ff7618f5feb1f5e02d01' (2025-09-25) • Updated input 'nur': 'github:nix-community/NUR/69487852af657127184fbf299bcf0db18a0f5b7c' (2025-09-21) → 'github:nix-community/NUR/234a8ff556a8995692152f1b0a7d1ee89096ad54' (2025-09-28) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/8eaee110344796db060382e15d3af0a9fc396e0e' (2025-09-19) → 'github:nixos/nixpkgs/e643668fd71b949c53f8626614b21ff71a07379d' (2025-09-24) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index baf3212..1e30092 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757943327, - "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", + "lastModified": 1758663926, + "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", + "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1758427187, - "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", + "lastModified": 1758690382, + "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", + "rev": "e643668fd71b949c53f8626614b21ff71a07379d", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758589230, - "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", + "lastModified": 1758791193, + "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0", + "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1758277210, - "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", + "lastModified": 1758690382, + "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", + "rev": "e643668fd71b949c53f8626614b21ff71a07379d", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1758480552, - "narHash": "sha256-etydkbJMu3ng7tB/aUiem70V5BxODi1ZLxSCpGM/wCA=", + "lastModified": 1759064577, + "narHash": "sha256-v/M19hUHp+FBFAzLx22FejbAQeW7xEAKmEab5Ou+N1s=", "owner": "nix-community", "repo": "NUR", - "rev": "69487852af657127184fbf299bcf0db18a0f5b7c", + "rev": "234a8ff556a8995692152f1b0a7d1ee89096ad54", "type": "github" }, "original": { From de45531920e4f038bdb4404be2b5d6171d13ba44 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 3 Oct 2025 01:52:42 +0200 Subject: [PATCH 288/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/170ff93c860b2a9868ed1e1102d4e52cb3d934e1?narHash=sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk%3D' (2025-09-23) → 'github:NixOS/nixos-hardware/e087756cf4abbe1a34f3544c480fc1034d68742f?narHash=sha256-wPd5oGvBBpUEzMF0kWnXge0WITNsITx/aGI9qLHgJ4g%3D' (2025-09-30) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/e643668fd71b949c53f8626614b21ff71a07379d?narHash=sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o%3D' (2025-09-24) → 'github:NixOS/nixpkgs/7df7ff7d8e00218376575f0acdcc5d66741351ee?narHash=sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs%3D' (2025-10-02) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/25e53aa156d47bad5082ff7618f5feb1f5e02d01?narHash=sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e%2BHYf0%3D' (2025-09-25) → 'github:NixOS/nixpkgs/5b5be50345d4113d04ba58c444348849f5585b4a?narHash=sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0%3D' (2025-10-01) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 1e30092..1a230f6 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1758663926, - "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", + "lastModified": 1759261527, + "narHash": "sha256-wPd5oGvBBpUEzMF0kWnXge0WITNsITx/aGI9qLHgJ4g=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", + "rev": "e087756cf4abbe1a34f3544c480fc1034d68742f", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758791193, - "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", + "lastModified": 1759281824, + "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", + "rev": "5b5be50345d4113d04ba58c444348849f5585b4a", "type": "github" }, "original": { From 478ab9f8d14090478c6bcdf1995979bea68d4c91 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 7 Oct 2025 17:26:19 +0200 Subject: [PATCH 289/330] vscodium extension: sync-rsync -> sync-rsync-extended The former is unmaintained since 6 years --- home/modules/vscodium.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 3f80cd5..0458218 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -27,10 +27,10 @@ ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ { - name = "Sync-Rsync"; - publisher = "vscode-ext"; - version = "0.36.0"; - sha256 = "sha256-0b/OHLZfXo0NAVAVkzZSqMGDzF0uvPRoiqsZtW1iOdA"; + name = "sync-rsync-extended"; + publisher = "SanderVerschoor"; + version = "1.0.1"; + sha256 = "sha256-Jsfa1SrK1H0QwlJPEBdrb0gfGiIYoXdtIP32/4g+ceM="; } # TODO: probably available in nixpkgs soonish? { From deed85180525c865a65b24b3338d19ed5c33e8d5 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 4 Oct 2025 19:56:37 +0200 Subject: [PATCH 290/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/e087756cf4abbe1a34f3544c480fc1034d68742f' (2025-09-30) → 'github:NixOS/nixos-hardware/3441b5242af7577230a78ffb03542add264179ab' (2025-10-04) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5b5be50345d4113d04ba58c444348849f5585b4a' (2025-10-01) → 'github:NixOS/nixpkgs/879bd460b3d3e8571354ce172128fbcbac1ed633' (2025-10-02) • Updated input 'nur': 'github:nix-community/NUR/234a8ff556a8995692152f1b0a7d1ee89096ad54' (2025-09-28) → 'github:nix-community/NUR/c95772f7420e4710a497ec8d3f140d40d09d40e8' (2025-10-04) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/e643668fd71b949c53f8626614b21ff71a07379d' (2025-09-24) → 'github:nixos/nixpkgs/7df7ff7d8e00218376575f0acdcc5d66741351ee' (2025-10-02) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 1a230f6..597879d 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1759261527, - "narHash": "sha256-wPd5oGvBBpUEzMF0kWnXge0WITNsITx/aGI9qLHgJ4g=", + "lastModified": 1759582739, + "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e087756cf4abbe1a34f3544c480fc1034d68742f", + "rev": "3441b5242af7577230a78ffb03542add264179ab", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759281824, - "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=", + "lastModified": 1759439645, + "narHash": "sha256-oiAyQaRilPk525Z5aTtTNWNzSrcdJ7IXM0/PL3CGlbI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b5be50345d4113d04ba58c444348849f5585b4a", + "rev": "879bd460b3d3e8571354ce172128fbcbac1ed633", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1759064577, - "narHash": "sha256-v/M19hUHp+FBFAzLx22FejbAQeW7xEAKmEab5Ou+N1s=", + "lastModified": 1759599971, + "narHash": "sha256-PjWT3m4S5hjoXhmCM5LSsfxhvX3AmfNCsMajdelHKlI=", "owner": "nix-community", "repo": "NUR", - "rev": "234a8ff556a8995692152f1b0a7d1ee89096ad54", + "rev": "c95772f7420e4710a497ec8d3f140d40d09d40e8", "type": "github" }, "original": { From 7e91aa35523768f99c3d2aeaeeb8e08cd6490c0f Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 9 Oct 2025 03:39:00 +0200 Subject: [PATCH 291/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/7df7ff7d8e00218376575f0acdcc5d66741351ee' (2025-10-02) → 'github:NixOS/nixpkgs/c9b6fb798541223bbb396d287d16f43520250518' (2025-10-07) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/879bd460b3d3e8571354ce172128fbcbac1ed633' (2025-10-02) → 'github:NixOS/nixpkgs/20c4598c84a671783f741e02bf05cbfaf4907cff' (2025-10-06) • Updated input 'nur': 'github:nix-community/NUR/c95772f7420e4710a497ec8d3f140d40d09d40e8' (2025-10-04) → 'github:nix-community/NUR/a35174bf00ee89e9549b676d4b36c0deeee0bd58' (2025-10-09) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/7df7ff7d8e00218376575f0acdcc5d66741351ee' (2025-10-02) → 'github:nixos/nixpkgs/c9b6fb798541223bbb396d287d16f43520250518' (2025-10-07) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 597879d..0a8774b 100644 --- a/flake.lock +++ b/flake.lock @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1759831965, + "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "c9b6fb798541223bbb396d287d16f43520250518", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759439645, - "narHash": "sha256-oiAyQaRilPk525Z5aTtTNWNzSrcdJ7IXM0/PL3CGlbI=", + "lastModified": 1759735786, + "narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "879bd460b3d3e8571354ce172128fbcbac1ed633", + "rev": "20c4598c84a671783f741e02bf05cbfaf4907cff", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1759831965, + "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "c9b6fb798541223bbb396d287d16f43520250518", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1759599971, - "narHash": "sha256-PjWT3m4S5hjoXhmCM5LSsfxhvX3AmfNCsMajdelHKlI=", + "lastModified": 1759973374, + "narHash": "sha256-GirfKi10w5zBCdQAjO7H9rR80hmY9clR+EZWXD7rB4Y=", "owner": "nix-community", "repo": "NUR", - "rev": "c95772f7420e4710a497ec8d3f140d40d09d40e8", + "rev": "a35174bf00ee89e9549b676d4b36c0deeee0bd58", "type": "github" }, "original": { From 540c23b45a41faa6bff9f9d2aa5ded915f2283a9 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 20 Oct 2025 09:29:35 +0200 Subject: [PATCH 292/330] 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-darwin': 'github:LnL7/nix-darwin/1fef4404de4d1596aa5ab2bd68078370e1b9dcdb?narHash=sha256-qHn%2B/0%2BIOz5cG68BZUwL9BV3EO/e9eNKCjH3%2BN7wMdI%3D' (2025-09-09) → 'github:LnL7/nix-darwin/000eadb231812ad6ea6aebd7526974aaf4e79355?narHash=sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU%3D' (2025-10-03) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/3441b5242af7577230a78ffb03542add264179ab?narHash=sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc%3D' (2025-10-04) → 'github:NixOS/nixos-hardware/9ed85f8afebf2b7478f25db0a98d0e782c0ed903?narHash=sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b%2BVolKU%3D' (2025-10-10) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/c9b6fb798541223bbb396d287d16f43520250518?narHash=sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH%2B47XEBo%3D' (2025-10-07) → 'github:NixOS/nixpkgs/5e2a59a5b1a82f89f2c7e598302a9cacebb72a67?narHash=sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs%3D' (2025-10-19) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/20c4598c84a671783f741e02bf05cbfaf4907cff?narHash=sha256-a0%2Bh02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0%3D' (2025-10-06) → 'github:NixOS/nixpkgs/81b927b14b7b3988334d5282ef9cba802e193fe1?narHash=sha256-tdoIhL/NlER290HfSjOkgi4jfmjeqmqrzgnmiMtGepE%3D' (2025-10-17) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 0a8774b..539a3db 100644 --- a/flake.lock +++ b/flake.lock @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1757432263, - "narHash": "sha256-qHn+/0+IOz5cG68BZUwL9BV3EO/e9eNKCjH3+N7wMdI=", + "lastModified": 1759509947, + "narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "1fef4404de4d1596aa5ab2bd68078370e1b9dcdb", + "rev": "000eadb231812ad6ea6aebd7526974aaf4e79355", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1759582739, - "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", + "lastModified": 1760106635, + "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3441b5242af7577230a78ffb03542add264179ab", + "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1759831965, - "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c9b6fb798541223bbb396d287d16f43520250518", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759735786, - "narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=", + "lastModified": 1760725957, + "narHash": "sha256-tdoIhL/NlER290HfSjOkgi4jfmjeqmqrzgnmiMtGepE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20c4598c84a671783f741e02bf05cbfaf4907cff", + "rev": "81b927b14b7b3988334d5282ef9cba802e193fe1", "type": "github" }, "original": { From 69f7d827c6d6e1f3827036404c0b37da0c5bfb5e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 12 Oct 2025 11:29:30 +0200 Subject: [PATCH 293/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/3441b5242af7577230a78ffb03542add264179ab' (2025-10-04) → 'github:NixOS/nixos-hardware/9ed85f8afebf2b7478f25db0a98d0e782c0ed903' (2025-10-10) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/c9b6fb798541223bbb396d287d16f43520250518' (2025-10-07) → 'github:NixOS/nixpkgs/0b4defa2584313f3b781240b29d61f6f9f7e0df3' (2025-10-09) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/20c4598c84a671783f741e02bf05cbfaf4907cff' (2025-10-06) → 'github:NixOS/nixpkgs/5da4a26309e796daa7ffca72df93dbe53b8164c7' (2025-10-09) • Updated input 'nur': 'github:nix-community/NUR/a35174bf00ee89e9549b676d4b36c0deeee0bd58' (2025-10-09) → 'github:nix-community/NUR/5774f15cd5fbaccd89ec2d1479e436de6c2eda52' (2025-10-12) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/c9b6fb798541223bbb396d287d16f43520250518' (2025-10-07) → 'github:nixos/nixpkgs/0b4defa2584313f3b781240b29d61f6f9f7e0df3' (2025-10-09) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 539a3db..5f24b23 100644 --- a/flake.lock +++ b/flake.lock @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1759831965, - "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", + "lastModified": 1760038930, + "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c9b6fb798541223bbb396d287d16f43520250518", + "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1759973374, - "narHash": "sha256-GirfKi10w5zBCdQAjO7H9rR80hmY9clR+EZWXD7rB4Y=", + "lastModified": 1760260831, + "narHash": "sha256-DrPfiWNS7xJFH7c+j1K68UIhz2xyMNxzwbsKyrkXrrA=", "owner": "nix-community", "repo": "NUR", - "rev": "a35174bf00ee89e9549b676d4b36c0deeee0bd58", + "rev": "5774f15cd5fbaccd89ec2d1479e436de6c2eda52", "type": "github" }, "original": { From dd118c60331d9536b976ef084f98e6b9a922d5a1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 15 Oct 2025 22:17:04 +0200 Subject: [PATCH 294/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/0b4defa2584313f3b781240b29d61f6f9f7e0df3' (2025-10-09) → 'github:NixOS/nixpkgs/cf3f5c4def3c7b5f1fc012b3d839575dbe552d43' (2025-10-12) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5da4a26309e796daa7ffca72df93dbe53b8164c7' (2025-10-09) → 'github:NixOS/nixpkgs/a493e93b4a259cd9fea8073f89a7ed9b1c5a1da2' (2025-10-14) • Updated input 'nur': 'github:nix-community/NUR/5774f15cd5fbaccd89ec2d1479e436de6c2eda52' (2025-10-12) → 'github:nix-community/NUR/f5d86fca061b9edc68cbe03e3a3c1a37decf0ce1' (2025-10-15) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/0b4defa2584313f3b781240b29d61f6f9f7e0df3' (2025-10-09) → 'github:nixos/nixpkgs/cf3f5c4def3c7b5f1fc012b3d839575dbe552d43' (2025-10-12) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 5f24b23..d59c282 100644 --- a/flake.lock +++ b/flake.lock @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1760038930, - "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1760260831, - "narHash": "sha256-DrPfiWNS7xJFH7c+j1K68UIhz2xyMNxzwbsKyrkXrrA=", + "lastModified": 1760556986, + "narHash": "sha256-FXSaTJBhwHdZDasiiW+dD7fsIYvXYwDVSUothJ9T4Z0=", "owner": "nix-community", "repo": "NUR", - "rev": "5774f15cd5fbaccd89ec2d1479e436de6c2eda52", + "rev": "f5d86fca061b9edc68cbe03e3a3c1a37decf0ce1", "type": "github" }, "original": { From e4a2f607d34801f6c0cbc7e389a6d7fb5941f5a4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 23 Oct 2025 10:43:39 +0200 Subject: [PATCH 295/330] workmac: install rectangel window manager --- home/workmac.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/workmac.nix b/home/workmac.nix index 9f7e922..93198ab 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -25,6 +25,7 @@ in home.packages = [ wireshark # on NixOS systems enabled via system config _1password-cli + rectangle # also TODO: color schemes nix-darwin ]; From 1f4bfd74485d1322082462897c65254f4cae3128 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 23 Oct 2025 10:44:58 +0200 Subject: [PATCH 296/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/9ed85f8afebf2b7478f25db0a98d0e782c0ed903?narHash=sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b%2BVolKU%3D' (2025-10-10) → 'github:NixOS/nixos-hardware/d6645c340ef7d821602fd2cd199e8d1eed10afbc?narHash=sha256-2m1S4jl%2BGEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU%3D' (2025-10-20) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/5e2a59a5b1a82f89f2c7e598302a9cacebb72a67?narHash=sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs%3D' (2025-10-19) → 'github:NixOS/nixpkgs/01f116e4df6a15f4ccdffb1bcd41096869fb385c?narHash=sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d%2BdAiC3H%2BCDle4%3D' (2025-10-22) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/81b927b14b7b3988334d5282ef9cba802e193fe1?narHash=sha256-tdoIhL/NlER290HfSjOkgi4jfmjeqmqrzgnmiMtGepE%3D' (2025-10-17) → 'github:NixOS/nixpkgs/481cf557888e05d3128a76f14c76397b7d7cc869?narHash=sha256-G/iC4t/9j/52i/nm%2B0/4ybBmAF4hzR8CNHC75qEhjHo%3D' (2025-10-21) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index d59c282..6187498 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1760106635, - "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", + "lastModified": 1760958188, + "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", + "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", + "lastModified": 1761114652, + "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1760725957, - "narHash": "sha256-tdoIhL/NlER290HfSjOkgi4jfmjeqmqrzgnmiMtGepE=", + "lastModified": 1761016216, + "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "81b927b14b7b3988334d5282ef9cba802e193fe1", + "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", "type": "github" }, "original": { From fce88b188dfa7839a4f9c8b5a083d92d492ec81a Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 26 Oct 2025 21:03:11 +0100 Subject: [PATCH 297/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/01f116e4df6a15f4ccdffb1bcd41096869fb385c' (2025-10-22) → 'github:NixOS/nixpkgs/6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce' (2025-10-25) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/481cf557888e05d3128a76f14c76397b7d7cc869' (2025-10-21) → 'github:NixOS/nixpkgs/c8aa8cc00a5cb57fada0851a038d35c08a36a2bb' (2025-10-22) • Updated input 'nur': 'github:nix-community/NUR/f5d86fca061b9edc68cbe03e3a3c1a37decf0ce1' (2025-10-15) → 'github:nix-community/NUR/c62746c2327c4b3a347d8176e0862ee6991116cc' (2025-10-26) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/cf3f5c4def3c7b5f1fc012b3d839575dbe552d43' (2025-10-12) → 'github:nixos/nixpkgs/6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce' (2025-10-25) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 6187498..a2b14a2 100644 --- a/flake.lock +++ b/flake.lock @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1761114652, - "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", + "lastModified": 1761373498, + "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", + "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1761016216, - "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", + "lastModified": 1761173472, + "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", + "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1760284886, - "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", + "lastModified": 1761373498, + "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", + "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1760556986, - "narHash": "sha256-FXSaTJBhwHdZDasiiW+dD7fsIYvXYwDVSUothJ9T4Z0=", + "lastModified": 1761507885, + "narHash": "sha256-5FKEXmJ0xuyTb404m3Y4bFzYaHsSXIwM9dwnbfZiOHA=", "owner": "nix-community", "repo": "NUR", - "rev": "f5d86fca061b9edc68cbe03e3a3c1a37decf0ce1", + "rev": "c62746c2327c4b3a347d8176e0862ee6991116cc", "type": "github" }, "original": { From 96bb02b76f908e92d030d529acf5c32ded1ee276 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 2 Nov 2025 17:24:44 +0100 Subject: [PATCH 298/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/d6645c340ef7d821602fd2cd199e8d1eed10afbc' (2025-10-20) → 'github:NixOS/nixos-hardware/7467f155fcba189eb088a7601f44fbef7688669b' (2025-10-31) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce' (2025-10-25) → 'github:NixOS/nixpkgs/2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15' (2025-10-31) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/c8aa8cc00a5cb57fada0851a038d35c08a36a2bb' (2025-10-22) → 'github:NixOS/nixpkgs/daf6dc47aa4b44791372d6139ab7b25269184d55' (2025-10-27) • Updated input 'nur': 'github:nix-community/NUR/c62746c2327c4b3a347d8176e0862ee6991116cc' (2025-10-26) → 'github:nix-community/NUR/69ebb60ec4c48dcd88ee714e5fd9f0a330044a0d' (2025-11-02) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce' (2025-10-25) → 'github:nixos/nixpkgs/2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15' (2025-10-31) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index a2b14a2..13660dc 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1760958188, - "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=", + "lastModified": 1761933221, + "narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc", + "rev": "7467f155fcba189eb088a7601f44fbef7688669b", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1761373498, - "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", + "lastModified": 1761907660, + "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", + "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1761173472, - "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", + "lastModified": 1761597516, + "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", + "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1761373498, - "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", + "lastModified": 1761907660, + "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", + "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1761507885, - "narHash": "sha256-5FKEXmJ0xuyTb404m3Y4bFzYaHsSXIwM9dwnbfZiOHA=", + "lastModified": 1762096902, + "narHash": "sha256-79Ly39dSmA5JfuLPZDaZbO0V3jUQyrbpgA+8J6Z+Mug=", "owner": "nix-community", "repo": "NUR", - "rev": "c62746c2327c4b3a347d8176e0862ee6991116cc", + "rev": "69ebb60ec4c48dcd88ee714e5fd9f0a330044a0d", "type": "github" }, "original": { From 52e00bbadd880df8cc5f49560f7bcecdc21d5b94 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 2 Nov 2025 17:55:48 +0100 Subject: [PATCH 299/330] python-3.12-ecdsa: permit insecure package --- common/packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/packages.nix b/common/packages.nix index ec4f22b..06e5d73 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -11,6 +11,8 @@ nixpkgs.config.permittedInsecurePackages = [ # (temporarily) permit the usage of libolm "olm-3.2.16" + # dependency of pynitrokey + "python3.12-ecdsa-0.19.1" ]; # List packages installed in system profile. From e759503e7750372293910dd3b0cf6302b70885d6 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 7 Nov 2025 12:21:07 +0100 Subject: [PATCH 300/330] yt-dlp: migrate from plain package to home-manager module --- home/common.nix | 9 +++++++++ home/modules/packages.nix | 1 - home/modules/vscodium.nix | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/home/common.nix b/home/common.nix index b8dc67f..3a631e8 100644 --- a/home/common.nix +++ b/home/common.nix @@ -170,6 +170,15 @@ EDITOR = "nvim"; }; + programs.yt-dlp = { + enable = true; + settings = { + embed-thumbnail = true; + embed-subs = true; + sub-langs = "all"; + }; + }; + home.activation.reportChanges = config.lib.dag.entryAnywhere '' if [[ -v oldGenPath ]]; then run nix store diff-closures $oldGenPath $newGenPath diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 6b4cc88..ee86b7e 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -33,7 +33,6 @@ let multimediaApps = [ mpv - yt-dlp ] ++ lib.optionals pkgs.stdenv.isDarwin [ vlc-bin ] ++ lib.optionals pkgs.stdenv.isLinux [ diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 0458218..8926b3e 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -58,7 +58,7 @@ ]); in { - "telemetry.enableTelemetry" = false; # might not be needed for Codium + "telemetry.enableTelemetry" = false; # might not be needed for Codium "editor.fontLigatures" = true; "editor.accessibilitySupport" = false; # prevent asking "editor.cursorBlinking" = "phase"; From 9ea608d0065444815116d8e47e9682cb6ceadd77 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 7 Nov 2025 12:23:09 +0100 Subject: [PATCH 301/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/7467f155fcba189eb088a7601f44fbef7688669b' (2025-10-31) → 'github:NixOS/nixos-hardware/52113c4f5cfd1e823001310e56d9c8d0699a6226' (2025-11-06) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15' (2025-10-31) → 'github:NixOS/nixpkgs/ae814fd3904b621d8ab97418f1d0f2eb0d3716f4' (2025-11-05) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/daf6dc47aa4b44791372d6139ab7b25269184d55' (2025-10-27) → 'github:NixOS/nixpkgs/ca534a76c4afb2bdc07b681dbc11b453bab21af8' (2025-11-04) • Updated input 'nur': 'github:nix-community/NUR/69ebb60ec4c48dcd88ee714e5fd9f0a330044a0d' (2025-11-02) → 'github:nix-community/NUR/fada3c996d48503e346badf124366f656a174c0a' (2025-11-07) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15' (2025-10-31) → 'github:nixos/nixpkgs/ae814fd3904b621d8ab97418f1d0f2eb0d3716f4' (2025-11-05) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 13660dc..e38c27a 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1761933221, - "narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=", + "lastModified": 1762463231, + "narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7467f155fcba189eb088a7601f44fbef7688669b", + "rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1761907660, - "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", + "lastModified": 1762363567, + "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", + "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1761597516, - "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", + "lastModified": 1762233356, + "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", + "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1761907660, - "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", + "lastModified": 1762363567, + "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", + "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1762096902, - "narHash": "sha256-79Ly39dSmA5JfuLPZDaZbO0V3jUQyrbpgA+8J6Z+Mug=", + "lastModified": 1762501568, + "narHash": "sha256-kXu7v2+oiocHC+VAL9ZPvV5LpTAQ6vaD4WaXS9sC7HA=", "owner": "nix-community", "repo": "NUR", - "rev": "69ebb60ec4c48dcd88ee714e5fd9f0a330044a0d", + "rev": "fada3c996d48503e346badf124366f656a174c0a", "type": "github" }, "original": { From 71d6a8f458d4aa95604d852b64734fa16ab91d92 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 8 Nov 2025 02:29:34 +0100 Subject: [PATCH 302/330] prepare better darwin application listing --- home/workmac.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/workmac.nix b/home/workmac.nix index 93198ab..bf2ae5c 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -21,6 +21,8 @@ in devTools = true; pythonTools = true; }; + # TODO: enable when on 25.11 + #targets.darwin.copyApps.enable = true; home.packages = [ wireshark # on NixOS systems enabled via system config From 2cb788fa4a557aedec28ed4ee5d6d8ebc99de404 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 8 Nov 2025 19:12:36 +0100 Subject: [PATCH 303/330] 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/ca534a76c4afb2bdc07b681dbc11b453bab21af8' (2025-11-04) → 'github:NixOS/nixpkgs/6faeb062ee4cf4f105989d490831713cc5a43ee1' (2025-11-07) • Updated input 'nur': 'github:nix-community/NUR/fada3c996d48503e346badf124366f656a174c0a' (2025-11-07) → 'github:nix-community/NUR/1574446aca715072c9f7d53b14cfe3a1dc5d5a3f' (2025-11-08) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index e38c27a..3ffedf5 100644 --- a/flake.lock +++ b/flake.lock @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1762233356, - "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=", + "lastModified": 1762498405, + "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8", + "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1762501568, - "narHash": "sha256-kXu7v2+oiocHC+VAL9ZPvV5LpTAQ6vaD4WaXS9sC7HA=", + "lastModified": 1762618508, + "narHash": "sha256-tFRxHd/1cn0nnMHaz4r6WtAJDjujIF3NfIcNs57SOGE=", "owner": "nix-community", "repo": "NUR", - "rev": "fada3c996d48503e346badf124366f656a174c0a", + "rev": "1574446aca715072c9f7d53b14cfe3a1dc5d5a3f", "type": "github" }, "original": { From d8f5b11ab6b5b2a950dcc25b88ba42937617d4b4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 14 Nov 2025 14:34:42 +0100 Subject: [PATCH 304/330] nvim: add which-key plugin TODO configuration and usage --- home/overlays.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/overlays.nix b/home/overlays.nix index 5a9b213..b41ebe2 100644 --- a/home/overlays.nix +++ b/home/overlays.nix @@ -22,6 +22,7 @@ vim-pandoc-syntax vim-nix vim-jinja + which-key-nvim ]; }; customRC = builtins.readFile ./vimrc; From b1605390168c241f8121a8f1f8fc246e7d7ef6ce Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 16 Nov 2025 21:03:56 +0100 Subject: [PATCH 305/330] vim: add DirDiff plugin --- home/overlays.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/overlays.nix b/home/overlays.nix index b41ebe2..6d1cbf1 100644 --- a/home/overlays.nix +++ b/home/overlays.nix @@ -18,6 +18,7 @@ nerdtree nerdtree-git-plugin supertab + vim-dirdiff vim-pandoc vim-pandoc-syntax vim-nix From 84775ab3812bfa5843105af612d18f24c1b3c5cb Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 17 Nov 2025 10:44:45 +0100 Subject: [PATCH 306/330] 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-darwin': 'github:LnL7/nix-darwin/000eadb231812ad6ea6aebd7526974aaf4e79355?narHash=sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU%3D' (2025-10-03) → 'github:LnL7/nix-darwin/d76299b2cd01837c4c271a7b5186e3d5d8ebd126?narHash=sha256-4hpBE7bGd24SfD28rzMdUGXsLsNEYxCCrTipFdoqoNM%3D' (2025-11-12) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/52113c4f5cfd1e823001310e56d9c8d0699a6226?narHash=sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7%2B/YE%3D' (2025-11-06) → 'github:NixOS/nixos-hardware/899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9?narHash=sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR%2BZdLX8IbrU%3D' (2025-11-11) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/ae814fd3904b621d8ab97418f1d0f2eb0d3716f4?narHash=sha256-YRqMDEtSMbitIMj%2BJLpheSz0pwEr0Rmy5mC7myl17xs%3D' (2025-11-05) → 'github:NixOS/nixpkgs/50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a?narHash=sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c%2Bi7novT85Uk%3D' (2025-11-16) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/6faeb062ee4cf4f105989d490831713cc5a43ee1?narHash=sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy%2BOAeBcGeA5okdYDc%3D' (2025-11-07) → 'github:NixOS/nixpkgs/3acb677ea67d4c6218f33de0db0955f116b7588c?narHash=sha256-A5LS0AJZ1yDPTa2fHxufZN%2B%2Bn8MCmtgrJDtxFxrH4S8%3D' (2025-11-13) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 3ffedf5..d87debe 100644 --- a/flake.lock +++ b/flake.lock @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1759509947, - "narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=", + "lastModified": 1762912391, + "narHash": "sha256-4hpBE7bGd24SfD28rzMdUGXsLsNEYxCCrTipFdoqoNM=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "000eadb231812ad6ea6aebd7526974aaf4e79355", + "rev": "d76299b2cd01837c4c271a7b5186e3d5d8ebd126", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762463231, - "narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=", + "lastModified": 1762847253, + "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226", + "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1762363567, - "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", + "lastModified": 1763283776, + "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", + "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1762498405, - "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", + "lastModified": 1763049705, + "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", + "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", "type": "github" }, "original": { From 0784c271f6e8fca80f1961f6b619b00b05e72f63 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 20 Nov 2025 12:37:30 +0100 Subject: [PATCH 307/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a?narHash=sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c%2Bi7novT85Uk%3D' (2025-11-16) → 'github:NixOS/nixpkgs/89c2b2330e733d6cdb5eae7b899326930c2c0648?narHash=sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw%3D' (2025-11-17) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/3acb677ea67d4c6218f33de0db0955f116b7588c?narHash=sha256-A5LS0AJZ1yDPTa2fHxufZN%2B%2Bn8MCmtgrJDtxFxrH4S8%3D' (2025-11-13) → 'github:NixOS/nixpkgs/4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c?narHash=sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ%3D' (2025-11-16) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index d87debe..d2c976b 100644 --- a/flake.lock +++ b/flake.lock @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1763283776, - "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1763049705, - "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", + "lastModified": 1763334038, + "narHash": "sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", + "rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c", "type": "github" }, "original": { From db2d194eaa10e129d43ae49ff6fd265dbdaa015c Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 21 Nov 2025 21:05:51 +0100 Subject: [PATCH 308/330] jameica: use from unstable necessary for latest Hibiscus release --- home/modules/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index ee86b7e..32b6ce9 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -185,7 +185,7 @@ let logseq # for Hibiscus banking software - jameica + unstable.jameica #ToDo: which of these drivers is actually used? geckodriver chromedriver From f2f2f9019e5e020657edb88128d78b3535bdea05 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 23 Nov 2025 20:44:05 +0100 Subject: [PATCH 309/330] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/89c2b2330e733d6cdb5eae7b899326930c2c0648' (2025-11-17) → 'github:NixOS/nixpkgs/117cc7f94e8072499b0a7aa4c52084fa4e11cc9b' (2025-11-20) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c' (2025-11-16) → 'github:NixOS/nixpkgs/c58bc7f5459328e4afac201c5c4feb7c818d604b' (2025-11-20) • Updated input 'nur': 'github:nix-community/NUR/1574446aca715072c9f7d53b14cfe3a1dc5d5a3f' (2025-11-08) → 'github:nix-community/NUR/0912016ed69160333b4fe1ed61eb6cfd196578c1' (2025-11-23) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/ae814fd3904b621d8ab97418f1d0f2eb0d3716f4' (2025-11-05) → 'github:nixos/nixpkgs/117cc7f94e8072499b0a7aa4c52084fa4e11cc9b' (2025-11-20) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index d2c976b..c30c713 100644 --- a/flake.lock +++ b/flake.lock @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1763678758, + "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1763334038, - "narHash": "sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ=", + "lastModified": 1763622513, + "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c", + "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1762363567, - "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", + "lastModified": 1763678758, + "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", + "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", "type": "github" }, "original": { @@ -279,11 +279,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1762618508, - "narHash": "sha256-tFRxHd/1cn0nnMHaz4r6WtAJDjujIF3NfIcNs57SOGE=", + "lastModified": 1763926732, + "narHash": "sha256-oC8EjqK7nnvJL/uRLMXBw5hOmopypGzF9bZHEnv00q4=", "owner": "nix-community", "repo": "NUR", - "rev": "1574446aca715072c9f7d53b14cfe3a1dc5d5a3f", + "rev": "0912016ed69160333b4fe1ed61eb6cfd196578c1", "type": "github" }, "original": { From ff88fe87c04752240ec4b7e05aceeaa469344b12 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 23 Nov 2025 23:36:31 +0100 Subject: [PATCH 310/330] hardware-configuration: do not autoload kvm modules kvm kernel modules clash with the VirtualBox one when accessing hardware accelleration. Maybe the kvm module is even loaded automatically when required, but even if that is not the case I am currently still using VirtualBox more often than KVM-based virtualisation. --- hosts/framenix/hardware-configuration.nix | 2 +- hosts/thinknix/hardware-configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/framenix/hardware-configuration.nix b/hosts/framenix/hardware-configuration.nix index b9295b2..868c352 100644 --- a/hosts/framenix/hardware-configuration.nix +++ b/hosts/framenix/hardware-configuration.nix @@ -19,7 +19,7 @@ "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; + boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/hosts/thinknix/hardware-configuration.nix b/hosts/thinknix/hardware-configuration.nix index 74708b5..5ad4ef8 100644 --- a/hosts/thinknix/hardware-configuration.nix +++ b/hosts/thinknix/hardware-configuration.nix @@ -17,7 +17,7 @@ "sd_mod" "rtsx_pci_sdmmc" ]; - boot.kernelModules = [ "kvm-intel" ]; + boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; nix.settings.max-jobs = lib.mkDefault 4; From 93236c380476fb9d3c10d222ec78bfa90e8f22f4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 26 Nov 2025 14:21:03 +0100 Subject: [PATCH 311/330] nix: auto-optimise-store --- common/nix-settings.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/common/nix-settings.nix b/common/nix-settings.nix index caa16f9..eb32daf 100644 --- a/common/nix-settings.nix +++ b/common/nix-settings.nix @@ -29,6 +29,7 @@ in ]; # use all cores for building cores = 0; + auto-optimise-store = true; }; # TODO: manage access token with sops instead of manual deployment # permissions: needs to be readable by the user invoking nix and root (for nix daemon) From 5b38506c49441b43a7a7317277bde9691e518723 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 28 Nov 2025 19:11:14 +0100 Subject: [PATCH 312/330] scripts/reporsync: exclude more common temp files --- home/scripts/reporsync.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/scripts/reporsync.nix b/home/scripts/reporsync.nix index 8412c8c..ed2e9f0 100644 --- a/home/scripts/reporsync.nix +++ b/home/scripts/reporsync.nix @@ -10,7 +10,7 @@ # reset pre-defined variables that are read and manipulated throughout this function unset JUMPHOST # arrays are bash or zsh specific - RSYNC_OPTS=("-rlptzv" "--progress" "--delete" "--exclude=.git" "--exclude=.vscode" "--exclude=result" "--exclude=channels/" "--exclude=.mypy_cache") + RSYNC_OPTS=("-rlptzv" "--progress" "--delete" "--exclude=.git/" "--exclude=.direnv/" "--exclude=.vscode/" "--exclude=result" "--exclude=channels/" "--exclude=.mypy_cache/" "--exclude=__pycache__") while getopts ':Jj:' OPT; do case $OPT in From a99996056f7013f95b46053c96274218855ea142 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 28 Nov 2025 19:12:39 +0100 Subject: [PATCH 313/330] license everything as GPLv3, unless specified otherwise --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From 03ae1479afb9d61b1520a11e191190616143e80b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 2 Dec 2025 23:49:19 +0100 Subject: [PATCH 314/330] inputs: upgrade 25.05 -> 25.11 --- flake.lock | 117 +++++++++++++++++++++++------------------------------ flake.nix | 8 ++-- 2 files changed, 54 insertions(+), 71 deletions(-) diff --git a/flake.lock b/flake.lock index c30c713..fa233a0 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1731098351, - "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", + "lastModified": 1754269165, + "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", "owner": "ipetkov", "repo": "crane", - "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", + "rev": "444e81206df3f7d92780680e45858e31d2f07a08", "type": "github" }, "original": { @@ -18,11 +18,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1754091436, + "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", "type": "github" }, "original": { @@ -102,16 +102,16 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1764613336, + "narHash": "sha256-L979az28t/+SXvYw9qhOno5HLlDwkZOpz6LzCLnjmRM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "f3902b5d8767985680875ad86d028371100faeb3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -126,16 +126,16 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1737639419, - "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", + "lastModified": 1762205063, + "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", + "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.4.2", + "ref": "v0.4.3", "repo": "lanzaboote", "type": "github" } @@ -163,27 +163,27 @@ ] }, "locked": { - "lastModified": 1762912391, - "narHash": "sha256-4hpBE7bGd24SfD28rzMdUGXsLsNEYxCCrTipFdoqoNM=", + "lastModified": 1764161084, + "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "d76299b2cd01837c4c271a7b5186e3d5d8ebd126", + "rev": "e95de00a471d07435e0527ff4db092c84998698e", "type": "github" }, "original": { "owner": "LnL7", - "ref": "nix-darwin-25.05", + "ref": "nix-darwin-25.11", "repo": "nix-darwin", "type": "github" } }, "nixos-hardware": { "locked": { - "lastModified": 1762847253, - "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1763678758, - "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -211,11 +211,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731919951, - "narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=", + "lastModified": 1754243818, + "narHash": "sha256-sEPw2W01UPf0xNGnMGNZIaE1XHkk7O+lLLetYEXVZHk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "04386ac325a813047fc314d4b4d838a5b1e3c7fe", + "rev": "c460617dfb709a67d18bb31e15e455390ee4ee1c", "type": "github" }, "original": { @@ -225,45 +225,29 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1763622513, - "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1763678758, - "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -279,11 +263,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1763926732, - "narHash": "sha256-oC8EjqK7nnvJL/uRLMXBw5hOmopypGzF9bZHEnv00q4=", + "lastModified": 1764629053, + "narHash": "sha256-RcxVqrd5i70Tk4ydefdwf8DFJc41KA4wxLLrMsnnBjE=", "owner": "nix-community", "repo": "NUR", - "rev": "0912016ed69160333b4fe1ed61eb6cfd196578c1", + "rev": "d5697e876963198dd304489e88cff538d6c5b2e7", "type": "github" }, "original": { @@ -302,15 +286,14 @@ "nixpkgs": [ "lanzaboote", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -341,11 +324,11 @@ ] }, "locked": { - "lastModified": 1731897198, - "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", + "lastModified": 1761791894, + "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", + "rev": "59c45eb69d9222a4362673141e00ff77842cd219", "type": "github" }, "original": { @@ -376,11 +359,11 @@ ] }, "locked": { - "lastModified": 1748243702, - "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", + "lastModified": 1762938485, + "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", + "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cb177ff..0241e2d 100644 --- a/flake.nix +++ b/flake.nix @@ -2,15 +2,15 @@ description = "NixOS system flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; lanzaboote = { - url = "github:nix-community/lanzaboote/v0.4.2"; + url = "github:nix-community/lanzaboote/v0.4.3"; # deliberately do _not_ follow the nixpkgs input here, because paranoia and test coverage }; utils.url = "github:numtide/flake-utils"; @@ -19,7 +19,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nix-darwin = { - url = "github:LnL7/nix-darwin/nix-darwin-25.05"; + url = "github:LnL7/nix-darwin/nix-darwin-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; From 30cd2d42fd98d5c9b631c3ef80c21dd6015a41f5 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 2 Dec 2025 23:51:34 +0100 Subject: [PATCH 315/330] nixos/networkmanager: explicitly configure VPN plugins required after NixOS 25.11 upgrade --- common/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/default.nix b/common/default.nix index 4616f93..b672069 100644 --- a/common/default.nix +++ b/common/default.nix @@ -109,6 +109,9 @@ in }; }; }; + plugins = with pkgs; [ + networkmanager-openvpn + ]; }; services.avahi.enable = true; From 89f2374309630d7effe91a54b3d373503fc951c4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 2 Dec 2025 23:52:23 +0100 Subject: [PATCH 316/330] home/packages: drop `thefuck` dropped from nixpkgs in 25.11 --- home/common.nix | 2 -- home/modules/packages.nix | 1 - 2 files changed, 3 deletions(-) diff --git a/home/common.nix b/home/common.nix index 3a631e8..5e57d1c 100644 --- a/home/common.nix +++ b/home/common.nix @@ -122,8 +122,6 @@ # automatic rehash of path completion zstyle ':completion:*' rehash true - eval "$(${pkgs.thefuck}/bin/thefuck --alias)" - ## helper functions nixify() { if [ ! -e ./.envrc ]; then diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 32b6ce9..cfdfb5e 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -62,7 +62,6 @@ let sshfs-fuse sshuttle cryfs - thefuck gnupg unar lzop From 0e520c30d6fe5302b992725867be33cdd9c36936 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 2 Dec 2025 23:53:18 +0100 Subject: [PATCH 317/330] home/packages: drop soundkonverter Dropped in nixpkgs 25.11 as part of the KDE5 removal :'( --- home/modules/packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index cfdfb5e..373bd6c 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -42,7 +42,6 @@ let kdePackages.elisa musescore tenacity - soundkonverter #nur.repos.fooker.studio-link ]; From 737e643df65891e25df2f40d0067718dd43a381b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 2 Dec 2025 23:53:58 +0100 Subject: [PATCH 318/330] home/packages: adjust several changed package names --- home/modules/fonts.nix | 2 +- home/modules/packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home/modules/fonts.nix b/home/modules/fonts.nix index 6ce1185..5bcdf53 100644 --- a/home/modules/fonts.nix +++ b/home/modules/fonts.nix @@ -11,7 +11,7 @@ source-sans-pro source-code-pro source-serif-pro - ubuntu_font_family + ubuntu-classic twemoji-color-font open-sans (iosevka-bin.override { variant = "CurlySlab"; }) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 373bd6c..04ade57 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -163,7 +163,7 @@ let libreoffice-qt6 # still with KDE integration anki signal-desktop - (tor-browser-bundle-bin.override { + (tor-browser.override { mediaSupport = true; pulseaudioSupport = pkgs.stdenv.isLinux; }) @@ -183,7 +183,7 @@ let logseq # for Hibiscus banking software - unstable.jameica + jameica #ToDo: which of these drivers is actually used? geckodriver chromedriver From 11db2738c94ece778c13e5b2ede7617ca2ce83dc Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 2 Dec 2025 23:54:40 +0100 Subject: [PATCH 319/330] home/common: adjust git and delta config to home-manager changes --- home/common.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/home/common.nix b/home/common.nix index 5e57d1c..afeadbf 100644 --- a/home/common.nix +++ b/home/common.nix @@ -43,7 +43,7 @@ programs.git = { enable = true; - extraConfig = { + settings = { credential.helper = "cache"; push.default = "simple"; push.forceIfIncludes = true; # avoid accidental force overrides when remote is autofetched in background @@ -75,13 +75,14 @@ rerere.enabled = true; }; lfs.enable = true; - delta = { - enable = true; - options = { - line-numbers = true; - side-by-side = true; - #dark = true; - }; + }; + programs.delta = { + enable = true; + enableGitIntegration = true; + options = { + line-numbers = true; + side-by-side = true; + #dark = true; }; }; programs.lazygit = { From 5feaaf0b3f61049604fb20014382bb1589297d43 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 2 Dec 2025 23:54:59 +0100 Subject: [PATCH 320/330] home/packages: scriv build fixes will be upstreamed later --- home/modules/packages.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 04ade57..6f5b756 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -105,7 +105,14 @@ let fd gitui pre-commit - scriv + (scriv.overridePythonAttrs (old: { + patches = old.patches or [ ] ++ [ + (fetchpatch { + url = "https://github.com/nedbat/scriv/commit/04ac45da9e1adb24a95ad9643099fe537b3790fd.diff"; + hash = "sha256-Gle3zWC/WypGHsKmVlqedRAZVWsBjGpzMq3uKuG9+SY="; + }) + ]; + })) # Haskell ghc From ea5ed13d1c4e0a47f7120e1497a396ecfa830a1b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 3 Dec 2025 11:36:01 +0100 Subject: [PATCH 321/330] nix settings: temporarily use regular store optimisation instead of integrated one --- common/nix-settings.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/nix-settings.nix b/common/nix-settings.nix index eb32daf..beb5ca0 100644 --- a/common/nix-settings.nix +++ b/common/nix-settings.nix @@ -29,8 +29,9 @@ in ]; # use all cores for building cores = 0; - auto-optimise-store = true; + #auto-optimise-store = true; }; + nix.optimise.automatic = true; # temporary workaround until Lix/ Nix bug is fixed https://github.com/nix-darwin/nix-darwin/blob/e95de00a471d07435e0527ff4db092c84998698e/modules/nix/default.nix#L817C39-L817C78 # TODO: manage access token with sops instead of manual deployment # permissions: needs to be readable by the user invoking nix and root (for nix daemon) nix.extraOptions = '' From 1c4d30b542824bb97fc1322bc1420940782b8556 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 3 Dec 2025 11:36:57 +0100 Subject: [PATCH 322/330] home/workmac/packages: make darktable linux-only long compile times, and I have not really used it on workmac --- home/modules/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 6f5b756..731decc 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -14,7 +14,6 @@ let graphicsApps = [ inkscape - darktable exiftool ] ++ (with gimp3Plugins; [ @@ -22,6 +21,7 @@ let #lqrPlugin # broken ]) ++ lib.optionals pkgs.stdenv.isLinux [ + darktable gimp3 hugin #luminanceHDR # FIXME, build failure From e4a9502d07d6242260806c57c1debb3f35f2ae87 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 3 Dec 2025 11:37:27 +0100 Subject: [PATCH 323/330] hom/workmac/packages: gimp2 is not gimp anymore --- home/modules/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 731decc..0bade9a 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -28,7 +28,7 @@ let xournalpp ] ++ lib.optionals pkgs.stdenv.isDarwin [ - gimp + gimp2 ]; multimediaApps = [ From 17e34212a3ae1667095f2074ceba8559f24d8e1e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 3 Dec 2025 11:37:48 +0100 Subject: [PATCH 324/330] home/packages: drop gitui broken under darwin, and not really used anymore --- home/modules/packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 0bade9a..6ff5bed 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -103,7 +103,6 @@ let mtr ripgrep fd - gitui pre-commit (scriv.overridePythonAttrs (old: { patches = old.patches or [ ] ++ [ From 1d753aa6a6e60c3d3e0483f64b23ca79909f2ac1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 3 Dec 2025 11:57:41 +0100 Subject: [PATCH 325/330] home/wormac: fix application appearance in Spotlight --- home/workmac.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/home/workmac.nix b/home/workmac.nix index bf2ae5c..3845488 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -21,8 +21,10 @@ in devTools = true; pythonTools = true; }; - # TODO: enable when on 25.11 - #targets.darwin.copyApps.enable = true; + targets.darwin = { + linkApps.enable = false; # spotlight ignores symlinks + copyApps.enable = true; + }; home.packages = [ wireshark # on NixOS systems enabled via system config From 1e8123fef6fafbde52aa657738e9fbe49dbc967f Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 7 Dec 2025 12:38:30 +0100 Subject: [PATCH 326/330] 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/f3902b5d8767985680875ad86d028371100faeb3' (2025-12-01) → 'github:nix-community/home-manager/f63d0fe9d81d36e5fc95497217a72e02b8b7bcab' (2025-12-04) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/2d293cbfa5a793b4c50d17c05ef9e385b90edf6c' (2025-11-30) → 'github:NixOS/nixpkgs/f61125a668a320878494449750330ca58b78c557' (2025-12-05) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f' (2025-11-30) → 'github:NixOS/nixpkgs/c97c47f2bac4fa59e2cbdeba289686ae615f8ed4' (2025-12-04) • Updated input 'nur': 'github:nix-community/NUR/d5697e876963198dd304489e88cff538d6c5b2e7' (2025-12-01) → 'github:nix-community/NUR/902c2223fc433b82d7149a33e1bb729fdba1a898' (2025-12-07) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/2d293cbfa5a793b4c50d17c05ef9e385b90edf6c' (2025-11-30) → 'github:nixos/nixpkgs/f61125a668a320878494449750330ca58b78c557' (2025-12-05) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index fa233a0..464dd07 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1764613336, - "narHash": "sha256-L979az28t/+SXvYw9qhOno5HLlDwkZOpz6LzCLnjmRM=", + "lastModified": 1764866045, + "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3902b5d8767985680875ad86d028371100faeb3", + "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -227,11 +227,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", + "lastModified": 1764831616, + "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", + "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -263,11 +263,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1764629053, - "narHash": "sha256-RcxVqrd5i70Tk4ydefdwf8DFJc41KA4wxLLrMsnnBjE=", + "lastModified": 1765105806, + "narHash": "sha256-drH4w3MzlQXDtseWX82n3nkuXAuDN/uJdTP5KOc2Tlo=", "owner": "nix-community", "repo": "NUR", - "rev": "d5697e876963198dd304489e88cff538d6c5b2e7", + "rev": "902c2223fc433b82d7149a33e1bb729fdba1a898", "type": "github" }, "original": { From 8a08f506ab6b218393428e49239ea498d8cd29db Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 7 Dec 2025 12:41:40 +0100 Subject: [PATCH 327/330] Revert "home/packages: scriv build fixes" This reverts commit 5feaaf0b3f61049604fb20014382bb1589297d43. --- home/modules/packages.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 6ff5bed..c267b3a 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -104,14 +104,7 @@ let ripgrep fd pre-commit - (scriv.overridePythonAttrs (old: { - patches = old.patches or [ ] ++ [ - (fetchpatch { - url = "https://github.com/nedbat/scriv/commit/04ac45da9e1adb24a95ad9643099fe537b3790fd.diff"; - hash = "sha256-Gle3zWC/WypGHsKmVlqedRAZVWsBjGpzMq3uKuG9+SY="; - }) - ]; - })) + scriv # Haskell ghc From 76d3ffde1cbe86d1ee5b65492ea590d1d6d05f8e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 4 Dec 2025 13:05:30 +0100 Subject: [PATCH 328/330] home/workmac: ssh-root-loop shell function --- home/scripts/ssh-loop-fc.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/home/scripts/ssh-loop-fc.nix b/home/scripts/ssh-loop-fc.nix index a632477..2508de6 100644 --- a/home/scripts/ssh-loop-fc.nix +++ b/home/scripts/ssh-loop-fc.nix @@ -8,6 +8,15 @@ for x in $1; do echo $x; ${pkgs.openssh}/bin/ssh $x.fcio.net -o StrictHostKeyChecking=no -C "$2"; done } + ssh-root-loop () { + setopt shwordsplit + local hosts=$1 + local cmd=$2 + + for x in $1; do echo $x; ${pkgs.openssh}/bin/ssh root@$x.fcio.net -o StrictHostKeyChecking=no -C "$2"; done + } + + ssh-loop-parallel () { setopt shwordsplit local hosts=$1 From 0b36532ed3ea379e102c31340bd826386caf9bce Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 8 Dec 2025 19:25:26 +0100 Subject: [PATCH 329/330] nixos/kde-pim: install standalone versions of programs --- common/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/default.nix b/common/default.nix index b672069..73d5200 100644 --- a/common/default.nix +++ b/common/default.nix @@ -160,6 +160,12 @@ in kontact = true; merkuro = true; }; + # additional standalone versions of kontact components + environment.systemPackages = with pkgs.kdePackages; [ + korganizer + kaddressbook + pkgs.ktimetracker + ]; programs.kdeconnect.enable = true; # enable wayland for Chromium and Electron environment.sessionVariables.NIXOS_OZONE_WL = "1"; From 3672286b574377a0404c921d1ae1ad1fd58736a4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 8 Dec 2025 19:26:18 +0100 Subject: [PATCH 330/330] nixfmt --- common/nix-settings.nix | 2 +- home/workmac.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/nix-settings.nix b/common/nix-settings.nix index beb5ca0..6199694 100644 --- a/common/nix-settings.nix +++ b/common/nix-settings.nix @@ -31,7 +31,7 @@ in cores = 0; #auto-optimise-store = true; }; - nix.optimise.automatic = true; # temporary workaround until Lix/ Nix bug is fixed https://github.com/nix-darwin/nix-darwin/blob/e95de00a471d07435e0527ff4db092c84998698e/modules/nix/default.nix#L817C39-L817C78 + nix.optimise.automatic = true; # temporary workaround until Lix/ Nix bug is fixed https://github.com/nix-darwin/nix-darwin/blob/e95de00a471d07435e0527ff4db092c84998698e/modules/nix/default.nix#L817C39-L817C78 # TODO: manage access token with sops instead of manual deployment # permissions: needs to be readable by the user invoking nix and root (for nix daemon) nix.extraOptions = '' diff --git a/home/workmac.nix b/home/workmac.nix index 3845488..e378da3 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -22,7 +22,7 @@ in pythonTools = true; }; targets.darwin = { - linkApps.enable = false; # spotlight ignores symlinks + linkApps.enable = false; # spotlight ignores symlinks copyApps.enable = true; };