diff --git a/flake.lock b/flake.lock index 8a7b25d..2f3e094 100644 --- a/flake.lock +++ b/flake.lock @@ -93,23 +93,9 @@ "type": "github" } }, - "flake-schemas": { - "locked": { - "lastModified": 1721999734, - "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", - "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", - "revCount": 75, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" - } - }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1731533236, @@ -125,21 +111,21 @@ "type": "github" } }, - "hayase": { + "flake-utils_2": { "inputs": { - "nixpkgs": "nixpkgs_3" + "systems": "systems_3" }, "locked": { - "lastModified": 1778700931, - "narHash": "sha256-b5LHDafXv7Q+PLf/cQEF/WN1EmSoUltRqBDX8pl5HuQ=", - "owner": "darkguibrine", - "repo": "hayase-nix", - "rev": "728e5821937fb99f89abc392bf7c51155294958e", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { - "owner": "darkguibrine", - "repo": "hayase-nix", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, @@ -164,27 +150,6 @@ } }, "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nyx-loner", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1779336838, - "narHash": "sha256-n1+l78hJRABp4cQHKeD0BVByT0vZLPqd09Tvoq8Q+d8=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "928d72376949e222ea4f07b44828a55b0136422e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { "inputs": { "nixpkgs": [ "zen-browser", @@ -205,25 +170,22 @@ "type": "github" } }, - "jovian": { + "my-pkgs": { "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "nyx-loner", - "nixpkgs" - ] + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1779349451, - "narHash": "sha256-+xv7+hV4Ow51QzlP3PFQsDPB5bMhLMLfrgKTJX3jNsM=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "885e391f4c0f676417c86706d132e35e0c785bc1", + "lastModified": 1779598443, + "narHash": "sha256-Hyr97z7NoSollaM3rQbuAMdRDZHiHJspZwtwlZTTUAo=", + "owner": "darkguibrine", + "repo": "nix-pkgs", + "rev": "10a7cb7470dd76b01e7a42937f09f282476e18d4", "type": "github" }, "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", + "owner": "darkguibrine", + "repo": "nix-pkgs", "type": "github" } }, @@ -283,29 +245,6 @@ "type": "github" } }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "nyx-loner", - "jovian", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729697500, - "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", - "owner": "zhaofengli", - "repo": "nix-github-actions", - "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "matrix-name", - "repo": "nix-github-actions", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1777268161, @@ -339,11 +278,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1779558193, - "narHash": "sha256-iiKdRXBtZqYEtsMdC+rfFwsIfnzZMqFGth2Tpth/QU0=", + "lastModified": 1779561355, + "narHash": "sha256-HrMbEBJUdOIQ8m5HMjOWa3OaSMo3VWmkN+gHP0kRVmw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b0d43cc89d33e20d9f2c7c60bf308100fcd7b4ed", + "rev": "f9188aa83c426496b2471fe23c000033e189f26a", "type": "github" }, "original": { @@ -385,37 +324,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1768127708, - "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1772198003, - "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { "locked": { "lastModified": 1778443072, "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", @@ -449,16 +357,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", + "lastModified": 1779536132, + "narHash": "sha256-q+fF42iv/geEbHfgSzy3tS0FF/EyD6XTZ98E6yxiBO8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "3d8f0f3f72a6cd4d93d0ad13203f2ea1cb7e1456", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -481,11 +389,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1779475168, - "narHash": "sha256-gm3D4FF9EcZlXK/ZnsC6IYzpEQplOoT+LPTurzOPyrk=", + "lastModified": 1779536132, + "narHash": "sha256-q+fF42iv/geEbHfgSzy3tS0FF/EyD6XTZ98E6yxiBO8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a0991c886dc83e6e9de01d5266e4842985b1850e", + "rev": "3d8f0f3f72a6cd4d93d0ad13203f2ea1cb7e1456", "type": "github" }, "original": { @@ -529,27 +437,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1779414690, - "narHash": "sha256-gOTcX/9MZVMUE0Xvb4IEcv+0TQJkZFNEnL757ljU360=", + "lastModified": 1779508470, + "narHash": "sha256-Ap9KJX+5xHIn3bPIpfNgT6MEXdAECECwo4/rmlQD74M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6dedf69f94d03cbe7bdde106f2d4c23ae2a853bf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1779357205, - "narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1", + "rev": "29916453413845e54a65b8a1cf996842300cd299", "type": "github" }, "original": { @@ -559,6 +451,21 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1768127708, + "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "noctalia": { "inputs": { "nixpkgs": "nixpkgs_6", @@ -584,7 +491,7 @@ "noctalia", "nixpkgs" ], - "systems": "systems", + "systems": "systems_2", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -620,32 +527,10 @@ "type": "github" } }, - "nyx-loner": { - "inputs": { - "flake-schemas": "flake-schemas", - "home-manager": "home-manager_2", - "jovian": "jovian", - "nixpkgs": "nixpkgs_8", - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1779481028, - "narHash": "sha256-QLGEDVZB6dz9HPambJj3M2s+upQgzMjHBqoHpGrtb4A=", - "owner": "lonerOrz", - "repo": "nyx-loner", - "rev": "33b3558bc484a5f3de7f4b1f08c6cb6c8a681679", - "type": "github" - }, - "original": { - "owner": "lonerOrz", - "repo": "nyx-loner", - "type": "github" - } - }, "preload-ng": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_9" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1768356181, @@ -663,7 +548,7 @@ }, "quickshell": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1779430452, @@ -684,18 +569,16 @@ "aagl": "aagl", "disko": "disko", "flake-parts": "flake-parts", - "hayase": "hayase", "home-manager": "home-manager", + "my-pkgs": "my-pkgs", "niri": "niri", "nixpkgs": "nixpkgs_5", "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable_2", "noctalia": "noctalia", "nur": "nur", - "nyx-loner": "nyx-loner", "preload-ng": "preload-ng", "quickshell": "quickshell", - "shiru": "shiru", "zen-browser": "zen-browser" } }, @@ -720,46 +603,22 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "nyx-loner", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1779419951, - "narHash": "sha256-dMX0PUslUHPajP6o8FEoRdFv9afq/dec4POR0vVfjK4=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "5b5c521d6cae9ef4aa32f888eb2c0ce595c9be52", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "shiru": { - "inputs": { - "nixpkgs": "nixpkgs_11" - }, - "locked": { - "lastModified": 1778291268, - "narHash": "sha256-95b35l94BfQo6Ui9DIUyqpIA3xW8EY1oLTzEyY9QyXw=", - "owner": "darkguibrine", - "repo": "shiru-nix", - "rev": "275240677c27f9c8d51e6d1906eb508d922d4bcf", - "type": "github" - }, - "original": { - "owner": "darkguibrine", - "repo": "shiru-nix", - "type": "github" - } - }, "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -774,7 +633,7 @@ "type": "github" } }, - "systems_2": { + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -846,8 +705,8 @@ }, "zen-browser": { "inputs": { - "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_12" + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1779455631, diff --git a/flake.nix b/flake.nix index 333507c..eded31f 100644 --- a/flake.nix +++ b/flake.nix @@ -11,8 +11,7 @@ home-manager.url = "github:nix-community/home-manager/"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; zen-browser.url = "github:0xc000022070/zen-browser-flake"; - shiru.url = "github:darkguibrine/shiru-nix"; - hayase.url = "github:darkguibrine/hayase-nix"; + my-pkgs.url = "github:darkguibrine/nix-pkgs"; noctalia.url = "github:noctalia-dev/noctalia-shell"; niri.url = "github:sodiboo/niri-flake"; quickshell.url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; diff --git a/hosts/Alfa/conf/GM/Pkgs/pkgs.nix b/hosts/Alfa/conf/GM/Pkgs/pkgs.nix index f26145f..7353246 100644 --- a/hosts/Alfa/conf/GM/Pkgs/pkgs.nix +++ b/hosts/Alfa/conf/GM/Pkgs/pkgs.nix @@ -12,11 +12,12 @@ environment.systemPackages = with pkgs; [ ## Navegadores - inputs.zen-browser.packages.${pkgs.system}.default + inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default + inputs.my-pkgs.packages.${pkgs.stdenv.hostPlatform.system}.hellium ## Streaming / mídia - inputs.shiru.packages.${pkgs.system}.default - inputs.hayase.packages.${pkgs.system}.default + inputs.my-pkgs.packages.${pkgs.stdenv.hostPlatform.system}.shiru + inputs.my-pkgs.packages.${pkgs.stdenv.hostPlatform.system}.hayase linux-wallpaperengine ## Segurança / rede diff --git a/hosts/Alfa/conf/GM/configs/nixhelper.nix b/hosts/Alfa/conf/GM/configs/nixhelper.nix index d94c47a..d39cdd4 100644 --- a/hosts/Alfa/conf/GM/configs/nixhelper.nix +++ b/hosts/Alfa/conf/GM/configs/nixhelper.nix @@ -65,12 +65,6 @@ ); }; - # chaotic - chaotic.nyx = { - cache.enable = true; - overlay.enable = true; - }; - services.printing.enable = false; services = { flatpak = { diff --git a/hosts/Alfa/configuration.nix b/hosts/Alfa/configuration.nix index 81fc215..24994c3 100644 --- a/hosts/Alfa/configuration.nix +++ b/hosts/Alfa/configuration.nix @@ -14,7 +14,7 @@ ## Configuraçãao do bootloader boot = { - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_xanmod_latest; loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; loader.systemd-boot.configurationLimit = 10;