From 7be06bf1f6446397dc5cb78770045ff361bdfc72 Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 19:33:01 +0100 Subject: [PATCH 01/26] updates zen config --- modules/zen/default.nix | 168 +++++++++++++++++++++++++++++++++------- 1 file changed, 142 insertions(+), 26 deletions(-) diff --git a/modules/zen/default.nix b/modules/zen/default.nix index d7241c9..7e9b3be 100644 --- a/modules/zen/default.nix +++ b/modules/zen/default.nix @@ -28,34 +28,150 @@ Fingerprinting = true; }; }; - profiles.default = { - containersForce = true; - containers = { - Personal = { - color = "purple"; - icon = "fingerprint"; - id = 1; - }; - }; - spacesForce = true; - spaces = - let - containers = config.programs.zen-browser.profiles."default".containers; - in - { - "Space" = { - id = "c6de089c-410d-4206-961d-ab11f988d40a"; - position = 1000; - container = containers."Personal".id; + profiles.default = + let + containers = { + Personal = { + color = "purple"; + icon = "fingerprint"; + id = 1; }; }; - extensions.packages = with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [ - ublock-origin - dearrow - bitwarden - sponsorblock - ]; - }; + spaces = + let + containers = config.programs.zen-browser.profiles."default".containers; + in + { + "Personal" = { + id = "c6de089c-410d-4206-961d-ab11f988d40a"; + position = 1000; + container = containers."Personal".id; + }; + }; + pins = { + "Apps" = { + id = "092abc24-d7c5-4012-b311-d4ee0b193537"; + workspace = spaces.Personal.id; + container = containers.Personal.id; + isGroup = true; + isFolderCollapsed = true; + editedTitle = true; + position = 200; + }; + "Mail" = { + id = "746d2753-f042-4050-89b3-d2e5f1697a90"; + workspace = spaces.Personal.id; + container = containers.Personal.id; + folderParentId = pins."Apps".id; + url = "https://app.fastmail.com/mail/Inbox/?u=b88140d0"; + position = 201; + }; + "Finance" = { + id = "02bad3d7-7a88-4ca2-8b29-ced5f9956ac6"; + workspace = spaces.Personal.id; + container = containers.Personal.id; + folderParentId = pins."Apps".id; + url = "https://finance.dnsc.io/"; + position = 202; + }; + "Codeberg" = { + id = "c79480bb-ad11-4bd4-b4a2-f6d9a1790278"; + workspace = spaces.Personal.id; + container = containers.Personal.id; + folderParentId = pins."Apps".id; + url = "https://codeberg.org/dnscio"; + position = 203; + }; + "Github" = { + id = "811448b3-ac9b-4f56-b7c1-f0d5b1d25b62"; + workspace = spaces.Personal.id; + container = containers.Personal.id; + folderParentId = pins."Apps".id; + url = "https://github.com/"; + position = 204; + }; + "Entertainment" = { + id = "969167a2-c586-4382-a6f8-a5f17df43b51"; + workspace = spaces.Personal.id; + container = containers.Personal.id; + isGroup = true; + isFolderCollapsed = true; + editedTitle = true; + folderParentId = pins."Entertainment".id; + position = 300; + }; + "Twitch" = { + id = "043a9077-ce81-4f6d-8f61-d2947c675eef"; + workspace = spaces.Personal.id; + container = containers.Personal.id; + url = "https://www.twitch.tv/directory/following"; + folderParentId = pins."Entertainment".id; + position = 301; + }; + "Youtube" = { + id = "54b399ae-1106-4b91-9e2c-893e9114c215"; + workspace = spaces.Personal.id; + container = containers.Personal.id; + url = "https://www.youtube.com/feed/subscriptions"; + position = 302; + }; + "Nix" = { + id = "02329197-7617-42e0-bc9a-1d09415ef10c"; + workspace = spaces.Personal.id; + container = containers.Personal.id; + isGroup = true; + isFolderCollapsed = true; + editedTitle = true; + position = 400; + }; + "Packages" = { + id = "c79480bb-ad11-4bd4-b4a2-f6d9a1790278"; + workspace = spaces.Personal.id; + container = containers.Personal.id; + folderParentId = pins."Nix".id; + url = "https://search.nixos.org/packages"; + position = 401; + }; + "Options" = { + id = "63930b7a-d423-4a74-8edb-0179b9c9902e"; + workspace = spaces.Personal.id; + container = containers.Personal.id; + folderParentId = pins."Nix".id; + url = "https://search.nixos.org/options"; + position = 401; + }; + "Home Manager" = { + id = "97194c72-9ab9-4310-90f8-397fd7ce626a"; + workspace = spaces.Personal.id; + container = containers.Personal.id; + folderParentId = pins."Nix".id; + url = "https://home-manager-options.extranix.com"; + position = 401; + }; + }; + in + { + containersForce = true; + pinsForce = true; + spacesForce = true; + inherit containers pins spaces; + + settings = { + "layout.css.prefers-color-scheme.content-override" = 0; + }; + + search = { + default = "google"; + force = true; + }; + + extensions.packages = with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [ + ublock-origin + dearrow + bitwarden + sponsorblock + ]; + }; }; xdg.mimeApps = From 7cf36dfa51087ea0269f192bf0d8d74f7bba608b Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 19:36:20 +0100 Subject: [PATCH 02/26] zen config --- hosts/dnsc-machine/default.nix | 1 - modules/zen/default.nix | 17 ++++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix index 9afceaa..718495c 100644 --- a/hosts/dnsc-machine/default.nix +++ b/hosts/dnsc-machine/default.nix @@ -1,6 +1,5 @@ { lib, - config, inputs, outputs, pkgs, diff --git a/modules/zen/default.nix b/modules/zen/default.nix index 7e9b3be..cd89091 100644 --- a/modules/zen/default.nix +++ b/modules/zen/default.nix @@ -1,6 +1,5 @@ { inputs, - config, pkgs, system, ... @@ -37,17 +36,13 @@ id = 1; }; }; - spaces = - let - containers = config.programs.zen-browser.profiles."default".containers; - in - { - "Personal" = { - id = "c6de089c-410d-4206-961d-ab11f988d40a"; - position = 1000; - container = containers."Personal".id; - }; + spaces = { + "Personal" = { + id = "c6de089c-410d-4206-961d-ab11f988d40a"; + position = 1000; + container = containers."Personal".id; }; + }; pins = { "Apps" = { id = "092abc24-d7c5-4012-b311-d4ee0b193537"; From a8b15311f1e880d1a1fb0c30a929d4ddec897785 Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 22:41:01 +0100 Subject: [PATCH 03/26] fix networkmanager --- flake.lock | 48 +++++++++++++++++----------------- flake.nix | 2 ++ hosts/dnsc-machine/default.nix | 7 +++++ 3 files changed, 33 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index da48b56..11a0994 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1765489453, - "narHash": "sha256-wLSrwiYr7ck5jN56lJp8YzWuLk5dpRd1v+8Ta7ru608=", + "lastModified": 1765876616, + "narHash": "sha256-j9BnLfWdJrJrETfmfnlnpvRGKVp1MLRaw78oYDSnTRY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "c3e6306094f23d57c40f7fba007303fba4db0ba9", + "rev": "2843ec4d4793815111a1b99e170ec7b1842b7f9f", "type": "gitlab" }, "original": { @@ -146,11 +146,11 @@ ] }, "locked": { - "lastModified": 1765479516, - "narHash": "sha256-yGZcd4bvygzG9EFi0QOW4cJwN8FhZwQXDf/D4Y4bh0w=", + "lastModified": 1765860045, + "narHash": "sha256-7Lxp/PfOy4h3QIDtmWG/EgycaswqRSkDX4DGtet14NE=", "owner": "nix-community", "repo": "home-manager", - "rev": "9b5ac85d79d1136e51834f6c0d6987107ea28181", + "rev": "09de9577d47d8bffb11c449b6a3d24e32ac16c99", "type": "github" }, "original": { @@ -167,11 +167,11 @@ ] }, "locked": { - "lastModified": 1762964643, - "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", + "lastModified": 1765682243, + "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", "owner": "nix-community", "repo": "home-manager", - "rev": "827f2a23373a774a8805f84ca5344654c31f354b", + "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", "type": "github" }, "original": { @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1765211814, - "narHash": "sha256-USI9biMhvWBs7hC9JlDS3/Oi/TlFNcYCszA5GT9gp3o=", + "lastModified": 1765808204, + "narHash": "sha256-pnI+SmXYXeNofYBYbcCkj4CTJdoXwJYYPgc1MutMz0Q=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "222f5c55b655b627d0703cb05948fc61e09ab231", + "rev": "c2f1043524b8eee45369692e56bb170b640df047", "type": "github" }, "original": { @@ -250,11 +250,11 @@ ] }, "locked": { - "lastModified": 1765065051, - "narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=", + "lastModified": 1765684049, + "narHash": "sha256-svCS2r984qEowMT0y3kCrsD/m0J6zaF5I/UusS7QaH0=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79", + "rev": "9b628e171bfaea1a3d1edf31eee46251e0fe4a33", "type": "github" }, "original": { @@ -343,11 +343,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1765270179, - "narHash": "sha256-g2a4MhRKu4ymR4xwo+I+auTknXt/+j37Lnf0Mvfl1rE=", + "lastModified": 1765803225, + "narHash": "sha256-xwaZV/UgJ04+ixbZZfoDE8IsOWjtvQZICh9aamzPnrg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "677fbe97984e7af3175b6c121f3c39ee5c8d62c9", + "rev": "ac9a217389ee622d4e1e727c4efcc9c4bc9089ba", "type": "github" }, "original": { @@ -387,11 +387,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1765472234, + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", "type": "github" }, "original": { @@ -506,11 +506,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1765430623, - "narHash": "sha256-YfJwnCXF3V+WFedx4RtrIdZ8XxF6zB1Oh2ij/EHzoWk=", + "lastModified": 1765895443, + "narHash": "sha256-yftYGV0skUwV5neT1BJrs7RRbXPKozQTzC7d9c7kEFs=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "f2881ba36cbfc86ef1fe741cec871fe523aea5bd", + "rev": "bc7dfff92cb7919dfb213ea78c11ea0a4d265a56", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cc8d34b..f2beb50 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,8 @@ inputs = { agenix.url = "github:ryantm/agenix"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + nixpkgs-backport-fix.url = "github:NixOS/nixpkgs/2bdc7039afa38f4330de69360a817e11f7e2f2c5"; + home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix index 718495c..d6081f0 100644 --- a/hosts/dnsc-machine/default.nix +++ b/hosts/dnsc-machine/default.nix @@ -6,6 +6,9 @@ ... }: +let + backportPkgs = inputs.nixpkgs-backport-fix.legacyPackages.${pkgs.system}; +in { imports = [ # Include the results of the hardware scan. @@ -29,6 +32,10 @@ # in modules/default.nix nixpkgs.overlays = [ inputs.zellij-switch.overlays.default + + (final: prev: { + networkmanager = backportPkgs.networkmanager; + }) ]; # General settings From cf64cf0890c6c1d8fa3e208f2269bba6c225b07e Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 22:56:19 +0100 Subject: [PATCH 04/26] fix networkmanager --- flake.lock | 17 +++++++++++++++++ hosts/dnsc-machine/default.nix | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 11a0994..79cf249 100644 --- a/flake.lock +++ b/flake.lock @@ -313,6 +313,22 @@ "type": "github" } }, + "nixpkgs-backport-fix": { + "locked": { + "lastModified": 1765812099, + "narHash": "sha256-qz3kYPbJAEWnangoTGICi6QHvOoi9zssJ24MZqv6ejk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2bdc7039afa38f4330de69360a817e11f7e2f2c5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2bdc7039afa38f4330de69360a817e11f7e2f2c5", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1744536153, @@ -411,6 +427,7 @@ "nix-darwin": "nix-darwin", "nix-homebrew": "nix-homebrew", "nixpkgs": "nixpkgs_4", + "nixpkgs-backport-fix": "nixpkgs-backport-fix", "zellij-switch": "zellij-switch", "zen-browser": "zen-browser" } diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix index d6081f0..355be6b 100644 --- a/hosts/dnsc-machine/default.nix +++ b/hosts/dnsc-machine/default.nix @@ -34,7 +34,7 @@ in inputs.zellij-switch.overlays.default (final: prev: { - networkmanager = backportPkgs.networkmanager; + python3Packages.python-dbusmock = backportPkgs.python3Packages.python-dbusmock; }) ]; From c6a0633b82c744349d1a2c6619121078d200641c Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 23:00:15 +0100 Subject: [PATCH 05/26] fix networkmanager --- hosts/dnsc-machine/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix index 355be6b..c594621 100644 --- a/hosts/dnsc-machine/default.nix +++ b/hosts/dnsc-machine/default.nix @@ -34,7 +34,9 @@ in inputs.zellij-switch.overlays.default (final: prev: { - python3Packages.python-dbusmock = backportPkgs.python3Packages.python-dbusmock; + python3Packages.python-dbusmock = backportPkgs.python3Packages.python-dbusmock.override { + inherit (backportPkgs) "python3Packages.buildPythonApplication"; + }; }) ]; From 94591af346317eb61327cdec24ab4a03870d4138 Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 23:03:39 +0100 Subject: [PATCH 06/26] fix networkmanager --- hosts/dnsc-machine/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix index c594621..355be6b 100644 --- a/hosts/dnsc-machine/default.nix +++ b/hosts/dnsc-machine/default.nix @@ -34,9 +34,7 @@ in inputs.zellij-switch.overlays.default (final: prev: { - python3Packages.python-dbusmock = backportPkgs.python3Packages.python-dbusmock.override { - inherit (backportPkgs) "python3Packages.buildPythonApplication"; - }; + python3Packages.python-dbusmock = backportPkgs.python3Packages.python-dbusmock; }) ]; From b15da599b71d1e4cd0f4d9ab615ccff9ff2d62c8 Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 23:04:35 +0100 Subject: [PATCH 07/26] fix networkmanager --- hosts/dnsc-machine/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix index 355be6b..0f62031 100644 --- a/hosts/dnsc-machine/default.nix +++ b/hosts/dnsc-machine/default.nix @@ -34,7 +34,7 @@ in inputs.zellij-switch.overlays.default (final: prev: { - python3Packages.python-dbusmock = backportPkgs.python3Packages.python-dbusmock; + python313Packages.python-dbusmock = backportPkgs.python313Packages.python-dbusmock; }) ]; From cbffbfe9b64b9f01f438f84ea95b620be1c6cf2b Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 23:05:58 +0100 Subject: [PATCH 08/26] wip: dnsc-machine setup --- hosts/dnsc-machine/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix index 0f62031..cd76017 100644 --- a/hosts/dnsc-machine/default.nix +++ b/hosts/dnsc-machine/default.nix @@ -34,7 +34,11 @@ in inputs.zellij-switch.overlays.default (final: prev: { - python313Packages.python-dbusmock = backportPkgs.python313Packages.python-dbusmock; + python313Packages = prev.python313Packages.overrideScope ( + pyFinal: pyPrev: { + python-dbusmock = backportPkgs.python313Packages.python-dbusmock; + } + ); }) ]; From 30918d5e956ac35d10ec6888df61ff568d1fb94e Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 23:12:38 +0100 Subject: [PATCH 09/26] wip: dnsc-machine setup --- hosts/dnsc-machine/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix index cd76017..3ee62a1 100644 --- a/hosts/dnsc-machine/default.nix +++ b/hosts/dnsc-machine/default.nix @@ -7,7 +7,7 @@ }: let - backportPkgs = inputs.nixpkgs-backport-fix.legacyPackages.${pkgs.system}; + backportPkgs = inputs.nixpkgs-backport-fix.legacyPackages.${pkgs.stdenv.hostPlatform.system}; in { imports = [ @@ -40,6 +40,19 @@ in } ); }) + (final: prev: { + python313Packages = prev.python313Packages.overrideScope ( + pyFinal: pyPrev: { + python-dbusmock = pyPrev.python-dbusmock.overridePythonAttrs (old: { + # take the *source* (or patches) from the backport + src = backportPkgs.python313Packages.python-dbusmock.src; + + # optional but often needed + patches = (old.patches or [ ]) ++ (backportPkgs.python313Packages.python-dbusmock.patches or [ ]); + }); + } + ); + }) ]; # General settings From 2c3799476dbb4e893e00300ad36397b23bebc384 Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 23:16:18 +0100 Subject: [PATCH 10/26] wip: dnsc-machine setup --- hosts/dnsc-machine/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix index 3ee62a1..4a0336d 100644 --- a/hosts/dnsc-machine/default.nix +++ b/hosts/dnsc-machine/default.nix @@ -44,11 +44,7 @@ in python313Packages = prev.python313Packages.overrideScope ( pyFinal: pyPrev: { python-dbusmock = pyPrev.python-dbusmock.overridePythonAttrs (old: { - # take the *source* (or patches) from the backport - src = backportPkgs.python313Packages.python-dbusmock.src; - - # optional but often needed - patches = (old.patches or [ ]) ++ (backportPkgs.python313Packages.python-dbusmock.patches or [ ]); + doCheck = false; }); } ); From 1932def1c1996f0b04d02290619c48d592a8e1b4 Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 23:19:58 +0100 Subject: [PATCH 11/26] wip: dnsc-machine setup --- hosts/dnsc-machine/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix index 4a0336d..1dcf474 100644 --- a/hosts/dnsc-machine/default.nix +++ b/hosts/dnsc-machine/default.nix @@ -34,14 +34,7 @@ in inputs.zellij-switch.overlays.default (final: prev: { - python313Packages = prev.python313Packages.overrideScope ( - pyFinal: pyPrev: { - python-dbusmock = backportPkgs.python313Packages.python-dbusmock; - } - ); - }) - (final: prev: { - python313Packages = prev.python313Packages.overrideScope ( + python3Packages = prev.python3Packages.overrideScope ( pyFinal: pyPrev: { python-dbusmock = pyPrev.python-dbusmock.overridePythonAttrs (old: { doCheck = false; From 604e582c011b72ae1f4f6cd31c4d49b1b1352c8e Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 23:24:22 +0100 Subject: [PATCH 12/26] wip: dnsc-machine setup --- flake.nix | 17 +++++++++++++++++ hosts/dnsc-machine/default.nix | 13 ------------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index f2beb50..a1668e9 100644 --- a/flake.nix +++ b/flake.nix @@ -55,9 +55,26 @@ nixosModules.steam = import ./modules/steam; nixosModules.niriSystem = import ./modules/wm/niri-system; + # Overlays + overlays.default = final: prev: { + python3 = prev.python3.override { + packageOverrides = pyFinal: pyPrev: { + python-dbusmock = pyPrev.python-dbusmock.overridePythonAttrs (_: { + doCheck = false; + }); + }; + }; + }; + nixosConfigurations.dnsc-machine = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs outputs; }; + pkgs = import nixpkgs { + system = "x86_64-linux"; + overlays = [ + self.overlays.default + ]; + }; modules = [ ./hosts/dnsc-machine ]; diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix index 1dcf474..718495c 100644 --- a/hosts/dnsc-machine/default.nix +++ b/hosts/dnsc-machine/default.nix @@ -6,9 +6,6 @@ ... }: -let - backportPkgs = inputs.nixpkgs-backport-fix.legacyPackages.${pkgs.stdenv.hostPlatform.system}; -in { imports = [ # Include the results of the hardware scan. @@ -32,16 +29,6 @@ in # in modules/default.nix nixpkgs.overlays = [ inputs.zellij-switch.overlays.default - - (final: prev: { - python3Packages = prev.python3Packages.overrideScope ( - pyFinal: pyPrev: { - python-dbusmock = pyPrev.python-dbusmock.overridePythonAttrs (old: { - doCheck = false; - }); - } - ); - }) ]; # General settings From a53696211b786f8cd9dfbe2aee3fe6b4c0b8f783 Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 23:26:26 +0100 Subject: [PATCH 13/26] wip: dnsc-machine setup --- flake.nix | 6 ------ hosts/dnsc-machine/default.nix | 4 +++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index a1668e9..f18be15 100644 --- a/flake.nix +++ b/flake.nix @@ -69,12 +69,6 @@ nixosConfigurations.dnsc-machine = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs outputs; }; - pkgs = import nixpkgs { - system = "x86_64-linux"; - overlays = [ - self.overlays.default - ]; - }; modules = [ ./hosts/dnsc-machine ]; diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix index 718495c..52b0cd8 100644 --- a/hosts/dnsc-machine/default.nix +++ b/hosts/dnsc-machine/default.nix @@ -3,6 +3,7 @@ inputs, outputs, pkgs, + self, ... }: @@ -26,8 +27,9 @@ # Device specific overlays # Overlays for all devices are defined - # in modules/default.nix + # in flake.nix nixpkgs.overlays = [ + self.overlays.default inputs.zellij-switch.overlays.default ]; From ffe035cc634175e83167e164b10ac8ae9cc8e3e0 Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 23:27:05 +0100 Subject: [PATCH 14/26] wip: dnsc-machine setup --- hosts/dnsc-machine/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix index 52b0cd8..7c5adf7 100644 --- a/hosts/dnsc-machine/default.nix +++ b/hosts/dnsc-machine/default.nix @@ -3,7 +3,6 @@ inputs, outputs, pkgs, - self, ... }: @@ -29,7 +28,7 @@ # Overlays for all devices are defined # in flake.nix nixpkgs.overlays = [ - self.overlays.default + outputs.self.overlays.default inputs.zellij-switch.overlays.default ]; From 2760b066662a1935a3c671d74ae37c69b0b9f783 Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 23:29:20 +0100 Subject: [PATCH 15/26] wip: dnsc-machine setup --- flake.nix | 12 +++++++++++- hosts/dnsc-machine/default.nix | 8 -------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index f18be15..1694ab1 100644 --- a/flake.nix +++ b/flake.nix @@ -40,7 +40,6 @@ in { # Custom nixosModules - nixosModules.base = import ./modules/base; nixosModules.macos = import ./modules/macos; nixosModules.homebrew = import ./modules/homebrew; nixosModules.aerospace = import ./modules/aerospace; @@ -69,6 +68,17 @@ nixosConfigurations.dnsc-machine = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs outputs; }; + pkgs = import nixpkgs { + system = "x86_64-linux"; + overlays = [ + self.overlays.default + inputs.zellij-switch.overlays.default + ]; + config = { + allowUnfree = true; + allowUnsupportedSystem = true; + }; + }; modules = [ ./hosts/dnsc-machine ]; diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix index 7c5adf7..c876bf5 100644 --- a/hosts/dnsc-machine/default.nix +++ b/hosts/dnsc-machine/default.nix @@ -24,14 +24,6 @@ outputs.nixosModules.steam ]; - # Device specific overlays - # Overlays for all devices are defined - # in flake.nix - nixpkgs.overlays = [ - outputs.self.overlays.default - inputs.zellij-switch.overlays.default - ]; - # General settings networking.hostName = "dnsc-machine"; time.timeZone = "Europe/Berlin"; From f2ab72c92dd992980ce3e1ba57a4c3e6252ad970 Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 23:35:30 +0100 Subject: [PATCH 16/26] wip: dnsc-machine setup --- flake.nix | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/flake.nix b/flake.nix index 1694ab1..7590181 100644 --- a/flake.nix +++ b/flake.nix @@ -40,6 +40,7 @@ in { # Custom nixosModules + nixosModules.base = import ./modules/base; nixosModules.macos = import ./modules/macos; nixosModules.homebrew = import ./modules/homebrew; nixosModules.aerospace = import ./modules/aerospace; @@ -54,33 +55,19 @@ nixosModules.steam = import ./modules/steam; nixosModules.niriSystem = import ./modules/wm/niri-system; - # Overlays - overlays.default = final: prev: { - python3 = prev.python3.override { - packageOverrides = pyFinal: pyPrev: { - python-dbusmock = pyPrev.python-dbusmock.overridePythonAttrs (_: { - doCheck = false; - }); - }; - }; - }; - nixosConfigurations.dnsc-machine = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs outputs; }; - pkgs = import nixpkgs { - system = "x86_64-linux"; - overlays = [ - self.overlays.default - inputs.zellij-switch.overlays.default - ]; - config = { - allowUnfree = true; - allowUnsupportedSystem = true; - }; - }; modules = [ ./hosts/dnsc-machine + { + nixpkgs.overlays = [ + inputs.zellij-switch.overlays.default + (final: prev: { + networkmanager = inputs.nixpkgs-backport-fix.legacyPackages.x86_64-linux.networkmanager; + }) + ]; + } ]; }; From bc4d0c2aedb8c551fbcf0e9a8d3d1169f3513671 Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 23:36:13 +0100 Subject: [PATCH 17/26] wip: dnsc-machine setup --- flake.nix | 8 -------- hosts/dnsc-machine/default.nix | 10 ++++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 7590181..f2beb50 100644 --- a/flake.nix +++ b/flake.nix @@ -60,14 +60,6 @@ specialArgs = { inherit inputs outputs; }; modules = [ ./hosts/dnsc-machine - { - nixpkgs.overlays = [ - inputs.zellij-switch.overlays.default - (final: prev: { - networkmanager = inputs.nixpkgs-backport-fix.legacyPackages.x86_64-linux.networkmanager; - }) - ]; - } ]; }; diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix index c876bf5..748522a 100644 --- a/hosts/dnsc-machine/default.nix +++ b/hosts/dnsc-machine/default.nix @@ -24,6 +24,16 @@ outputs.nixosModules.steam ]; + # Device specific overlays + # Overlays for all devices are defined + # in flake.nix + nixpkgs.overlays = [ + inputs.zellij-switch.overlays.default + (final: prev: { + networkmanager = inputs.nixpkgs-backport-fix.legacyPackages.x86_64-linux.networkmanager; + }) + ]; + # General settings networking.hostName = "dnsc-machine"; time.timeZone = "Europe/Berlin"; From ad643f45ce3545174c37e4d5ff7989bdcd75e558 Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 23:39:24 +0100 Subject: [PATCH 18/26] wip: dnsc-machine setup --- hosts/dnsc-machine/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix index 748522a..2f2057c 100644 --- a/hosts/dnsc-machine/default.nix +++ b/hosts/dnsc-machine/default.nix @@ -30,7 +30,13 @@ nixpkgs.overlays = [ inputs.zellij-switch.overlays.default (final: prev: { - networkmanager = inputs.nixpkgs-backport-fix.legacyPackages.x86_64-linux.networkmanager; + python3 = prev.python3.override { + packageOverrides = pyfinal: pyprev: { + python-dbusmock = + inputs.nixpkgs-backport-fix.legacyPackages.x86_64-linux.python3Packages.python-dbusmock; + }; + }; + python3Packages = final.python3.pkgs; }) ]; From 2d8da058b984c4ce7e23ce06f0099d5807d4a38a Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 23:43:25 +0100 Subject: [PATCH 19/26] wip: dnsc-machine setup --- hosts/dnsc-machine/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix index 2f2057c..7a7001a 100644 --- a/hosts/dnsc-machine/default.nix +++ b/hosts/dnsc-machine/default.nix @@ -30,13 +30,10 @@ nixpkgs.overlays = [ inputs.zellij-switch.overlays.default (final: prev: { - python3 = prev.python3.override { - packageOverrides = pyfinal: pyprev: { - python-dbusmock = - inputs.nixpkgs-backport-fix.legacyPackages.x86_64-linux.python3Packages.python-dbusmock; - }; + python3Packages = prev.python3Packages // { + python-dbusmock = + inputs.nixpkgs-backport-fix.legacyPackages.x86_64-linux.python3Packages.python-dbusmock; }; - python3Packages = final.python3.pkgs; }) ]; From 6b33207075dd7a81b1c860310f1918d7abde3afe Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 23:46:45 +0100 Subject: [PATCH 20/26] wip: dnsc-machine setup --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index f2beb50..c7d06bb 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { agenix.url = "github:ryantm/agenix"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - nixpkgs-backport-fix.url = "github:NixOS/nixpkgs/2bdc7039afa38f4330de69360a817e11f7e2f2c5"; + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11"; home-manager = { url = "github:nix-community/home-manager"; @@ -55,7 +55,7 @@ nixosModules.steam = import ./modules/steam; nixosModules.niriSystem = import ./modules/wm/niri-system; - nixosConfigurations.dnsc-machine = nixpkgs.lib.nixosSystem { + nixosConfigurations.dnsc-machine = inputs.nixpkgs-stable.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs outputs; }; modules = [ From 50193ad4a084bde5937dfa0684f93ce872c3871f Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 23:53:27 +0100 Subject: [PATCH 21/26] wip: dnsc-machine setup --- flake.lock | 12 ++++++------ modules/zen/default.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 79cf249..b04fa18 100644 --- a/flake.lock +++ b/flake.lock @@ -313,19 +313,19 @@ "type": "github" } }, - "nixpkgs-backport-fix": { + "nixpkgs-stable": { "locked": { - "lastModified": 1765812099, - "narHash": "sha256-qz3kYPbJAEWnangoTGICi6QHvOoi9zssJ24MZqv6ejk=", + "lastModified": 1765762245, + "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2bdc7039afa38f4330de69360a817e11f7e2f2c5", + "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-25.11", "repo": "nixpkgs", - "rev": "2bdc7039afa38f4330de69360a817e11f7e2f2c5", "type": "github" } }, @@ -427,7 +427,7 @@ "nix-darwin": "nix-darwin", "nix-homebrew": "nix-homebrew", "nixpkgs": "nixpkgs_4", - "nixpkgs-backport-fix": "nixpkgs-backport-fix", + "nixpkgs-stable": "nixpkgs-stable", "zellij-switch": "zellij-switch", "zen-browser": "zen-browser" } diff --git a/modules/zen/default.nix b/modules/zen/default.nix index cd89091..181fbcd 100644 --- a/modules/zen/default.nix +++ b/modules/zen/default.nix @@ -38,7 +38,7 @@ }; spaces = { "Personal" = { - id = "c6de089c-410d-4206-961d-ab11f988d40a"; + id = "53d805fa-2cc1-44b5-929b-a72cc83d9587"; position = 1000; container = containers."Personal".id; }; From f7aa5b589a5b81c1451d7d8338063ef12ac49a5d Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 23:57:29 +0100 Subject: [PATCH 22/26] wip: dnsc-machine setup --- home/linux.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home/linux.nix b/home/linux.nix index 98c296d..45405f6 100644 --- a/home/linux.nix +++ b/home/linux.nix @@ -49,7 +49,6 @@ ../modules/zellij ../modules/mpv ../modules/firefox - ../modules/zen ../modules/wm/swaync ../modules/wm/cliphist ../modules/wm/awww From 6abcd04a5603303708195efda7333f88b8e0ac11 Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Tue, 16 Dec 2025 23:58:50 +0100 Subject: [PATCH 23/26] Revert "wip: dnsc-machine setup" This reverts commit f7aa5b589a5b81c1451d7d8338063ef12ac49a5d. --- home/linux.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/linux.nix b/home/linux.nix index 45405f6..98c296d 100644 --- a/home/linux.nix +++ b/home/linux.nix @@ -49,6 +49,7 @@ ../modules/zellij ../modules/mpv ../modules/firefox + ../modules/zen ../modules/wm/swaync ../modules/wm/cliphist ../modules/wm/awww From 297cf7cc950d86d51609a1ba7dce811e9545ebcb Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Wed, 17 Dec 2025 00:04:57 +0100 Subject: [PATCH 24/26] wip: dnsc-machine setup --- modules/zen/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/zen/default.nix b/modules/zen/default.nix index 181fbcd..fdaf214 100644 --- a/modules/zen/default.nix +++ b/modules/zen/default.nix @@ -44,6 +44,14 @@ }; }; pins = { + "home.dnsc.io" = { + id = "245843da-9cc4-4c78-ad43-ea7d9139838b"; + workspace = spaces.Personal.id; + container = containers.Personal.id; + folderParentId = pins."Apps".id; + url = "https://app.fastmail.com/mail/Inbox/?u=b88140d0"; + position = 201; + }; "Apps" = { id = "092abc24-d7c5-4012-b311-d4ee0b193537"; workspace = spaces.Personal.id; @@ -107,6 +115,7 @@ id = "54b399ae-1106-4b91-9e2c-893e9114c215"; workspace = spaces.Personal.id; container = containers.Personal.id; + folderParentId = pins."Entertainment".id; url = "https://www.youtube.com/feed/subscriptions"; position = 302; }; @@ -133,7 +142,7 @@ container = containers.Personal.id; folderParentId = pins."Nix".id; url = "https://search.nixos.org/options"; - position = 401; + position = 402; }; "Home Manager" = { id = "97194c72-9ab9-4310-90f8-397fd7ce626a"; @@ -141,7 +150,7 @@ container = containers.Personal.id; folderParentId = pins."Nix".id; url = "https://home-manager-options.extranix.com"; - position = 401; + position = 403; }; }; in From 7112df175a96b18e1e57120f2d0fdf6b83691975 Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Wed, 17 Dec 2025 00:11:34 +0100 Subject: [PATCH 25/26] wip: dnsc-machine setup --- modules/zen/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/zen/default.nix b/modules/zen/default.nix index fdaf214..53e07e8 100644 --- a/modules/zen/default.nix +++ b/modules/zen/default.nix @@ -44,13 +44,12 @@ }; }; pins = { - "home.dnsc.io" = { + "Home" = { id = "245843da-9cc4-4c78-ad43-ea7d9139838b"; workspace = spaces.Personal.id; container = containers.Personal.id; - folderParentId = pins."Apps".id; - url = "https://app.fastmail.com/mail/Inbox/?u=b88140d0"; - position = 201; + url = "home.dnsc.io"; + position = 100; }; "Apps" = { id = "092abc24-d7c5-4012-b311-d4ee0b193537"; From 16bd79bcc04ab6d81e25a0086a2cac0a990e6a1d Mon Sep 17 00:00:00 2001 From: Dennis Schoepf Date: Wed, 17 Dec 2025 00:16:17 +0100 Subject: [PATCH 26/26] wip: dnsc-machine setup --- modules/zen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/zen/default.nix b/modules/zen/default.nix index 53e07e8..1559f9c 100644 --- a/modules/zen/default.nix +++ b/modules/zen/default.nix @@ -48,7 +48,7 @@ id = "245843da-9cc4-4c78-ad43-ea7d9139838b"; workspace = spaces.Personal.id; container = containers.Personal.id; - url = "home.dnsc.io"; + url = "https://home.dnsc.io"; position = 100; }; "Apps" = {