From d9c1f63f3bc8b81bfc16c96e1a7d56c25dd27a33 Mon Sep 17 00:00:00 2001 From: FabricSoul Date: Thu, 7 Aug 2025 19:13:38 -0400 Subject: [PATCH] update flake --- flake.lock | 116 +++++++++++++++++++++++++---------------------------- flake.nix | 21 +++++----- 2 files changed, 66 insertions(+), 71 deletions(-) diff --git a/flake.lock b/flake.lock index 316e409..3309065 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "fabric-dwl": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1754514691, + "narHash": "sha256-/KgE/0DAMTOEIwubGoEcFSO3HP0peOdJEHoe7gOCO/8=", + "ref": "refs/heads/main", + "rev": "c35ba0afa76a7a7143bede61e4cb1caf63efc52e", + "revCount": 1329, + "type": "git", + "url": "https://codeberg.org/FabricSoul/dwl" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/FabricSoul/dwl" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -30,11 +48,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1754420989, + "narHash": "sha256-3e4wHzNwTMg7GaeLH9A091DMaO9AfFxUjpfqbddCUeo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "7f38f25a44023a21a504bd3fd9d4f41c4a39f55c", "type": "github" }, "original": { @@ -86,11 +104,11 @@ ] }, "locked": { - "lastModified": 1753294394, - "narHash": "sha256-1Dfgq09lHZ8AdYB2Deu/mYP1pMNpob8CgqT5Mzo44eI=", + "lastModified": 1754503522, + "narHash": "sha256-V0iiDcYvNeMOP2FyfgC4H8Esx+JodXEl80lD4hFD4SI=", "owner": "nix-community", "repo": "home-manager", - "rev": "1fde6fb1be6cd5dc513dc1c287d69e4eb2de973e", + "rev": "13461dec40bf03d9196ff79d1abe48408268cc35", "type": "github" }, "original": { @@ -100,27 +118,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "zen-browser", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1752603129, - "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "ixx": { "inputs": { "flake-utils": [ @@ -151,11 +148,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753151930, - "narHash": "sha256-XSQy6wRKHhRe//iVY5lS/ZpI/Jn6crWI8fQzl647wCg=", + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1754340878, + "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "83e677f31c84212343f4cc553bab85c2efcad60a", + "rev": "cab778239e705082fe97bb4990e0d24c50924c04", "type": "github" }, "original": { @@ -165,7 +178,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -191,11 +204,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1752976861, - "narHash": "sha256-59HcrqHfbSJUdmpzrAa9x8fW1PoS+ZGhCjL5k5HbyV8=", + "lastModified": 1754506651, + "narHash": "sha256-LcpDSjGtTVU0S+aWJPE3/8RONQV0q8dDuanfCj7mAW0=", "owner": "nix-community", "repo": "nixvim", - "rev": "0c50ed9349199219583cb1ed1a972d71e06039ec", + "rev": "085ef66994f94226dd3d62921e1d48bf731b663a", "type": "github" }, "original": { @@ -215,11 +228,11 @@ ] }, "locked": { - "lastModified": 1749730855, - "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", + "lastModified": 1754301638, + "narHash": "sha256-aRgzcPDd2axHFOuMlPLuzmDptUM2JU8mUL3jfgbBeyc=", "owner": "NuschtOS", "repo": "search", - "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", + "rev": "a60091045273484c040a91f5c229ba298f8ecc27", "type": "github" }, "original": { @@ -232,7 +245,7 @@ "inputs": { "fenix": "fenix", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "systems": "systems_4" }, "locked": { @@ -251,11 +264,11 @@ }, "root": { "inputs": { + "fabric-dwl": "fabric-dwl", "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", - "openapi-tui": "openapi-tui", - "zen-browser": "zen-browser" + "openapi-tui": "openapi-tui" } }, "rust-analyzer-src": { @@ -334,27 +347,6 @@ "repo": "default-linux", "type": "github" } - }, - "zen-browser": { - "inputs": { - "home-manager": "home-manager_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1753069499, - "narHash": "sha256-YtgY0ueqKNrBma4Euu8WH23BhUkBujirJDMDE1KujnU=", - "owner": "0xc000022070", - "repo": "zen-browser-flake", - "rev": "c64b94235ae24e3b9e01a08f0331d8bb0e5b037a", - "type": "github" - }, - "original": { - "owner": "0xc000022070", - "repo": "zen-browser-flake", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index b9ac030..87d7b64 100644 --- a/flake.nix +++ b/flake.nix @@ -17,11 +17,10 @@ openapi-tui = { url = "github:zaghaghi/openapi-tui"; }; - zen-browser = { - url = "github:0xc000022070/zen-browser-flake"; - # IMPORTANT: we're using "libgbm" and is only available in unstable so ensure - # to have it up-to-date or simply don't specify the nixpkgs input - inputs.nixpkgs.follows = "nixpkgs"; + + fabric-dwl = { + url = "git+https://codeberg.org/FabricSoul/dwl"; + flake = true; }; }; @@ -30,9 +29,9 @@ nixpkgs, # nvidiaPkgs, home-manager, - zen-browser, nixvim, openapi-tui, + fabric-dwl, ... }: let lib = nixpkgs.lib; @@ -66,12 +65,16 @@ homeConfigurations.fabric = home-manager.lib.homeManagerConfiguration { inherit pkgs; extraSpecialArgs = { - inherit nixvim openapi-tui zen-browser; # deleted hyprpanel + inherit nixvim openapi-tui; }; modules = [ ./home/fabric/default.nix - nixvim.homeManagerModules.nixvim - # hyprpanel.homeManagerModules.hyprpanel + nixvim.homeModules.nixvim + ({pkgs, ...}: { + home.packages = [ + fabric-dwl.packages.${pkgs.system}.default + ]; + }) ]; }; };